Handle changes in window position for workspace thumbnails

Connect to the 'position-set' signal of MetaWindowActor and move actors when the source windows move.
Improve workspace controls slide-in positioning
2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:57 -05:00 · 2011-02-02 23:45:56 -05:00
262 changed files with 24918 additions and 72377 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,7 @@ ChangeLog
 INSTALL
 Makefile
 Makefile.in
+NEWS
 aclocal.m4
 autom4te.cache
 config.h
@ -20,6 +21,8 @@ data/gnome-shell.desktop.in
 data/gschemas.compiled
 data/org.gnome.shell.gschema.xml
 data/org.gnome.shell.gschema.valid
+data/org.gnome.accessibility.magnifier.gschema.xml
+data/org.gnome.accessibility.magnifier.gschema.valid
 js/misc/config.js
 intltool-extract.in
 intltool-merge.in
@ -39,13 +42,8 @@ src/*-enum-types.[ch]
 src/*-marshal.[ch]
 src/Makefile
 src/Makefile.in
-src/calendar-server/org.gnome.Shell.CalendarServer.service
+src/gnomeshell-taskpanel
 src/gnome-shell
-src/gnome-shell-calendar-server
-src/gnome-shell-extension-tool
-src/gnome-shell-jhbuild
-src/gnome-shell-perf-helper
-src/gnome-shell-real
 src/run-js-test
 src/test-recorder
 src/test-recorder.ogg
@ -58,4 +56,3 @@ tests/run-test.sh
 xmldocs.make
 *~
 *.patch
-*.sw?
--- a/146
+++ b/146
@ -1,146 +0,0 @@
-3.0.1
-=====
-
-* Network menu
-  - Fix problems updating the menu for mobile broadband devices [Giovanni]
-    https://bugzilla.gnome.org/show_bug.cgi?id=646395
-  - Fix missing device descriptions with multiple devices of the
-    same type [Giovanni]
-    https://bugzilla.gnome.org/show_bug.cgi?id=646074
-  - Label ad-hoc neworks with an appropriate icon [Dan]
-    https://bugzilla.gnome.org/show_bug.cgi?id=646141
-  - Fix displaying some devices states as "invalid" [Dan]
-    https://bugzilla.gnome.org/show_bug.cgi?id=646946
-  - Fix problems with access points that don't report a SSID [Giovanni]
-    https://bugzilla.gnome.org/show_bug.cgi?id=647040
-  - Miscellaneous minor bug fixes [Dan, Giovanni, Owen]
-    645981, 646558, 646443, 646708, 646968
-* Application menu and icon
-  - Fix bug where application menu icon was missing at GNOME Shell
-    startup. [Florian]
-    https://bugzilla.gnome.org/show_bug.cgi?id=644122
-  - Fix missing application menu for dialog windows [Colin]
-    https://bugzilla.gnome.org/show_bug.cgi?id=647082
- -  When launching an application through an alternate launcher
-    (like for a System Settings pane), association the windows with
-    the application, not the launcher. [Colin]
-    https://bugzilla.gnome.org/show_bug.cgi?id=646689
-* Activities overview
-  - Load the applications view incrementally to avoid potentially freezing
-    for multiple seconds [Colin]
-    https://bugzilla.gnome.org/show_bug.cgi?id=647778
-  - Fix bug where package installation while the overview
-    was up could result in a corrupted application display. [Giovanni]
-    https://bugzilla.gnome.org/show_bug.cgi?id=645801
-  - Fix dragging from the search results to launch apps and docs [Florian]
-    https://bugzilla.gnome.org/show_bug.cgi?id=645990
-  - Fix flickering of selection when searching in the overview [Florian]
-    https://bugzilla.gnome.org/show_bug.cgi?id=646019
-  - Fix bug when typing into the search box when text was already
-    selected [Nohemi]
-    https://bugzilla.gnome.org/show_bug.cgi?id=636341
-* Fix layout of notifications for right-to-left languages [Florian]
-  https://bugzilla.gnome.org/show_bug.cgi?id=646921
-* Remove a confusing special case where Alt-Tab sometimes switched
-  to a different window of the same application rather than to
-  a different application. [Rui]
-  https://bugzilla.gnome.org/show_bug.cgi?id=648132
-* Fix a crash that could happen when a window was opened on a
-  workspace that was immediately removed [Dan]
-  https://bugzilla.gnome.org/show_bug.cgi?id=648132
-* Fix keyboard navigation in logout/reboot dialogs [Dan]
-  https://bugzilla.gnome.org/show_bug.cgi?id=646740
-* Fix missing inspector icon in Looking Glass console [Dan]
-* Miscellaneous minor bug fixes [Adel, Colin, Dan, Florian, Nohemi]
-  645648, 646205, 646257, 646855, 647098, 646730
-
-Contributors:
- Giovanni Campagna, Nohemi Fernandez, Adel Gadllah, Rui Matos, Florian Müllner,
- Owen Taylor, Colin Walters, Dan Winship
-
-Translations:
- Hendrik Richter [de], Jorge González [es], Arash Mousavi [fa],
- Fran Diéguez [gl], Jiro Matsuzawa [ja], Piotr Drąg [pl], Daniel Nylander [sv],
- Sira Nokyoongtong [th], Muhammet Kara [tr], Nguyễn Thái Ngọc Duy [vi],
- Aron Xu [zh_CN], Chao-Hsiung Liao [zh_HK, zh_TW]
-
-3.0.0.2
-=======
-
-* Fix missing import that was preventing extensions from loading.
-  [Maxim Ermilov]
-  https://bugzilla.gnome.org/show_bug.cgi?id=646333
-
-Translations:
- Timo Jyrinki [fi]
-
-3.0.0.1
-=======
-
-* Fix problem with stuck event handling if network menu pops down while
-  user is using the scrollbar. [Owen Taylor]
-  https://bugzilla.gnome.org/show_bug.cgi?id=646825
-
-Contributors to GNOME Shell 3.0
-===============================
-
-Code:
-
- Josh Adams, Kiyoshi Aman, Nuno Araujo, Emmanuele Bassi, Dirk-Jan C. Binnema,
- Wouter Bolsterlee, Raphael Bosshard, Milan Bouchet-Valat, Christina Boumpouka,
- Mathieu Bridon, Alban Browaeys, Phil Bull, Micro Cai, Giovanni Campagna,
- Cosimo Cecchi, Tor-björn Claesson, Matthias Clasen, Jason D. Clinton,
- Frederic Crozat, Guillaume Desmottes, Sander Dijkhuis, Neha Doijode,
- Maxim Ermilov, Diego Escalante Urrelo, Luca Ferretti, Steve Frécinaux,
- Takao Fujiwara, Adel Gadllah, Vadim Girlin, Nick Glynn, Guido Günther,
- Leon Handreke, Lex Hider, Richard Hughes, Javier Jardón, Abderrahim Kitouni,
- Andre Klapper, Alexander Larsson, Nickolas Lloyd, Ryan Lortie, Kjartan Maraas,
- Koop Mast, Rui Matos, Jonathan Matthew, William Jon McCann, Morten Mjelva,
- Federico Mena Quintero, Florian Müllner, Jon Nettleton, Hellyna Ng,
- Discardi Nicola, Carlos Martín Nieto, Bastien Nocera, Bill Nottingham,
- Matt Novenstern, Marc-Antoine Perennou, Neil Perry, Frédéric Péters,
- Alejandro Piñeiro, Siegfried-Angel Gevatter Pujals, "res", Neil Roberts,
- "Sardem FF7", Florian Scandella, Joseph Scheuhammer, Christian Schramm,
- Gustavo Noronha Silva, Jasper St. Pierre, Eric Springer, Jakub Steiner,
- Jonathan Strander, Ray Strode, Owen Taylor, Rico Tzschichholz,
- Sergey V. Udaltsov, Daiki Ueno, Vincent Untz, Marcelo Jorge Vieira,
- Mads Villadsen, Colin Walters, Dan Winship, William Wolf, Thomas Wood,
- Pierre Yager, David Zeuthen, Marina Zhurakhinskaya
-
-Design:
-
- Allan Day, William Jon McCann, Jeremy Perry, Jakub Steiner
- 2008 Boston GNOME design hackfest participants (especially Neil J. Patel
- for turning the resulting sketches into our first mockups.)
- Everybody on irc.gnome.org:#gnome-design
-
-Translations:
-
- Friedel Wolff (af), Khaled Hosny (ar), Ivaylo Valkov (bg), Jamil Ahmed (bn)
- Runa Bhattacharjee (bn_IN), Gil Forcada, Siegfried-Angel Gevatter Pujals,
- Jordi Serratosa (ca), Andre Klapper, Petr Kovar (cs), Kenneth Nielsen,
- Kris Thomsen (da), Mario Blättermann, Hendrik Brandt, Christian Kirbach,
- Hendrik Richter, Wolfgang Stöggl (de), Michael Kotsarinis, Kostas Papadimas,
- Jennie Petoumenou, Sterios Prosiniklis, Fotis Tsamis, Simos Xenitellis (el),
- Bruce Cowan, Philip Withnall (en_GB), Jorge Gonzalez, Daniel Mustieles (es),
- Mattias Põldaru, Ivar Smolin (et), Inaki Larranaga Murgoitio (eu),
- Mahyar Moghimi (fa), Timo Jyrinki (fi), Cyril Arnaud, Bruno Brouard,
- Pablo Martin-Gomez, Claude Paroz, Frédéric Peters (fr), Seán de Búrca (ga)
- Francisco Diéguez, Antón Méixome (gl), Sweta Kothari (gu), Liel Fridman,
- Yaron Shahrabani (he), Rajesh Ranjan (hi), Gabor Kelemen (hu), Milo Casagrande,
- Luca Ferretti (it), Dirgita, Andika Triwidada (id), Takayuki KUSANO,
- Takayoshi OKANO, Kiyotaka NISHIBORI, Futoshi NISHIO (ja), Shankar Prasad (kn),
- Young-Ho Cha, Changwoo Ryu (ko), Žygimantas Beručka, Gintautas Miliauskas (lt),
- Rudolfs Mazurs (lv), Sandeep Shedmake (mr), Kjartan Maraas (nb),
- Wouter Bolsterlee, Sander Dijkhuis, Reinout van Schouwen (nl),
- Torstein Winterseth (nn), A S Alam (pa), Tomasz Dominikowski, Piotr Drąg (pl),
- Duarte Loreto (pt), Felipe Borges, Rodrigo Padula de Oliveira,
- Rodrigo L. M. Flores, Amanda Magalhães, Og B. Maciel, Gabriel F. Vilar,
- Jonh Wendell (pt_BR), Lucian Adrian Grijincu, Daniel Șerbănescu (ro),
- Sergey V. Kovylov, Andrey Korzinev, Yuri Myasoedov, Marina Zhurakhinskaya (ru),
- Daniel Nylander (se), Matej Urbančič, Andrej Žnidaršič (sl),
- Miloš Popović (sr, sr@latin), Miroslav Nikolić (sr), Tirumurti Vasudevan (ta),
- Sira Nokyoongtong (th), Baris Cicek (tr), Abduxukur Abdurixit,
- Gheyret T. Kenji (ug), Maxim V. Dziumanenko, Daniel Korostil (uk),
- Nguyễn Thái Ngọc Duy (vi), Jessica Ban, 'jiero', Wei Li, YunQiang Su, Ray Wang,
- Aron Xu (zh_CN), Chao-Hsiung Liao (zh_HK, zh_TW)
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.0.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[2.91.6],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@ -52,8 +52,8 @@ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
 if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
   AC_MSG_RESULT(yes)
   build_recorder=true
-   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
+   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes"
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
 else
   AC_MSG_RESULT(no)
 fi
@ -62,65 +62,48 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

 CLUTTER_MIN_VERSION=1.5.15
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=0.7.11
-MUTTER_MIN_VERSION=3.0.0
-GTK_MIN_VERSION=3.0.0
+GJS_MIN_VERSION=0.7.8
+MUTTER_MIN_VERSION=2.91.4
+GTK_MIN_VERSION=2.91.7
 GIO_MIN_VERSION=2.25.9
-LIBECAL_MIN_VERSION=2.32.0
-LIBEDATASERVER_MIN_VERSION=1.2.0
-LIBEDATASERVERUI2_MIN_VERSION=1.2.0
-LIBEDATASERVERUI3_MIN_VERSION=2.91.6
-TELEPATHY_GLIB_MIN_VERSION=0.13.12
-TELEPATHY_LOGGER_MIN_VERSION=0.2.4
-POLKIT_MIN_VERSION=0.100
+LIBECAL_REQUIRED=1.6.0
+LIBEDATASERVER_REQUIRED=1.2.0
+LIBEDATASERVERUI2_REQUIRED=1.2.0
+LIBEDATASERVERUI3_REQUIRED=2.91.6
+

 # Collect more than 20 libraries for a prize!
-PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
-                               gio-unix-2.0 dbus-glib-1 libxml-2.0
-                               gtk+-3.0 >= $GTK_MIN_VERSION
-                               libmutter >= $MUTTER_MIN_VERSION
-                               gjs-internals-1.0 >= $GJS_MIN_VERSION
-			       libgnome-menu $recorder_modules gconf-2.0
-                               gdk-x11-3.0
-			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
-			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
-                               libstartup-notification-1.0
-                               gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-			       libcanberra
-                               telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
-                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
-
-PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
+                                 gio-unix-2.0 dbus-glib-1 libxml-2.0
+                                 gtk+-3.0 >= $GTK_MIN_VERSION
+                                 mutter-plugins >= $MUTTER_MIN_VERSION
+                                 gjs-internals-1.0 >= $GJS_MIN_VERSION
+				 libgnome-menu $recorder_modules gconf-2.0
+                                 gdk-x11-3.0
+				 clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
+				 clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
+                                 libstartup-notification-1.0
+                                 gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+				 libcanberra)

 GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
 AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
 AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])

-GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
-JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
-# NM is the only typelib we use that we don't jhbuild
-PKG_CHECK_EXISTS([libnm-glib >= 0.8.999],
-        [NM_TYPELIBDIR=`$PKG_CONFIG --variable=libdir libnm-glib`/girepository-1.0
-	 if test "$INTROSPECTION_TYPELIBDIR" != "$NM_TYPELIBDIR"; then
-	     JHBUILD_TYPELIBDIR="$JHBUILD_TYPELIBDIR:$NM_TYPELIBDIR"
-	 fi])
-AC_SUBST(JHBUILD_TYPELIBDIR)
-
 saved_CFLAGS=$CFLAGS
 saved_LIBS=$LIBS
-CFLAGS=$GNOME_SHELL_CFLAGS
-LIBS=$GNOME_SHELL_LIBS
+CFLAGS=$MUTTER_PLUGIN_CFLAGS
+LIBS=$MUTTER_PLUGIN_LIBS
 # sn_startup_sequence_get_application_id, we can replace with a version check later
-AC_CHECK_FUNCS(JS_NewGlobalObject sn_startup_sequence_get_application_id XFixesCreatePointerBarrier)
+AC_CHECK_FUNCS(JS_NewGlobalObject sn_startup_sequence_get_application_id)
 CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS

-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
+PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 gnome-desktop-3.0 >= 2.90.0)
 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
-PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
+PKG_CHECK_MODULES(JS_TEST, clutter-x11-1.0 gjs-1.0 gobject-introspection-1.0 gtk+-3.0)

 AC_MSG_CHECKING([for bluetooth support])
 PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
@ -138,17 +121,20 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 2.90.0],
 # Default to libedataserverui-3.0, but allow falling back to 1.2
 PKG_CHECK_EXISTS(libedataserverui-3.0,
                 [EDS_API=3.0
-                  LIBEDATASERVERUI_MIN_VERSION=$LIBEDATASERVERUI3_MIN_VERSION],
+                  LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI3_REQUIRED],
                 [EDS_API=1.2
-                  LIBEDATASERVERUI_MIN_VERSION=$LIBEDATASERVERUI2_MIN_VERSION])
-PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-$EDS_API >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
-AC_SUBST(CALENDAR_SERVER_CFLAGS)
-AC_SUBST(CALENDAR_SERVER_LIBS)
+                  LIBEDATASERVERUI_REQUIRED=$LIBEDATASERVERUI2_REQUIRED])
+PKG_CHECK_MODULES(LIBECAL, libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-$EDS_API >= $LIBEDATASERVERUI_REQUIRED)
+AC_SUBST(LIBECAL_CFLAGS)
+AC_SUBST(LIBECAL_LIBS)

-MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
-MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
-AC_SUBST(MUTTER_GIR_DIR)
-AC_SUBST(MUTTER_TYPELIB_DIR)
+MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin
+# FIXME: metacity-plugins.pc should point directly to its .gir file
+MUTTER_LIB_DIR=`$PKG_CONFIG --variable=libdir mutter-plugins`
+MUTTER_PLUGIN_DIR=`$PKG_CONFIG --variable=plugindir mutter-plugins`
+AC_SUBST(MUTTER_BIN_DIR)
+AC_SUBST(MUTTER_LIB_DIR)
+AC_SUBST(MUTTER_PLUGIN_DIR)

 GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
 AC_SUBST(GJS_CONSOLE)
@ -197,9 +183,8 @@ if test "$enable_compile_warnings" != no ; then
 fi
 changequote([,])dnl

-AC_ARG_ENABLE(jhbuild-wrapper-script,
-  AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
-AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
+AC_PATH_PROG(mutter, [mutter])
+AC_SUBST(mutter)

 AC_CONFIG_FILES([
  Makefile
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -17,36 +17,47 @@ dist_searchproviders_DATA =				\
 	search_providers/google.xml				\
 	search_providers/wikipedia.xml

+imagesdir = $(pkgdatadir)/images
+dist_images_DATA =				\
+	close-black.svg				\
+	magnifier.svg
+
 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
 	theme/calendar-arrow-left.svg		\
 	theme/calendar-arrow-right.svg		\
-	theme/calendar-today.svg		\
 	theme/close-window.svg			\
 	theme/close.svg				\
-	theme/corner-ripple-ltr.png		\
-	theme/corner-ripple-rtl.png		\
+	theme/corner-ripple.png			\
 	theme/dash-placeholder.svg		\
-	theme/filter-selected-ltr.svg		\
-	theme/filter-selected-rtl.svg		\
+	theme/filter-selected.svg		\
 	theme/gnome-shell.css			\
-	theme/panel-border.svg			\
-	theme/panel-button-border.svg		\
-	theme/panel-button-highlight-narrow.svg	\
-	theme/panel-button-highlight-wide.svg	\
-	theme/process-working.svg		\
+	theme/mosaic-view-active.svg		\
+	theme/mosaic-view.svg			\
+	theme/move-window-on-new.svg		\
+	theme/process-working.png		\
 	theme/running-indicator.svg		\
+	theme/scroll-button-down-hover.png	\
+	theme/scroll-button-down.png		\
+	theme/scroll-button-up-hover.png	\
+	theme/scroll-button-up.png		\
 	theme/scroll-hhandle.svg		\
 	theme/scroll-vhandle.svg		\
-	theme/source-button-border.svg		\
+	theme/section-more.svg			\
+	theme/section-more-open.svg		\
+	theme/separator-white.png		\
+	theme/single-view-active.svg		\
+	theme/single-view.svg			\
 	theme/toggle-off-us.svg			\
 	theme/toggle-off-intl.svg		\
 	theme/toggle-on-us.svg			\
 	theme/toggle-on-intl.svg		\
-	theme/ws-switch-arrow-up.svg		\
-	theme/ws-switch-arrow-down.svg
+	theme/ws-switch-arrow-left.svg		\
+	theme/ws-switch-arrow-right.svg

-gsettings_SCHEMAS = org.gnome.shell.gschema.xml
+gsettings_SCHEMAS =					\
+	org.gnome.accessibility.magnifier.gschema.xml	\
+	org.gnome.shell.gschema.xml

@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
@ -63,6 +74,11 @@ all-local: gschemas.compiled
 gconfschemadir  = @GCONF_SCHEMA_FILE_DIR@
 gconfschema_DATA = gnome-shell.schemas

+menudir = $(sysconfdir)/xdg/menus
+
+menu_DATA = \
+	gs-applications.menu
+
 shadersdir = $(pkgdatadir)/shaders
 shaders_DATA = \
 	shaders/dim-window.glsl
@ -77,6 +93,7 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(gconfschema_DATA)				\
 	$(shaders_DATA)					\
+	org.gnome.accessibility.magnifier.gschema.xml.in \
 	org.gnome.shell.gschema.xml.in

 CLEANFILES =						\
--- a/data/close-black.svg
+++ b/data/close-black.svg
@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="close-black.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata2399"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs2397"><linearGradient
+     id="linearGradient3173"><stop
+       style="stop-color:#c4c4c4;stop-opacity:1;"
+       offset="0"
+       id="stop3175" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3177" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 8 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="16 : 8 : 1"
+     inkscape:persp3d-origin="8 : 5.3333333 : 1"
+     id="perspective2401" /></defs><sodipodi:namedview
+   inkscape:window-height="811"
+   inkscape:window-width="1272"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="32.125"
+   inkscape:cx="8"
+   inkscape:cy="10.440056"
+   inkscape:window-x="40"
+   inkscape:window-y="40"
+   inkscape:current-layer="Foreground" />
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   d="M10.5,3.5l2,2L10,8l2.5,2.5l-2,2L8,10l-2.5,2.5l-2-2L6,8L3.5,5.5l2-2L8,6L10.5,3.5  z M0,8c0-4.418,3.582-8,8-8s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
+   id="path2394"
+   style="fill-opacity:1;fill:#545454" />
+</svg>
--- a/data/gnome-shell.desktop.in.in
+++ b/data/gnome-shell.desktop.in.in
@ -13,4 +13,3 @@ NoDisplay=true
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=panel;windowmanager;
 X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@ -22,7 +22,7 @@
        <applyto>/desktop/gnome/shell/windows/button_layout</applyto>
        <owner>gnome-shell</owner>
        <type>string</type>
-        <default>:close</default>
+        <default>:minimize,maximize,close</default>
        <locale name="C">
           <short>Arrangement of buttons on the titlebar</short>
           <long>
@ -81,20 +81,5 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/desktop/gnome/shell/windows/workspaces_only_on_primary</key>
-        <applyto>/desktop/gnome/shell/windows/workspaces_only_on_primary</applyto>
-        <owner>gnome-shell</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short>Workspaces only on primary monitor</short>
-          <long>
-             This key overrides /apps/mutter/general/workspaces_only_on_primary when
-             running GNOME Shell.
-          </long>
-        </locale>
-      </schema>
-
  </schemalist>
 </gconfschemafile>
--- a/data/gs-applications.menu
+++ b/data/gs-applications.menu
@ -0,0 +1,85 @@
+<Menu>
+	<DefaultLayout>
+		<Menuname>Accessories</Menuname>
+		<Menuname>Games</Menuname>
+		<Menuname>Graphics</Menuname>
+		<Menuname>Internet</Menuname>
+		<Menuname>Multimedia</Menuname>
+		<Menuname>Office</Menuname>
+		<Menuname>Other</Menuname>
+	</DefaultLayout>
+
+	<Name>Applications</Name>
+	<AppDir>/usr/local/share/applications</AppDir>
+	<DefaultAppDirs/>
+
+	<Menu>
+		<Name>Accessories</Name>
+		<Include>
+			<And>
+				<Category>Utility</Category>
+				<Not>
+					<Category>System</Category>
+				</Not>
+			</And>
+		</Include>
+	</Menu>
+
+	<Menu>
+		<Name>Games</Name>
+		<Include>
+			<And>
+				<Category>Game</Category>
+			</And>
+		</Include>
+	</Menu>
+
+	<Menu>
+		<Name>Graphics</Name>
+		<Include>
+			<And>
+				<Category>Graphics</Category>
+			</And>
+		</Include>
+	</Menu>
+
+	<Menu>
+		<Name>Internet</Name>
+		<Include>
+			<And>
+				<Category>Network</Category>
+				<Not><Category>Settings</Category></Not>
+			</And>
+		</Include>
+	</Menu>
+
+	<Menu>
+		<Name>Multimedia</Name>
+		<Include>
+			<And>
+				<Category>AudioVideo</Category>
+				<Not><Category>Settings</Category></Not>
+			</And>
+		</Include>
+	</Menu>
+
+	<Menu>
+		<Name>Office</Name>
+		<Include>
+			<And>
+				<Category>Office</Category>
+			</And>
+		</Include>
+	</Menu>
+
+	<Menu>
+		<Name>Other</Name>
+		<OnlyUnallocated/>
+		<Include>
+			<And>
+				<Not><Category>Settings</Category></Not>
+				<Not><Category>Screensaver</Category></Not>
+			</And>
+		</Include>
+	</Menu>
+</Menu>
--- a/data/magnifier.svg
+++ b/data/magnifier.svg
@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="18"
+   height="18"
+   viewBox="0 0 18 18"
+   enable-background="new 0 0 29 18"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="magnifier.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata16"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs14"><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 9 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="29 : 9 : 1"
+     inkscape:persp3d-origin="14.5 : 6 : 1"
+     id="perspective18" /></defs><sodipodi:namedview
+   inkscape:window-height="728"
+   inkscape:window-width="1103"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="1"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#000000"
+   id="base"
+   showgrid="true"
+   inkscape:zoom="27.260185"
+   inkscape:cx="9.5844061"
+   inkscape:cy="9.4435574"
+   inkscape:window-x="142"
+   inkscape:window-y="26"
+   inkscape:current-layer="Foreground"
+   inkscape:snap-global="true"
+   showguides="false"><inkscape:grid
+     type="xygrid"
+     id="grid2391"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+<g
+   id="g5"
+   style="fill:#ffffff;fill-opacity:1"
+   transform="translate(-4,-0.023114)">
+	<path
+   d="m 6.246,13.98 c -0.319,-0.319 -0.319,-0.837 0,-1.157 L 9.963,9.106 c 0.319,-0.319 0.837,-0.319 1.157,0 l 0.786,0.787 c 0.32,0.319 0.32,0.837 0,1.157 l -3.717,3.717 c -0.32,0.319 -0.838,0.319 -1.157,0 l -0.786,-0.787 0,0 z"
+   id="path7"
+   style="fill:#ffffff;fill-opacity:1" />
+	<path
+   d="M 9.076,11.937"
+   id="path9"
+   style="fill:#ffffff;fill-opacity:1" />
+</g>
+<path
+   clip-rule="evenodd"
+   d="m 7.25,7.476886 c 0,-1.243 1.007,-2.25 2.2499998,-2.25 1.2430002,0 2.2500002,1.007 2.2500002,2.25 0,1.243 -1.007,2.25 -2.2500002,2.25 C 8.257,9.726886 7.25,8.719886 7.25,7.476886 z m -2.25,0 c 0,-2.485 2.015,-4.5 4.4999998,-4.5 2.4850002,0 4.5000002,2.015 4.5000002,4.5 0,2.4849998 -2.015,4.5 -4.5000002,4.5 C 7.015,11.976886 5,9.9618858 5,7.476886 z"
+   id="path11"
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" />
+</svg>
--- a/data/org.gnome.accessibility.magnifier.gschema.xml.in
+++ b/data/org.gnome.accessibility.magnifier.gschema.xml.in
@ -0,0 +1,133 @@
+<schemalist>
+
+  <enum id="MouseTrackingMode">
+    <value nick="none"         value="0"/>
+    <value nick="centered"     value="1"/>
+    <value nick="proportional" value="2"/>
+    <value nick="push"         value="3"/>
+  </enum>
+
+  <enum id="ScreenPosition">
+    <value nick="none"        value="0"/>
+    <value nick="full-screen" value="1"/>
+    <value nick="top-half"    value="2"/>
+    <value nick="bottom-half" value="3"/>
+    <value nick="left-half"   value="4"/>
+    <value nick="right-half"  value="5"/>
+  </enum>
+
+  <schema id="org.gnome.accessibility.magnifier"
+          path="/desktop/gnome/accessibility/magnifier/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-magnifier" type="b">
+      <default>false</default>
+      <_summary>Show or hide the magnifier</_summary>
+      <_description>
+        Show or hide the magnifier and all of its zoom regions.
+      </_description>
+    </key>
+    <key name="mouse-tracking" enum="MouseTrackingMode">
+      <default>'proportional'</default>
+      <_summary>Mouse Tracking Mode</_summary>
+      <_description>
+        Determines the position of the magnified mouse image within the
+        magnified view and how it reacts to system mouse movement. The values
+        are
+        - none: no mouse tracking;
+        - centered: the mouse image is
+        displayed at the center of the zoom region (which also represents
+        the point under the system mouse) and the magnified contents are
+        scrolled as the system mouse moves;
+        - proportional: the position of the magnified mouse in the zoom region
+        is proportionally the same as the position of the system mouse on screen;
+        - push: when the magnified mouse intersects a boundary of the zoom
+        region, the contents are scrolled into view.
+      </_description>
+    </key>
+    <key name="screen-position" enum="ScreenPosition">
+      <default>'full-screen'</default>
+      <_summary>Screen position</_summary>
+      <_description>
+        The magnified view either fills the entire screen, or occupies the
+        top-half, bottom-half, left-half, or right-half of the screen.
+      </_description>
+    </key>
+    <key name="mag-factor" type="d">
+      <default>2.0</default>
+      <_summary>Magnification factor</_summary>
+      <_description>
+        The power of the magnification. A value of 1.0 means no magnification.
+        A value of 2.0 doubles the size.
+      </_description>
+    </key>
+    <key name="lens-mode" type="b">
+      <default>false</default>
+      <_summary>Enable lens mode</_summary>
+      <_description>
+        Whether the magnified view should be centered over the location of
+        the system mouse and move with it.
+      </_description>
+    </key>
+    <key name="scroll-at-edges" type="b">
+      <default>false</default>
+      <_summary>
+        Scroll magnified contents beyond the edges of the desktop
+      </_summary>
+      <_description>
+        For centered mouse tracking, when the system pointer is at or near the
+        edge of the screen, the magnified contents continue to scroll such that
+        the screen edge moves into the magnified view.
+      </_description>
+    </key>
+
+    <!-- Cross-hairs -->
+    <key name="show-cross-hairs" type="b">
+      <default>false</default>
+      <_summary>Show or hide crosshairs</_summary>
+      <_description>
+        Enables/disables display of crosshairs centered on the magnified
+        mouse sprite.
+      </_description>
+    </key>
+    <key name="cross-hairs-thickness" type="i">
+      <default>8</default>
+      <_summary>Thickness of the crosshairs</_summary>
+      <_description>
+        Width of the vertical and horizontal lines that make up the crosshairs.
+      </_description>
+    </key>
+    <key name="cross-hairs-color" type="s">
+      <default>'#ff0000'</default>
+      <_summary>Color of the crosshairs</_summary>
+      <_description>
+        The color of the the vertical and horizontal lines that make up
+        the crosshairs.
+      </_description>
+    </key>
+    <key name="cross-hairs-opacity" type="i">
+      <default>169</default>
+      <_summary>Opacity of the crosshairs</_summary>
+      <_description>
+        Determines the transparency of the crosshairs, from fully opaque
+        to fully transparent.
+      </_description>
+    </key>
+    <key name="cross-hairs-length" type="i">
+      <default>4096</default>
+      <_summary>Length of the crosshairs</_summary>
+      <_description>
+        Determines the length of the vertical and horizontal lines that
+        make up the crosshairs.
+      </_description>
+    </key>
+    <key name="cross-hairs-clip" type="b">
+      <default>false</default>
+      <_summary>Clip the crosshairs at the center</_summary>
+      <_description>
+        Determines whether the crosshairs intersect the magnified mouse sprite,
+        or are clipped such that the ends of the horizontal and vertical lines
+        surround the mouse image.
+      </_description>
+    </key>
+  </schema>
+</schemalist>
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.shell" path="/org/gnome/shell/"
+  <schema id="org.gnome.shell" path="/apps/gnome-shell/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="development-tools" type="b">
      <default>true</default>
@ -45,16 +45,12 @@
      <default>[]</default>
      <_summary>History for command (Alt-F2) dialog</_summary>
    </key>
-    <key name="looking-glass-history" type="as">
-      <default>[]</default>
-      <_summary>History for the looking glass dialog</_summary>
-    </key>
    <child name="clock" schema="org.gnome.shell.clock"/>
    <child name="calendar" schema="org.gnome.shell.calendar"/>
    <child name="recorder" schema="org.gnome.shell.recorder"/>
  </schema>

-  <schema id="org.gnome.shell.calendar" path="/org/gnome/shell/calendar/"
+  <schema id="org.gnome.shell.calendar" path="/apps/gnome-shell/calendar/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="show-weekdate" type="b">
      <default>false</default>
@ -65,7 +61,7 @@
      </key>
  </schema>

-  <schema id="org.gnome.shell.clock" path="/org/gnome/shell/clock/"
+  <schema id="org.gnome.shell.clock" path="/apps/gnome-shell/clock/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="show-seconds" type="b">
      <default>false</default>
@ -83,7 +79,7 @@
    </key>
  </schema>

-  <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
+  <schema id="org.gnome.shell.recorder" path="/apps/gnome-shell/recorder/"
          gettext-domain="@GETTEXT_PACKAGE@">
    <key name="framerate" type="i">
      <default>15</default>
--- a/data/theme/calendar-today.svg
+++ b/data/theme/calendar-today.svg
@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="28"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="calendar-today.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3007"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient3072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient2997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="8.3750933"
-     inkscape:cy="8.0837211"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-469.08263,-536.99307)">
-    <g
-       id="g3003">
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-         transform="matrix(0.43692393,0,0,1.3783114,460.60467,517.48289)"
-         sodipodi:end="6.2831853"
-         sodipodi:start="3.1415927"
-         d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-         sodipodi:ry="16"
-         sodipodi:rx="42"
-         sodipodi:cy="30"
-         sodipodi:cx="51"
-         id="path34506-3"
-         style="opacity:0.4625;color:#000000;fill:url(#radialGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <rect
-         y="558.85046"
-         x="468.96878"
-         height="3.1425927"
-         width="28.149134"
-         id="rect2996"
-         style="fill:#ffffff;fill-opacity:0.50196078;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
-  </g>
-</svg>
--- a/data/theme/close-window.svg
+++ b/data/theme/close-window.svg
@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.0"
   id="Foreground"
   x="0px"
   y="0px"
-   width="32"
-   height="32"
-   viewBox="0 0 23.272727 23.272727"
+   width="22"
+   height="22"
+   viewBox="0 0 16 16"
   enable-background="new 0 0 16 16"
   xml:space="preserve"
   sodipodi:version="0.32"
-   inkscape:version="0.48+devel r10081 custom"
+   inkscape:version="0.46"
   sodipodi:docname="close-window.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
   id="metadata2399"><rdf:RDF><cc:Work
@ -39,49 +37,11 @@
     inkscape:vp_y="0 : 1000 : 0"
     inkscape:vp_z="16 : 8 : 1"
     inkscape:persp3d-origin="8 : 5.3333333 : 1"
-     id="perspective2401" /><filter
-     color-interpolation-filters="sRGB"
-     inkscape:collect="always"
-     id="filter16494-4"
-     x="-0.20989846"
-     width="1.4197969"
-     y="-0.20903821"
-     height="1.4180764"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="1.3282637"
-       id="feGaussianBlur16496-8" /></filter><radialGradient
-     inkscape:collect="always"
-     xlink:href="#linearGradient16498-6"
-     id="radialGradient16504-1"
-     cx="7.6582627"
-     cy="5.8191104"
-     fx="7.6582627"
-     fy="5.8191104"
-     r="8.6928644"
-     gradientTransform="matrix(1.0474339,0,0,1.0517402,-0.3632615,-0.42032492)"
-     gradientUnits="userSpaceOnUse" /><linearGradient
-     inkscape:collect="always"
-     id="linearGradient16498-6"><stop
-       style="stop-color:#7b7b7b;stop-opacity:1"
-       offset="0"
-       id="stop16500-8" /><stop
-       style="stop-color:#101010;stop-opacity:1"
-       offset="1"
-       id="stop16502-0" /></linearGradient><filter
-     color-interpolation-filters="sRGB"
-     inkscape:collect="always"
-     id="filter16524-9"
-     x="-0.212979"
-     width="1.425958"
-     y="-0.21305652"
-     height="1.426113"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="0.71020915"
-       id="feGaussianBlur16526-0" /></filter></defs><sodipodi:namedview
-   inkscape:window-height="1114"
-   inkscape:window-width="1463"
+     id="perspective2401" /></defs><sodipodi:namedview
+   inkscape:window-height="999"
+   inkscape:window-width="1680"
   inkscape:pageshadow="2"
-   inkscape:pageopacity="0"
+   inkscape:pageopacity="1"
   guidetolerance="10.0"
   gridtolerance="10.0"
   objecttolerance="10.0"
@ -90,63 +50,27 @@
   pagecolor="#000000"
   id="base"
   showgrid="false"
-   inkscape:zoom="1"
-   inkscape:cx="10.720189"
-   inkscape:cy="13.739577"
+   inkscape:zoom="25.648691"
+   inkscape:cx="8.8097603"
+   inkscape:cy="9.0472789"
   inkscape:window-x="0"
   inkscape:window-y="26"
   inkscape:current-layer="Foreground"
   showguides="true"
-   inkscape:guide-bbox="true"
-   borderlayer="true"
-   inkscape:showpageshadow="false"
-   inkscape:window-maximized="0"><inkscape:grid
-     type="xygrid"
-     id="grid11246"
-     empspacing="5"
-     visible="true"
-     enabled="true"
-     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+   inkscape:guide-bbox="true" />

 <g
-   style="display:inline"
-   id="g16402-8"
-   transform="translate(4.7533483,2.8238929)"><g
-     id="g3175-4"><path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="0"
-       inkscape:original="M 7.65625 0.125 C 3.2589349 0.125 -0.3125 3.7070002 -0.3125 8.125 C -0.3125 12.543001 3.2589349 16.125 7.65625 16.125 C 12.053566 16.125 15.625 12.543001 15.625 8.125 C 15.625 3.7070002 12.053566 0.125 7.65625 0.125 z "
-       xlink:href="#path2394-32"
-       style="opacity:0.52994014;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.18181825;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16494-4);enable-background:accumulate"
-       id="path16480-5"
-       inkscape:href="#path2394-32"
-       d="m 7.65625,0.125 c -4.3973151,0 -7.96875,3.5820002 -7.96875,8 0,4.418001 3.5714349,8 7.96875,8 4.397316,0 7.96875,-3.581999 7.96875,-8 0,-4.4179998 -3.571434,-8 -7.96875,-8 z"
-       transform="translate(0,1.028519)" /><path
-       clip-rule="evenodd"
-       d="m -0.30428257,8.1237596 c 0,-4.4179998 3.56522987,-7.9999996 7.96254497,-7.9999996 4.3973156,0 7.9625456,3.5819998 7.9625456,7.9999996 0,4.4180014 -3.56523,8.0000004 -7.9625456,8.0000004 -4.3973151,0 -7.96254497,-3.581999 -7.96254497,-8.0000004 z"
-       id="path2394-32"
-       style="color:#000000;fill:url(#radialGradient16504-1);fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1.4545455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:nodetypes="csssc"
-       inkscape:connector-curvature="0" /><g
-       id="g3172-6" /></g><g
-     transform="matrix(0.72727273,0,0,0.72727273,2.368236,2.1803254)"
-     style="fill:#ffffff;fill-opacity:1;display:inline"
-     id="g27275-6-6"
-     inkscape:label="window-close"><g
-       style="fill:#ffffff;fill-opacity:1;display:inline"
-       id="g27277-1-1"
-       transform="translate(-41,-760)"><path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="0"
-         inkscape:original="M 44.21875 764.1875 L 44.21875 765.1875 C 44.19684 765.46825 44.289258 765.74287 44.5 765.9375 L 46.78125 768.21875 L 44.5 770.46875 C 44.31181 770.65692 44.218747 770.92221 44.21875 771.1875 L 44.21875 772.1875 L 45.21875 772.1875 C 45.48404 772.1875 45.749336 772.09444 45.9375 771.90625 L 48.21875 769.625 L 50.5 771.90625 C 50.688164 772.0944 50.953449 772.18749 51.21875 772.1875 L 52.21875 772.1875 L 52.21875 771.1875 C 52.218742 770.9222 52.125688 770.65692 51.9375 770.46875 L 49.6875 768.21875 L 51.96875 765.9375 C 52.18441 765.73815 52.21875 765.47397 52.21875 765.1875 L 52.21875 764.1875 L 51.21875 764.1875 C 50.977922 764.1945 50.796875 764.2695 50.53125 764.5 L 48.21875 766.78125 L 45.9375 764.5 C 45.75987 764.31608 45.504951 764.1987 45.25 764.1875 C 45.23954 764.18704 45.22912 764.18738 45.21875 764.1875 L 44.21875 764.1875 z "
-         xlink:href="#path27279-0-5"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter16524-9);enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
-         id="path16506-5"
-         inkscape:href="#path27279-0-5"
-         d="m 44.21875,764.1875 0,1 c -0.02191,0.28075 0.07051,0.55537 0.28125,0.75 l 2.28125,2.28125 -2.28125,2.25 c -0.18819,0.18817 -0.281253,0.45346 -0.28125,0.71875 l 0,1 1,0 c 0.26529,0 0.530586,-0.0931 0.71875,-0.28125 L 48.21875,769.625 50.5,771.90625 c 0.188164,0.18815 0.453449,0.28124 0.71875,0.28125 l 1,0 0,-1 c -8e-6,-0.2653 -0.09306,-0.53058 -0.28125,-0.71875 l -2.25,-2.25 2.28125,-2.28125 c 0.21566,-0.19935 0.25,-0.46353 0.25,-0.75 l 0,-1 -1,0 c -0.240828,0.007 -0.421875,0.082 -0.6875,0.3125 l -2.3125,2.28125 L 45.9375,764.5 c -0.17763,-0.18392 -0.432549,-0.3013 -0.6875,-0.3125 -0.01046,-4.6e-4 -0.02088,-1.2e-4 -0.03125,0 l -1,0 z"
-         transform="translate(0,1.3535534)" /><path
-         sodipodi:nodetypes="ccsccccccccccccccccccccccc"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Andale Mono;-inkscape-font-specification:Andale Mono"
-         id="path27279-0-5"
-         inkscape:connector-curvature="0"
-         d="m 44.226475,764.17222 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-1e-5 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z" /></g></g></g></svg>
+   id="g3175"><path
+     sodipodi:nodetypes="csssc"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.59217799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path2394"
+     d="M 0.83987936,8.0425327 C 0.83987936,4.0805265 4.0712155,0.86823453 8.0567103,0.86823453 C 12.042205,0.86823453 15.273542,4.0805265 15.273542,8.0425327 C 15.273542,12.004539 12.042205,15.216831 8.0567103,15.216831 C 4.0712155,15.216831 0.83987936,12.004539 0.83987936,8.0425327 z"
+     clip-rule="evenodd" /><g
+     id="g3172"><path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.67127273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 5.4242673,5.3313047 L 10.515414,10.421272 L 10.714004,10.646491"
+       id="path3152" /></g></g><path
+   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.67127273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 5.4402527,10.650392 L 10.688082,5.3573033"
+   id="path3154"
+   sodipodi:nodetypes="cc" /></svg>
--- a/data/theme/corner-ripple-rtl.png
+++ b/data/theme/corner-ripple-rtl.png
--- a/data/theme/corner-ripple-ltr.png
+++ b/data/theme/corner-ripple-ltr.png
--- a/data/theme/filter-selected-ltr.svg
+++ b/data/theme/filter-selected-ltr.svg
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
--- a/data/theme/mosaic-view-active.svg
+++ b/data/theme/mosaic-view-active.svg
@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="16"
+   id="svg6503"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="mosaic-view-active.svg">
+  <defs
+     id="defs6505">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective6511" />
+    <inkscape:perspective
+       id="perspective6494"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.197802"
+     inkscape:cx="-15.97056"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6508">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <g
+       style="display:inline;fill:#cbcbcb;fill-opacity:1"
+       transform="translate(-449.85476,-685.85869)"
+       id="g5306">
+      <rect
+         style="fill:#cbcbcb;fill-opacity:1;stroke:#000000;stroke-width:0.99999970000000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.44262299999999999;stroke-dasharray:none"
+         id="rect5308"
+         width="11"
+         height="7"
+         x="450.5"
+         y="710.5"
+         rx="0.99999958"
+         ry="1" />
+      <rect
+         style="fill:#cbcbcb;fill-opacity:1;stroke:#000000;stroke-width:0.99999970000000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.44262299999999999;stroke-dasharray:none;display:inline"
+         id="rect5310"
+         width="11"
+         height="7"
+         x="462.5"
+         y="702.5"
+         rx="0.99999958"
+         ry="1" />
+      <rect
+         style="fill:#cbcbcb;fill-opacity:1;stroke:#000000;stroke-width:0.99999976000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.44262299999999999;stroke-dasharray:none;display:inline"
+         id="rect5312"
+         width="11"
+         height="7"
+         x="450.5"
+         y="702.5"
+         rx="0.99999958"
+         ry="1" />
+      <rect
+         style="fill:#cbcbcb;fill-opacity:1;stroke:#000000;stroke-width:0.99999970000000005;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.44262299999999999;stroke-dasharray:none;display:inline"
+         id="rect5314"
+         width="11"
+         height="7"
+         x="462.5"
+         y="710.5"
+         rx="0.99999958"
+         ry="1" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/mosaic-view.svg
+++ b/data/theme/mosaic-view.svg
@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="16"
+   id="svg6503"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="New document 19">
+  <defs
+     id="defs6505">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective6511" />
+    <inkscape:perspective
+       id="perspective6494"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.197802"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6508">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-16)">
+    <g
+       style="display:inline"
+       transform="translate(-449.85476,-685.85869)"
+       id="g5306">
+      <rect
+         style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.442623;stroke-dasharray:none"
+         id="rect5308"
+         width="11"
+         height="7"
+         x="450.5"
+         y="710.5"
+         rx="0.99999958"
+         ry="1" />
+      <rect
+         style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.442623;stroke-dasharray:none;display:inline"
+         id="rect5310"
+         width="11"
+         height="7"
+         x="462.5"
+         y="702.5"
+         rx="0.99999958"
+         ry="1" />
+      <rect
+         style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.442623;stroke-dasharray:none;display:inline"
+         id="rect5312"
+         width="11"
+         height="7"
+         x="450.5"
+         y="702.5"
+         rx="0.99999958"
+         ry="1" />
+      <rect
+         style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.442623;stroke-dasharray:none;display:inline"
+         id="rect5314"
+         width="11"
+         height="7"
+         x="462.5"
+         y="710.5"
+         rx="0.99999958"
+         ry="1" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/move-window-on-new.svg
+++ b/data/theme/move-window-on-new.svg
@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="98"
+   height="98"
+   id="svg6375"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="add-workspace.svg">
+  <defs
+     id="defs6377">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective6383" />
+    <inkscape:perspective
+       id="perspective6366"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.9590209"
+     inkscape:cx="56.650687"
+     inkscape:cy="20.635343"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6380">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,66)">
+    <g
+       id="g2824"
+       transform="matrix(11.568551,0,0,11.698271,-78.828159,-304.81518)">
+      <path
+         style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 11.07363,21.36834 0,6.43903"
+         id="path5322" />
+      <path
+         style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         d="m 14.29314,24.58786 -6.43902,0"
+         id="path5324" />
+    </g>
+    <path
+       style="fill:#000000;fill-opacity:0.98823529"
+       d="m 48.239516,97.908047 c -0.41677,-0.05102 -1.269253,-0.222408 -1.894408,-0.380859 -4.088493,-1.036262 -7.520781,-4.753234 -8.330163,-9.021094 -0.154947,-0.817026 -0.257819,-6.68112 -0.257819,-14.696556 l 0,-13.337088 -13.829177,-0.08909 C 10.802042,60.298796 10.026884,60.268266 8.6851548,59.783022 3.6288503,57.954375 0.62673331,53.828648 0.62673331,48.708554 c 0,-5.625522 4.25936019,-10.425065 9.97721469,-11.242548 0.987903,-0.141242 7.368912,-0.254994 14.460646,-0.257791 l 12.692532,-0.005 0,-13.586668 c 0,-14.6441583 0.03287,-15.0698926 1.364686,-17.6753047 2.185477,-4.2754229 6.938193,-6.75739913 11.687647,-6.10355607 3.382776,0.46569661 6.737962,2.72496967 8.414081,5.66577137 1.480816,2.5981315 1.519067,3.0522448 1.519067,18.0333334 l 0,13.666424 12.692533,0.005 c 7.091733,0.0028 13.472742,0.116549 14.460646,0.257791 6.395303,0.914337 10.804785,6.623716 9.941157,12.871766 -0.698243,5.051565 -4.792685,9.104635 -9.941157,9.840713 -0.987904,0.141242 -7.368913,0.254995 -14.460646,0.257791 l -12.692533,0.005 0,13.801945 c 0,13.031417 -0.02798,13.895893 -0.501177,15.484801 -1.526902,5.127058 -6.919246,8.802262 -12.001914,8.18002 z"
+       id="path2828"
+       transform="translate(0,-66)" />
+  </g>
+</svg>
--- a/data/theme/panel-border.svg
+++ b/data/theme/panel-border.svg
@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="3"
-   height="10"
-   id="svg2"
-   version="1.1">
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-  </metadata>
-  <g
-     id="layer1">
-    <rect
-       style="fill:#000000;fill-opacity:1;stroke-width:0.43599999000000000;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3779"
-       width="3"
-       height="10"
-       x="0"
-       y="0" />
-    <rect
-       style="fill:#536272;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3796"
-       width="3"
-       height="1"
-       x="0"
-       y="9" />
-  </g>
-</svg>
--- a/data/theme/panel-button-border.svg
+++ b/data/theme/panel-button-border.svg
@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="21"
-   height="10"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="panel-button-border.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="8.6594891"
-     inkscape:cy="5.7029946"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     guidetolerance="10000"
-     objecttolerance="10000">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3792"
-       empspacing="10"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3796"
-       width="3"
-       height="2"
-       x="9"
-       y="8" />
-  </g>
-</svg>
--- a/data/theme/panel-button-highlight-narrow.svg
+++ b/data/theme/panel-button-highlight-narrow.svg
@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="panel-button-highlight-narrow.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-171.36384"
-     inkscape:cy="-53.255157"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-468.08632,-537.03477)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(0.35714286,0,0,1.5625,464.87203,515.15977)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
--- a/data/theme/panel-button-highlight-wide.svg
+++ b/data/theme/panel-button-highlight-wide.svg
@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="84"
-   height="25"
-   id="svg10621"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="panel-button-highlight-wide.svg">
-  <defs
-     id="defs10623">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34508-1-3"
-       id="radialGradient99561-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       cx="51"
-       cy="30"
-       fx="51"
-       fy="30"
-       r="42" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34508-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop34510-1-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop34512-4-5" />
-    </linearGradient>
-    <radialGradient
-       r="42"
-       fy="30"
-       fx="51"
-       cy="30"
-       cx="51"
-       gradientTransform="matrix(0.72146227,0,0,0.27484277,14.205424,21.754717)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient10592"
-       xlink:href="#linearGradient34508-1-3"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="-118.50071"
-     inkscape:cy="27.304508"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata10626">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-441.08632,-537.03477)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4625;color:#000000;fill:url(#radialGradient10592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path34506-3"
-       sodipodi:cx="51"
-       sodipodi:cy="30"
-       sodipodi:rx="42"
-       sodipodi:ry="16"
-       d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30 l -42,0 z"
-       sodipodi:start="3.1415927"
-       sodipodi:end="6.2831853"
-       transform="matrix(1,0,0,1.5625,432.08632,515.15977)"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/motion/textures/panel.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
--- a/data/theme/process-working.png
+++ b/data/theme/process-working.png
--- a/data/theme/process-working.svg
+++ b/data/theme/process-working.svg
@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg5369"
-   version="1.1"
-   inkscape:version="0.48+devel r10053 custom"
-   width="96"
-   height="48"
-   sodipodi:docname="process-working.svg"
-   style="display:inline">
-  <metadata
-     id="metadata5375">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs5373" />
-  <sodipodi:namedview
-     pagecolor="#808080"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1975"
-     inkscape:window-height="1098"
-     id="namedview5371"
-     showgrid="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:zoom="16"
-     inkscape:cx="53.997662"
-     inkscape:cy="22.367695"
-     inkscape:window-x="1600"
-     inkscape:window-y="33"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid11933"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="tiles"
-     style="display:none">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect12451"
-       width="24"
-       height="24"
-       x="0"
-       y="0" />
-    <rect
-       y="24"
-       x="0"
-       height="24"
-       width="24"
-       id="rect12453"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       y="0"
-       x="24"
-       height="24"
-       width="24"
-       id="rect12455"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect12457"
-       width="24"
-       height="24"
-       x="24"
-       y="24" />
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect12459"
-       width="24"
-       height="24"
-       x="48"
-       y="0" />
-    <rect
-       y="24"
-       x="48"
-       height="24"
-       width="24"
-       id="rect12461"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       y="0"
-       x="72"
-       height="24"
-       width="24"
-       id="rect12463"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect12465"
-       width="24"
-       height="24"
-       x="72"
-       y="24" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="spinner">
-    <g
-       transform="matrix(0.28240106,0,0,0.28240106,146.92015,-382.52444)"
-       id="g10450-5"
-       style="display:inline">
-      <path
-         inkscape:connector-curvature="0"
-         style="opacity:0.6;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -477.76072,1373.3569 0,9.4717"
-         id="path18768"
-         sodipodi:nodetypes="cc"
-         inkscape:transform-center-y="-4.6808838" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-y="-3.3099227"
-         sodipodi:nodetypes="cc"
-         id="path18770"
-         d="m -461.0171,1380.2922 -7.23427,7.3824"
-         style="opacity:0.7;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-x="-3.3098966" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-x="-4.6808962"
-         style="opacity:0.8;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -454.08163,1397.0359 -9.47165,0"
-         id="path18772"
-         sodipodi:nodetypes="cc"
-         inkscape:transform-center-y="-2.6596956e-05" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         id="path18774"
-         d="m -461.01709,1413.7796 -6.93831,-7.0864"
-         style="opacity:0.9;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-x="-3.3098966"
-         inkscape:transform-center-y="3.3098652" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-y="4.6808757"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -477.76074,1420.715 9e-5,-9.4716"
-         id="path18776"
-         sodipodi:nodetypes="cc" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         id="path18778"
-         d="m -494.50442,1413.7796 6.79048,-6.9384"
-         style="opacity:0.3;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-y="3.3098769"
-         inkscape:transform-center-x="3.3098883" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:transform-center-x="4.6808941"
-         style="opacity:0.4;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -501.43987,1397.0359 9.47174,0"
-         id="path18780"
-         sodipodi:nodetypes="cc"
-         inkscape:transform-center-y="-2.6596956e-05" />
-      <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc"
-         id="path18782"
-         d="m -494.5044,1380.2922 6.64243,6.9384"
-         style="opacity:0.5;color:#000000;fill:none;stroke:#ffffff;stroke-width:7.08212566;stroke-linecap:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:transform-center-x="3.3098902"
-         inkscape:transform-center-y="-3.3099302" />
-    </g>
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#g10450-5"
-       id="use4981"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,36,-4.9705636)"
-       width="400"
-       height="400" />
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#use4981"
-       id="use4983"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,43.032478,-21.909695)"
-       width="400"
-       height="400" />
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#use4983"
-       id="use4985"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,50.081986,-38.904617)"
-       width="400"
-       height="400" />
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#use4985"
-       id="use4987"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,-38.919996,-31.872139)"
-       width="400"
-       height="400" />
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#use4987"
-       id="use4989"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,52.986628,2.0890543)"
-       width="400"
-       height="400" />
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#use4989"
-       id="use4991"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,60.013026,-14.912936)"
-       width="400"
-       height="400" />
-    <use
-       style="display:inline"
-       x="0"
-       y="0"
-       xlink:href="#use4991"
-       id="use4993"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,67.022396,-31.859127)"
-       width="400"
-       height="400" />
-  </g>
-</svg>
--- a/data/theme/running-indicator.svg
+++ b/data/theme/running-indicator.svg
@ -5,8 +5,8 @@
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
-   width="119.97824"
-   height="119.97824"
+   width="74.01342"
+   height="74.006706"
   id="svg7355"
   version="1.1">
  <defs
@ -66,7 +66,7 @@
  </defs>
  <g
     id="layer1"
-     transform="matrix(1.6213276,0,0,1.6213276,-431.6347,-272.5745)">
+     transform="translate(-266.21629,-168.11809)">
    <g
       style="display:inline"
       id="g30864"
@ -83,8 +83,7 @@
      <path
         id="rect34520"
         d="m 84.506708,167.95508 c 6e-6,1.96759 -1.584022,3.55162 -3.551629,3.55163 l -65.910146,0 c -1.967608,-1e-5 -3.551648,-1.58402 -3.551643,-3.55164"
-         style="opacity:0.2;fill:none;stroke:url(#radialGradient7488);stroke-width:1;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.2;fill:none;stroke:url(#radialGradient7488);stroke-width:1;stroke-opacity:1" />
    </g>
  </g>
 </svg>
--- a/data/theme/scroll-button-down-hover.png
+++ b/data/theme/scroll-button-down-hover.png
--- a/data/theme/scroll-button-down.png
+++ b/data/theme/scroll-button-down.png
--- a/data/theme/scroll-button-up-hover.png
+++ b/data/theme/scroll-button-up-hover.png
--- a/data/theme/scroll-button-up.png
+++ b/data/theme/scroll-button-up.png
--- a/data/theme/section-more-open.svg
+++ b/data/theme/section-more-open.svg
@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="5.8600588"
+   height="9"
+   id="svg3647"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="section-more.svg">
+  <defs
+     id="defs3649">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3655" />
+    <inkscape:perspective
+       id="perspective3603"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="82.777778"
+     inkscape:cx="2.9300294"
+     inkscape:cy="5.466443"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3652">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-262.78425,-490.71933)">
+    <path
+       transform="matrix(0,-0.98149546,0.71467449,0,25.404986,578.15569)"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 88.830127,340 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="1.5707963"
+       sodipodi:arg1="0.52359878"
+       sodipodi:r2="2.5"
+       sodipodi:r1="5"
+       sodipodi:cy="337.5"
+       sodipodi:cx="84.5"
+       sodipodi:sides="3"
+       id="path5497-5"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.59699643;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="star" />
+  </g>
+</svg>
--- a/data/theme/section-more.svg
+++ b/data/theme/section-more.svg
@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="5.8600588"
+   height="9"
+   id="svg3647"
+   version="1.1"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="New document 6">
+  <defs
+     id="defs3649">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3655" />
+    <inkscape:perspective
+       id="perspective3603"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="112.21575"
+     inkscape:cy="-32.642856"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="164"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3652">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-262.78425,-490.71933)">
+    <path
+       transform="matrix(0,0.98149546,-0.71467449,0,506.02358,412.28296)"
+       d="M 88.830127,340 80.169873,340 84.5,332.5 88.830127,340 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="1.5707963"
+       sodipodi:arg1="0.52359878"
+       sodipodi:r2="2.5"
+       sodipodi:r1="5"
+       sodipodi:cy="337.5"
+       sodipodi:cx="84.5"
+       sodipodi:sides="3"
+       id="path5497-5"
+       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.59699643;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       sodipodi:type="star" />
+  </g>
+</svg>
--- a/data/theme/separator-white.png
+++ b/data/theme/separator-white.png
--- a/data/theme/filter-selected-rtl.svg
+++ b/data/theme/filter-selected-rtl.svg
@ -9,23 +9,23 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="10"
-   height="20"
-   id="svg10003"
+   width="24"
+   height="16"
+   id="svg6446"
   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="filter-selected-ltr.svg">
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="single-view-active.svg">
  <defs
-     id="defs10005">
+     id="defs6448">
    <inkscape:perspective
       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_x="0 : 16 : 1"
       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective10011" />
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective6454" />
    <inkscape:perspective
-       id="perspective9998"
+       id="perspective6441"
       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
       inkscape:vp_z="1 : 0.5 : 1"
       inkscape:vp_y="0 : 1000 : 0"
@ -37,29 +37,29 @@
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
-     inkscape:pageopacity="0"
+     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32.363636"
-     inkscape:cy="10.181818"
+     inkscape:zoom="11.197802"
+     inkscape:cx="0.014720032"
+     inkscape:cy="16"
     inkscape:current-layer="layer1"
     showgrid="true"
-     inkscape:document-units="px"
     inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="839"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
     inkscape:window-x="0"
     inkscape:window-y="26"
     inkscape:window-maximized="1" />
  <metadata
-     id="metadata10008">
+     id="metadata6451">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
@ -67,15 +67,15 @@
     id="layer1"
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
-     transform="translate(0,-44)">
-    <path
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/app-picker.png"
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="rect34320"
-       d="m 10.369085,54.181804 -10.55634072,10.55636 -1e-5,-21.11269 z"
-       style="opacity:0.21000001;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     transform="translate(0,-17)">
+    <rect
+       ry="0.5"
+       rx="0.49999979"
+       y="17.483809"
+       x="0.53483802"
+       height="15"
+       width="23"
+       id="rect5304"
+       style="fill:#cccccc;fill-opacity:1;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
  </g>
 </svg>
--- a/data/theme/single-view.svg
+++ b/data/theme/single-view.svg
@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="16"
+   id="svg6446"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="single-view.svg">
+  <defs
+     id="defs6448">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective6454" />
+    <inkscape:perspective
+       id="perspective6441"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.197802"
+     inkscape:cx="0.014720032"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6451">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-17)">
+    <rect
+       ry="0.5"
+       rx="0.49999979"
+       y="17.483809"
+       x="0.53483802"
+       height="15"
+       width="23"
+       id="rect5304"
+       style="fill:#626262;fill-opacity:1;stroke:#cccccc;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+  </g>
+</svg>
--- a/data/theme/source-button-border.svg
+++ b/data/theme/source-button-border.svg
@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="21"
-   height="10"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="source-button-border.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="44.8"
-     inkscape:cx="8.704132"
-     inkscape:cy="5.7029946"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="1145"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     guidetolerance="10000"
-     objecttolerance="10000">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3792"
-       empspacing="10"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect3796"
-       width="19"
-       height="2"
-       x="1"
-       y="8" />
-  </g>
-</svg>
--- a/data/theme/ws-switch-arrow-left.svg
+++ b/data/theme/ws-switch-arrow-left.svg
@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="96" height="96" id="svg25070" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="dark-arrow-larger.svg">
+  <defs id="defs25072">
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 24 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="48 : 24 : 1" inkscape:persp3d-origin="24 : 16 : 1" id="perspective25078"/>
+    <inkscape:perspective id="perspective24985" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4034-0-4" id="linearGradient24957" gradientUnits="userSpaceOnUse" gradientTransform="translate(6)" x1="-86.552246" y1="185.439" x2="-83.37072" y2="197.31261"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4034-0-4">
+      <stop style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" offset="0" id="stop4036-5-7"/>
+      <stop style="stop-color: rgb(186, 189, 182); stop-opacity: 1;" offset="1" id="stop4038-9-6"/>
+    </linearGradient>
+    <filter id="filter24765" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix24767" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix24769" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4632-1-3-9-3-2" id="linearGradient24955" gradientUnits="userSpaceOnUse" gradientTransform="translate(-5)" x1="-74.520325" y1="169.06032" x2="-74.520325" y2="205.94189"/>
+    <linearGradient id="linearGradient4632-1-3-9-3-2">
+      <stop style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" offset="0" id="stop4634-1-8-3-9-0"/>
+      <stop id="stop4636-1-9-9-8-8" offset="0.0274937" style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"/>
+      <stop id="stop4638-8-3-9-6-6" offset="0.274937" style="stop-color: rgb(242, 242, 242); stop-opacity: 1;"/>
+      <stop id="stop4640-8-5-7-8-9" offset="0.38707438" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop4642-5-41-9-6-9" offset="0.66528589" style="stop-color: rgb(217, 218, 216); stop-opacity: 1;"/>
+      <stop id="stop4644-5-2-7-9-2" offset="0.76745707" style="stop-color: rgb(223, 224, 221); stop-opacity: 1;"/>
+      <stop style="stop-color: rgb(240, 240, 240); stop-opacity: 1;" offset="1" id="stop4646-3-2-3-7-3"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4869-4-1" id="radialGradient24959" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)" cx="-33.412369" cy="185.74171" fx="-33.412369" fy="185.74171" r="2.3554697"/>
+    <linearGradient id="linearGradient4869-4-1">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4871-6-2"/>
+      <stop id="stop4879-7-4" offset="0.31807542" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop4877-6-1" offset="0.74691135" style="stop-color: rgb(200, 201, 198); stop-opacity: 1;"/>
+      <stop style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" offset="1" id="stop4873-1-0"/>
+    </linearGradient>
+    <filter id="filter25011" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25013" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25015" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4869-4-0" id="radialGradient24961" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)" cx="-33.412369" cy="185.74171" fx="-33.412369" fy="185.74171" r="2.3554697"/>
+    <linearGradient id="linearGradient4869-4-0">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4871-6-8"/>
+      <stop id="stop4879-7-5" offset="0.31807542" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop4877-6-5" offset="0.74691135" style="stop-color: rgb(200, 201, 198); stop-opacity: 1;"/>
+      <stop style="stop-color: rgb(211, 215, 207); stop-opacity: 1;" offset="1" id="stop4873-1-4"/>
+    </linearGradient>
+    <filter id="filter25023" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25025" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25027" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4941" id="linearGradient24963" gradientUnits="userSpaceOnUse" x1="-39.858727" y1="184.61784" x2="-38.244785" y2="188.84898"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4941">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4943"/>
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop4945"/>
+    </linearGradient>
+    <filter id="filter25033" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25035" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25037" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4941-7" id="linearGradient24965" gradientUnits="userSpaceOnUse" x1="-39.858727" y1="184.61784" x2="-38.244785" y2="188.84898"/>
+    <linearGradient inkscape:collect="always" id="linearGradient4941-7">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop4943-2"/>
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop4945-5"/>
+    </linearGradient>
+    <filter id="filter25043" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25045" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25047" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <filter id="filter25049" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25051" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25053" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+    <filter id="filter25055" inkscape:label="Invert" x="0" y="0" width="1" height="1" inkscape:menu="Color" inkscape:menu-tooltip="Invert colors" color-interpolation-filters="sRGB">
+      <feColorMatrix id="feColorMatrix25057" type="saturate" values="1" result="fbSourceGraphic"/>
+      <feColorMatrix id="feColorMatrix25059" in="fbSourceGraphic" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/>
+    </filter>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8284271" inkscape:cx="48.631638" inkscape:cy="57.536221" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="1200" inkscape:window-height="851" inkscape:window-x="0" inkscape:window-y="52" inkscape:window-maximized="0"/>
+  <metadata id="metadata25075">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" transform="translate(0, 48)">
+    <g id="g4030-1-8" transform="matrix(2, 0, 0, 2, 193.25, -374.967)" style="stroke: rgb(0, 0, 0); display: inline; stroke-opacity: 1;">
+      <path sodipodi:nodetypes="ccc" id="path3165-7-3" d="m -72.5,173.5 -14,14 14,14" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 7; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;"/>
+    </g>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 0.523439; visibility: visible; display: inline;" id="path4050-2-7-9-4" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(3.34328, 0, 0, 3.34328, 185.28, -623.176)"/>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 0.523439; visibility: visible; display: inline;" id="path4050-2-7-9-4-8" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(3.34328, 0, 0, 3.34328, 207.28, -623.176)"/>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 0.697921; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;" id="path4050-2-7-9-4-0" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(2.86565, 0, 0, 2.86565, 166.846, -534.143)"/>
+    <path sodipodi:type="arc" style="overflow: visible; marker: none; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 0.697921; stroke-linecap: round; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-opacity: 1; stroke-dasharray: none; stroke-dashoffset: 0pt; visibility: visible; display: inline;" id="path4050-2-7-9-4-0-9" sodipodi:cx="-38.59375" sodipodi:cy="186.40625" sodipodi:rx="2.09375" sodipodi:ry="2.09375" d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z" transform="matrix(2.86565, 0, 0, 2.86565, 188.846, -534.143)"/>
+    <path style="overflow: visible; marker: none; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; opacity: 0.35; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 1; stroke-miterlimit: 4; stroke-dasharray: none; visibility: visible; display: inline; font-family: Bitstream Vera Sans; stroke-opacity: 1;" d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z" id="path3165-7-3-1" sodipodi:nodetypes="ccccscccsc" transform="matrix(2, 0, 0, 2, -586, -765.967)"/>
+    <path style="overflow: visible; marker: none; font-size: medium; font-style: normal; font-variant: normal; font-weight: normal; font-stretch: normal; text-indent: 0pt; text-align: start; text-decoration: none; line-height: normal; letter-spacing: normal; word-spacing: normal; text-transform: none; direction: ltr; text-anchor: start; color: rgb(0, 0, 0); fill: none; stroke: rgb(0, 0, 0); stroke-width: 1; stroke-linecap: round; stroke-miterlimit: 4; stroke-dasharray: none; visibility: visible; display: inline; font-family: Bitstream Vera Sans; stroke-opacity: 1;" d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383" id="path3165-7-3-1-9" sodipodi:nodetypes="ccccccc" transform="matrix(2, 0, 0, 2, -586, -765.967)"/>
+  </g>
+</svg>
--- a/data/theme/ws-switch-arrow-right.svg
+++ b/data/theme/ws-switch-arrow-right.svg
@ -2,51 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   width="96"
   height="96"
-   id="svg25070"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ws-switch-arrow-down.svg">
-  <metadata
-     id="metadata3353">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="718"
-     inkscape:window-height="480"
-     id="namedview3351"
-     showgrid="false"
-     inkscape:zoom="2.6979167"
-     inkscape:cx="48"
-     inkscape:cy="48"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg25070" />
+   id="svg25070">
  <defs
     id="defs25072">
    <linearGradient
@ -326,7 +288,7 @@
    </filter>
  </defs>
  <g
-     transform="matrix(0,1,-1,0,48.0003,4.1307112e-7)"
+     transform="translate(0,48)"
     id="layer1">
    <g
       transform="matrix(-2,0,0,2,-97.2497,-374.967)"
@ -335,42 +297,35 @@
      <path
         d="m -72.5,173.5 -14,14 14,14"
         id="path3165-7-3"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         inkscape:connector-curvature="0" />
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
    </g>
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-3.34328,0,0,3.34328,-89.2797,-623.176)"
       id="path4050-2-7-9-4"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-3.34328,0,0,3.34328,-111.2797,-623.176)"
       id="path4050-2-7-9-4-8"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-2.86565,0,0,2.86565,-70.8457,-534.143)"
       id="path4050-2-7-9-4-0"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m -36.5,186.40625 a 2.09375,2.09375 0 1 1 -4.1875,0 2.09375,2.09375 0 1 1 4.1875,0 z"
       transform="matrix(-2.86565,0,0,2.86565,-92.8457,-534.143)"
       id="path4050-2-7-9-4-0-9"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
    <path
       d="m 47.87528,-34.0295 c 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25 -32.25,32.25 c -2.2253,2.2253 -6.2747,2.2253 -8.5,0 -2.2253,-2.22528 -2.2253,-6.2747 0,-8.5 l 23.75,-23.75 -23.75,-23.75 c -1.73168,-1.6731 -2.295,-4.44228 -1.3546,-6.65894 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 z"
       id="path3165-7-3-1"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       inkscape:connector-curvature="0" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
    <path
       d="m 41.8316,28.09418 c -0.014,-1.58898 0.54158,-3.18406 1.66868,-4.31118 l 23.75,-23.75 m -25.1046,-30.40894 c 0.94042,-2.21668 3.32312,-3.73604 5.7296,-3.65356 1.53896,0.0448 3.0511,0.70928 4.125,1.8125 l 32.25,32.25"
       id="path3165-7-3-1-9"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-       inkscape:connector-curvature="0" />
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" />
  </g>
 </svg>
--- a/data/theme/ws-switch-arrow-up.svg
+++ b/data/theme/ws-switch-arrow-up.svg
@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="96"
-   height="96"
-   id="svg25070"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="ws-switch-arrow-up.svg">
-  <defs
-     id="defs25072">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective25078" />
-    <inkscape:perspective
-       id="perspective24985"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4034-0-4"
-       id="linearGradient24957"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6)"
-       x1="-86.552246"
-       y1="185.439"
-       x2="-83.37072"
-       y2="197.31261" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4034-0-4">
-      <stop
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
-         offset="0"
-         id="stop4036-5-7" />
-      <stop
-         style="stop-color: rgb(186, 189, 182); stop-opacity: 1;"
-         offset="1"
-         id="stop4038-9-6" />
-    </linearGradient>
-    <filter
-       id="filter24765"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix24767"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix24769"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4632-1-3-9-3-2"
-       id="linearGradient24955"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5)"
-       x1="-74.520325"
-       y1="169.06032"
-       x2="-74.520325"
-       y2="205.94189" />
-    <linearGradient
-       id="linearGradient4632-1-3-9-3-2">
-      <stop
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
-         offset="0"
-         id="stop4634-1-8-3-9-0" />
-      <stop
-         id="stop4636-1-9-9-8-8"
-         offset="0.0274937"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" />
-      <stop
-         id="stop4638-8-3-9-6-6"
-         offset="0.274937"
-         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;" />
-      <stop
-         id="stop4640-8-5-7-8-9"
-         offset="0.38707438"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4642-5-41-9-6-9"
-         offset="0.66528589"
-         style="stop-color: rgb(217, 218, 216); stop-opacity: 1;" />
-      <stop
-         id="stop4644-5-2-7-9-2"
-         offset="0.76745707"
-         style="stop-color: rgb(223, 224, 221); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(240, 240, 240); stop-opacity: 1;"
-         offset="1"
-         id="stop4646-3-2-3-7-3" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4869-4-1"
-       id="radialGradient24959"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
-       cx="-33.412369"
-       cy="185.74171"
-       fx="-33.412369"
-       fy="185.74171"
-       r="2.3554697" />
-    <linearGradient
-       id="linearGradient4869-4-1">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4871-6-2" />
-      <stop
-         id="stop4879-7-4"
-         offset="0.31807542"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4877-6-1"
-         offset="0.74691135"
-         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
-         offset="1"
-         id="stop4873-1-0" />
-    </linearGradient>
-    <filter
-       id="filter25011"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25013"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25015"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4869-4-0"
-       id="radialGradient24961"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0075, 0, 0, 1.0075, -5.4544, -1.25141)"
-       cx="-33.412369"
-       cy="185.74171"
-       fx="-33.412369"
-       fy="185.74171"
-       r="2.3554697" />
-    <linearGradient
-       id="linearGradient4869-4-0">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4871-6-8" />
-      <stop
-         id="stop4879-7-5"
-         offset="0.31807542"
-         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
-      <stop
-         id="stop4877-6-5"
-         offset="0.74691135"
-         style="stop-color: rgb(200, 201, 198); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
-         offset="1"
-         id="stop4873-1-4" />
-    </linearGradient>
-    <filter
-       id="filter25023"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25025"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25027"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4941"
-       id="linearGradient24963"
-       gradientUnits="userSpaceOnUse"
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4941">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4943" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop4945" />
-    </linearGradient>
-    <filter
-       id="filter25033"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25035"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25037"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4941-7"
-       id="linearGradient24965"
-       gradientUnits="userSpaceOnUse"
-       x1="-39.858727"
-       y1="184.61784"
-       x2="-38.244785"
-       y2="188.84898" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4941-7">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
-         offset="0"
-         id="stop4943-2" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1"
-         id="stop4945-5" />
-    </linearGradient>
-    <filter
-       id="filter25043"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25045"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25047"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <filter
-       id="filter25049"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25051"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25053"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-    <filter
-       id="filter25055"
-       inkscape:label="Invert"
-       x="0"
-       y="0"
-       width="1"
-       height="1"
-       inkscape:menu="Color"
-       inkscape:menu-tooltip="Invert colors"
-       color-interpolation-filters="sRGB">
-      <feColorMatrix
-         id="feColorMatrix25057"
-         type="saturate"
-         values="1"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         id="feColorMatrix25059"
-         in="fbSourceGraphic"
-         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="-12.356322"
-     inkscape:cy="57.536221"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1200"
-     inkscape:window-height="840"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata25075">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0, 48)">
-    <g
-       id="g3181"
-       transform="matrix(0,1,-1,0,48.0003,-48)">
-      <g
-         style="stroke:#000000;stroke-opacity:1;display:inline"
-         transform="matrix(2,0,0,2,193.25,-374.967)"
-         id="g4030-1-8">
-        <path
-           style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-           d="m -72.5,173.5 -14,14 14,14"
-           id="path3165-7-3"
-           sodipodi:nodetypes="ccc"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         transform="matrix(3.34328,0,0,3.34328,185.28,-623.176)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(3.34328,0,0,3.34328,207.28,-623.176)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-8"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52343899;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2.86565,0,0,2.86565,166.846,-534.143)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-0"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2.86565,0,0,2.86565,188.846,-534.143)"
-         d="m -36.5,186.40625 c 0,1.15635 -0.937404,2.09375 -2.09375,2.09375 -1.156346,0 -2.09375,-0.9374 -2.09375,-2.09375 0,-1.15635 0.937404,-2.09375 2.09375,-2.09375 1.156346,0 2.09375,0.9374 2.09375,2.09375 z"
-         sodipodi:ry="2.09375"
-         sodipodi:rx="2.09375"
-         sodipodi:cy="186.40625"
-         sodipodi:cx="-38.59375"
-         id="path4050-2-7-9-4-0-9"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:0.69792098;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(2,0,0,2,-586,-765.967)"
-         sodipodi:nodetypes="ccccscccsc"
-         id="path3165-7-3-1"
-         d="m 317.06251,365.96875 c -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 l -16.125,16.125 16.125,16.125 c 1.11265,1.11265 3.13735,1.11265 4.25,0 1.11265,-1.11264 1.11265,-3.13735 0,-4.25 l -11.875,-11.875 11.875,-11.875 c 0.86584,-0.83655 1.1475,-2.22114 0.6773,-3.32947 -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;opacity:0.35;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="matrix(2,0,0,2,-586,-765.967)"
-         sodipodi:nodetypes="ccccccc"
-         id="path3165-7-3-1-9"
-         d="m 320.08435,397.03059 c 0.007,-0.79449 -0.27079,-1.59203 -0.83434,-2.15559 L 307.37501,383 m 12.5523,-15.20447 c -0.47021,-1.10834 -1.66156,-1.86802 -2.8648,-1.82678 -0.76948,0.0224 -1.52555,0.35464 -2.0625,0.90625 L 298.87501,383"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0pt;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
--- a/gnome-shell.doap
+++ b/gnome-shell.doap
@ -6,22 +6,6 @@

  <name xml:lang="en">GNOME Shell</name>
  <shortdesc xml:lang="en">Next generation GNOME desktop shell</shortdesc>
-  <description>GNOME Shell provides core user interface functions for the GNOME 3
-desktop, like switching to windows and launching applications.
-GNOME Shell takes advantage of the capabilities of modern graphics
-hardware and introduces innovative user interface concepts to
-provide a visually attractive and easy to use experience.
-
-Tarball releases are provided largely for distributions to build
-packages. If you are interested in building GNOME Shell from source,
-we would recommend building from version control using the build
-script described at:
-
- http://live.gnome.org/GnomeShell
-
-Not only will that give you the very latest version of this rapidly
-changing project, it will be much easier than get GNOME Shell and
-its dependencies to build from tarballs.</description>
  <!--
  <homepage rdf:resource="http://live.gnome.org/GnomeShell" />
  -->
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -7,9 +7,8 @@ nobase_dist_js_DATA = 	\
 	misc/fileUtils.js	\
 	misc/format.js		\
 	misc/gnomeSession.js	\
-	misc/history.js		\
-	misc/modemManager.js	\
 	misc/params.js		\
+	misc/telepathy.js	\
 	misc/util.js		\
 	perf/core.js		\
 	ui/altTab.js		\
@ -26,7 +25,6 @@ nobase_dist_js_DATA = 	\
 	ui/endSessionDialog.js	\
 	ui/environment.js	\
 	ui/extensionSystem.js	\
-	ui/goaClient.js		\
 	ui/iconGrid.js		\
 	ui/lightbox.js		\
 	ui/link.js		\
@ -41,7 +39,6 @@ nobase_dist_js_DATA = 	\
 	ui/panel.js		\
 	ui/panelMenu.js		\
 	ui/placeDisplay.js	\
-	ui/polkitAuthenticationAgent.js \
 	ui/popupMenu.js		\
 	ui/runDialog.js		\
 	ui/scripting.js		\
@ -52,7 +49,6 @@ nobase_dist_js_DATA = 	\
 	ui/statusMenu.js	\
 	ui/status/accessibility.js	\
 	ui/status/keyboard.js	\
-	ui/status/network.js	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@ -7,8 +7,7 @@ const Signals = imports.signals;
 const PresenceIface = {
    name: 'org.gnome.SessionManager.Presence',
    methods: [{ name: 'SetStatus',
-                inSignature: 'u',
-                outSignature: '' }],
+                inSignature: 'u' }],
    properties: [{ name: 'status',
                   signature: 'u',
                   access: 'readwrite' }],
@ -102,24 +101,3 @@ Inhibitor.prototype = {
 };
 DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface);
 Signals.addSignalMethods(Inhibitor.prototype);
-
-
-// Not the full interface, only the methods we use
-const SessionManagerIface = {
-    name: 'org.gnome.SessionManager',
-    methods: [
-        { name: 'Logout', inSignature: 'u', outSignature: '' },
-        { name: 'Shutdown', inSignature: '', outSignature: '' }
-    ]
-};
-
-function SessionManager() {
-    this._init();
-}
-
-SessionManager.prototype = {
-    _init: function() {
-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager');
-    }
-};
-DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface);
--- a/js/misc/history.js
+++ b/js/misc/history.js
@ -1,115 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-const Clutter = imports.gi.Clutter;
-const Params = imports.misc.params;
-
-const DEFAULT_LIMIT = 512;
-
-function HistoryManager(params) {
-    this._init(params);
-}
-
-HistoryManager.prototype = {
-    _init: function(params) {
-        params = Params.parse(params, { gsettingsKey: null,
-                                        limit: DEFAULT_LIMIT,
-                                        entry: null });
-
-        this._key = params.gsettingsKey;
-        this._limit = params.limit;
-
-        this._historyIndex = 0;
-        if (this._key) {
-            this._history = global.settings.get_strv(this._key);
-            global.settings.connect('changed::' + this._key,
-                                    Lang.bind(this, this._historyChanged));
-
-        } else {
-            this._history = [];
-        }
-
-        this._entry = params.entry;
-
-        if (this._entry) {
-            this._entry.connect('key-press-event', 
-                                Lang.bind(this, this._onEntryKeyPress));
-        }
-    },
-
-    _historyChanged: function() {
-        this._history = global.settings.get_strv(this._key);
-        this._historyIndex = this._history.length;
-    },
-
-    prevItem: function(text) {
-        if (this._historyIndex <= 0)
-            return text;
-
-        if (text)
-            this._history[this._historyIndex] = text;
-        this._historyIndex--;
-        return this._indexChanged();
-    },
-
-    nextItem: function(text) {
-        if (this._historyIndex >= this._history.length)
-            return text;
-
-        if (text)
-            this._history[this._historyIndex] = text;
-        this._historyIndex++;
-        return this._indexChanged();
-    },
-
-    lastItem: function() {
-        if (this._historyIndex != this._history.length) {
-            this._historyIndex = this._history.length;
-            this._indexChanged();
-        }
-
-        return this._historyIndex[this._history.length];
-    },
-
-    addItem: function(input) {
-        if (this._history.length == 0 ||
-            this._history[this._history.length - 1] != input) {
-
-            this._history.push(input);
-            this._save();
-        }
-        this._historyIndex = this._history.length;
-    },
-
-    _onEntryKeyPress: function(entry, event) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.KEY_Up) {
-            this.prevItem(entry.get_text());
-            return true;
-        } else if (symbol == Clutter.KEY_Down) {
-            this.nextItem(entry.get_text());
-            return true;
-        }
-        return false;
-    },
-
-    _indexChanged: function() {
-        let current = this._history[this._historyIndex] || '';
-        this.emit('changed', current);
-
-        if (this._entry)
-            this._entry.set_text(current);
-
-        return current;
-    },
-
-    _save: function() {
-        if (this._history.length > this._limit)
-            this._history.splice(0, this._history.length - this._limit);
-
-        if (this._key)
-            global.settings.set_strv(this._key, this._history);
-    }
-};
-Signals.addSignalMethods(HistoryManager.prototype);
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@ -1,225 +0,0 @@
-// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*-
-
-const DBus = imports.dbus;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-
-// The following are not the complete interfaces, just the methods we need
-// (or may need in the future)
-
-const ModemGsmNetworkInterface = {
-    name: 'org.freedesktop.ModemManager.Modem.Gsm.Network',
-    methods: [
-        { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' },
-        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }
-    ],
-    properties: [
-        { name: 'AccessTechnology', signature: 'u', access: 'read' }
-    ],
-    signals: [
-        { name: 'SignalQuality', inSignature: 'u' },
-        { name: 'RegistrationInfo', inSignature: 'uss' }
-    ]
-};
-const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface);
-
-const ModemCdmaInterface = {
-    name: 'org.freedesktop.ModemManager.Modem.Cdma',
-    methods: [
-        { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' },
-        { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' }
-    ],
-    signals: [
-        { name: 'SignalQuality', inSignature: 'u' }
-    ]
-};
-const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface);
-
-let _providersTable;
-function _getProvidersTable() {
-    if (_providersTable)
-        return _providersTable;
-    let [providers, countryCodes] = Shell.mobile_providers_parse();
-    return _providersTable = providers;
-}
-
-function ModemGsm() {
-    this._init.apply(this, arguments);
-}
-
-ModemGsm.prototype = {
-    _init: function(path) {
-        this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path);
-
-        this.signal_quality = 0;
-        this.operator_name = null;
-
-        // Code is duplicated because the function have different signatures
-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
-            this.signal_quality = quality;
-            this.emit('notify::signal-quality');
-        }));
-        this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) {
-            this.operator_name = this._findOperatorName(name, code);
-            this.emit('notify::operator-name');
-        }));
-        this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function(result, err) {
-            if (err) {
-                log(err);
-                return;
-            }
-
-            let [status, code, name] = result;
-            this.operator_name = this._findOperatorName(name, code);
-            this.emit('notify::operator-name');
-        }));
-        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
-            if (err) {
-                // it will return an error if the device is not connected
-                this.signal_quality = 0;
-            } else {
-                let [quality] = result;
-                this.signal_quality = quality;
-            }
-            this.emit('notify::signal-quality');
-        }));
-    },
-
-    _findOperatorName: function(name, opCode) {
-        if (name.length != 0 && (name.length > 6 || name.length < 5)) {
-            // this looks like a valid name, i.e. not an MCCMNC (that some
-            // devices return when not yet connected
-            return name;
-        }
-        if (isNaN(parseInt(name))) {
-            // name is definitely not a MCCMNC, so it may be a name
-            // after all; return that
-            return name;
-        }
-
-        let needle;
-        if (name.length == 0 && opCode)
-            needle = opCode;
-        else if (name.length == 6 || name.length == 5)
-            needle = name;
-        else // nothing to search
-            return null;
-
-        return this._findProviderForMCCMNC(needle);
-    },
-
-    _findProviderForMCCMNC: function(needle) {
-        let table = _getProvidersTable();
-        let needlemcc = needle.substring(0, 3);
-        let needlemnc = needle.substring(3, needle.length);
-
-        let name2, name3;
-        for (let iter in table) {
-            let providers = table[iter];
-
-            // Search through each country's providers
-            for (let i = 0; i < providers.length; i++) {
-                let provider = providers[i];
-
-                // Search through MCC/MNC list
-                let list = provider.get_gsm_mcc_mnc();
-                for (let j = 0; j < list.length; j++) {
-                    let mccmnc = list[j];
-
-                    // Match both 2-digit and 3-digit MNC; prefer a
-                    // 3-digit match if found, otherwise a 2-digit one.
-                    if (mccmnc.mcc != needlemcc)
-                        continue;  // MCC was wrong
-
-                    if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
-                        name3 = provider.name;
-
-                    if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
-                        name2 = provider.name;
-
-                    if (name2 && name3)
-                        break;
-                }
-            }
-        }
-
-        return name3 || name2 || null;
-    }
-}
-Signals.addSignalMethods(ModemGsm.prototype);
-
-function ModemCdma() {
-    this._init.apply(this, arguments);
-}
-
-ModemCdma.prototype = {
-    _init: function(path) {
-        this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path);
-
-        this.signal_quality = 0;
-        this.operator_name = null;
-        this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) {
-            this.signal_quality = quality;
-            this.emit('notify::signal-quality');
-
-            // receiving this signal means the device got activated
-            // and we can finally call GetServingSystem
-            if (this.operator_name == null)
-                this._refreshServingSystem();
-        }));
-        this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
-            if (err) {
-                // it will return an error if the device is not connected
-                this.signal_quality = 0;
-            } else {
-                let [quality] = result;
-                this.signal_quality = quality;
-            }
-            this.emit('notify::signal-quality');
-        }));
-    },
-
-    _refreshServingSystem: function() {
-        this._proxy.GetServingSystemRemote(Lang.bind(this, function(result, err) {
-            if (err) {
-                // it will return an error if the device is not connected
-                this.operator_name = null;
-            } else {
-                let [bandClass, band, id] = result;
-                if (name.length > 0)
-                    this.operator_name = this._findProviderForSid(id);
-                else
-                    this.operator_name = null;
-            }
-            this.emit('notify::operator-name');
-        }));
-    },
-
-    _findProviderForSid: function(sid) {
-        if (sid == 0)
-            return null;
-
-        let table = _getProvidersTable();
-
-        // Search through each country
-        for (let iter in table) {
-            let providers = table[iter];
-
-            // Search through each country's providers
-            for (let i = 0; i < providers.length; i++) {
-                let provider = providers[i];
-                let cdma_sid = provider.get_cdma_sid();
-
-                // Search through CDMA SID list
-                for (let j = 0; j < cdma_sid.length; j++) {
-                    if (cdma_sid[j] == sid)
-                        return provider.name;
-                }
-            }
-        }
-
-        return null;
-    }
-};
-Signals.addSignalMethods(ModemCdma.prototype);
--- a/js/misc/telepathy.js
+++ b/js/misc/telepathy.js
@ -0,0 +1,361 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+
+// D-Bus utils
+function nameToPath(name) {
+    return '/' + name.replace(/\./g, '/');
+};
+
+function pathToName(path) {
+    if (path[0] != '/')
+        throw new Error('not a D-Bus path: ' + path);
+    return path.substr(1).replace(/\//g, '.');
+};
+
+// This is tp_escape_as_identifier() from telepathy-glib
+function escapeAsIdentifier(name) {
+    if (!name)
+        return '_';
+
+    // first char is replaced with _XX if it's non-alpha,
+    // later chars are replaced with _XX if they're non-alphanumeric
+    if (name.length == 1) {
+        return name.replace(/[^a-zA-Z]/, _hexEscape);
+    } else {
+        return (name[0].replace(/[^a-zA-Z]/, _hexEscape) +
+                name.substring(1).replace(/[^a-zA-Z0-9]/g, _hexEscape));
+    }
+}
+
+function _hexEscape(ch) {
+    return '_' + ch.charCodeAt(0).toString(16);
+}
+
+// Telepathy D-Bus interface definitions. Note that most of these are
+// incomplete, and only cover the methods/properties/signals that
+// we're currently using.
+
+const TELEPATHY = 'org.freedesktop.Telepathy';
+
+const CLIENT_NAME = TELEPATHY + '.Client';
+const ClientIface = {
+    name: CLIENT_NAME,
+    properties: [
+        { name: 'Interfaces',
+          signature: 'as',
+          access: 'read' }
+    ]
+};
+
+const CLIENT_APPROVER_NAME = TELEPATHY + '.Client.Approver';
+const ClientApproverIface = {
+    name: CLIENT_APPROVER_NAME,
+    methods: [
+        { name: 'AddDispatchOperation',
+          inSignature: 'a(oa{sv})oa{sv}',
+          outSignature: '' }
+    ],
+    properties: [
+        { name: 'ApproverChannelFilter',
+          signature: 'aa{sv}',
+          access: 'read' }
+    ]
+};
+
+const CLIENT_HANDLER_NAME = TELEPATHY + '.Client.Handler';
+const ClientHandlerIface = {
+    name: CLIENT_HANDLER_NAME,
+    methods: [
+        { name: 'HandleChannels',
+          inSignature: 'ooa(oa{sv})aota{sv}',
+          outSignature: '' }
+    ],
+    properties: [
+        { name: 'HandlerChannelFilter',
+          signature: 'aa{sv}',
+          access: 'read' }
+    ]
+};
+
+const CLIENT_OBSERVER_NAME = TELEPATHY + '.Client.Observer';
+const ClientObserverIface = {
+    name: CLIENT_OBSERVER_NAME,
+    methods: [
+        { name: 'ObserveChannels',
+          inSignature: 'ooa(oa{sv})oaoa{sv}',
+          outSignature: '' }
+    ],
+    properties: [
+        { name: 'ObserverChannelFilter',
+          signature: 'aa{sv}',
+          access: 'read' }
+    ]
+};
+
+const CHANNEL_DISPATCH_OPERATION_NAME = TELEPATHY + '.ChannelDispatchOperation';
+const ChannelDispatchOperationIface = {
+    name: CHANNEL_DISPATCH_OPERATION_NAME,
+    methods: [
+        { name: 'HandleWith',
+          inSignature: 's',
+          outSignature: '' },
+        { name: 'Claim',
+          inSignature: '',
+          outSignature: '' }
+    ]
+};
+let ChannelDispatchOperation = DBus.makeProxyClass(ChannelDispatchOperationIface);
+
+const CONNECTION_NAME = TELEPATHY + '.Connection';
+const ConnectionIface = {
+    name: CONNECTION_NAME,
+    signals: [
+        { name: 'StatusChanged',
+          inSignature: 'uu' }
+    ]
+};
+let Connection = DBus.makeProxyClass(ConnectionIface);
+
+const ConnectionStatus = {
+    CONNECTED:    0,
+    CONNECTING:   1,
+    DISCONNECTED: 2
+};
+
+const CONNECTION_ALIASING_NAME = CONNECTION_NAME + '.Interface.Aliasing';
+const ConnectionAliasingIface = {
+    name: CONNECTION_ALIASING_NAME,
+    methods: [
+        { name: 'RequestAliases',
+          inSignature: 'au',
+          outSignature: 'as'
+        }
+    ],
+    signals: [
+        { name: 'AliasesChanged',
+          inSignature: 'a(us)' }
+    ]
+};
+let ConnectionAliasing = DBus.makeProxyClass(ConnectionAliasingIface);
+
+const CONNECTION_AVATARS_NAME = CONNECTION_NAME + '.Interface.Avatars';
+const ConnectionAvatarsIface = {
+    name: CONNECTION_AVATARS_NAME,
+    methods: [
+        { name: 'GetKnownAvatarTokens',
+          inSignature: 'au',
+          outSignature: 'a{us}'
+        },
+        { name: 'RequestAvatars',
+          inSignature: 'au',
+          outSignature: ''
+        }
+    ],
+    signals: [
+        { name: 'AvatarRetrieved',
+          inSignature: 'usays'
+        },
+        { name: 'AvatarUpdated',
+          inSignature: 'us'
+        }
+    ]
+};
+let ConnectionAvatars = DBus.makeProxyClass(ConnectionAvatarsIface);
+
+const CONNECTION_CONTACTS_NAME = CONNECTION_NAME + '.Interface.Contacts';
+const ConnectionContactsIface = {
+    name: CONNECTION_CONTACTS_NAME,
+    methods: [
+        { name: 'GetContactAttributes',
+          inSignature: 'auasb',
+          outSignature: 'a{ua{sv}}'
+        }
+    ]
+};
+let ConnectionContacts = DBus.makeProxyClass(ConnectionContactsIface);
+
+const CONNECTION_REQUESTS_NAME = CONNECTION_NAME + '.Interface.Requests';
+const ConnectionRequestsIface = {
+    name: CONNECTION_REQUESTS_NAME,
+    methods: [
+        { name: 'CreateChannel',
+          inSignature: 'a{sv}',
+          outSignature: 'oa{sv}'
+        },
+        { name: 'EnsureChannel',
+          inSignature: 'a{sv}',
+          outSignature: 'boa{sv}'
+        }
+    ],
+    properties: [
+        { name: 'Channels',
+          signature: 'a(oa{sv})',
+          access: 'read' }
+    ],
+    signals: [
+        { name: 'NewChannels',
+          inSignature: 'a(oa{sv})'
+        },
+        { name: 'ChannelClosed',
+          inSignature: 'o'
+        }
+    ]
+};
+let ConnectionRequests = DBus.makeProxyClass(ConnectionRequestsIface);
+
+const CONNECTION_SIMPLE_PRESENCE_NAME = CONNECTION_NAME + '.Interface.SimplePresence';
+const ConnectionSimplePresenceIface = {
+    name: CONNECTION_SIMPLE_PRESENCE_NAME,
+    methods: [
+        { name: 'SetPresence',
+          inSignature: 'ss'
+        },
+        { name: 'GetPresences',
+          inSignature: 'au',
+          outSignature: 'a{u(uss)}'
+        }
+    ],
+    signals: [
+        { name: 'PresencesChanged',
+          inSignature: 'a{u(uss)}' }
+    ]
+};
+let ConnectionSimplePresence = DBus.makeProxyClass(ConnectionSimplePresenceIface);
+
+const ConnectionPresenceType = {
+    UNSET:         0,
+    OFFLINE:       1,
+    AVAILABLE:     2,
+    AWAY:          3,
+    EXTENDED_AWAY: 4,
+    HIDDEN:        5,
+    BUSY:          6,
+    UNKNOWN:       7,
+    ERROR:         8
+};
+
+const HandleType = {
+    NONE:    0,
+    CONTACT: 1,
+    ROOM:    2,
+    LIST:    3,
+    GROUP:   4
+};
+
+const CHANNEL_NAME = TELEPATHY + '.Channel';
+const ChannelIface = {
+    name: CHANNEL_NAME,
+    signals: [
+        { name: 'Closed',
+          inSignature: '' }
+    ]
+};
+let Channel = DBus.makeProxyClass(ChannelIface);
+
+const CHANNEL_TEXT_NAME = CHANNEL_NAME + '.Type.Text';
+const ChannelTextIface = {
+    name: CHANNEL_TEXT_NAME,
+    methods: [
+        { name: 'ListPendingMessages',
+          inSignature: 'b',
+          outSignature: 'a(uuuuus)'
+        },
+        { name: 'AcknowledgePendingMessages',
+          inSignature: 'au',
+          outSignature: ''
+        },
+        { name: 'Send',
+          inSignature: 'us',
+          outSignature: ''
+        }
+    ],
+    signals: [
+        { name: 'Received',
+          inSignature: 'uuuuus' },
+        { name: 'Sent',
+          inSignature: 'uus' }
+    ]
+};
+let ChannelText = DBus.makeProxyClass(ChannelTextIface);
+
+const ChannelTextMessageType = {
+    NORMAL: 0,
+    ACTION: 1,
+    NOTICE: 2,
+    AUTO_REPLY: 3,
+    DELIVERY_REPORT: 4
+};
+
+const CHANNEL_CONTACT_LIST_NAME = CHANNEL_NAME + '.Type.ContactList';
+// There is no interface associated with ContactList; it's just a
+// special kind of Channel.Interface.Group
+
+const CHANNEL_GROUP_NAME = CHANNEL_NAME + '.Interface.Group';
+const ChannelGroupIface = {
+    name: CHANNEL_GROUP_NAME,
+    properties: [
+        { name: 'Members',
+          signature: 'au',
+          access: 'read' }
+    ],
+    signals: [
+        { name: 'MembersChanged',
+          inSignature: 'sauauauauuu' }
+    ]
+};
+let ChannelGroup = DBus.makeProxyClass(ChannelGroupIface);
+
+const ACCOUNT_MANAGER_NAME = TELEPATHY + '.AccountManager';
+const AccountManagerIface = {
+    name: ACCOUNT_MANAGER_NAME,
+    properties: [
+        { name: 'ValidAccounts',
+          signature: 'ao',
+          access: 'read' }
+    ],
+    signals: [
+        { name: 'AccountValidityChanged',
+          inSignature: 'ob' }
+    ]
+};
+let AccountManager = DBus.makeProxyClass(AccountManagerIface);
+
+const ACCOUNT_NAME = TELEPATHY + '.Account';
+const AccountIface = {
+    name: ACCOUNT_NAME,
+    properties: [
+        { name: 'Connection',
+          signature: 'o',
+          access: 'read' }
+    ]
+};
+let Account = DBus.makeProxyClass(AccountIface);
+
+const CHANNEL_DISPATCHER_NAME = TELEPATHY + '.ChannelDispatcher';
+const ChannelDispatcherIface = {
+    name: CHANNEL_DISPATCHER_NAME,
+    methods: [
+        { name: 'EnsureChannel',
+          inSignature: 'oa{sv}xs',
+          outSignature: 'o' }
+    ]
+};
+let ChannelDispatcher = DBus.makeProxyClass(ChannelDispatcherIface);
+
+const CHANNEL_REQUEST_NAME = TELEPATHY + '.ChannelRequest';
+const ChannelRequestIface = {
+    name: CHANNEL_REQUEST_NAME,
+    methods: [
+        { name: 'Proceed',
+          inSignature: '',
+          outSignature: '' }
+    ],
+    signals: [
+        { name: 'Failed',
+          signature: 'ss' },
+        { name: 'Succeeded',
+          signature: '' }
+    ]
+};
+let ChannelRequest = DBus.makeProxyClass(ChannelRequestIface);
--- a/js/misc/util.js
+++ b/js/misc/util.js
@ -6,6 +6,10 @@ const GLib = imports.gi.GLib;
 const Shell = imports.gi.Shell;

 const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 /* http://daringfireball.net/2010/07/improved_regex_for_matching_urls */
 const _urlRegexp = new RegExp('\\b(([a-z][\\w-]+:(/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)([^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'\\".,<>?«»“”‘’]))', 'gi');
@ -52,6 +56,20 @@ function spawnCommandLine(command_line) {
    }
 }

+// spawnDesktop:
+// @id: a desktop file ID
+//
+// Spawns the desktop file identified by @id using startup notification,
+// etc, handling any errors that occur when trying to find or start
+// the program.
+function spawnDesktop(id) {
+    try {
+        trySpawnDesktop(id);
+    } catch (err) {
+        _handleSpawnError(id, err);
+    }
+}
+
 // trySpawn:
 // @argv: an argv array
 //
@ -99,9 +117,41 @@ function trySpawnCommandLine(command_line) {
    trySpawn(argv);
 }

+// trySpawnDesktop:
+// @id: a desktop file ID
+//
+// Spawns the desktop file identified by @id using startup notification.
+// On error, throws an exception.
+function trySpawnDesktop(id) {
+    let app;
+
+    // shell_app_system_load_from_desktop_file() will end up returning
+    // a stupid error message if the desktop file doesn't exist, but
+    // that's the only case it returns an error for, so we just
+    // substitute our own error in instead
+    try {
+        app = Shell.AppSystem.get_default().load_from_desktop_file(id + '.desktop');
+    } catch (err) {
+        throw new Error(_("No such application"));
+    }
+
+    try {
+        app.launch();
+    } catch(err) {
+        // see trySpawn
+        err.message = err.message.replace(/.*\((.+)\)/, '$1');
+        throw err;
+    }
+}
+
 function _handleSpawnError(command, err) {
    let title = _("Execution of '%s' failed:").format(command);
-    Main.notifyError(title, err.message);
+
+    let source = new MessageTray.SystemNotificationSource();
+    Main.messageTray.add(source);
+    let notification = new MessageTray.Notification(source, title, err.message);
+    notification.setTransient(true);
+    source.notify(notification);
 }

 // killall:
@ -128,83 +178,3 @@ function killall(processName) {
        logError(e, 'Failed to kill ' + processName);
    }
 }
-
-// This was ported from network-manager-applet
-// Copyright 2007 - 2011 Red Hat, Inc.
-// Author: Dan Williams <dcbw@redhat.com>
-
-const _IGNORED_WORDS = [
-        'Semiconductor',
-        'Components',
-        'Corporation',
-        'Communications',
-        'Company',
-        'Corp.',
-        'Corp',
-        'Co.',
-        'Inc.',
-        'Inc',
-        'Incorporated',
-        'Ltd.',
-        'Limited.',
-        'Intel',
-        'chipset',
-        'adapter',
-        '[hex]',
-        'NDIS',
-        'Module'
-];
-
-const _IGNORED_PHRASES = [
-        'Multiprotocol MAC/baseband processor',
-        'Wireless LAN Controller',
-        'Wireless LAN Adapter',
-        'Wireless Adapter',
-        'Network Connection',
-        'Wireless Cardbus Adapter',
-        'Wireless CardBus Adapter',
-        '54 Mbps Wireless PC Card',
-        'Wireless PC Card',
-        'Wireless PC',
-        'PC Card with XJACK(r) Antenna',
-        'Wireless cardbus',
-        'Wireless LAN PC Card',
-        'Technology Group Ltd.',
-        'Communication S.p.A.',
-        'Business Mobile Networks BV',
-        'Mobile Broadband Minicard Composite Device',
-        'Mobile Communications AB',
-        '(PC-Suite Mode)'
-];
-
-function fixupPCIDescription(desc) {
-    desc = desc.replace(/[_,]/, ' ');
-
-    /* Attempt to shorten ID by ignoring certain phrases */
-    for (let i = 0; i < _IGNORED_PHRASES.length; i++) {
-        let item = _IGNORED_PHRASES[i];
-        let pos = desc.indexOf(item);
-        if (pos != -1) {
-            let before = desc.substring(0, pos);
-            let after = desc.substring(pos + item.length, desc.length);
-            desc = before + after;
-        }
-    }
-
-    /* Attmept to shorten ID by ignoring certain individual words */
-    let words = desc.split(' ');
-    let out = [ ];
-    for (let i = 0; i < words.length; i++) {
-        let item = words[i];
-
-        // skip empty items (that come out from consecutive spaces)
-        if (item.length == 0)
-            continue;
-
-        if (_IGNORED_WORDS.indexOf(item) == -1) {
-            out.push(item);
-        }
-    }
-
-    return out.join(' ');
-}
--- a/js/perf/core.js
+++ b/js/perf/core.js
@ -21,77 +21,26 @@ let METRICS = {
    overviewFpsSubsequent:
    { description: "Frames rate when going to the overview, second time",
      units: "frames / s" },
-    overviewFps5Windows:
-    { description: "Frames rate when going to the overview, 5 windows open",
-      units: "frames / s" },
-    overviewFps10Windows:
-    { description: "Frames rate when going to the overview, 10 windows open",
-      units: "frames / s" },
-    overviewFps5Maximized:
-    { description: "Frames rate when going to the overview, 5 maximized windows open",
-      units: "frames / s" },
-    overviewFps10Maximized:
-    { description: "Frames rate when going to the overview, 10 maximized windows open",
-      units: "frames / s" },
-    overviewFps5Alpha:
-    { description: "Frames rate when going to the overview, 5 alpha-transparent windows open",
-      units: "frames / s" },
-    overviewFps10Alpha:
-    { description: "Frames rate when going to the overview, 10 alpha-transparent windows open",
-      units: "frames / s" },
    usedAfterOverview:
    { description: "Malloc'ed bytes after the overview is shown once",
      units: "B" },
    leakedAfterOverview:
    { description: "Additional malloc'ed bytes the second time the overview is shown",
-      units: "B" },
-    applicationsShowTimeFirst:
-    { description: "Time to switch to applications view, first time",
-      units: "us" },
-    applicationsShowTimeSubsequent:
-    { description: "Time to switch to applications view, second time",
-      units: "us"}
+      units: "B" }
 };

-let WINDOW_CONFIGS = [
-    { width: 640, height: 480, alpha: false, maximized: false, count: 1,  metric: 'overviewFpsSubsequent' },
-    { width: 640, height: 480, alpha: false, maximized: false, count: 5,  metric: 'overviewFps5Windows'  },
-    { width: 640, height: 480, alpha: false, maximized: false, count: 10, metric: 'overviewFps10Windows'  },
-    { width: 640, height: 480, alpha: false, maximized: true,  count: 5,  metric: 'overviewFps5Maximized' },
-    { width: 640, height: 480, alpha: false, maximized: true,  count: 10, metric: 'overviewFps10Maximized' },
-    { width: 640, height: 480, alpha: true,  maximized: false, count: 5,  metric: 'overviewFps5Alpha' },
-    { width: 640, height: 480, alpha: true,  maximized: false, count: 10, metric: 'overviewFps10Alpha' }
-];
-
 function run() {
    Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
    Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
    Scripting.defineScriptEvent("afterShowHide", "After a show/hide cycle for the overview");
-    Scripting.defineScriptEvent("applicationsShowStart", "Starting to switch to applications view");
-    Scripting.defineScriptEvent("applicationsShowDone", "Done switching to applications view");

    Main.overview.connect('shown', function() {
                              Scripting.scriptEvent('overviewShowDone');
                          });

    yield Scripting.sleep(1000);
-
-    for (let i = 0; i < 2 * WINDOW_CONFIGS.length; i++) {
-        // We go to the overview twice for each configuration; the first time
-        // to calculate the mipmaps for the windows, the second time to get
-        // a clean set of numbers.
-        if ((i % 2) == 0) {
-            let config = WINDOW_CONFIGS[i / 2];
-            yield Scripting.destroyTestWindows();
-
-            for (let k = 0; k < config.count; k++)
-                yield Scripting.createTestWindow(config.width, config.height, config.alpha, config.maximized);
-
-            yield Scripting.waitTestWindows();
-            yield Scripting.sleep(1000);
-            yield Scripting.waitLeisure();
-        }
-
+    yield Scripting.waitLeisure();
+    for (let i = 0; i < 2; i++) {
        Scripting.scriptEvent('overviewShowStart');
        Main.overview.show();

@ -104,21 +53,6 @@ function run() {
        Scripting.collectStatistics();
        Scripting.scriptEvent('afterShowHide');
    }
-
-    yield Scripting.destroyTestWindows();
-    yield Scripting.sleep(1000);
-
-    Main.overview.show();
-    yield Scripting.waitLeisure();
-
-    for (let i = 0; i < 2; i++) {
-        Scripting.scriptEvent('applicationsShowStart');
-        Main.overview.viewSelector.switchTab('applications');
-        yield Scripting.waitLeisure();
-        Scripting.scriptEvent('applicationsShowDone');
-        Main.overview.viewSelector.switchTab('windows');
-        yield Scripting.waitLeisure();
-    }
 }

 let showingOverview = false;
@ -130,8 +64,6 @@ let mallocUsedSize = 0;
 let overviewShowCount = 0;
 let firstOverviewUsedSize;
 let haveSwapComplete = false;
-let applicationsShowStart;
-let applicationsShowCount = 0;

 function script_overviewShowStart(time) {
    showingOverview = true;
@ -147,18 +79,6 @@ function script_overviewShowDone(time) {
    finishedShowingOverview = true;
 }

-function script_applicationsShowStart(time) {
-    applicationsShowStart = time;
-}
-
-function script_applicationsShowDone(time) {
-    applicationsShowCount++;
-    if (applicationsShowCount == 1)
-        METRICS.applicationsShowTimeFirst.value = time - applicationsShowStart;
-    else
-        METRICS.applicationsShowTimeSubsequent.value = time - applicationsShowStart;
-}
-
 function script_afterShowHide(time) {
    if (overviewShowCount == 1) {
        METRICS.usedAfterOverview.value = mallocUsedSize;
@ -193,15 +113,9 @@ function _frameDone(time) {
        if (overviewShowCount == 1) {
            METRICS.overviewLatencyFirst.value = overviewLatency;
            METRICS.overviewFpsFirst.value = fps;
-        } else if (overviewShowCount == 2) {
+        } else {
            METRICS.overviewLatencySubsequent.value = overviewLatency;
-        }
-
-        // Other than overviewFpsFirst, we collect FPS metrics the second
-        // we show each window configuration. overviewShowCount is 1,2,3...
-        if (overviewShowCount % 2 == 0) {
-            let config = WINDOW_CONFIGS[(overviewShowCount / 2) - 1];
-            METRICS[config.metric].value = fps;
+            METRICS.overviewFpsSubsequent.value = fps;
        }
    }
 }
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -87,7 +86,7 @@ AltTabPopup.prototype = {
        let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(primary.width - hPadding);
        let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight);
        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(primary.x + primary.width - rightPadding, childBox.x1 + childNaturalWidth);
+        childBox.x2 = Math.min(childBox.x1 + primary.width - hPadding, childBox.x1 + childNaturalWidth);
        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
        childBox.y2 = childBox.y1 + childNaturalHeight;
        this._appSwitcher.actor.allocate(childBox, flags);
@ -121,7 +120,7 @@ AltTabPopup.prototype = {
        }
    },

-    show : function(backward, switch_group) {
+    show : function(backward) {
        let tracker = Shell.WindowTracker.get_default();
        let apps = tracker.get_running_apps ('');

@ -145,28 +144,31 @@ AltTabPopup.prototype = {

        this._appIcons = this._appSwitcher.icons;

-        // Need to force an allocation so we can figure out whether we
-        // need to scroll when selecting
-        this.actor.opacity = 0;
-        this.actor.show();
-        this.actor.get_allocation_box();
-
        // Make the initial selection
-        if (switch_group) {
-            if (backward) {
-                this._select(0, this._appIcons[0].cachedWindows.length - 1);
-            } else {
-                if (this._appIcons[0].cachedWindows.length > 1)
-                    this._select(0, 1);
-                else
-                    this._select(0, 0);
-            }
-        } else if (this._appIcons.length == 1) {
-            this._select(0);
+        if (this._appIcons.length == 1) {
+            if (!backward && this._appIcons[0].cachedWindows.length > 1) {
+                // For compatibility with the multi-app case below
+                this._select(0, 1, true);
+            } else
+                this._select(0);
        } else if (backward) {
            this._select(this._appIcons.length - 1);
        } else {
-            this._select(1);
+            let firstWindows = this._appIcons[0].cachedWindows;
+            if (firstWindows.length > 1) {
+                let curAppNextWindow = firstWindows[1];
+                let nextAppWindow = this._appIcons[1].cachedWindows[0];
+
+                // If the next window of the current app is more-recently-used
+                // than the first window of the next app, then select it.
+                if (curAppNextWindow.get_workspace() == global.screen.get_active_workspace() &&
+                    curAppNextWindow.get_user_time() > nextAppWindow.get_user_time())
+                    this._select(0, 1, true);
+                else
+                    this._select(1);
+            } else {
+                this._select(1);
+            }
        }

        // There's a race condition; if the user released Alt before
@ -180,6 +182,8 @@ AltTabPopup.prototype = {
            return false;
        }

+        this.actor.opacity = 0;
+        this.actor.show();
        Tweener.addTween(this.actor,
                         { opacity: 255,
                           time: POPUP_FADE_TIME,
@ -213,38 +217,41 @@ AltTabPopup.prototype = {

    _keyPressEvent : function(actor, event) {
        let keysym = event.get_key_symbol();
-        let event_state = Shell.get_event_state(event);
-        let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
-        let action = global.screen.get_display().get_keybinding_action(event.get_key_code(), event_state);
+        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
+        // X allows servers to represent Shift+Tab in two different ways
+        if (shift && keysym == Clutter.Tab)
+            keysym = Clutter.ISO_Left_Tab;

        this._disableHover();

-        if (action == Meta.KeyBindingAction.SWITCH_GROUP)
-            this._select(this._currentApp, backwards ? this._previousWindow() : this._nextWindow());
+        if (keysym == Clutter.grave)
+            this._select(this._currentApp, this._nextWindow());
+        else if (keysym == Clutter.asciitilde)
+            this._select(this._currentApp, this._previousWindow());
        else if (keysym == Clutter.Escape)
            this.destroy();
        else if (this._thumbnailsFocused) {
-            if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
-                if (backwards) {
-                    if (this._currentWindow == 0 || this._currentWindow == -1)
-                        this._select(this._previousApp());
-                    else
-                        this._select(this._currentApp, this._previousWindow());
-                } else {
-                    if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
-                        this._select(this._nextApp());
-                    else
-                        this._select(this._currentApp, this._nextWindow());
-                }
-            else if (keysym == Clutter.Left)
+            if (keysym == Clutter.Tab) {
+                if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
+                    this._select(this._nextApp());
+                else
+                    this._select(this._currentApp, this._nextWindow());
+            } else if (keysym == Clutter.ISO_Left_Tab) {
+                if (this._currentWindow == 0 || this._currentWindow == -1)
+                    this._select(this._previousApp());
+                else
+                    this._select(this._currentApp, this._previousWindow());
+            } else if (keysym == Clutter.Left)
                this._select(this._currentApp, this._previousWindow());
            else if (keysym == Clutter.Right)
                this._select(this._currentApp, this._nextWindow());
            else if (keysym == Clutter.Up)
                this._select(this._currentApp, null, true);
        } else {
-            if (action == Meta.KeyBindingAction.SWITCH_WINDOWS)
-                this._select(backwards ? this._previousApp() : this._nextApp());
+            if (keysym == Clutter.Tab)
+                this._select(this._nextApp());
+            else if (keysym == Clutter.ISO_Left_Tab)
+                this._select(this._previousApp());
            else if (keysym == Clutter.Left)
                this._select(this._previousApp());
            else if (keysym == Clutter.Right)
@ -362,15 +369,7 @@ AltTabPopup.prototype = {
        this.destroy();
    },

-    _popModal: function() {
-        if (this._haveModal) {
-            Main.popModal(this.actor);
-            this._haveModal = false;
-        }
-    },
-
    destroy : function() {
-        this._popModal();
        if (this.actor.visible) {
            Tweener.addTween(this.actor,
                             { opacity: 0,
@ -386,7 +385,8 @@ AltTabPopup.prototype = {
    },

    _onDestroy : function() {
-        this._popModal();
+        if (this._haveModal)
+            Main.popModal(this.actor);

        if (this._thumbnails)
            this._destroyThumbnails();
@ -527,11 +527,16 @@ SwitcherList.prototype = {
        this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
                                               pseudo_class: 'highlighted' });
        this._leftArrow.connect('repaint', Lang.bind(this,
-            function() { _drawArrow(this._leftArrow, St.Side.LEFT); }));
+                                            function (area) {
+                                                Shell.draw_box_pointer(area, Shell.PointerDirection.LEFT);
+                                            }));
+
        this._rightArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
                                                pseudo_class: 'highlighted' });
        this._rightArrow.connect('repaint', Lang.bind(this,
-            function() { _drawArrow(this._rightArrow, St.Side.RIGHT); }));
+                                            function (area) {
+                                                Shell.draw_box_pointer(area, Shell.PointerDirection.RIGHT);
+                                            }));

        this.actor.add_actor(this._leftArrow);
        this.actor.add_actor(this._rightArrow);
@ -587,9 +592,9 @@ SwitcherList.prototype = {
        this._rightArrow.opacity = this._rightGradient.opacity;
    },

-    addItem : function(item, label) {
-        let bbox = new St.Button({ style_class: 'item-box',
-                                   reactive: true });
+    addItem : function(item) {
+        let bbox = new St.Clickable({ style_class: 'item-box',
+                                      reactive: true });

        bbox.set_child(item);
        this._list.add_actor(bbox);
@ -598,8 +603,6 @@ SwitcherList.prototype = {
        bbox.connect('clicked', Lang.bind(this, function() { this._onItemClicked(n); }));
        bbox.connect('enter-event', Lang.bind(this, function() { this._onItemEnter(n); }));

-        bbox.label_actor = label;
-
        this._items.push(bbox);
    },

@ -815,7 +818,7 @@ AppIcon.prototype = {
        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
                                         vertical: true });
        this.icon = null;
-        this._iconBin = new St.Bin({ x_fill: true, y_fill: true });
+        this._iconBin = new St.Bin();

        this.actor.add(this._iconBin, { x_fill: false, y_fill: false } );
        this.label = new St.Label({ text: this.app.get_name() });
@ -985,11 +988,14 @@ AppSwitcher.prototype = {

    _addIcon : function(appIcon) {
        this.icons.push(appIcon);
-        this.addItem(appIcon.actor, appIcon.label);
+        this.addItem(appIcon.actor);

        let n = this._arrows.length;
        let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
-        arrow.connect('repaint', function() { _drawArrow(arrow, St.Side.BOTTOM); });
+        arrow.connect('repaint', Lang.bind(this,
+            function (area) {
+                Shell.draw_box_pointer(area, Shell.PointerDirection.DOWN);
+            }));
        this._list.add_actor(arrow);
        this._arrows.push(arrow);

@ -1055,12 +1061,9 @@ ThumbnailList.prototype = {
                this._labels.push(bin);
                bin.add_actor(name);
                box.add_actor(bin);
-
-                this.addItem(box, name);
-            } else {
-                this.addItem(box, null);
            }

+            this.addItem(box);
        }
    },

@ -1078,9 +1081,6 @@ ThumbnailList.prototype = {

        for (let i = 0; i < this._thumbnailBins.length; i++) {
            let mutterWindow = this._windows[i].get_compositor_private();
-            if (!mutterWindow)
-                continue;
-
            let windowTexture = mutterWindow.get_texture ();
            let [width, height] = windowTexture.get_size();
            let scale = Math.min(1.0, THUMBNAIL_DEFAULT_SIZE / width, availHeight / height);
@ -1098,46 +1098,3 @@ ThumbnailList.prototype = {
        this._thumbnailBins = new Array();
    }
 };
-
-function _drawArrow(area, side) {
-    let themeNode = area.get_theme_node();
-    let borderColor = themeNode.get_border_color(side);
-    let bodyColor = themeNode.get_foreground_color();
-
-    let [width, height] = area.get_surface_size ();
-    let cr = area.get_context();
-
-    cr.setLineWidth(1.0);
-    Clutter.cairo_set_source_color(cr, borderColor);
-
-    switch (side) {
-    case St.Side.TOP:
-        cr.moveTo(0, height);
-        cr.lineTo(Math.floor(width * 0.5), 0);
-        cr.lineTo(width, height);
-        break;
-
-    case St.Side.BOTTOM:
-        cr.moveTo(width, 0);
-        cr.lineTo(Math.floor(width * 0.5), height);
-        cr.lineTo(0, 0);
-        break;
-
-    case St.Side.LEFT:
-        cr.moveTo(width, height);
-        cr.lineTo(0, Math.floor(height * 0.5));
-        cr.lineTo(width, 0);
-        break;
-
-    case St.Side.RIGHT:
-        cr.moveTo(0, 0);
-        cr.lineTo(width, Math.floor(height * 0.5));
-        cr.lineTo(0, height);
-        break;
-    }
-
-    cr.strokePreserve();
-
-    Clutter.cairo_set_source_color(cr, bodyColor);
-    cr.fill();
-}
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -1,14 +1,14 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
 const Signals = imports.signals;
-const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Mainloop = imports.mainloop;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
@ -21,9 +21,7 @@ const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
 const Params = imports.misc.params;

-const MAX_APPLICATION_WORK_MILLIS = 75;
 const MENU_POPUP_TIMEOUT = 600;
-const SCROLL_TIME = 0.1;

 function AlphabeticalView() {
    this._init();
@ -34,8 +32,6 @@ AlphabeticalView.prototype = {
        this._grid = new IconGrid.IconGrid({ xAlign: St.Align.START });
        this._appSystem = Shell.AppSystem.get_default();

-        this._pendingAppLaterId = 0;
-        this._apps = [];
        this._filterApp = null;

        let box = new St.BoxLayout({ vertical: true });
@ -55,9 +51,6 @@ AlphabeticalView.prototype = {
                let adjustment = this.actor.vscroll.adjustment;
                let direction = Overview.SwipeScrollDirection.VERTICAL;
                Main.overview.setScrollAdjustment(adjustment, direction);
-
-                // Reset scroll on mapping
-                adjustment.value = 0;
            }));
    },

@ -70,7 +63,6 @@ AlphabeticalView.prototype = {
        let appIcon = new AppWellIcon(this._appSystem.get_app(appInfo.get_id()));

        this._grid.addItem(appIcon.actor);
-        appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible));

        appIcon._appInfo = appInfo;
        if (this._filterApp && !this._filterApp(appInfo))
@ -79,62 +71,12 @@ AlphabeticalView.prototype = {
        this._apps.push(appIcon);
    },

-    _ensureIconVisible: function(icon) {
-        let adjustment = this.actor.vscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
-
-        let offset = 0;
-        let vfade = this.actor.get_effect("vfade");
-        if (vfade)
-            offset = vfade.fade_offset;
-
-        // If this gets called as part of a right-click, the actor
-        // will be needs_allocation, and so "icon.y" would return 0
-        let box = icon.get_allocation_box();
-
-        if (box.y1 < value + offset)
-            value = Math.max(0, box.y1 - offset);
-        else if (box.y2 > value + pageSize - offset)
-            value = Math.min(upper, box.y2 + offset - pageSize);
-        else
-            return;
-
-        Tweener.addTween(adjustment,
-                         { value: value,
-                           time: SCROLL_TIME,
-                           transition: 'easeOutQuad' });
-    },
-
    setFilter: function(filter) {
        this._filterApp = filter;
        for (let i = 0; i < this._apps.length; i++)
            this._apps[i].actor.visible = filter(this._apps[i]._appInfo);
    },

-    // Create actors for the applications in an idle to avoid blocking
-    // for too long; see bug 647778
-    _addPendingApps: function() {
-        let i;
-        let startTimeMillis = new Date().getTime();
-        for (i = 0; i < this._pendingAppIds.length; i++) {
-            let id = this._pendingAppIds[i];
-            this._addApp(this._pendingApps[id]);
-
-            let currentTimeMillis = new Date().getTime();
-            if (currentTimeMillis - startTimeMillis > MAX_APPLICATION_WORK_MILLIS)
-                break;
-        }
-        this._pendingAppIds.splice(0, i + 1);
-        if (this._pendingAppIds.length > 0) {
-            return true;
-        } else {
-            this._pendingAppLaterId = 0;
-            this._pendingAppIds = null;
-            this._pendingApps = null;
-            return false;
-        }
-    },
-
    refresh: function(apps) {
        let ids = [];
        for (let i in apps)
@ -145,12 +87,9 @@ AlphabeticalView.prototype = {

        this._removeAll();

-        this._pendingAppIds = ids;
-        this._pendingApps = apps;
-        if (this._pendingAppLaterId)
-            Meta.later_remove(this._pendingAppLaterId);
-        this._pendingAppLaterId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                                                 Lang.bind(this, this._addPendingApps));
+        for (let i = 0; i < ids.length; i++) {
+            this._addApp(apps[ids[i]]);
+        }
    }
 };

@ -166,47 +105,14 @@ ViewByCategories.prototype = {

        this._view = new AlphabeticalView();

-        // categories can be -1 (the All view) or 0...n-1, where n
-        // is the number of sections
-        // -2 is a flag to indicate that nothing is selected
-        // (used only before the actor is mapped the first time)
-        this._currentCategory = -2;
-        this._filters = new St.BoxLayout({ vertical: true, reactive: true });
-        this._filters.connect('scroll-event', Lang.bind(this, this._scrollFilter));
-
+        this._filters = new St.BoxLayout({ vertical: true });
        this.actor.add(this._view.actor, { expand: true, x_fill: true, y_fill: true });
        this.actor.add(this._filters, { expand: false, y_fill: false, y_align: St.Align.START });

-        // Always select the "All" filter when switching to the app view
-        this.actor.connect('notify::mapped', Lang.bind(this,
-            function() {
-                if (this.actor.mapped && this._allFilter)
-                    this._selectCategory(-1);
-            }));
-
        this._sections = [];
-
-        // We need a dummy actor to catch the keyboard focus if the
-        // user Ctrl-Alt-Tabs here before the deferred work creates
-        // our real contents
-        this._focusDummy = new St.Bin({ can_focus: true });
-        this.actor.add(this._focusDummy);
-    },
-
-    _scrollFilter: function(actor, event) {
-        let direction = event.get_scroll_direction();
-        if (direction == Clutter.ScrollDirection.UP)
-            this._selectCategory(Math.max(this._currentCategory - 1, -1))
-        else if (direction == Clutter.ScrollDirection.DOWN)
-            this._selectCategory(Math.min(this._currentCategory + 1, this._sections.length - 1));
    },

    _selectCategory: function(num) {
-        if (this._currentCategory == num) // nothing to do
-            return;
-
-        this._currentCategory = num;
-
        if (num != -1)
            this._allFilter.remove_style_pseudo_class('selected');
        else
@ -227,10 +133,9 @@ ViewByCategories.prototype = {
    },

    _addFilter: function(name, num) {
-        let button = new St.Button({ label: GLib.markup_escape_text (name, -1),
+        let button = new St.Button({ label: name,
                                     style_class: 'app-filter',
-                                     x_align: St.Align.START,
-                                     can_focus: true });
+                                     x_align: St.Align.START });
        this._filters.add(button, { expand: true, x_fill: true, y_fill: false });
        button.connect('clicked', Lang.bind(this, function() {
            this._selectCategory(num);
@ -253,6 +158,7 @@ ViewByCategories.prototype = {

        let sections = this._appSystem.get_sections();
        this._apps = apps;
+        this._view.refresh(apps);

        /* Translators: Filter to display all applications */
        this._addFilter(_("All"), -1);
@ -264,15 +170,6 @@ ViewByCategories.prototype = {
            this._addFilter(sections[i], i);

        this._selectCategory(-1);
-        this._view.refresh(apps);
-
-        if (this._focusDummy) {
-            let focused = this._focusDummy.has_key_focus();
-            this._focusDummy.destroy();
-            this._focusDummy = null;
-            if (focused)
-                this.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-        }
    }
 };

@ -323,10 +220,7 @@ BaseAppSearchProvider.prototype = {
            return null;
        return { 'id': resultId,
                 'name': app.get_name(),
-                 'createIcon': function(size) {
-                                   return app.create_icon_texture(size);
-                               }
-               };
+                 'icon': app.create_icon_texture(Search.RESULT_ICON_SIZE)};
    },

    activateResult: function(id, params) {
@ -342,7 +236,7 @@ BaseAppSearchProvider.prototype = {
                                        timestamp: null });

        let app = this._appSys.get_app(id);
-        app.open_new_window(params.workspace ? params.workspace.index() : -1);
+        app.open_new_window(params.workspace ? params.workspace.get_index() : -1);
    }
 };

@ -369,6 +263,10 @@ AppSearchProvider.prototype = {
        let app = this._appSys.get_app(resultMeta['id']);
        let icon = new AppWellIcon(app);
        return icon.actor;
+    },
+
+    expandSearch: function(terms) {
+        log('TODO expand search');
    }
 };

@ -380,7 +278,7 @@ PrefsSearchProvider.prototype = {
    __proto__: BaseAppSearchProvider.prototype,

    _init: function() {
-        BaseAppSearchProvider.prototype._init.call(this, _("SETTINGS"));
+        BaseAppSearchProvider.prototype._init.call(this, _("PREFERENCES"));
    },

    getInitialResultSet: function(terms) {
@ -389,6 +287,12 @@ PrefsSearchProvider.prototype = {

    getSubsearchResultSet: function(previousResults, terms) {
        return this._appSys.subsearch(true, previousResults, terms);
+    },
+
+    expandSearch: function(terms) {
+        let controlCenter = this._appSys.load_from_desktop_file('gnomecc.desktop');
+        controlCenter.launch();
+        Main.overview.hide();
    }
 };

@ -421,22 +325,16 @@ function AppWellIcon(app, iconParams) {
 AppWellIcon.prototype = {
    _init : function(app, iconParams) {
        this.app = app;
-        this.actor = new St.Button({ style_class: 'app-well-app',
-                                     reactive: true,
-                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
-                                     can_focus: true,
-                                     x_fill: true,
-                                     y_fill: true });
+        this.actor = new St.Clickable({ style_class: 'app-well-app',
+                                         reactive: true,
+                                         x_fill: true,
+                                         y_fill: true });
        this.actor._delegate = this;

        this.icon = new AppIcon(app, iconParams);
        this.actor.set_child(this.icon.actor);

-        this.actor.label_actor = this.icon.label;
-
-        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));

        this._menu = null;
        this._menuManager = new PopupMenu.PopupMenuManager(this);
@ -447,15 +345,12 @@ AppWellIcon.prototype = {
                this._removeMenuTimeout();
                Main.overview.beginItemDrag(this);
            }));
-        this._draggable.connect('drag-cancelled', Lang.bind(this,
-            function () {
-                Main.overview.cancelledItemDrag(this);
-            }));
        this._draggable.connect('drag-end', Lang.bind(this,
            function () {
               Main.overview.endItemDrag(this);
            }));

+        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._menuTimeoutId = 0;
@ -494,34 +389,29 @@ AppWellIcon.prototype = {
                Lang.bind(this, function() {
                    this.popupMenu();
                }));
-        } else if (button == 3) {
-            this.popupMenu();
-            return true;
        }
-        return false;
    },

-    _onClicked: function(actor, button) {
+    _onClicked: function(actor, event) {
        this._removeMenuTimeout();

+        let button = event.get_button();
        if (button == 1) {
-            this._onActivate(Clutter.get_current_event());
+            this._onActivate(event);
        } else if (button == 2) {
-            // Last workspace is always empty
-            let launchWorkspace = global.screen.get_workspace_by_index(global.screen.n_workspaces - 1);
-            launchWorkspace.activate(global.get_current_time());
-            this.emit('launching');
-            this.app.open_new_window(-1);
-            Main.overview.hide();
+            let newWorkspace = Main.overview.workspaces.addWorkspace();
+            if (newWorkspace != null) {
+                newWorkspace.activate(global.get_current_time());
+                this.emit('launching');
+                this.app.open_new_window(-1);
+                Main.overview.hide();
+            }
+        } else if (button == 3) {
+            this.popupMenu();
        }
        return false;
    },

-    _onKeyboardPopupMenu: function() {
-        this.popupMenu();
-        this._menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    },
-
    getId: function() {
        return this.app.get_id();
    },
@ -532,35 +422,67 @@ AppWellIcon.prototype = {

        if (!this._menu) {
            this._menu = new AppIconMenu(this);
+            this._menu.connect('highlight-window', Lang.bind(this, function (menu, window) {
+                this.highlightWindow(window);
+            }));
            this._menu.connect('activate-window', Lang.bind(this, function (menu, window) {
                this.activateWindow(window);
            }));
            this._menu.connect('popup', Lang.bind(this, function (menu, isPoppedUp) {
-                if (!isPoppedUp)
+                if (isPoppedUp) {
+                    this._onMenuPoppedUp();
+                } else {
                    this._onMenuPoppedDown();
+                }
            }));
-            Main.overview.connect('hiding', Lang.bind(this, function () { this._menu.close(); }));

            this._menuManager.addMenu(this._menu);
        }

-        this.actor.set_hover(true);
-        this.actor.show_tooltip();
        this._menu.popup();

        return false;
    },

+    highlightWindow: function(metaWindow) {
+        if (this._didActivateWindow)
+            return;
+        if (!this._getRunning())
+            return;
+        Main.overview.getWorkspacesForWindow(metaWindow).setHighlightWindow(metaWindow);
+    },
+
    activateWindow: function(metaWindow) {
        if (metaWindow) {
+            this._didActivateWindow = true;
            Main.activateWindow(metaWindow);
        } else {
            Main.overview.hide();
        }
    },

+    _onMenuPoppedUp: function() {
+        if (this._getRunning()) {
+            Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(this.app.get_id());
+            this._setWindowSelection = true;
+            this._didActivateWindow = false;
+        }
+    },
+
    _onMenuPoppedDown: function() {
        this.actor.sync_hover();
+
+        if (this._didActivateWindow)
+            return;
+        if (!this._setWindowSelection)
+            return;
+
+        Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(null);
+        this._setWindowSelection = false;
+    },
+
+    _getRunning: function() {
+        return this.app.state != Shell.AppState.STOPPED;
    },

    _onActivate: function (event) {
@ -576,6 +498,11 @@ AppWellIcon.prototype = {
        Main.overview.hide();
    },

+    // called by this._menuManager when it has the grab
+    menuEventFilter: function(event) {
+        return this._menu.menuEventFilter(event);
+    },
+
    shellWorkspaceLaunch : function(params) {
        params = Params.parse(params, { workspace: null,
                                        timestamp: null });
@ -584,7 +511,7 @@ AppWellIcon.prototype = {
    },

    getDragActor: function() {
-        return this.app.create_icon_texture(Main.overview.dash.iconSize);
+        return this.app.create_icon_texture(this.icon.iconSize);
    },

    // Returns the original actor that should align with the actor
@ -607,13 +534,11 @@ AppIconMenu.prototype = {
        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
            side = St.Side.RIGHT;

-        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, 0.5, side, 0);
-
-        // We want to keep the item hovered while the menu is up
-        this.blockSourceEvents = true;
+        PopupMenu.PopupMenu.prototype._init.call(this, source.actor, St.Align.MIDDLE, side, 0);

        this._source = source;

+        this.connect('active-changed', Lang.bind(this, this._onActiveChanged));
        this.connect('activate', Lang.bind(this, this._onActivate));
        this.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));

@ -653,12 +578,14 @@ AppIconMenu.prototype = {

        let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());

-        this._newWindowMenuItem = this._appendMenuItem(_("New Window"));
-        this._appendSeparator();
+        this._newWindowMenuItem = windows.length > 0 ? this._appendMenuItem(_("New Window")) : null;

+        if (windows.length > 0)
+            this._appendSeparator();
        this._toggleFavoriteMenuItem = this._appendMenuItem(isFavorite ? _("Remove from Favorites")
                                                                    : _("Add to Favorites"));

+        this._highlightedItem = null;
    },

    _appendSeparator: function () {
@ -682,10 +609,68 @@ AppIconMenu.prototype = {
        if (open) {
            this.emit('popup', true);
        } else {
+            this._updateHighlight(null);
            this.emit('popup', false);
        }
    },

+    // called by this._menuManager when it has the grab
+    menuEventFilter: function(event) {
+        let eventType = event.type();
+
+        // Check if the user is interacting with a window representation
+        // rather than interacting with the menu
+
+        if (eventType == Clutter.EventType.BUTTON_RELEASE) {
+            let metaWindow = this._findMetaWindowForActor(event.get_source());
+            if (metaWindow)
+                this.emit('activate-window', metaWindow);
+        } else if (eventType == Clutter.EventType.ENTER) {
+            let metaWindow = this._findMetaWindowForActor(event.get_source());
+            if (metaWindow)
+                this._selectMenuItemForWindow(metaWindow, true);
+        } else if (eventType == Clutter.EventType.LEAVE) {
+            let metaWindow = this._findMetaWindowForActor(event.get_source());
+            if (metaWindow)
+                this._selectMenuItemForWindow(metaWindow, false);
+        }
+
+        return false;
+    },
+
+    _findMetaWindowForActor: function (actor) {
+        if (actor._delegate.metaWindow)
+            return actor._delegate.metaWindow;
+        else if (actor.get_meta_window)
+            return actor.get_meta_window();
+        return null;
+    },
+
+    _updateHighlight: function (item) {
+        if (this._highlightedItem)
+            this.emit('highlight-window', null);
+        this._highlightedItem = item;
+        if (this._highlightedItem) {
+            let window = this._highlightedItem._window;
+            if (window)
+                this.emit('highlight-window', window);
+        }
+    },
+
+    _selectMenuItemForWindow: function (metaWindow, selected) {
+        let items = this.getMenuItems();
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
+            let menuMetaWindow = item._window;
+            if (menuMetaWindow == metaWindow)
+                item.setActive(selected);
+        }
+    },
+
+    _onActiveChanged: function (menu, child) {
+        this._updateHighlight(child);
+    },
+
    _onActivate: function (actor, child) {
        if (child._window) {
            let metaWindow = child._window;
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -3,6 +3,8 @@
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
 const Signals = imports.signals;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Main = imports.ui.main;

--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -2,7 +2,6 @@

 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
-const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;

@ -28,6 +27,7 @@ BoxPointer.prototype = {
    _init: function(arrowSide, binProperties) {
        this._arrowSide = arrowSide;
        this._arrowOrigin = 0;
+        this._arrowCorner = null;
        this.actor = new St.Bin({ x_fill: true,
                                  y_fill: true });
        this._container = new Shell.GenericContainer();
@ -41,80 +41,80 @@ BoxPointer.prototype = {
        this._border.connect('repaint', Lang.bind(this, this._drawBorder));
        this._container.add_actor(this._border);
        this.bin.raise(this._border);
-        this._xOffset = 0;
-        this._yOffset = 0;
-        this._xPosition = 0;
-        this._yPosition = 0;
    },

    show: function(animate, onComplete) {
+        let x = this.actor.x;
+        let y = this.actor.y;
        let themeNode = this.actor.get_theme_node();
        let rise = themeNode.get_length('-arrow-rise');

-        this.opacity = 0;
+        this.actor.opacity = 0;
        this.actor.show();

        if (animate) {
            switch (this._arrowSide) {
                case St.Side.TOP:
-                    this.yOffset = -rise;
+                    this.actor.y -= rise;
                    break;
                case St.Side.BOTTOM:
-                    this.yOffset = rise;
+                    this.actor.y += rise;
                    break;
                case St.Side.LEFT:
-                    this.xOffset = -rise;
+                    this.actor.x -= rise;
                    break;
                case St.Side.RIGHT:
-                    this.xOffset = rise;
+                    this.actor.x += rise;
                    break;
            }
        }

-        Tweener.addTween(this, { opacity: 255,
-                                 xOffset: 0,
-                                 yOffset: 0,
-                                 transition: "linear",
-                                 onComplete: onComplete,
-                                 time: POPUP_ANIMATION_TIME });
+        Tweener.addTween(this.actor, { opacity: 255,
+                                       x: x,
+                                       y: y,
+                                       transition: "linear",
+                                       onComplete: onComplete,
+                                       time: POPUP_ANIMATION_TIME });
    },

    hide: function(animate, onComplete) {
-        let xOffset = 0;
-        let yOffset = 0;
+        let x = this.actor.x;
+        let y = this.actor.y;
+        let originalX = this.actor.x;
+        let originalY = this.actor.y;
        let themeNode = this.actor.get_theme_node();
        let rise = themeNode.get_length('-arrow-rise');

        if (animate) {
            switch (this._arrowSide) {
                case St.Side.TOP:
-                    yOffset = rise;
+                    y += rise;
                    break;
                case St.Side.BOTTOM:
-                    yOffset = -rise;
+                    y -= rise;
                    break;
                case St.Side.LEFT:
-                    xOffset = rise;
+                    x += rise;
                    break;
                case St.Side.RIGHT:
-                    xOffset = -rise;
+                    x -= rise;
                    break;
            }
        }

-        Tweener.addTween(this, { opacity: 0,
-                                 xOffset: xOffset,
-                                 yOffset: yOffset,
-                                 transition: "linear",
-                                 time: POPUP_ANIMATION_TIME,
-                                 onComplete: Lang.bind(this, function () {
-                                     this.actor.hide();
-                                     this.xOffset = 0;
-                                     this.yOffset = 0;
-                                     if (onComplete)
-                                         onComplete();
-                                 })
-                               });
+        Tweener.addTween(this.actor, { opacity: 0,
+                                       x: x,
+                                       y: y,
+                                       transition: "linear",
+                                       time: POPUP_ANIMATION_TIME,
+                                       onComplete: Lang.bind(this, function () {
+                                           this.actor.hide();
+                                           this.actor.x = originalX;
+                                           this.actor.y = originalY;
+                                           if (onComplete)
+                                               onComplete();
+                                       })
+                                     });
    },

    _adjustAllocationForArrow: function(isWidth, alloc) {
@ -177,9 +177,6 @@ BoxPointer.prototype = {
                break;
        }
        this.bin.allocate(childBox, flags);
-
-        if (this._sourceActor && this._sourceActor.mapped)
-            this._reposition(this._sourceActor, this._gap, this._alignment);
    },

    _drawBorder: function(area) {
@ -193,8 +190,10 @@ BoxPointer.prototype = {
        let halfBorder = borderWidth / 2;
        let halfBase = Math.floor(base/2);

-        let borderColor = themeNode.get_color('-arrow-border-color');
-        let backgroundColor = themeNode.get_color('-arrow-background-color');
+        let borderColor = new Clutter.Color();
+        themeNode.get_color('-arrow-border-color', borderColor);
+        let backgroundColor = new Clutter.Color();
+        themeNode.get_color('-arrow-background-color', backgroundColor);

        let [width, height] = area.get_surface_size();
        let [boxWidth, boxHeight] = [width, height];
@ -219,84 +218,135 @@ BoxPointer.prototype = {

        cr.moveTo(x1 + borderRadius, y1);
        if (this._arrowSide == St.Side.TOP) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+            if (this._arrowCorner == St.Corner.TOPLEFT) {
+                cr.moveTo(x1, y1);
+                cr.lineTo(x1, y1 - rise);
+                cr.lineTo(x1 + halfBase, y1);
+                cr.lineTo(x2 - borderRadius, y1);
+            } else if (this._arrowCorner == St.Corner.TOPRIGHT) {
+                cr.lineTo(x2 - halfBase, y1);
+                cr.lineTo(x2, y1 - rise);
+            } else if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin, y1);
                cr.lineTo(this._arrowOrigin, y1 - rise);
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y1);
+                cr.lineTo(this._arrowOrigin + halfBase, y1);
+                cr.lineTo(x2 - borderRadius, y1);
            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y1);
+                cr.lineTo(this._arrowOrigin - halfBase, y1);
                cr.lineTo(this._arrowOrigin, y1 - rise);
+                cr.lineTo(this._arrowOrigin, y1);
+                cr.lineTo(x2 - borderRadius, y1);
            } else {
                cr.lineTo(this._arrowOrigin - halfBase, y1);
                cr.lineTo(this._arrowOrigin, y1 - rise);
                cr.lineTo(this._arrowOrigin + halfBase, y1);
+                cr.lineTo(x2 - borderRadius, y1);
            }
-        }
-
-        cr.lineTo(x2 - borderRadius, y1);
+        } else
+            cr.lineTo(x2 - borderRadius, y1);

        // top-right corner
-        cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
-               3*Math.PI/2, Math.PI*2);
+        if (this._arrowCorner != St.Corner.TOPRIGHT)
+            cr.arc(x2 - borderRadius, y1 + borderRadius, borderRadius,
+                   3*Math.PI/2, Math.PI*2);

        if (this._arrowSide == St.Side.RIGHT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+            if (this._arrowCorner == St.Corner.TOPRIGHT) {
+                cr.lineTo(x2, y1);
+                cr.lineTo(x2 + rise, y1);
+                cr.lineTo(x2, y1 + halfBase);
+                cr.lineTo(x2, y2 - borderRadius);
+            } else if (this._arrowCorner == St.Corner.BOTTOMRIGHT) {
+                cr.moveTo(x2, y2 - halfBase);
+                cr.lineTo(x2 + rise, y2);
+            } else if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+                cr.lineTo(x2, this._arrowOrigin);
                cr.lineTo(x2 + rise, this._arrowOrigin);
-                cr.lineTo(x2, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+                cr.lineTo(x2, this._arrowOrigin + halfBase);
+                cr.lineTo(x2, y2 - borderRadius);
            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
-                cr.lineTo(x2, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+                cr.lineTo(x2, this._arrowOrigin - halfBase);
                cr.lineTo(x2 + rise, this._arrowOrigin);
+                cr.lineTo(x2, this._arrowOrigin);
+                cr.lineTo(x2, y2 - borderRadius);
            } else {
                cr.lineTo(x2, this._arrowOrigin - halfBase);
                cr.lineTo(x2 + rise, this._arrowOrigin);
                cr.lineTo(x2, this._arrowOrigin + halfBase);
+                cr.lineTo(x2, y2 - borderRadius);
            }
-        }
-
-        cr.lineTo(x2, y2 - borderRadius);
+        } else
+            cr.lineTo(x2, y2 - borderRadius);

        // bottom-right corner
-        cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
-               0, Math.PI/2);
+        if (this._arrowCorner != St.Corner.BOTTOMRIGHT)
+            cr.arc(x2 - borderRadius, y2 - borderRadius, borderRadius,
+                   0, Math.PI/2);

        if (this._arrowSide == St.Side.BOTTOM) {
-            if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
-                cr.lineTo(Math.max(x1 + borderRadius, this._arrowOrigin) + halfBase, y2);
+            if (this._arrowCorner == St.Corner.BOTTOMLEFT) {
+                cr.lineTo(x1 + halfBase, y2);
+                cr.lineTo(x1, y2 + rise);
+            } else if (this._arrowCorner == St.Corner.BOTTOMRIGHT) {
+                cr.lineTo(x2, y2 + rise);
+                cr.lineTo(x2 - halfBase, y2);
+                cr.lineTo(x1 + borderRadius, y2);
+            } else if (this._arrowOrigin < (x1 + (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin + halfBase, y2);
                cr.lineTo(this._arrowOrigin, y2 + rise);
+                cr.lineTo(this._arrowOrigin, y2);
+                cr.lineTo(x1 + borderRadius, y2);
            } else if (this._arrowOrigin > (x2 - (borderRadius + halfBase))) {
+                cr.lineTo(this._arrowOrigin, y2);
                cr.lineTo(this._arrowOrigin, y2 + rise);
-                cr.lineTo(Math.min(x2 - borderRadius, this._arrowOrigin) - halfBase, y2);
+                cr.lineTo(this._arrowOrigin - halfBase, y2);
+                cr.lineTo(x1 + borderRadius, y2);
            } else {
                cr.lineTo(this._arrowOrigin + halfBase, y2);
                cr.lineTo(this._arrowOrigin, y2 + rise);
                cr.lineTo(this._arrowOrigin - halfBase, y2);
+                cr.lineTo(x1 + borderRadius, y2);
            }
-        }
-
-        cr.lineTo(x1 + borderRadius, y2);
+        } else
+            cr.lineTo(x1 + borderRadius, y2);

        // bottom-left corner
-        cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
-               Math.PI/2, Math.PI);
+        if (this._arrowCorner != St.Corner.BOTTOMLEFT)
+            cr.arc(x1 + borderRadius, y2 - borderRadius, borderRadius,
+                   Math.PI/2, Math.PI);

        if (this._arrowSide == St.Side.LEFT) {
-            if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
-                cr.lineTo(x1, Math.max(y1 + borderRadius, this._arrowOrigin) + halfBase);
+            if (this._arrowCorner == St.Corner.TOPLEFT) {
+                cr.lineTo(x2, y1 + halfBase);
+                cr.lineTo(x1 - rise, y1);
+            } else if (this._arrowCorner == St.Corner.BOTTOMLEFT) {
+                cr.lineTo(x1 + rise, y2);
+                cr.moveTo(x1, y2 - halfBase);
+            } else if (this._arrowOrigin < (y1 + (borderRadius + halfBase))) {
+                cr.lineTo(x1, this._arrowOrigin + halfBase);
                cr.lineTo(x1 - rise, this._arrowOrigin);
+                cr.lineTo(x1, this._arrowOrigin);
+                cr.lineTo(x1, y1 + borderRadius);
            } else if (this._arrowOrigin > (y2 - (borderRadius + halfBase))) {
+                cr.lineTo(x1, this._arrowOrigin);
                cr.lineTo(x1 - rise, this._arrowOrigin);
-                cr.lineTo(x1, Math.min(y2 - borderRadius, this._arrowOrigin) - halfBase);
+                cr.lineTo(x1, this._arrowOrigin - halfBase);
+                cr.lineTo(x1, y1 + borderRadius);
            } else {
                cr.lineTo(x1, this._arrowOrigin + halfBase);
                cr.lineTo(x1 - rise, this._arrowOrigin);
                cr.lineTo(x1, this._arrowOrigin - halfBase);
+                cr.lineTo(x1, y1 + borderRadius);
            }
-        }
-
-        cr.lineTo(x1, y1 + borderRadius);
+        } else
+            cr.lineTo(x1, y1 + borderRadius);

        // top-left corner
-        cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
-               Math.PI, 3*Math.PI/2);
+        if (this._arrowCorner != St.Corner.TOPLEFT)
+            cr.arc(x1 + borderRadius, y1 + borderRadius, borderRadius,
+                   Math.PI, 3*Math.PI/2);
+        else
+            cr.lineTo(x1, y1);

        Clutter.cairo_set_source_color(cr, backgroundColor);
        cr.fillPreserve();
@ -310,20 +360,10 @@ BoxPointer.prototype = {
        // so that we can query the correct size.
        this.actor.show();

-        this._sourceActor = sourceActor;
-        this._gap = gap;
-        this._alignment = alignment;
-
-        this._reposition(sourceActor, gap, alignment);
-    },
-
-    _reposition: function(sourceActor, gap, alignment) {
        // Position correctly relative to the sourceActor
-        let sourceNode = sourceActor.get_theme_node();
-        let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
-        let sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
-        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) / 2;
-        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) / 2;
+        let [sourceX, sourceY] = sourceActor.get_transformed_position();
+        let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
+        let [sourceCenterX, sourceCenterY] = [sourceX + (sourceWidth / 2), sourceY + (sourceHeight / 2)];
        let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();

        // We also want to keep it onscreen, and separated from the
@ -331,26 +371,27 @@ BoxPointer.prototype = {
        // separated from its sourceActor
        let primary = global.get_primary_monitor();
        let themeNode = this.actor.get_theme_node();
-        let borderWidth = themeNode.get_length('-arrow-border-width');
-        let arrowBase = themeNode.get_length('-arrow-base');
+        let halfBorder = themeNode.get_length('-arrow-border-width') / 2;
+        let halfBase = themeNode.get_length('-arrow-base') / 2;
        let borderRadius = themeNode.get_length('-arrow-border-radius');
-        let margin = (4 * borderRadius + borderWidth + arrowBase);
-        let halfMargin = margin / 2;
+
+        let margin = 2 * borderRadius + halfBorder;

        let resX, resY;
+        this._arrowCorner = null;

        switch (this._arrowSide) {
        case St.Side.TOP:
-            resY = sourceAllocation.y2 + gap;
+            resY = sourceY + sourceHeight + gap;
            break;
        case St.Side.BOTTOM:
-            resY = sourceAllocation.y1 - natHeight - gap;
+            resY = sourceY - natHeight - gap;
            break;
        case St.Side.LEFT:
-            resX = sourceAllocation.x2 + gap;
+            resX = sourceX + sourceWidth + gap;
            break;
        case St.Side.RIGHT:
-            resX = sourceAllocation.x1 - natWidth - gap;
+            resX = sourceX - natWidth - gap;
            break;
        }

@ -359,7 +400,26 @@ BoxPointer.prototype = {
        switch (this._arrowSide) {
        case St.Side.TOP:
        case St.Side.BOTTOM:
-            resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
+            switch (alignment) {
+            case St.Align.START:
+                resX = sourceCenterX - (halfBase + borderRadius + halfBorder);
+                break;
+            case St.Align.MIDDLE:
+                resX = sourceCenterX - (natWidth / 2);
+                break;
+            case St.Align.END:
+                resX = sourceCenterX - natWidth + (halfBase + borderRadius + halfBorder);
+                break;
+            }
+            if (sourceCenterX < margin) {
+                // Not enough space to the top
+                this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPLEFT : St.Corner.BOTTOMLEFT;
+                resX = primary.x + 10;
+            } else if (sourceCenterX > (primary.x + primary.width - margin)) {
+                // Not enough space to the botom
+                this._arrowCorner = (this._arrowSide == St.Side.TOP) ? St.Corner.TOPRIGHT : St.Corner.BOTTOMRIGHT;
+                resX = primary.x + primary.width - (10 + natWidth);
+            }

            resX = Math.max(resX, primary.x + 10);
            resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
@ -368,7 +428,27 @@ BoxPointer.prototype = {

        case St.Side.LEFT:
        case St.Side.RIGHT:
-            resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
+            switch (alignment) {
+            case St.Align.START:
+                resY = sourceCenterY - (halfBase + borderRadius + halfBorder);
+                break;
+            case St.Align.MIDDLE:
+                resY = sourceCenterY - (natHeight / 2);
+                break;
+            case St.Align.END:
+                resY = sourceCenterY - natHeight + (halfBase + borderRadius + halfBorder);
+                break;
+            }
+            if (sourceCenterY < margin) {
+                // Not enough space to the left
+                this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.TOPLEFT : St.Corner.TORIGHT;
+                resY = 10;
+            }
+            else if (sourceCenterY > (primary.y + primary.height - margin)) {
+                // Not enough space to the right
+                this._arrowCorner = (this._arrowSide == St.Side.LEFT) ? St.Corner.BOTTOMLEFT : St.Corner.BOTTOMRIGHT;
+                resY = primary.y + primary.height - (10 + natHeight);
+            }

            resY = Math.max(resY, primary.y + 10);
            resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
@ -384,9 +464,9 @@ BoxPointer.prototype = {
            parent = parent.get_parent();
        }

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

    // @origin: Coordinate specifying middle of the arrow, along
@ -397,42 +477,5 @@ BoxPointer.prototype = {
            this._arrowOrigin = origin;
            this._border.queue_repaint();
        }
-    },
-
-    _shiftActor : function() {
-        // Since the position of the BoxPointer depends on the allocated size
-        // of the BoxPointer and the position of the source actor, trying
-        // to position the BoxPoiner via the x/y properties will result in
-        // allocation loops and warnings. Instead we do the positioning via
-        // the anchor point, which is independent of allocation, and leave
-        // x == y == 0.
-        this.actor.set_anchor_point(-(this._xPosition + this._xOffset),
-                                    -(this._yPosition + this._yOffset));
-    },
-
-    set xOffset(offset) {
-        this._xOffset = offset;
-        this._shiftActor();
-    },
-
-    get xOffset() {
-        return this._xOffset;
-    },
-
-    set yOffset(offset) {
-        this._yOffset = offset;
-        this._shiftActor();
-    },
-
-    get yOffset() {
-        return this._yOffset;
-    },
-
-    set opacity(opacity) {
-        this.actor.opacity = opacity;
-    },
-
-    get opacity() {
-        return this.actor.opacity;
    }
 };
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const DBus = imports.dbus;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
@ -8,6 +7,8 @@ const St = imports.gi.St;
 const Signals = imports.signals;
 const Pango = imports.gi.Pango;
 const Gettext_gtk30 = imports.gettext.domain('gtk30');
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;

@ -57,22 +58,18 @@ function _getEndOfDay(date) {
 function _formatEventTime(event, clockFormat) {
    let ret;
    if (event.allDay) {
-        /* Translators: Shown in calendar event list for all day events
-         * Keep it short, best if you can use less then 10 characters
-         */
-        ret = C_("event list time", "All Day");
+        /* Translators: Shown in calendar event list for all day events */
+        ret = _("All Day");
    } else {
        switch (clockFormat) {
        case '24h':
-            /* Translators: Shown in calendar event list, if 24h format */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H:%M"));
+            ret = event.date.toLocaleFormat('%H:%M');
            break;

        default:
            /* explicit fall-through */
        case '12h':
-            /* Transators: Shown in calendar event list, if 12h format */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l:%M %p"));
+            ret = event.date.toLocaleFormat('%l:%M %p');
            break;
        }
    }
@ -109,22 +106,22 @@ function _getCalendarDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Calendar grid abbreviation for Sunday.
         *
-         * NOTE: These grid abbreviations are always shown together
-         * and in order, e.g. "S M T W T F S".
+         * NOTE: These abbreviations are always shown together and in
+         * order, e.g. "S M T W T F S".
         */
-        C_("grid sunday", "S"),
+        _("S"),
        /* Translators: Calendar grid abbreviation for Monday */
-        C_("grid monday", "M"),
+        _("M"),
        /* Translators: Calendar grid abbreviation for Tuesday */
-        C_("grid tuesday", "T"),
+        _("T"),
        /* Translators: Calendar grid abbreviation for Wednesday */
-        C_("grid wednesday", "W"),
+        _("W"),
        /* Translators: Calendar grid abbreviation for Thursday */
-        C_("grid thursday", "T"),
+        _("T"),
        /* Translators: Calendar grid abbreviation for Friday */
-        C_("grid friday", "F"),
+        _("F"),
        /* Translators: Calendar grid abbreviation for Saturday */
-        C_("grid saturday", "S")
+        _("S")
    ];
    return abbreviations[dayNumber];
 }
@ -133,37 +130,36 @@ function _getEventDayAbbreviation(dayNumber) {
    let abbreviations = [
        /* Translators: Event list abbreviation for Sunday.
         *
-         * NOTE: These list abbreviations are normally not shown together
+         * NOTE: These abbreviations are normally not shown together
         * so they need to be unique (e.g. Tuesday and Thursday cannot
         * both be 'T').
         */
-        C_("list sunday", "Su"),
+        _("Su"),
        /* Translators: Event list abbreviation for Monday */
-        C_("list monday", "M"),
+        _("M"),
        /* Translators: Event list abbreviation for Tuesday */
-        C_("list tuesday", "T"),
+        _("T"),
        /* Translators: Event list abbreviation for Wednesday */
-        C_("list wednesday", "W"),
+        _("W"),
        /* Translators: Event list abbreviation for Thursday */
-        C_("list thursday", "Th"),
+        _("Th"),
        /* Translators: Event list abbreviation for Friday */
-        C_("list friday", "F"),
+        _("F"),
        /* Translators: Event list abbreviation for Saturday */
-        C_("list saturday", "S")
+        _("S")
    ];
    return abbreviations[dayNumber];
 }

 // Abstraction for an appointment/event in a calendar

-function CalendarEvent(date, end, summary, allDay) {
-    this._init(date, end, summary, allDay);
+function CalendarEvent(date, summary, allDay) {
+    this._init(date, summary, allDay);
 }

 CalendarEvent.prototype = {
-    _init: function(date, end, summary, allDay) {
+    _init: function(date, summary, allDay) {
        this.date = date;
-        this.end = end;
        this.summary = summary;
        this.allDay = allDay;
    }
@ -195,135 +191,29 @@ EmptyEventSource.prototype = {
 };
 Signals.addSignalMethods(EmptyEventSource.prototype);

-const CalendarServerIface = {
-    name: 'org.gnome.Shell.CalendarServer',
-    methods: [{ name: 'GetEvents',
-                inSignature: 'xxb',
-                outSignature: 'a(sssbxxa{sv})' }],
-    signals: [{ name: 'Changed',
-                inSignature: '' }]
-};
-
-const CalendarServer = function () {
+// Second, wrap native Evolution event source
+function EvolutionEventSource() {
    this._init();
-};
-
-CalendarServer.prototype = {
-     _init: function() {
-         DBus.session.proxifyObject(this, 'org.gnome.Shell.CalendarServer', '/org/gnome/Shell/CalendarServer');
-     }
-};
-
-DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface);
-
-// an implementation that reads data from a session bus service
-function DBusEventSource(owner) {
-    this._init(owner);
 }

-function _datesEqual(a, b) {
-    if (a < b)
-        return false;
-    else if (a > b)
-        return false;
-    return true;
-}
-
-function _dateIntervalsOverlap(a0, a1, b0, b1)
-{
-    if (a1 <= b0)
-        return false;
-    else if (b1 <= a0)
-        return false;
-    else
-        return true;
-}
-
-
-DBusEventSource.prototype = {
-    _init: function(owner) {
-        this._resetCache();
-
-        this._dbusProxy = new CalendarServer(owner);
-        this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged));
-
-        DBus.session.watch_name('org.gnome.Shell.CalendarServer',
-                                false, // do not launch a name-owner if none exists
-                                Lang.bind(this, this._onNameAppeared),
-                                Lang.bind(this, this._onNameVanished));
+EvolutionEventSource.prototype = {
+    _init: function() {
+        this._native = new Shell.EvolutionEventSource();
+        this._native.connect('changed', Lang.bind(this, function() {
+            this.emit('changed');
+        }));
    },

-    _resetCache: function() {
-        this._events = [];
-        this._lastRequestBegin = null;
-        this._lastRequestEnd = null;
-    },
-
-    _onNameAppeared: function(owner) {
-        this._resetCache();
-        this._loadEvents(true);
-    },
-
-    _onNameVanished: function(oldOwner) {
-        this._resetCache();
-        this.emit('changed');
-    },
-
-    _onChanged: function() {
-        this._loadEvents(false);
-    },
-
-    _onEventsReceived: function(appointments) {
-        let newEvents = [];
-        if (appointments != null) {
-            for (let n = 0; n < appointments.length; n++) {
-                let a = appointments[n];
-                let date = new Date(a[4] * 1000);
-                let end = new Date(a[5] * 1000);
-                let summary = a[1];
-                let allDay = a[3];
-                let event = new CalendarEvent(date, end, summary, allDay);
-                newEvents.push(event);
-            }
-            newEvents.sort(function(event1, event2) {
-                return event1.date.getTime() - event2.date.getTime();
-            });
-        }
-
-        this._events = newEvents;
-        this.emit('changed');
-    },
-
-    _loadEvents: function(forceReload) {
-        if (this._curRequestBegin && this._curRequestEnd){
-            let callFlags = 0;
-            if (forceReload)
-                callFlags |= DBus.CALL_FLAG_START;
-            this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000,
-                                            this._curRequestEnd.getTime() / 1000,
-                                            forceReload,
-                                            Lang.bind(this, this._onEventsReceived),
-                                            callFlags);
-        }
-    },
-
-    requestRange: function(begin, end, forceReload) {
-        if (forceReload || !(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
-            this._lastRequestBegin = begin;
-            this._lastRequestEnd = end;
-            this._curRequestBegin = begin;
-            this._curRequestEnd = end;
-            this._loadEvents(forceReload);
-        }
+    requestRange: function(begin, end) {
+        this._native.request_range(begin.getTime(), end.getTime());
    },

    getEvents: function(begin, end) {
        let result = [];
-        for(let n = 0; n < this._events.length; n++) {
-            let event = this._events[n];
-            if (_dateIntervalsOverlap (event.date, event.end, begin, end)) {
-                result.push(event);
-            }
+        let nativeEvents = this._native.get_events(begin.getTime(), end.getTime());
+        for (let n = 0; n < nativeEvents.length; n++) {
+            let nativeEvent = nativeEvents[n];
+            result.push(new CalendarEvent(new Date(nativeEvent.msec_begin), nativeEvent.summary, nativeEvent.all_day));
        }
        return result;
    },
@ -340,7 +230,117 @@ DBusEventSource.prototype = {
        return true;
    }
 };
-Signals.addSignalMethods(DBusEventSource.prototype);
+Signals.addSignalMethods(EvolutionEventSource.prototype);
+
+// Finally, an implementation with fake events
+function FakeEventSource() {
+    this._init();
+}
+
+FakeEventSource.prototype = {
+    _init: function() {
+
+        this._fakeEvents = [];
+
+        // Generate fake events
+        //
+        let midnightToday = _getBeginningOfDay(new Date());
+        let summary = '';
+
+        // '10-oclock pow-wow' is an event occuring IN THE PAST every four days at 10am
+        for (let n = 0; n < 10; n++) {
+            let t = new Date(midnightToday.getTime() - n * 4 * 86400 * 1000);
+            t.setHours(10);
+            summary = '10-oclock pow-wow (n=' + n + ')';
+            this._fakeEvents.push(new CalendarEvent(t, summary, false));
+        }
+
+        // '11-oclock thing' is an event occuring every three days at 11am
+        for (let n = 0; n < 10; n++) {
+            let t = new Date(midnightToday.getTime() + n * 3 * 86400 * 1000);
+            t.setHours(11);
+            summary = '11-oclock thing (n=' + n + ')';
+            this._fakeEvents.push(new CalendarEvent(t, summary, false));
+        }
+
+        // 'Weekly Meeting' is an event occuring every seven days at 1:45pm (two days displaced)
+        for (let n = 0; n < 5; n++) {
+            let t = new Date(midnightToday.getTime() + (n * 7 + 2) * 86400 * 1000);
+            t.setHours(13);
+            t.setMinutes(45);
+            summary = 'Weekly Meeting (n=' + n + ')';
+            this._fakeEvents.push(new CalendarEvent(t, summary, false));
+        }
+
+        // 'Fun All Day' is an all-day event occuring every fortnight (three days displayed)
+        for (let n = 0; n < 10; n++) {
+            let t = new Date(midnightToday.getTime() + (n * 14 + 3) * 86400 * 1000);
+            summary = 'Fun All Day (n=' + n + ')';
+            this._fakeEvents.push(new CalendarEvent(t, summary, true));
+        }
+
+        // 'Get Married' is an event that actually reflects reality (Dec 4, 2010) :-)
+        this._fakeEvents.push(new CalendarEvent(new Date(2010, 11, 4, 16, 0), 'Get Married', false));
+
+        // ditto for 'NE Patriots vs NY Jets'
+        this._fakeEvents.push(new CalendarEvent(new Date(2010, 11, 6, 20, 30), 'NE Patriots vs NY Jets', false));
+
+        // An event for tomorrow @6:30pm that is added/removed every five
+        // seconds (to check that the ::changed signal works)
+        let transientEventDate = new Date(midnightToday.getTime() + 86400 * 1000);
+        transientEventDate.setHours(18);
+        transientEventDate.setMinutes(30);
+        transientEventDate.setSeconds(0);
+        Mainloop.timeout_add(5000, Lang.bind(this, this._updateTransientEvent));
+        this._includeTransientEvent = false;
+        this._transientEvent = new CalendarEvent(transientEventDate, 'A Transient Event', false);
+        this._transientEventCounter = 1;
+    },
+
+    _updateTransientEvent: function() {
+        this._includeTransientEvent = !this._includeTransientEvent;
+        this._transientEventCounter = this._transientEventCounter + 1;
+        this._transientEvent.summary = 'A Transient Event (' + this._transientEventCounter + ')';
+        this.emit('changed');
+        Mainloop.timeout_add(5000, Lang.bind(this, this._updateTransientEvent));
+    },
+
+    requestRange: function(begin, end) {
+    },
+
+    getEvents: function(begin, end) {
+        let result = [];
+        //log('begin:' + begin);
+        //log('end:  ' + end);
+        for(let n = 0; n < this._fakeEvents.length; n++) {
+            let event = this._fakeEvents[n];
+            if (event.date >= begin && event.date <= end) {
+                result.push(event);
+            }
+            //log('when:' + event.date + ' summary:' + event.summary);
+        }
+        if (this._includeTransientEvent && this._transientEvent.date >= begin && this._transientEvent.date <= end)
+            result.push(this._transientEvent);
+        result.sort(function(event1, event2) {
+            return event1.date.getTime() - event2.date.getTime();
+        });
+        return result;
+    },
+
+    hasEvents: function(day) {
+        let dayBegin = _getBeginningOfDay(day);
+        let dayEnd = _getEndOfDay(day);
+
+        let events = this.getEvents(dayBegin, dayEnd);
+
+        if (events.length == 0)
+            return false;
+
+        return true;
+    }
+
+};
+Signals.addSignalMethods(FakeEventSource.prototype);

 // Calendar:
 // @eventSource: is an object implementing the EventSource API, e.g. the
@ -353,10 +353,7 @@ Calendar.prototype = {
    _init: function(eventSource) {
        this._eventSource = eventSource;

-        this._eventSource.connect('changed', Lang.bind(this,
-                                                       function() {
-                                                           this._update(false);
-                                                       }));
+        this._eventSource.connect('changed', Lang.bind(this, this._update));

        // FIXME: This is actually the fallback method for GTK+ for the week start;
        // GTK+ by preference uses nl_langinfo (NL_TIME_FIRST_WEEKDAY). We probably
@ -405,17 +402,15 @@ Calendar.prototype = {
                           Lang.bind(this, this._onScroll));

        this._buildHeader ();
+        this._update();
    },

    // Sets the calendar to show a specific date
-    setDate: function(date, forceReload) {
+    setDate: function(date) {
        if (!_sameDay(date, this._selectedDate)) {
            this._selectedDate = date;
-            this._update(forceReload);
+            this._update();
            this.emit('selected-date-changed', new Date(this._selectedDate));
-        } else {
-            if (forceReload)
-                this._update(forceReload);
        }
    },

@ -510,7 +505,7 @@ Calendar.prototype = {
            }
        }

-        this.setDate(newDate, false);
+        this.setDate(newDate);
   },

   _onNextMonthButtonClicked: function() {
@ -532,16 +527,16 @@ Calendar.prototype = {
            }
        }

-       this.setDate(newDate, false);
+        this.setDate(newDate);
    },

    _onSettingsChange: function() {
        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
        this._buildHeader();
-        this._update(false);
+        this._update();
    },

-    _update: function(forceReload) {
+    _update: function() {
        let now = new Date();

        if (_sameYear(this._selectedDate, now))
@ -570,7 +565,7 @@ Calendar.prototype = {
            let iterStr = iter.toUTCString();
            button.connect('clicked', Lang.bind(this, function() {
                let newlySelectedDate = new Date(iterStr);
-                this.setDate(newlySelectedDate, false);
+                this.setDate(newlySelectedDate);
            }));

            let hasEvents = this._eventSource.hasEvents(iter);
@ -620,7 +615,7 @@ Calendar.prototype = {
        }
        // Signal to the event source that we are interested in events
        // only from this date range
-        this._eventSource.requestRange(beginDate, iter, forceReload);
+        this._eventSource.requestRange(beginDate, iter);
    }
 };

@ -698,7 +693,7 @@ EventsList.prototype = {
        if (events.length == 0 && showNothingScheduled) {
            let now = new Date();
            /* Translators: Text to show if there are no events */
-            let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
+            let nothingEvent = new CalendarEvent(now, _("Nothing Scheduled"), true);
            let timeString = _formatEventTime(nothingEvent, clockFormat);
            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
        }
@ -713,11 +708,9 @@ EventsList.prototype = {
        let dayString;
        let now = new Date();
        if (_sameYear(day, now))
-            /* Translators: Shown on calendar heading when selected day occurs on current year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
+            dayString = day.toLocaleFormat('%A, %B %d');
        else
-            /* Translators: Shown on calendar heading when selected day occurs on different year */
-            dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
+            dayString = day.toLocaleFormat('%A, %B %d, %Y');
        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
    },

--- a/js/ui/chrome.js
+++ b/js/ui/chrome.js
@ -13,6 +13,12 @@ const Params = imports.misc.params;
 // normal mode (ie, outside the Overview), that surrounds the main
 // workspace content.

+const Visibility = {
+    FULL:       1,
+    FULLSCREEN: 2,
+    OVERVIEW:   3
+};
+
 const defaultParams = {
    visibleInOverview: false,
    visibleInFullscreen: false,
@ -31,13 +37,12 @@ Chrome.prototype = {
        Main.uiGroup.add_actor(this.actor);
        this.actor.connect('allocate', Lang.bind(this, this._allocated));

-        this._monitors = [];
+        this._inFullscreen = false;
        this._inOverview = false;
+        this.visibility = Visibility.FULL;

        this._trackedActors = [];

-        global.screen.connect('monitors-changed',
-                              Lang.bind(this, this._monitorsChanged));
        global.screen.connect('restacked',
                              Lang.bind(this, this._windowsRestacked));

@ -50,8 +55,6 @@ Chrome.prototype = {
        Main.overview.connect('hidden',
                             Lang.bind(this, this._overviewHidden));

-        this._updateMonitors();
-        this._updateFullscreen();
        this._queueUpdateRegions();
    },

@ -191,12 +194,24 @@ Chrome.prototype = {
            let actorData = this._trackedActors[i];
            if (this._inOverview && !actorData.visibleInOverview)
                this.actor.set_skip_paint(actorData.actor, true);
-            else if (!this._inOverview && !actorData.visibleInFullscreen &&
-                     this._findMonitorForActor(actorData.actor).inFullscreen)
+            else if (!this._inOverview && this._inFullscreen && !actorData.visibleInFullscreen)
                this.actor.set_skip_paint(actorData.actor, true);
            else
                this.actor.set_skip_paint(actorData.actor, false);
        }
+
+        let newVisibility;
+        if (this._inOverview)
+            newVisibility = Visibility.OVERVIEW;
+        else if (this._inFullscreen)
+            newVisibility = Visibility.FULLSCREEN;
+        else
+            newVisibility = Visibility.FULL;
+
+        if (newVisibility != this.visibility) {
+            this.visibility = newVisibility;
+            this.emit('visibility-changed', this.visibility);
+        }
    },

    _overviewShowing: function() {
@ -211,77 +226,15 @@ Chrome.prototype = {
        this._queueUpdateRegions();
    },

-    _updateMonitors: function() {
-        let monitors = global.get_monitors();
-        let primary = global.get_primary_monitor();
-        this._monitors = monitors;
-        for (let i = 0; i < monitors.length; i++) {
-            let monitor = monitors[i];
-            if (monitor.x == primary.x &&
-                monitor.y == primary.y &&
-                monitor.width == primary.width &&
-                monitor.height == primary.height)
-                this._primaryMonitor = monitor;
-        }
-    },
-
-    _findMonitorForRect: function(x, y, w, h) {
-        // First look at what monitor the center of the rectangle is at
-        let cx = x + w/2;
-        let cy = y + h/2;
-        for (let i = 0; i < this._monitors.length; i++) {
-            let monitor = this._monitors[i];
-            if (cx >= monitor.x && cx < monitor.x + monitor.width &&
-                cy >= monitor.y && cy < monitor.y + monitor.height)
-                return monitor;
-        }
-        // If the center is not on a monitor, return the first overlapping monitor
-        for (let i = 0; i < this._monitors.length; i++) {
-            let monitor = this._monitors[i];
-            if (x + w > monitor.x && x < monitor.x + monitor.width &&
-                y + h > monitor.y && y < monitor.y + monitor.height)
-                return monitor;
-        }
-        // otherwise on no monitor
-        return null;
-    },
-
-    _findMonitorForWindow: function(window) {
-        return this._findMonitorForRect(window.x, window.y, window.width, window.height);
-    },
-
-    // This call guarantees that we return some monitor to simplify usage of it
-    // In practice all tracked actors should be visible on some monitor anyway
-    _findMonitorForActor: function(actor) {
-        let [x, y] = actor.get_transformed_position();
-        let [w, h] = actor.get_transformed_size();
-        let monitor = this._findMonitorForRect(x, y, w, h);
-        if (monitor)
-            return monitor;
-        return this._primaryMonitor; // Not on any monitor, pretend its on the primary
-    },
-
-    _monitorsChanged: function() {
-        this._updateMonitors();
-
-        // Update everything that depends on monitor positions
-        this._updateFullscreen();
-        this._updateVisibility();
-        this._queueUpdateRegions();
-    },
-
    _queueUpdateRegions: function() {
        if (!this._updateRegionIdle)
            this._updateRegionIdle = Mainloop.idle_add(Lang.bind(this, this._updateRegions),
                                                       Meta.PRIORITY_BEFORE_REDRAW);
    },

-    _updateFullscreen: function() {
-        let windows = Main.getWindowActorsForWorkspace(global.screen.get_active_workspace_index());
-
-        // Reset all monitors to not fullscreen
-        for (let i = 0; i < this._monitors.length; i++)
-            this._monitors[i].inFullscreen = false;
+    _windowsRestacked: function() {
+        let windows = global.get_window_actors();
+        let primary = global.get_primary_monitor();

        // The chrome layer should be visible unless there is a window
        // with layer FULLSCREEN, or a window with layer
@ -295,51 +248,42 @@ Chrome.prototype = {

        // @windows is sorted bottom to top.

+        let wasInFullscreen = this._inFullscreen;
+        this._inFullscreen = false;
        for (let i = windows.length - 1; i > -1; i--) {
-            let window = windows[i];
-            let layer = window.get_meta_window().get_layer();
+            let layer = windows[i].get_meta_window().get_layer();
+
+            // There are 3 cases we check here for:
+            // 1.) Monitor sized window
+            // 2.) Window with a position somewhere on the primary screen having the _NET_WM_FULLSCREEN flag set
+            // 3.) Window that is partly off screen (tries to hide its decorations) which might have negative coords
+            // We check for 1.) and 2.) by checking if the upper right corner is on the primary monitor, but avoid the case
+            // where it overlaps with the secondary screen (like window.x + window.width == primary.x + primary.width)
+            // For 3.) we just ignore negative values as they don't really make sense

            if (layer == Meta.StackLayer.FULLSCREEN) {
-                let monitor = this._findMonitorForWindow(window);
-                if (monitor)
-                    monitor.inFullscreen = true;
+                if (Math.max(windows[i].x, 0) >= primary.x && Math.max(windows[i].x, 0) < primary.x + primary.width &&
+                    Math.max(windows[i].y, 0) >= primary.y && Math.max(windows[i].y, 0) < primary.y + primary.height) {
+                        this._inFullscreen = true;
+                        break;
+                }
            }
            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
-                let monitor = this._findMonitorForWindow(window);
-                if (monitor &&
-                    window.x <= monitor.x &&
-                    window.x + window.width >= monitor.x + monitor.width &&
-                    window.y <= monitor.y &&
-                    window.y + window.height >= monitor.y + monitor.height)
-                    monitor.inFullscreen = true;
+                if (windows[i].x <= primary.x &&
+                    windows[i].x + windows[i].width >= primary.x + primary.width &&
+                    windows[i].y <= primary.y &&
+                    windows[i].y + windows[i].height >= primary.y + primary.height) {
+                    this._inFullscreen = true;
+                    break;
+                }
            } else
                break;
        }
-    },

-    _windowsRestacked: function() {
-        let wasInFullscreen = [];
-        for (let i = 0; i < this._monitors.length; i++)
-            wasInFullscreen[i] = this._monitors[i].inFullscreen;
-
-        this._updateFullscreen();
-
-        let changed = false;
-        for (let i = 0; i < wasInFullscreen.length; i++) {
-            if (wasInFullscreen[i] != this._monitors[i].inFullscreen) {
-                changed = true;
-                break;
-            }
-        }
-        if (changed) {
+        if (this._inFullscreen != wasInFullscreen) {
            this._updateVisibility();
            this._queueUpdateRegions();
        }
-
-        // Figure out where the pointer is in case we lost track of
-        // it during a grab. (In particular, if a trayicon popup menu
-        // is dismissed, see if we need to close the message tray.)
-        global.sync_pointer();
    },

    _updateRegions: function() {
@ -368,75 +312,41 @@ Chrome.prototype = {
            if (!actorData.affectsStruts)
                continue;

-            // Limit struts to the size of the screen
-            let x1 = Math.max(x, 0);
-            let x2 = Math.min(x + w, global.screen_width);
-            let y1 = Math.max(y, 0);
-            let y2 = Math.min(y + h, global.screen_height);
-
-            // NetWM struts are not really powerful enought to handle
-            // a multi-monitor scenario, they only describe what happens
-            // around the outer sides of the full display region. However
-            // it can describe a partial region along each side, so
-            // we can support having the struts only affect the
-            // primary monitor. This should be enough as we only have
-            // chrome affecting the struts on the primary monitor so
-            // far.
-            //
            // Metacity wants to know what side of the screen the
            // strut is considered to be attached to. If the actor is
            // only touching one edge, or is touching the entire
-            // border of the primary monitor, then it's obvious which
-            // side to call it. If it's in a corner, we pick a side
+            // width/height of one edge, then it's obvious which side
+            // to call it. If it's in a corner, we pick a side
            // arbitrarily. If it doesn't touch any edges, or it spans
            // the width/height across the middle of the screen, then
            // we don't create a strut for it at all.
            let side;
-            let primary = this._primaryMonitor;
-            if (x1 <= primary.x && x2 >= primary.x + primary.width) {
-                if (y1 <= primary.y)
+            if (w >= global.screen_width) {
+                if (y <= 0)
                    side = Meta.Side.TOP;
-                else if (y2 >= primary.y + primary.height)
+                else if (y + h >= global.screen_height)
                    side = Meta.Side.BOTTOM;
                else
                    continue;
-            } else if (y1 <= primary.y && y2 >= primary.y + primary.height) {
-                if (x1 <= 0)
+            } else if (h >= global.screen_height) {
+                if (x <= 0)
                    side = Meta.Side.LEFT;
-                else if (x2 >= global.screen_width)
+                else if (x + w >= global.screen_width)
                    side = Meta.Side.RIGHT;
                else
                    continue;
-            } else if (x1 <= 0)
+            } else if (x <= 0)
                side = Meta.Side.LEFT;
-            else if (y1 <= 0)
+            else if (y <= 0)
                side = Meta.Side.TOP;
-            else if (x2 >= global.screen_width)
+            else if (x + w >= global.screen_width)
                side = Meta.Side.RIGHT;
-            else if (y2 >= global.screen_height)
+            else if (y + h >= global.screen_height)
                side = Meta.Side.BOTTOM;
            else
                continue;

-            // Ensure that the strut rects goes all the way to the screen edge,
-            // as this really what mutter expects.
-            switch (side) {
-            case Meta.Side.TOP:
-                y1 = 0;
-                break;
-            case Meta.Side.BOTTOM:
-                y2 = global.screen_height;
-                break;
-            case Meta.Side.LEFT:
-                x1 = 0;
-                break;
-            case Meta.Side.RIGHT:
-                x2 = global.screen_width;
-                break;
-            }
-
-            let strutRect = new Meta.Rectangle({ x: x1, y: y1, width: x2 - x1, height: y2 - y1});
-            let strut = new Meta.Strut({ rect: strutRect, side: side });
+            let strut = new Meta.Strut({ rect: rect, side: side });
            struts.push(strut);
        }

--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@ -10,18 +10,11 @@ const St = imports.gi.St;

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

 const POPUP_APPICON_SIZE = 96;
 const POPUP_FADE_TIME = 0.1; // seconds

-const SortGroup = {
-    TOP:    0,
-    MIDDLE: 1,
-    BOTTOM: 2
-};
-
 function CtrlAltTabManager() {
    this._init();
 }
@ -30,18 +23,14 @@ CtrlAltTabManager.prototype = {
    _init: function() {
        this._items = [];
        this._focusManager = St.FocusManager.get_for_stage(global.stage);
+        Main.wm.setKeybindingHandler('switch_panels', Lang.bind(this,
+            function (shellwm, binding, window, backwards) {
+                this.popup(backwards);
+            }));
    },

-    addGroup: function(root, name, icon, params) {
-        let item = Params.parse(params, { sortGroup: SortGroup.MIDDLE,
-                                          proxy: root,
-                                          focusCallback: null });
-
-        item.root = root;
-        item.name = name;
-        item.iconName = icon;
-
-        this._items.push(item);
+    addGroup: function(root, name, icon) {
+        this._items.push({ root: root, name: name, iconName: icon });
        root.connect('destroy', Lang.bind(this, function() { this.removeGroup(root); }));
        this._focusManager.add_group(root);
    },
@ -56,73 +45,38 @@ CtrlAltTabManager.prototype = {
        }
    },

-    focusGroup: function(item) {
+    focusGroup: function(root) {
        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
            global.stage_input_mode == Shell.StageInputMode.NORMAL)
            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-
-        if (item.window)
-            Main.activateWindow(item.window);
-        else if (item.focusCallback)
-            item.focusCallback();
-        else
-            item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    },
-
-    // Sort the items into a consistent order; panel first, tray last,
-    // and everything else in between, sorted by X coordinate, so that
-    // they will have the same left-to-right ordering in the
-    // Ctrl-Alt-Tab dialog as they do onscreen.
-    _sortItems: function(a, b) {
-        if (a.sortGroup != b.sortGroup)
-            return a.sortGroup - b.sortGroup;
-
-        let y;
-        if (a.x == undefined) {
-            if (a.window)
-                a.x = a.window.get_compositor_private().x;
-            else
-                [a.x, y] = a.proxy.get_transformed_position();
-        }
-        if (b.x == undefined) {
-            if (b.window)
-                b.x = b.window.get_compositor_private().x;
-            else
-                [b.x, y] = b.proxy.get_transformed_position();
-        }
-
-        return a.x - b.x;
+        root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
    },

    popup: function(backwards) {
        // Start with the set of focus groups that are currently mapped
-        let items = this._items.filter(function (item) { return item.proxy.mapped; });
+        let items = this._items.filter(function (item) { return item.root.mapped; });

        // And add the windows metacity would show in its Ctrl-Alt-Tab list
-        if (!Main.overview.visible) {
-            let screen = global.screen;
-            let display = screen.get_display();
-            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
-            let windowTracker = Shell.WindowTracker.get_default();
-            let textureCache = St.TextureCache.get_default();
-            for (let i = 0; i < windows.length; i++) {
-                let icon;
-                let app = windowTracker.get_window_app(windows[i]);
-                if (app)
-                    icon = app.create_icon_texture(POPUP_APPICON_SIZE);
-                else
-                    icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
-                items.push({ window: windows[i],
-                             name: windows[i].title,
-                             iconActor: icon,
-                             sortGroup: SortGroup.MIDDLE });
-            }
+        let screen = global.screen;
+        let display = screen.get_display();
+        let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
+        let windowTracker = Shell.WindowTracker.get_default();
+        let textureCache = St.TextureCache.get_default();
+        for (let i = 0; i < windows.length; i++) {
+            let icon;
+            let app = windowTracker.get_window_app(windows[i]);
+            if (app)
+                icon = app.create_icon_texture(POPUP_APPICON_SIZE);
+            else
+                icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
+            items.push({ window: windows[i],
+                         name: windows[i].title,
+                         iconActor: icon });
        }

        if (!items.length)
            return;

-        items.sort(Lang.bind(this, this._sortItems));
        new CtrlAltTabPopup().show(items, backwards);
    }
 };
@ -137,12 +91,12 @@ function CtrlAltTabPopup() {

 CtrlAltTabPopup.prototype = {
    _init : function() {
-        this.actor = new Shell.GenericContainer({ name: 'ctrlAltTabPopup',
-                                                  reactive: true });
-
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        let primary = global.get_primary_monitor();
+        this.actor = new St.BoxLayout({ name: 'ctrlAltTabPopup',
+                                        reactive: true,
+                                        x: primary.x + primary.width / 2,
+                                        y: primary.y + primary.height / 2,
+                                        anchor_gravity: Clutter.Gravity.CENTER });

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

@ -152,37 +106,6 @@ CtrlAltTabPopup.prototype = {
        Main.uiGroup.add_actor(this.actor);
    },

-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let primary = global.get_primary_monitor();
-
-        alloc.min_size = primary.width;
-        alloc.natural_size = primary.width;
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let primary = global.get_primary_monitor();
-
-        alloc.min_size = primary.height;
-        alloc.natural_size = primary.height;
-    },
-
-    _allocate: function (actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        let primary = global.get_primary_monitor();
-
-        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
-        let vPadding = this.actor.get_theme_node().get_vertical_padding();
-        let hPadding = this.actor.get_theme_node().get_horizontal_padding();
-
-        let [childMinHeight, childNaturalHeight] = this._switcher.actor.get_preferred_height(primary.width - hPadding);
-        let [childMinWidth, childNaturalWidth] = this._switcher.actor.get_preferred_width(childNaturalHeight);
-        childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(primary.width - hPadding, childBox.x1 + childNaturalWidth);
-        childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
-        childBox.y2 = childBox.y1 + childNaturalHeight;
-        this._switcher.actor.allocate(childBox, flags);
-    },
-
    show : function(items, startBackwards) {
        if (!Main.pushModal(this.actor))
            return false;
@ -257,7 +180,11 @@ CtrlAltTabPopup.prototype = {
    _finish : function() {
        this.destroy();

-        Main.ctrlAltTabManager.focusGroup(this._items[this._selection]);
+        let item = this._items[this._selection];
+        if (item.root)
+            Main.ctrlAltTabManager.focusGroup(item.root);
+        else
+            Main.activateWindow(item.window);
    },

    _popModal: function() {
@ -281,7 +208,6 @@ CtrlAltTabPopup.prototype = {
    },

    _onDestroy : function() {
-        this._popModal();
        if (this._keyPressEventId)
            this.actor.disconnect(this._keyPressEventId);
        if (this._keyReleaseEventId)
@ -323,6 +249,6 @@ CtrlAltTabSwitcher.prototype = {
        let text = new St.Label({ text: item.name });
        box.add(text, { x_fill: false });

-        this.addItem(box, text);
+        this.addItem(box);
    }
 };
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -1,188 +1,34 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Clutter = imports.gi.Clutter;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const AppDisplay = imports.ui.appDisplay;
 const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;

-const DASH_ANIMATION_TIME = 0.2;
-
-// A container like StBin, but taking the child's scale into account
-// when requesting a size
-function DashItemContainer() {
-    this._init();
-}
-
-DashItemContainer.prototype = {
-    _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
-        this.actor.connect('get-preferred-width',
-                           Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height',
-                           Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate',
-                           Lang.bind(this, this._allocate));
-        this.actor._delegate = this;
-
-        this.child = null;
-        this._childScale = 1;
-        this._childOpacity = 255;
-    },
-
-    _allocate: function(actor, box, flags) {
-        if (this.child == null)
-            return;
-
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-        let [minChildWidth, minChildHeight, natChildWidth, natChildHeight] =
-            this.child.get_preferred_size();
-        let [childScaleX, childScaleY] = this.child.get_scale();
-
-        let childWidth = Math.min(natChildWidth * childScaleX, availWidth);
-        let childHeight = Math.min(natChildHeight * childScaleY, availHeight);
-
-        let childBox = new Clutter.ActorBox();
-        childBox.x1 = (availWidth - childWidth) / 2;
-        childBox.y1 = (availHeight - childHeight) / 2;
-        childBox.x2 = childBox.x1 + childWidth;
-        childBox.y2 = childBox.y1 + childHeight;
-
-        this.child.allocate(childBox, flags);
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        alloc.min_size = 0;
-        alloc.natural_size = 0;
-
-        if (this.child == null)
-            return;
-
-        let [minHeight, natHeight] = this.child.get_preferred_height(forWidth);
-        alloc.min_size += minHeight * this.child.scale_y;
-        alloc.natural_size += natHeight * this.child.scale_y;
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        alloc.min_size = 0;
-        alloc.natural_size = 0;
-
-        if (this.child == null)
-            return;
-
-        let [minWidth, natWidth] = this.child.get_preferred_width(forHeight);
-        alloc.min_size = minWidth * this.child.scale_y;
-        alloc.natural_size = natWidth * this.child.scale_y;
-    },
-
-    setChild: function(actor) {
-        if (this.child == actor)
-            return;
-
-        this.actor.destroy_children();
-
-        this.child = actor;
-        this.actor.add_actor(this.child);
-    },
-
-    animateIn: function() {
-        if (this.child == null)
-            return;
-
-        this.childScale = 0;
-        this.childOpacity = 0;
-        Tweener.addTween(this,
-                         { childScale: 1.0,
-                           childOpacity: 255,
-                           time: DASH_ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
-    },
-
-    animateOutAndDestroy: function() {
-        if (this.child == null) {
-            this.actor.destroy();
-            return;
-        }
-
-        this.childScale = 1.0;
-        Tweener.addTween(this,
-                         { childScale: 0.0,
-                           childOpacity: 0,
-                           time: DASH_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: Lang.bind(this, function() {
-                               this.actor.destroy();
-                           })
-                         });
-    },
-
-    set childScale(scale) {
-        this._childScale = scale;
-
-        if (this.child == null)
-            return;
-
-        this.child.set_scale_with_gravity(scale, scale,
-                                          Clutter.Gravity.CENTER);
-        this.actor.queue_relayout();
-    },
-
-    get childScale() {
-        return this._childScale;
-    },
-
-    set childOpacity(opacity) {
-        this._childOpacity = opacity;
-
-        if (this.child == null)
-            return;
-
-        this.child.set_opacity(opacity);
-        this.actor.queue_redraw();
-    },
-
-    get childOpacity() {
-        return this._childOpacity;
-    }
-};

 function RemoveFavoriteIcon() {
    this._init();
 }

 RemoveFavoriteIcon.prototype = {
-    __proto__: DashItemContainer.prototype,
-
    _init: function() {
-        DashItemContainer.prototype._init.call(this);
-
-        this._iconBin = new St.Bin({ style_class: 'remove-favorite' });
+        this.actor = new St.Bin({ style_class: 'remove-favorite' });
        this._iconActor = null;
        this.icon = new IconGrid.BaseIcon(_("Remove"),
                                           { setSizeManually: true,
-                                             showLabel: false,
                                             createIcon: Lang.bind(this, this._createIcon) });
-        this._iconBin.set_child(this.icon.actor);
-        this._iconBin._delegate = this;
-
-        this.setChild(this._iconBin);
-        this.hiding = false;
-    },
-
-    animateOutAndDestroy: function() {
-        DashItemContainer.prototype.animateOutAndDestroy.call(this);
-        this.hiding = true;
+        this.actor.set_child(this.icon.actor);
+        this.actor._delegate = this;
    },

    _createIcon: function(size) {
@ -193,7 +39,7 @@ RemoveFavoriteIcon.prototype = {
    },

    setHover: function(hovered) {
-        this._iconBin.set_hover(hovered);
+        this.actor.set_hover(hovered);
        if (this._iconActor)
            this._iconActor.set_hover(hovered);
    },
@ -226,20 +72,6 @@ RemoveFavoriteIcon.prototype = {
 };


-function DragPlaceholderItem() {
-    this._init();
-}
-
-DragPlaceholderItem.prototype = {
-    __proto__: DashItemContainer.prototype,
-
-    _init: function() {
-        DashItemContainer.prototype._init.call(this);
-        this.setChild(new St.Bin({ style_class: 'dash-placeholder' }));
-    }
-};
-
-
 function Dash() {
    this._init();
 }
@ -247,14 +79,14 @@ function Dash() {
 Dash.prototype = {
    _init : function() {
        this._maxHeight = -1;
-        this.iconSize = 64;
-        this._shownInitially = false;
+        this._iconSize = 48;

        this._dragPlaceholder = null;
        this._dragPlaceholderPos = -1;
-        this._animatingPlaceholdersCount = 0;
        this._favRemoveTarget = null;

+        this._favorites = [];
+
        this._box = new St.BoxLayout({ name: 'dash',
                                       vertical: true,
                                       clip_to_allocation: true });
@ -276,53 +108,38 @@ Dash.prototype = {
        this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
        AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
        this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
+    },

-        Main.overview.connect('item-drag-begin',
-                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('item-drag-end',
-                              Lang.bind(this, this._onDragEnd));
-        Main.overview.connect('item-drag-cancelled',
-                              Lang.bind(this, this._onDragCancelled));
-        Main.overview.connect('window-drag-begin',
-                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('window-drag-cancelled',
-                              Lang.bind(this, this._onDragCancelled));
-        Main.overview.connect('window-drag-end',
-                              Lang.bind(this, this._onDragEnd));
+    show: function() {
+        this._itemDragBeginId = Main.overview.connect('item-drag-begin',
+            Lang.bind(this, this._onDragBegin));
+        this._itemDragEndId = Main.overview.connect('item-drag-end',
+            Lang.bind(this, this._onDragEnd));
+        this._windowDragBeginId = Main.overview.connect('window-drag-begin',
+            Lang.bind(this, this._onDragBegin));
+        this._windowDragEndId = Main.overview.connect('window-drag-end',
+            Lang.bind(this, this._onDragEnd));
+    },
+
+    hide: function() {
+        Main.overview.disconnect(this._itemDragBeginId);
+        Main.overview.disconnect(this._itemDragEndId);
+        Main.overview.disconnect(this._windowDragBeginId);
+        Main.overview.disconnect(this._windowDragEndId);
    },

    _onDragBegin: function() {
-        this._dragCancelled = false;
        this._dragMonitor = {
            dragMotion: Lang.bind(this, this._onDragMotion)
        };
        DND.addDragMonitor(this._dragMonitor);
    },

-    _onDragCancelled: function() {
-        this._dragCancelled = true;
-        this._endDrag();
-    },
-
    _onDragEnd: function() {
-        if (this._dragCancelled)
-            return;
-
-        this._endDrag();
-    },
-
-    _endDrag: function() {
        this._clearDragPlaceholder();
        if (this._favRemoveTarget) {
-            this._favRemoveTarget.actor.hide();
-            this._adjustIconSize();
-            this._favRemoveTarget.actor.show();
-
-            this._favRemoveTarget.animateOutAndDestroy();
-            this._favRemoveTarget.actor.connect('destroy', Lang.bind(this,
-                function() {
-                    this._favRemoveTarget = null;
-                }));
+            this._favRemoveTarget.actor.destroy();
+            this._favRemoveTarget = null;
        }
        DND.removeMonitor(this._dragMonitor);
    },
@ -344,10 +161,8 @@ Dash.prototype = {

        if (srcIsFavorite && this._favRemoveTarget == null) {
                this._favRemoveTarget = new RemoveFavoriteIcon();
-                this._favRemoveTarget.icon.setIconSize(this.iconSize);
+                this._favRemoveTarget.icon.setIconSize(this._iconSize);
                this._box.add(this._favRemoveTarget.actor);
-                this._adjustIconSize();
-                this._favRemoveTarget.animateIn();
        }

        let favRemoveHovered = false;
@ -375,10 +190,9 @@ Dash.prototype = {
        Main.queueDeferredWork(this._workId);
    },

-    _createAppItem: function(app) {
+    _addApp: function(app) {
        let display = new AppDisplay.AppWellIcon(app,
-                                                 { setSizeManually: true,
-                                                   showLabel: false });
+                                                 { setSizeManually: true });
        display._draggable.connect('drag-begin',
                                   Lang.bind(this, function() {
                                       display.actor.opacity = 50;
@ -387,84 +201,13 @@ Dash.prototype = {
                                   Lang.bind(this, function() {
                                       display.actor.opacity = 255;
                                   }));
-        display.actor.set_tooltip_text(app.get_name());
-
-        let item = new DashItemContainer();
-        item.setChild(display.actor);
-
-        display.icon.setIconSize(this.iconSize);
-
-        return item;
-    },
-
-    _adjustIconSize: function() {
-        let children = this._box.get_children();
-        if (children.length == 0) {
-            this._box.add_style_pseudo_class('empty');
-            return;
-        }
-
-        this._box.remove_style_pseudo_class('empty');
-
-        if (this._maxHeight == -1)
-            return;
-
-        let iconChildren = children.filter(function(actor) {
-            return actor.visible &&
-                   actor._delegate.child &&
-                   actor._delegate.child._delegate &&
-                   actor._delegate.child._delegate.icon;
-        });
-
-        // Compute the amount of extra space (or missing space) we have
-        // per icon with the current icon size
-        let [minHeight, natHeight] = this.actor.get_preferred_height(-1);
-        let diff = (this._maxHeight - natHeight) / iconChildren.length;
-
-        let iconSizes = [ 16, 22, 24, 32, 48, 64 ];
-
-        let newIconSize = 16;
-        for (let i = 0; i < iconSizes.length; i++) {
-            if (iconSizes[i] < this.iconSize + diff)
-                newIconSize = iconSizes[i];
-        }
-
-        if (newIconSize == this.iconSize)
-            return;
-
-        let oldIconSize = this.iconSize;
-        this.iconSize = newIconSize;
-
-        let scale = oldIconSize / newIconSize;
-        for (let i = 0; i < iconChildren.length; i++) {
-            let icon = iconChildren[i]._delegate.child._delegate.icon;
-
-            // Set the new size immediately, to keep the icons' sizes
-            // in sync with this.iconSize
-            icon.setIconSize(this.iconSize);
-
-            // Don't animate the icon size change when the overview
-            // is not visible or when initially filling the dash
-            if (!Main.overview.visible || !this._shownInitially)
-                continue;
-
-            let [targetWidth, targetHeight] = icon.icon.get_size();
-
-            // Scale the icon's texture to the previous size and
-            // tween to the new size
-            icon.icon.set_size(icon.icon.width * scale,
-                               icon.icon.height * scale);
-
-            Tweener.addTween(icon.icon,
-                             { width: targetWidth,
-                               height: targetHeight,
-                               time: DASH_ANIMATION_TIME,
-                               transition: 'easeOutQuad'
-                             });
-        }
+        this._box.add(display.actor);
    },

    _redisplay: function () {
+        this._box.hide();
+        this._box.destroy_children();
+
        let favorites = AppFavorites.getAppFavorites().getFavoriteMap();

        /* hardcode here pending some design about how exactly desktop contexts behave */
@ -472,142 +215,47 @@ Dash.prototype = {

        let running = this._tracker.get_running_apps(contextId);

-        let children = this._box.get_children().filter(function(actor) {
-                return actor._delegate.child &&
-                       actor._delegate.child._delegate &&
-                       actor._delegate.child._delegate.app;
-            });
-        // Apps currently in the dash
-        let oldApps = children.map(function(actor) {
-                return actor._delegate.child._delegate.app;
-            });
-        // Apps supposed to be in the dash
-        let newApps = [];
-
-        for (let id in favorites)
-            newApps.push(favorites[id]);
+        for (let id in favorites) {
+            let app = favorites[id];
+            this._addApp(app);
+        }

        for (let i = 0; i < running.length; i++) {
            let app = running[i];
            if (app.get_id() in favorites)
                continue;
-            newApps.push(app);
+            this._addApp(app);
        }

-        // Figure out the actual changes to the list of items; we iterate
-        // over both the list of items currently in the dash and the list
-        // of items expected there, and collect additions and removals.
-        // Moves are both an addition and a removal, where the order of
-        // the operations depends on whether we encounter the position
-        // where the item has been added first or the one from where it
-        // was removed.
-        // There is an assumption that only one item is moved at a given
-        // time; when moving several items at once, everything will still
-        // end up at the right position, but there might be additional
-        // additions/removals (e.g. it might remove all the launchers
-        // and add them back in the new order even if a smaller set of
-        // additions and removals is possible).
-        // If above assumptions turns out to be a problem, we might need
-        // to use a more sophisticated algorithm, e.g. Longest Common
-        // Subsequence as used by diff.
-        let addedItems = [];
-        let removedActors = [];
+        let children = this._box.get_children();
+        if (children.length == 0) {
+            this._box.add_style_pseudo_class('empty');
+        } else {
+            this._box.remove_style_pseudo_class('empty');

-        let newIndex = 0;
-        let oldIndex = 0;
-        while (newIndex < newApps.length || oldIndex < oldApps.length) {
-            // No change at oldIndex/newIndex
-            if (oldApps[oldIndex] == newApps[newIndex]) {
-                oldIndex++;
-                newIndex++;
-                continue;
-            }
+            if (this._maxHeight > -1) {
+                let iconSizes = [ 48, 32, 24, 22, 16 ];

-            // App removed at oldIndex
-            if (oldApps[oldIndex] &&
-                newApps.indexOf(oldApps[oldIndex]) == -1) {
-                removedActors.push(children[oldIndex]);
-                oldIndex++;
-                continue;
-            }
+                for (let i = 0; i < iconSizes.length; i++) {
+                    let minHeight, natHeight;

-            // App added at newIndex
-            if (newApps[newIndex] &&
-                oldApps.indexOf(newApps[newIndex]) == -1) {
-                addedItems.push({ app: newApps[newIndex],
-                                  item: this._createAppItem(newApps[newIndex]),
-                                  pos: newIndex });
-                newIndex++;
-                continue;
-            }
+                    this._iconSize = iconSizes[i];
+                    for (let j = 0; j < children.length; j++)
+                        children[j]._delegate.icon.setIconSize(this._iconSize);

-            // App moved
-            let insertHere = newApps[newIndex + 1] &&
-                             newApps[newIndex + 1] == oldApps[oldIndex];
-            let alreadyRemoved = removedActors.reduce(function(result, actor) {
-                let removedApp = actor._delegate.child._delegate.app;
-                return result || removedApp == newApps[newIndex];
-            }, false);
+                    [minHeight, natHeight] = this.actor.get_preferred_height(-1);

-            if (insertHere || alreadyRemoved) {
-                let newItem = this._createAppItem(newApps[newIndex]);
-                addedItems.push({ app: newApps[newIndex],
-                                  item: newItem,
-                                  pos: newIndex + removedActors.length });
-                newIndex++;
-            } else {
-                removedActors.push(children[oldIndex]);
-                oldIndex++;
+                    if (natHeight <= this._maxHeight)
+                        break;
+                }
            }
        }
-
-        for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_actor(addedItems[i].item.actor,
-                                   addedItems[i].pos);
-
-        // Hide removed actors to not take them into account
-        // when adjusting the icon size ...
-        for (let i = 0; i < removedActors.length; i++)
-            removedActors[i].hide();
-
-        // ... and do the same for the remove target if necessary
-        if (this._favRemoveTarget && this._favRemoveTarget.hiding)
-            this._favRemoveTarget.actor.hide();
-
-        this._adjustIconSize();
-
-        if (this._favRemoveTarget && this._favRemoveTarget.hiding)
-            this._favRemoveTarget.actor.show();
-
-        // Skip animations on first run when adding the initial set
-        // of items, to avoid all items zooming in at once
-        if (!this._shownInitially) {
-            this._shownInitially = true;
-            return;
-        }
-
-        for (let i = 0; i < removedActors.length; i++) {
-            removedActors[i].show();
-            let item = removedActors[i]._delegate;
-
-            // Don't animate item removal when the overview is hidden
-            if (Main.overview.visible)
-                item.animateOutAndDestroy();
-            else
-                item.actor.destroy();
-        }
-
-        // Don't animate item addition when the overview is hidden
-        if (!Main.overview.visible)
-            return;
-
-        for (let i = 0; i < addedItems.length; i++)
-            addedItems[i].item.animateIn();
+        this._box.show();
    },

    _clearDragPlaceholder: function() {
        if (this._dragPlaceholder) {
-            this._dragPlaceholder.animateOutAndDestroy();
+            this._dragPlaceholder.destroy();
            this._dragPlaceholder = null;
            this._dragPlaceholderPos = -1;
        }
@ -629,64 +277,30 @@ Dash.prototype = {

        let favPos = favorites.indexOf(app);

-        let children = this._box.get_children();
-        let numChildren = children.length;
+        let numChildren = this._box.get_children().length;
        let boxHeight = this._box.height;

        // Keep the placeholder out of the index calculation; assuming that
        // the remove target has the same size as "normal" items, we don't
        // need to do the same adjustment there.
        if (this._dragPlaceholder) {
-            boxHeight -= this._dragPlaceholder.actor.height;
+            boxHeight -= this._dragPlaceholder.height;
            numChildren--;
        }

        let pos = Math.round(y * numChildren / boxHeight);

        if (pos != this._dragPlaceholderPos && pos <= numFavorites) {
-            if (this._animatingPlaceholdersCount > 0) {
-                let appChildren = children.filter(function(actor) {
-                    return actor._delegate &&
-                           actor._delegate.child &&
-                           actor._delegate.child._delegate &&
-                           actor._delegate.child._delegate.app;
-                });
-                this._dragPlaceholderPos = children.indexOf(appChildren[pos]);
-            } else {
-                this._dragPlaceholderPos = pos;
-            }
+            this._dragPlaceholderPos = pos;
+            if (this._dragPlaceholder)
+                this._dragPlaceholder.destroy();

            // Don't allow positioning before or after self
-            if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
-                if (this._dragPlaceholder) {
-                    this._dragPlaceholder.animateOutAndDestroy();
-                    this._animatingPlaceholdersCount++;
-                    this._dragPlaceholder.actor.connect('destroy',
-                        Lang.bind(this, function() {
-                            this._animatingPlaceholdersCount--;
-                        }));
-                }
-                this._dragPlaceholder = null;
-
+            if (favPos != -1 && (pos == favPos || pos == favPos + 1))
                return DND.DragMotionResult.CONTINUE;
-            }

-            // If the placeholder already exists, we just move
-            // it, but if we are adding it, expand its size in
-            // an animation
-            let fadeIn;
-            if (this._dragPlaceholder) {
-                this._dragPlaceholder.actor.destroy();
-                fadeIn = false;
-            } else {
-                fadeIn = true;
-            }
-
-            this._dragPlaceholder = new DragPlaceholderItem();
-            this._box.insert_actor(this._dragPlaceholder.actor,
-                                   this._dragPlaceholderPos);
-            if (fadeIn)
-                this._dragPlaceholder.animateIn();
+            this._dragPlaceholder = new St.Bin({ style_class: 'dash-placeholder' });
+            this._box.insert_actor(this._dragPlaceholder, pos);
        }

        let srcIsFavorite = (favPos != -1);
@ -720,11 +334,7 @@ Dash.prototype = {
        let favPos = 0;
        let children = this._box.get_children();
        for (let i = 0; i < this._dragPlaceholderPos; i++) {
-            if (this._dragPlaceholder &&
-                children[i] == this._dragPlaceholder.actor)
-                continue;
-
-            let childId = children[i]._delegate.child._delegate.app.get_id();
+            let childId = children[i]._delegate.app.get_id();
            if (childId == id)
                continue;
            if (childId in favorites)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@ -8,6 +8,8 @@ const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Util = imports.misc.util;
 const Main = imports.ui.main;
@ -27,9 +29,10 @@ function _onVertSepRepaint (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 stippleColor = new Clutter.Color();
    let stippleWidth = themeNode.get_length('-stipple-width');
    let x = Math.floor(width/2) + 0.5;
+    themeNode.lookup_color('-stipple-color', false, stippleColor);
    cr.moveTo(x, 0);
    cr.lineTo(x, height);
    Clutter.cairo_set_source_color(cr, stippleColor);
@ -50,12 +53,11 @@ DateMenuButton.prototype = {
        let hbox;
        let vbox;

-        this._eventSource = new Calendar.DBusEventSource();
+        //this._eventSource = new Calendar.EmptyEventSource();
+        //this._eventSource = new Calendar.FakeEventSource();
+        this._eventSource = new Calendar.EvolutionEventSource();

-        let menuAlignment = 0.25;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-            menuAlignment = 1.0 - menuAlignment;
-        PanelMenu.Button.prototype._init.call(this, menuAlignment);
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);

        this._clock = new St.Label();
        this.actor.set_child(this._clock);
@ -88,7 +90,6 @@ DateMenuButton.prototype = {
        vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});
        item = new PopupMenu.PopupMenuItem(_("Date and Time Settings"));
        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        item.actor.can_focus = false;
        vbox.add(item.actor);

        // Add vertical separator
@ -101,34 +102,20 @@ DateMenuButton.prototype = {
        // Fill up the second column

        vbox = new St.BoxLayout({vertical: true});
-        hbox.add(vbox, { expand: true });
+        hbox.add(vbox);

        // Event list
-        vbox.add(this._eventList.actor, { expand: true });
+        vbox.add(this._eventList.actor);

        item = new PopupMenu.PopupMenuItem(_("Open Calendar"));
        item.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-        item.actor.can_focus = false;
        vbox.add(item.actor, {y_align: St.Align.END, expand: true, y_fill: false});

        // Whenever the menu is opened, select today
        this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
            if (isOpen) {
                let now = new Date();
-                /* Passing true to setDate() forces events to be reloaded. We
-                 * want this behavior, because
-                 *
-                 *   o It will cause activation of the calendar server which is
-                 *     useful if it has crashed
-                 *
-                 *   o It will cause the calendar server to reload events which
-                 *     is useful if dynamic updates are not supported or not
-                 *     properly working
-                 *
-                 * Since this only happens when the menu is opened, the cost
-                 * isn't very big.
-                 */
-                this._calendar.setDate(now, true);
+                this._calendar.setDate(now);
                // No need to update this._eventList as ::selected-date-changed
                // signal will fire
            }
@ -183,6 +170,21 @@ DateMenuButton.prototype = {
        }

        let displayDate = new Date();
+        let msecRemaining;
+        if (showSeconds) {
+            msecRemaining = 1000 - displayDate.getMilliseconds();
+            if (msecRemaining < 50) {
+                displayDate.setSeconds(displayDate.getSeconds() + 1);
+                msecRemaining += 1000;
+            }
+        } else {
+            msecRemaining = 60000 - (1000 * displayDate.getSeconds() +
+                                     displayDate.getMilliseconds());
+            if (msecRemaining < 500) {
+                displayDate.setMinutes(displayDate.getMinutes() + 1);
+                msecRemaining += 60000;
+            }
+        }

        this._clock.set_text(displayDate.toLocaleFormat(clockFormat));

@ -192,19 +194,19 @@ DateMenuButton.prototype = {
        dateFormat = _("%A %B %e, %Y");
        this._date.set_text(displayDate.toLocaleFormat(dateFormat));

-        Mainloop.timeout_add_seconds(1, Lang.bind(this, this._updateClockAndDate));
+        Mainloop.timeout_add(msecRemaining, Lang.bind(this, this._updateClockAndDate));
        return false;
    },

    _onPreferencesActivate: function() {
        this.menu.close();
-        let app = Shell.AppSystem.get_default().get_app('gnome-datetime-panel.desktop');
-        app.activate(-1);
+        Util.spawnDesktop('gnome-datetime-panel');
    },

    _onOpenCalendarActivate: function() {
        this.menu.close();
+        // TODO: pass '-c calendar' (to force the calendar at startup)
        // TODO: pass the selected day
-        Util.spawn(['evolution', '-c', 'calendar']);
-    }
+        Util.spawnDesktop('evolution');
+    },
 };
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -87,10 +87,6 @@ _Draggable.prototype = {

        this.actor.connect('destroy', Lang.bind(this, function() {
            this._actorDestroyed = true;
-            // If the drag actor is destroyed and we were going to fix
-            // up its hover state, fix up the parent hover state instead
-            if (this.actor == this._firstLeaveActor)
-                this._firstLeaveActor = this._dragOrigParent;
            if (this._dragInProgress)
                this._cancelDrag(global.get_current_time());
            this.disconnectAll();
@ -106,10 +102,10 @@ _Draggable.prototype = {
        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).

        // During the drag, we eat enter/leave events so that actors don't prelight or show
-        // tooltips. But we remember the actors that we first left/last entered so we can
+        // tooltips. But we remember the relevant events (first leave, last enter) so we can
        // fix up the hover state after the drag ends.
-        this._firstLeaveActor = null;
-        this._lastEnterActor = null;
+        this._firstLeaveEvent = null;
+        this._lastEnterEvent = null;

        this._eventsGrabbed = false;
    },
@ -122,11 +118,11 @@ _Draggable.prototype = {
            return false;

        this._buttonDown = true;
-        // special case St.Button: grabbing the pointer would mess up the
+        // special case St.Clickable: grabbing the pointer would mess up the
        // internal state, so we start the drag manually on hover change
-        if (this.actor instanceof St.Button)
+        if (this.actor instanceof St.Clickable)
            this.actor.connect('notify::hover',
-                               Lang.bind(this, this._onButtonHoverChanged));
+                               Lang.bind(this, this._onClickableHoverChanged));
        else
            this._grabActor();

@ -137,8 +133,8 @@ _Draggable.prototype = {
        return false;
    },

-    _onButtonHoverChanged: function(button) {
-        if (button.hover || !button.pressed)
+    _onClickableHoverChanged: function(button) {
+        if (button.hover || !button.held)
            return;

        button.fake_release();
@ -154,8 +150,6 @@ _Draggable.prototype = {

    _ungrabActor: function() {
        Clutter.ungrab_pointer();
-        if (!this._onEventId)
-            return;
        this.actor.disconnect(this._onEventId);
        this._onEventId = null;
    },
@ -211,10 +205,10 @@ _Draggable.prototype = {
                return true;
            }
        } else if (event.type() == Clutter.EventType.LEAVE) {
-            if (this._firstLeaveActor == null)
-                this._firstLeaveActor = event.get_source();
+            if (this._firstLeaveEvent == null)
+                this._firstLeaveEvent = event;
        } else if (event.type() == Clutter.EventType.ENTER) {
-            this._lastEnterActor = event.get_source();
+            this._lastEnterEvent = event;
        }

        return false;
@ -478,14 +472,12 @@ _Draggable.prototype = {
            // its parent, adjusting for the fact that the parent
            // may have been moved or scaled
            let [parentX, parentY] = this._dragOrigParent.get_transformed_position();
+            x = parentX + this._dragOrigParent.scale_x * this._dragOrigX;
+            y = parentY + this._dragOrigParent.scale_y * this._dragOrigY;
+
            let [parentWidth, parentHeight] = this._dragOrigParent.get_size();
            let [parentScaledWidth, parentScaledHeight] = this._dragOrigParent.get_transformed_size();
-            let parentScale = 1.0;
-            if (parentWidth != 0)
-                parentScale = parentScaledWidth / parentWidth;
-
-            x = parentX + parentScale * this._dragOrigX;
-            y = parentY + parentScale * this._dragOrigY;
+            let parentScale = parentScaledWidth / parentWidth;
            scale = this._dragOrigScale * parentScale;
        } else {
            // Snap back actor to its original stage position
@ -498,7 +490,6 @@ _Draggable.prototype = {
    },

    _cancelDrag: function(eventTime) {
-        this.emit('drag-cancelled', eventTime);
        this._dragInProgress = false;
        let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();

@ -507,9 +498,6 @@ _Draggable.prototype = {
            if (!this._buttonDown)
                this._dragComplete();
            this.emit('drag-end', eventTime, false);
-            if (!this._dragOrigParent)
-                this._dragActor.destroy();
-
            return;
        }

@ -565,9 +553,14 @@ _Draggable.prototype = {
            this._dragComplete();
    },

-    // Actor is an actor we have entered or left during the drag; call
+    // Actor is an actor we might have entered or left during the drag; call
    // st_widget_sync_hover on all StWidget ancestors
    _syncHover: function(actor) {
+        // If the actor was reparented from its original location and
+        // destroyed, then start syncing hover at the original parent
+        if (actor == this._dragActor && this._actorDestroyed)
+            actor = this._dragOrigParent;
+
        while (actor) {
            let parent = actor.get_parent();
            if (actor instanceof St.Widget)
@ -583,14 +576,14 @@ _Draggable.prototype = {

        this._ungrabEvents();

-        if (this._firstLeaveActor) {
-            this._syncHover(this._firstLeaveActor);
-            this._firstLeaveActor = null;
+        if (this._firstLeaveEvent) {
+            this._syncHover(this._firstLeaveEvent.get_source());
+            this._firstLeaveEvent = null;
        }

-        if (this._lastEnterActor) {
-            this._syncHover(this._lastEnterActor);
-            this._lastEnterActor = null;
+        if (this._lastEnterEvent) {
+            this._syncHover(this._lastEnterEvent.get_source());
+            this._lastEnterEvent = null;
        }

        this._dragActor = undefined;
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -1,5 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
 const DocInfo = imports.misc.docInfo;
 const Params = imports.misc.params;
 const Search = imports.ui.search;
@ -23,10 +26,7 @@ DocSearchProvider.prototype = {
            return null;
        return { 'id': resultId,
                 'name': docInfo.name,
-                 'createIcon': function(size) {
-                                   return docInfo.createIcon(size);
-                               }
-               };
+                 'icon': docInfo.createIcon(Search.RESULT_ICON_SIZE)};
    },

    activateResult: function(id, params) {
@ -43,5 +43,9 @@ DocSearchProvider.prototype = {

    getSubsearchResultSet: function(previousResults, terms) {
        return this._docManager.subsearch(previousResults, terms);
+    },
+
+    expandSearch: function(terms) {
+        log('TODO expand docs search');
    }
 };
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -22,6 +22,9 @@ const DBus = imports.dbus;
 const Lang = imports.lang;
 const Signals = imports.signals;

+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
 const Clutter = imports.gi.Clutter;
 const Gdm = imports.gi.Gdm;
 const GLib = imports.gi.GLib;
@ -51,7 +54,7 @@ const EndSessionDialogIface = {
              }
             ],
    signals: [{ name: 'Canceled',
-                inSignature: '',
+                outSignature: '',
              }],
    properties: []
 };
@ -63,20 +66,16 @@ const logoutDialogContent = {
    uninhibitedDescriptionWithUser: _("%s will be logged out automatically in %d seconds."),
    uninhibitedDescription: _("You will be logged out automatically in %d seconds."),
    endDescription: _("Logging out of the system."),
-    confirmButtons: [{ signal: 'ConfirmedLogout',
-                       label:  _("Log Out") }],
+    confirmButtonText: _("Log Out"),
    iconStyleClass: 'end-session-dialog-logout-icon'
 };

 const shutdownDialogContent = {
-    subject: _("Power Off"),
-    inhibitedDescription: _("Click Power Off to quit these applications and power off the system."),
-    uninhibitedDescription: _("The system will power off automatically in %d seconds."),
-    endDescription: _("Powering off the system."),
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  _("Restart") },
-                     { signal: 'ConfirmedShutdown',
-                       label:  _("Power Off") }],
+    subject: _("Shut Down"),
+    inhibitedDescription: _("Click Shut Down to quit these applications and shut down the system."),
+    uninhibitedDescription: _("The system will shut down automatically in %d seconds."),
+    endDescription: _("Shutting down the system."),
+    confirmButtonText: _("Shut Down"),
    iconName: 'system-shutdown',
    iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
@ -86,8 +85,7 @@ const restartDialogContent = {
    inhibitedDescription: _("Click Restart to quit these applications and restart the system."),
    uninhibitedDescription: _("The system will restart automatically in %d seconds."),
    endDescription: _("Restarting the system."),
-    confirmButtons: [{ signal: 'ConfirmedReboot',
-                       label:  _("Restart") }],
+    confirmButtonText: _("Restart"),
    iconName: 'system-shutdown',
    iconStyleClass: 'end-session-dialog-shutdown-icon'
 };
@ -139,12 +137,12 @@ ListItem.prototype = {

        let layout = new St.BoxLayout({ vertical: false});

-        this.actor = new St.Button({ style_class: 'end-session-dialog-app-list-item',
-                                     can_focus:   true,
-                                     child:       layout,
-                                     reactive:    true,
-                                     x_align:     St.Align.START,
-                                     x_fill:      true });
+        this.actor = new St.Clickable({ style_class: 'end-session-dialog-app-list-item',
+                                        can_focus:   true,
+                                        child:       layout,
+                                        reactive:    true,
+                                        x_align:     St.Align.START,
+                                        x_fill:      true });

        this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE);

@ -235,7 +233,7 @@ EndSessionDialog.prototype = {
    __proto__: ModalDialog.ModalDialog.prototype,

    _init: function() {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
+        ModalDialog.ModalDialog.prototype._init.call(this);

        this._user = Gdm.UserManager.ref_default().get_user(GLib.get_user_name());

@ -290,26 +288,12 @@ EndSessionDialog.prototype = {
        this.contentLayout.add(scrollView,
                               { x_fill: true,
                                 y_fill: true });
-        scrollView.hide();
-
        this._applicationList = new St.BoxLayout({ vertical: true });
        scrollView.add_actor(this._applicationList,
                             { x_fill:  true,
                               y_fill:  true,
                               x_align: St.Align.START,
                               y_align: St.Align.MIDDLE });
-
-        this._applicationList.connect('actor-added',
-                                      Lang.bind(this, function() {
-                                          if (this._applicationList.get_children().length == 1)
-                                              scrollView.show();
-                                      }));
-
-        this._applicationList.connect('actor-removed',
-                                      Lang.bind(this, function() {
-                                          if (this._applicationList.get_children().length == 0)
-                                              scrollView.hide();
-                                      }));
    },

    _onDestroy: function() {
@ -363,10 +347,8 @@ EndSessionDialog.prototype = {

        if (this._user.is_loaded && !dialogContent.iconName) {
            let iconFile = this._user.get_icon_file();
-            if (GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-                this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
-            else
-                this._setIconFromName('avatar-default', dialogContent.iconStyleClass);
+
+            this._setIconFromFile(iconFile, dialogContent.iconStyleClass);
        } else if (dialogContent.iconName) {
            this._setIconFromName(dialogContent.iconName,
                                  dialogContent.iconStyleClass);
@ -405,28 +387,23 @@ EndSessionDialog.prototype = {
    },

    _updateButtons: function() {
+        if (this.state != ModalDialog.State.OPENING &&
+            this.state != ModalDialog.State.OPENED)
+            return;
+
        let dialogContent = DialogContent[this._type];
-        let buttons = [{ action: Lang.bind(this, this.cancel),
-                         label:  _("Cancel"),
-                         key:    Clutter.Escape }];
+        let confirmButtonText = _("Confirm");

-        for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
-            let signal = dialogContent.confirmButtons[i].signal;
-            let label = dialogContent.confirmButtons[i].label;
-            buttons.push({ action: Lang.bind(this, function() {
-                                       this._confirm(signal);
-                                   }),
-                           label: label });
-        }
+        if (dialogContent.confirmButtonText)
+            confirmButtonText = dialogContent.confirmButtonText;

-        this.setButtons(buttons);
-    },
-
-    close: function() {
-        ModalDialog.ModalDialog.prototype.close.call(this);
-        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
-                                 'org.gnome.SessionManager.EndSessionDialog',
-                                 'Closed', '', []);
+        this.setButtons([{ label: _("Cancel"),
+                           action: Lang.bind(this, this.cancel),
+                           key:    Clutter.Escape
+                         },
+                         { label:  confirmButtonText,
+                           action: Lang.bind(this, this._confirm)
+                         }]);
    },

    cancel: function() {
@ -437,12 +414,12 @@ EndSessionDialog.prototype = {
        this.close(global.get_current_time());
    },

-    _confirm: function(signal) {
+    _confirm: function() {
        this._fadeOutDialog();
        this._stopTimer();
        DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog',
                                 'org.gnome.SessionManager.EndSessionDialog',
-                                 signal, '', []);
+                                 'Confirmed', '', []);
    },

    _onOpened: function() {
@ -457,11 +434,7 @@ EndSessionDialog.prototype = {
                           time: this._secondsLeft,
                           transition: 'linear',
                           onUpdate: Lang.bind(this, this._updateContent),
-                           onComplete: Lang.bind(this, function() {
-                                           let dialogContent = DialogContent[this._type];
-                                           let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
-                                           this._confirm(button.signal);
-                                       }),
+                           onComplete: Lang.bind(this, this._confirm),
                         });
    },

@ -514,12 +487,11 @@ EndSessionDialog.prototype = {
            this._inhibitors.push(inhibitor);
        }

-        this._updateButtons();
-
        if (!this.open(timestamp))
            throw new DBus.DBusError('org.gnome.Shell.ModalDialog.GrabError',
                                     "Cannot grab pointer and keyboard");

+        this._updateButtons();
        this._updateContent();

        let signalId = this.connect('opened',
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -1,22 +1,14 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-imports.gi.versions.Clutter = '1.0';
-imports.gi.versions.Gio = '2.0';
-imports.gi.versions.Gdk = '3.0';
-imports.gi.versions.GdkPixbuf = '2.0';
-imports.gi.versions.Gtk = '3.0';
-
 const Clutter = imports.gi.Clutter;;
-const Gettext = imports.gettext;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Gettext_gtk30 = imports.gettext.domain('gtk30');

-// We can't import shell JS modules yet, because they may have
-// variable initializations, etc, that depend on init() already having
-// been run.
+const Tweener = imports.ui.tweener;

+const Format = imports.misc.format;

 // "monkey patch" in some varargs ClutterContainer methods; we need
 // to do this per-container class since there is no representation
@ -25,7 +17,7 @@ function _patchContainerClass(containerClass) {
    // This one is a straightforward mapping of the C method
    containerClass.prototype.child_set = function(actor, props) {
        let meta = this.get_child_meta(actor);
-        for (let prop in props)
+        for (prop in props)
            meta[prop] = props[prop];
    };

@ -69,20 +61,21 @@ function _blockMethod(method, replacement, reason) {
 }

 function init() {
-    // Add some bindings to the global JS namespace; (gjs keeps the web
-    // browser convention of having that namespace be called 'window'.)
-    window.global = Shell.Global.get();
-
-    window._ = Gettext.gettext;
-    window.C_ = Gettext.pgettext;
-    window.ngettext = Gettext.ngettext;
+    Tweener.init();
+    String.prototype.format = Format.format;

    // Set the default direction for St widgets (this needs to be done before any use of St)
-    if (Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL) {
+    if (Gettext_gtk30.gettext('default:LTR') == 'default:RTL') {
        St.Widget.set_default_direction(St.TextDirection.RTL);
    }

-    // Miscellaneous monkeypatching
+    let slowdownEnv = GLib.getenv('GNOME_SHELL_SLOWDOWN_FACTOR');
+    if (slowdownEnv) {
+        let factor = parseFloat(slowdownEnv);
+        if (!isNaN(factor) && factor > 0.0)
+            St.set_slow_down_factor(factor);
+    }
+
    _patchContainerClass(St.BoxLayout);
    _patchContainerClass(St.Table);

@ -90,14 +83,8 @@ function init() {
        return St.describe_actor(this);
    };

-    let origToString = Object.prototype.toString;
-    Object.prototype.toString = function() {
-        let base = origToString.call(this);
-        if ('actor' in this && this.actor instanceof Clutter.Actor)
-            return base.replace(/\]$/, ' delegate for ' + this.actor.toString().substring(1));
-        else
-            return base;
-    };
+    if (window.global === undefined) // test environment
+        return;

    _blockMethod('Clutter.Event.get_state', 'Shell.get_event_state',
                 'gjs\'s handling of Clutter.ModifierType is broken. See bug 597292.');
@ -109,23 +96,4 @@ function init() {
    // Shell.Global.prototype itself is read-only.
    global.set_property_mutable('imports.gi.Shell.Global.prototype', 'set_property_mutable', true);
    Shell.Global.prototype.set_property_mutable = undefined;
-
-    // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=508783
-    Date.prototype.toLocaleFormat = function(format) {
-        return Shell.util_format_date(format, this.getTime());
-    };
-
-    let slowdownEnv = GLib.getenv('GNOME_SHELL_SLOWDOWN_FACTOR');
-    if (slowdownEnv) {
-        let factor = parseFloat(slowdownEnv);
-        if (!isNaN(factor) && factor > 0.0)
-            St.set_slow_down_factor(factor);
-    }
-
-    // OK, now things are initialized enough that we can import shell JS
-    const Format = imports.misc.format;
-    const Tweener = imports.ui.tweener;
-
-    Tweener.init();
-    String.prototype.format = Format.format;
 }
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -3,7 +3,6 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;

 const Config = imports.misc.config;

@ -68,13 +67,7 @@ function loadExtension(dir, enabled, type) {
        return;
    }

-    let metadataContents;
-    try {
-        metadataContents = Shell.get_file_contents_utf8_sync(metadataFile.get_path());
-    } catch (e) {
-        global.logError(baseErrorString + 'Failed to load metadata.json: ' + e);
-        return;
-    }
+    let [success, metadataContents, len, etag] = metadataFile.load_contents(null);
    let meta;
    try {
        meta = JSON.parse(metadataContents);
@ -157,7 +150,7 @@ function loadExtension(dir, enabled, type) {
        return;
    }
    try {
-        extensionModule.main(meta);
+        extensionModule.main();
    } catch (e) {
        if (stylesheetPath != null)
            theme.unload_stylesheet(stylesheetPath);
@ -181,15 +174,8 @@ function init() {
 }

 function _loadExtensionsIn(dir, type) {
-    let fileEnum;
+    let fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
    let file, info;
-    try {
-        fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
-    } catch (e) {
-        global.logError('' + e);
-       return;
-    }
-
    while ((info = fileEnum.next_file(null)) != null) {
        let fileType = info.get_file_type();
        if (fileType != Gio.FileType.DIRECTORY)
--- a/js/ui/goaClient.js
+++ b/js/ui/goaClient.js
@ -1,500 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Goa = imports.gi.Goa;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const St = imports.gi.St;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-const C_ = Gettext.pgettext;
-const Gtk = imports.gi.Gtk;
-const Pango = imports.gi.Pango;
-
-const History = imports.misc.history;
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
-
-// ----------------------------------------------------------------------------------------------------
-
-function Client() {
-    this._init();
-}
-
-Client.prototype = {
-    _init : function() {
-        this._client = null;
-
-        this._accountIdToMailMonitor = {}
-        this._mailSource = null;
-
-        // TODO: need to call refreshAllMonitors() when network-connectivity changes
-
-        Goa.Client.new(null, /* cancellable */
-                       Lang.bind(this, this._onClientConstructed));
-    },
-
-    _onClientConstructed : function(object, asyncRes) {
-        this._client = object.new_finish(asyncRes);
-        this._updateAccounts();
-        this._client.connect('account-added', Lang.bind(this, this._updateAccounts));
-        this._client.connect('account-removed', Lang.bind(this, this._updateAccounts));
-        this._client.connect('account-changed', Lang.bind(this, this._updateAccounts));
-    },
-
-    _updateAccounts : function () {
-
-        let objects = this._client.get_accounts();
-        let mailIds = {};
-
-        // Add monitors for accounts that now exist
-        for (let n = 0; n < objects.length; n++) {
-            let object = objects[n];
-            let id = object.account.id;
-
-            if (object.mail) {
-                mailIds[id] = true;
-                if (!(id in this._accountIdToMailMonitor)) {
-                    let monitor = new MailMonitor(this, object);
-                    this._accountIdToMailMonitor[id] = monitor;
-                }
-            }
-        }
-
-        // Nuke monitors for accounts that are now non-existant
-        let monitorsToRemove = []
-        for (let existingMonitorId in this._accountIdToMailMonitor) {
-            if (!(existingMonitorId in mailIds)) {
-                monitorsToRemove.push(existingMonitorId);
-            }
-        }
-        for (let n = 0; n < monitorsToRemove.length; n++) {
-            let id = monitorsToRemove[n];
-            let monitor = this._accountIdToMailMonitor[id];
-            delete this._accountIdToMailMonitor[id]
-            monitor.destroy();
-        }
-    },
-
-    _ensureMailSource: function() {
-        if (!this._mailSource) {
-            this._mailSource = new MailSource(this);
-            this._mailSource.connect('destroy', Lang.bind(this,
-                                                          function () {
-                                                              this._mailSource = null;
-                                                          }));
-            Main.messageTray.add(this._mailSource);
-        }
-    },
-
-    addPendingMessage: function(message) {
-        this._ensureMailSource();
-        this._mailSource.addMessage(message);
-    },
-
-    refreshAllMonitors: function() {
-        log('Refreshing all mail monitors');
-        for (let id in this._accountIdToMailMonitor) {
-            let monitor = this._accountIdToMailMonitor[id];
-            monitor.refresh();
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------------------------------
-
-function Message(uid, from, subject, excerpt, uri, can_be_marked_as_spam, can_be_starred) {
-    this._init(uid, from, subject, excerpt, uri, can_be_marked_as_spam, can_be_starred);
-}
-
-Message.prototype = {
-    _init: function(uid, from, subject, excerpt, uri, can_be_marked_as_spam, can_be_starred) {
-        this.uid = uid;
-        this.from = from;
-        this.subject = subject;
-        this.excerpt = excerpt;
-        this.uri = uri;
-        this.can_be_marked_as_spam = can_be_marked_as_spam;
-        this.can_be_starred = can_be_starred;
-        this.receivedAt = new Date();
-    }
-}
-
-// ----------------------------------------------------------------------------------------------------
-
-function MailMonitor(client, accountObject) {
-    this._init(client, accountObject);
-}
-
-MailMonitor.prototype = {
-    _init : function(client, accountObject) {
-        this._client = client;
-        this._accountObject = accountObject;
-        this._account = this._accountObject.get_account();
-        this._mail = this._accountObject.get_mail();
-
-        // Create the remote monitor object
-        this._proxy = null;
-        this._cancellable = new Gio.Cancellable();
-        this._mail.call_create_monitor(this._cancellable, Lang.bind(this, this._onMonitorCreated));
-    },
-
-    destroy : function() {
-        this._cancellable.cancel();
-        if (this._proxy) {
-            // We don't really care if this fails or not
-            this._proxy.call_close(null, Lang.bind(this, function() { }));
-            this._proxy.disconnect(this._messageReceivedId);
-            this._proxy = null;
-        }
-    },
-
-    refresh : function() {
-        if (this._proxy) {
-            // We don't really care if this fails or not
-            log('Refreshing mail monitor for account ' + this._account.name);
-            this._proxy.call_refresh(null, Lang.bind(this, function() { }));
-        }
-    },
-
-    _onMonitorCreated : function(mail, asyncRes) {
-        // TODO: a (gboolean, object_path) tuple is returned here
-        // See https://bugzilla.gnome.org/show_bug.cgi?id=649657
-        let ret = mail.call_create_monitor_finish(asyncRes);
-        let object_path = ret[1];
-        Goa.MailMonitorProxy.new_for_bus(Gio.BusType.SESSION,
-                                       Gio.DBusProxyFlags.NONE,
-                                       'org.gnome.OnlineAccounts',
-                                       object_path,
-                                       null, /* cancellable */
-                                       Lang.bind(this, this._onMonitorProxyConstructed));
-    },
-
-    _onMonitorProxyConstructed : function(monitor, asyncRes) {
-        this._proxy = monitor.new_for_bus_finish(asyncRes);
-
-        // Now listen for changes on the mail monitor proxy
-        this._messageReceivedId = this._proxy.connect('message-received',
-                                                      Lang.bind(this, this._onMessageReceived));
-    },
-
-    _onMessageReceived : function(monitor, uid, from, subject, excerpt, uri, can_be_marked_as_spam, can_be_starred) {
-        let message = new Message(uid, from, subject, excerpt, uri, can_be_marked_as_spam, can_be_starred);
-        if (!Main.messageTray.getBusy()) {
-            let source = new Source(this._client, message);
-            let notification = new Notification(source, this._client, this, message);
-            // If the user is not marked as busy, present the notification to the user
-            Main.messageTray.add(source);
-            source.notify(notification);
-        } else {
-            // ... otherwise, if the user is busy, just add it to the MailSource's list
-            // of pending messages
-            this._client.addPendingMessage(message);
-        }
-    },
-
-    MessageAddStar: function (message) {
-        this._proxy.call_add_star(message.uid,
-                                  null, /* cancellable */
-                                  Lang.bind(this,
-                                            function(object, asyncRes) {
-                                                this._proxy.call_add_star_finish(asyncRes);
-                                            }));
-    },
-
-    MessageMarkAsSpam: function (message) {
-        this._proxy.call_mark_as_spam(message.uid,
-                                      null, /* cancellable */
-                                      Lang.bind(this,
-                                                function(object, asyncRes) {
-                                                    this._proxy.call_add_star_finish(asyncRes);
-                                                }));
-    }
-
-}
-
-// ----------------------------------------------------------------------------------------------------
-
-function Source(client, message) {
-    this._init(client, message);
-}
-
-Source.prototype = {
-    __proto__:  MessageTray.Source.prototype,
-
-    _init : function(client, message) {
-        this._client = client;
-        this._message = message;
-
-        // Init super class and add ourselves to the message tray
-        MessageTray.Source.prototype._init.call(this, 'Message from ' + _stripEmailAddress(this._message.from));
-        this.setTransient(true);
-        this.isChat = true;
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    createNotificationIcon : function() {
-        // TODO: use account icon
-        let icon = new St.Icon({ icon_type: St.IconType.FULLCOLOR,
-                                 icon_size: this.ICON_SIZE,
-                                 icon_name: 'mail-send'});
-        return icon;
-    }
-}
-
-// ----------------------------------------------------------------------------------------------------
-
-function _stripEmailAddress(name_and_addr) {
-    let bracketStartPos = name_and_addr.indexOf(' <');
-    if (bracketStartPos == -1) {
-        return name_and_addr;
-    } else {
-        return name_and_addr.slice(0, bracketStartPos);
-    }
-}
-
-function Notification(source, client, monitor, message) {
-    this._init(source, client, monitor, message);
-}
-
-Notification.prototype = {
-    __proto__: MessageTray.Notification.prototype,
-
-    _init : function(source, client, monitor, message) {
-        this._client = client;
-        this._monitor = monitor
-        this._message = message;
-        this._ignore = false;
-        this._alreadyExpanded = false;
-
-        this._strippedFrom = _stripEmailAddress(this._message.from);
-
-        let title = this._strippedFrom;
-        let banner = this._message.subject + ' \u2014 ' + this._message.excerpt; // — U+2014 EM DASH
-
-        // Init super class
-        MessageTray.Notification.prototype._init.call(this, source, title, banner);
-
-        // Change the contents once expanded
-        this.connect('expanded', Lang.bind (this, this._onExpanded));
-
-        this.update(title, banner);
-        this.setUrgency(MessageTray.Urgency.NORMAL);
-        this.setTransient(true);
-
-        this.addButton('ignore', 'Ignore');
-        if (message.can_be_starred)
-            this.addButton('star', 'Star');
-        if (message.can_be_marked_as_spam)
-            this.addButton('spam', 'Junk');
-        if (this._message.uri.length > 0) {
-            this.addButton('open', 'Open');
-        }
-        this.connect('action-invoked', Lang.bind(this,
-                                                 function(notification, id) {
-                                                     if (id == 'ignore') {
-                                                         this._actionIgnore();
-                                                     } else if (id == 'star') {
-                                                         this._actionStar();
-                                                     } else if (id == 'spam') {
-                                                         this._actionSpam();
-                                                     } else if (id == 'open') {
-                                                         this._actionOpen();
-                                                     }
-                                                 }));
-        this.connect('clicked', Lang.bind(this,
-                                          function() {
-                                              if (this._message.uri.length > 0) {
-                                                  this._actionOpen();
-                                              }
-                                          }));
-        // Hmm, should be ::done-displaying instead?
-        this.connect('destroy', Lang.bind(this, this._onDestroyed));
-    },
-
-    _onExpanded : function() {
-        if (this._alreadyExpanded)
-            return;
-        this._alreadyExpanded = true;
-        let escapedExcerpt = GLib.markup_escape_text(this._message.excerpt, -1);
-        let bannerMarkup = '<b>Subject:</b> ' + this._message.subject + '\n';
-        // TODO: if available, insert other headers such as Cc
-        bannerMarkup += '\n' + escapedExcerpt;
-        this.update(this._strippedFrom, bannerMarkup, {bannerMarkup: true});
-    },
-
-    _onDestroyed : function(reason) {
-        // If not ignoring the message, push it onto the Mail source
-        if (!this._ignore) {
-            this._client.addPendingMessage(this._message);
-        }
-    },
-
-    _actionIgnore : function() {
-        this._ignore = true;
-    },
-
-    _actionStar : function() {
-        this._ignore = true;
-        this._monitor.MessageAddStar(this._message);
-    },
-
-    _actionSpam : function() {
-        this._ignore = true;
-        this._monitor.MessageMarkAsSpam(this._message);
-    },
-
-    _actionOpen : function() {
-        this._ignore = true;
-        Gio.app_info_launch_default_for_uri(this._message.uri,
-                                            global.create_app_launch_context());
-    }
-
-}
-
-// ----------------------------------------------------------------------------------------------------
-
-function _sameDay(dateA, dateB) {
-    return (dateA.getDate() == dateB.getDate() &&
-            dateA.getMonth() == dateB.getMonth() &&
-            dateA.getYear() == dateB.getYear());
-}
-
-function _sameYear(dateA, dateB) {
-    return (dateA.getYear() == dateB.getYear());
-}
-
-function _formatRelativeDate(date) {
-    let ret = ''
-    let now = new Date();
-    if (_sameDay(date, now)) {
-        ret = date.toLocaleFormat("%l:%M %p");
-    } else {
-        if (_sameYear(date, now)) {
-            ret = date.toLocaleFormat("%B %e");
-        } else {
-            ret = date.toLocaleFormat("%B %e, %Y");
-        }
-    }
-    return ret;
-}
-
-function _addMessageToTable(table, message) {
-    let formattedExcerpt = message.excerpt.replace(/\r/g, '').replace(/\n/g, ' ');
-    let formattedDate = _formatRelativeDate(message.receivedAt);
-
-    let fromLabel = new St.Label({ style_class: 'goa-message-base goa-message-from',
-                                   text: _stripEmailAddress(message.from)});
-    let hbox = new St.BoxLayout({ style_class: 'goa-message-hbox', vertical: false });
-    let subjectLabel = new St.Label({ style_class: 'goa-message-base goa-message-subject',
-                                      text: message.subject });
-    let excerptLabel = new St.Label({ style_class: 'goa-message-base goa-message-excerpt',
-                                      text: formattedExcerpt });
-    let dateLabel = new St.Label({ style_class: 'goa-message-base goa-message-date',
-                                   text: formattedDate });
-
-    excerptLabel.clutter_text.line_wrap = false;
-    excerptLabel.clutter_text.ellipsize = Pango.EllipsizeMode.END;
-
-    hbox.add(subjectLabel, { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
-    hbox.add(excerptLabel, { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
-
-    let n = table.get_row_count();
-    table.add(fromLabel, { x_fill: true, x_expand: true, row: n, col: 0 });
-    table.add(hbox, { row: n, col: 1 });
-    table.add(dateLabel, { row: n, col: 2 });
-}
-
-function MailSource(client) {
-    this._init(client);
-}
-
-MailSource.prototype = {
-    __proto__:  MessageTray.Source.prototype,
-
-    _init : function(client) {
-        this._client = client;
-        this._pendingMessages = [];
-
-        // Init super class and add ourselves to the message tray
-        MessageTray.Source.prototype._init.call(this, 'Mail');
-
-        // Create the notification
-        this._notification = new MessageTray.Notification(this)
-        this._notification.setUrgency(MessageTray.Urgency.NORMAL);
-        this._notification.setResident(true);
-        this._updateNotification();
-        this.pushNotification(this._notification);
-        // Refresh all monitors everytime the "Mail" notification is displayed
-        this._notification.connect('expanded', Lang.bind(this,
-                                                         function() {
-                                                             this._client.refreshAllMonitors();
-                                                         }));
-    },
-
-    createNotificationIcon : function() {
-        let numPending = this._pendingMessages.length;
-        let baseIcon = new Gio.ThemedIcon({ name: 'mail-mark-unread'});
-        let numerableIcon = new Gtk.NumerableIcon({ gicon: baseIcon });
-        numerableIcon.set_count(numPending);
-        let icon = new St.Icon({ icon_type: St.IconType.FULLCOLOR,
-                                 icon_size: this.ICON_SIZE });
-        icon.set_gicon(numerableIcon);
-        return icon;
-    },
-
-    _updateNotification: function() {
-        if (!this._notification)
-            return
-
-        let title = 'Mail';
-        let banner = ''
-        let table = new St.Table({ homogeneous: false,
-                                   style_class: 'goa-message-table',
-                                   reactive: true });
-
-        for (let n = 0; n < this._pendingMessages.length; n++)
-            _addMessageToTable (table, this._pendingMessages[n]);
-
-        this._notification.update(title, banner, { clear: true,
-                                                   icon: this.createNotificationIcon() });
-        this._notification.addActor(table);
-        this._notification.addButton('close', 'Close');
-        this._notification.addButton('ignore-all', 'Ignore All');
-        this._notification.connect('action-invoked', Lang.bind(this,
-                                                               function(notification, id) {
-                                                                   if (id == 'close') {
-                                                                       // TODO: Can't find another way hide it
-                                                                       notification._onClicked();
-                                                                   } else if (id == 'ignore-all') {
-                                                                       this.clearMessages();
-                                                                   }
-                                                               }));
-    },
-
-    addMessage: function(message) {
-        this._pendingMessages.push(message);
-        // Update notification
-        this._updateNotification();
-        // Update icon with latest pending count
-        this._setSummaryIcon(this.createNotificationIcon());
-    },
-
-    clearMessages: function() {
-        let notification = this._notification;
-        this._notification = null;
-        if (notification)
-            notification.destroy();
-        this.destroy();
-    },
-}
-
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -17,8 +17,7 @@ function BaseIcon(label, createIcon) {
 BaseIcon.prototype = {
    _init : function(label, params) {
        params = Params.parse(params, { createIcon: null,
-                                        setSizeManually: false,
-                                        showLabel: true });
+                                        setSizeManually: false });
        this.actor = new St.Bin({ style_class: 'overview-icon',
                                  x_fill: true,
                                  y_fill: true });
@ -41,52 +40,42 @@ BaseIcon.prototype = {

        box.add_actor(this._iconBin);

-        if (params.showLabel) {
-            this.label = new St.Label({ text: label });
-            box.add_actor(this.label);
-        } else {
-            this.label = null;
-        }
+        this._name = new St.Label({ text: label });
+        box.add_actor(this._name);

        if (params.createIcon)
            this.createIcon = params.createIcon;
        this._setSizeManually = params.setSizeManually;

-        this.icon = null;
+        this.icon = this.createIcon(this.iconSize);
+        this._iconBin.set_child(this.icon);
    },

    _allocate: function(actor, box, flags) {
        let availWidth = box.x2 - box.x1;
        let availHeight = box.y2 - box.y1;

-        let iconSize = availHeight;
-
+        let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(-1);
        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(-1);
-        let [iconMinWidth, iconNatWidth] = this._iconBin.get_preferred_width(-1);
-        let preferredHeight = iconNatHeight;
+        let preferredHeight = labelNatHeight + this._spacing + iconNatHeight;
+        let labelHeight = availHeight >= preferredHeight ? labelNatHeight
+                                                         : labelMinHeight;
+        let iconSize = availHeight - this._spacing - labelHeight;
+        let iconPadding = (availWidth - iconSize) / 2;

        let childBox = new Clutter.ActorBox();

-        if (this.label) {
-            let [labelMinHeight, labelNatHeight] = this.label.get_preferred_height(-1);
-            preferredHeight += this._spacing + labelNatHeight;
-
-            let labelHeight = availHeight >= preferredHeight ? labelNatHeight
-                                                             : labelMinHeight;
-            iconSize -= this._spacing + labelHeight;
-
-            childBox.x1 = 0;
-            childBox.x2 = availWidth;
-            childBox.y1 = iconSize + this._spacing;
-            childBox.y2 = childBox.y1 + labelHeight;
-            this.label.allocate(childBox, flags);
-        }
-
-        childBox.x1 = Math.floor((availWidth - iconNatWidth) / 2);
-        childBox.y1 = Math.floor((iconSize - iconNatHeight) / 2);
-        childBox.x2 = childBox.x1 + iconNatWidth;
-        childBox.y2 = childBox.y1 + iconNatHeight;
+        childBox.x1 = iconPadding;
+        childBox.y1 = 0;
+        childBox.x2 = availWidth - iconPadding;
+        childBox.y2 = iconSize;
        this._iconBin.allocate(childBox, flags);
+
+        childBox.x1 = 0;
+        childBox.x2 = availWidth;
+        childBox.y1 = iconSize + this._spacing;
+        childBox.y2 = childBox.y1 + labelHeight;
+        this._name.allocate(childBox, flags);
    },

    _getPreferredWidth: function(actor, forHeight, alloc) {
@ -95,14 +84,9 @@ BaseIcon.prototype = {

    _getPreferredHeight: function(actor, forWidth, alloc) {
        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(forWidth);
-        alloc.min_size = iconMinHeight;
-        alloc.natural_size = iconNatHeight;
-
-        if (this.label) {
-            let [labelMinHeight, labelNatHeight] = this.label.get_preferred_height(forWidth);
-            alloc.min_size += this._spacing + labelMinHeight;
-            alloc.natural_size += this._spacing + labelNatHeight;
-        }
+        let [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(forWidth);
+        alloc.min_size = iconMinHeight + this._spacing + labelMinHeight;
+        alloc.natural_size = iconNatHeight + this._spacing + labelNatHeight;
    },

    // This can be overridden by a subclass, or by the createIcon
@ -115,23 +99,16 @@ BaseIcon.prototype = {
        if (!this._setSizeManually)
            throw new Error('setSizeManually has to be set to use setIconsize');

+        this._setIconSize(size);
+    },
+
+    _setIconSize: function(size) {
        if (size == this.iconSize)
            return;

-        this._createIconTexture(size);
-    },
-
-    _createIconTexture: function(size) {
-        if (this.icon)
-            this.icon.destroy();
+        this.icon.destroy();
        this.iconSize = size;
        this.icon = this.createIcon(this.iconSize);
-
-        // The icon returned by createIcon() might actually be smaller than
-        // the requested icon size (for instance StTextureCache does this
-        // for fallback icons), so set the size explicitly.
-        this.icon.set_size(this.iconSize, this.iconSize);
-
        this._iconBin.child = this.icon;
    },

@ -139,15 +116,12 @@ BaseIcon.prototype = {
        let node = this.actor.get_theme_node();
        this._spacing = node.get_length('spacing');

-        let size;
-        if (this._setSizeManually) {
-            size = this.iconSize;
-        } else {
-            let [found, len] = node.lookup_length('icon-size', false);
-            size = found ? len : ICON_SIZE;
-        }
+        if (this._setSizeManually)
+            return;

-        this._createIconTexture(size);
+        let len = node.get_length('icon-size');
+        if (len > 0)
+            this._setIconSize(len);
    }
 };

@ -281,11 +255,8 @@ IconGrid.prototype = {
        }
    },

-    childrenInRow: function(rowWidth) {
-        return this._computeLayout(rowWidth)[0];
-    },
-
    _computeLayout: function (forWidth) {
+        let children = this._grid.get_children();
        let nColumns = 0;
        let usedWidth = 0;
        while ((this._colLimit == null || nColumns < this._colLimit) &&
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -1,19 +1,18 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const Cogl = imports.gi.Cogl;
 const GConf = imports.gi.GConf;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
 const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

-const History = imports.misc.history;
 const ExtensionSystem = imports.ui.extensionSystem;
 const Link = imports.ui.link;
 const Tweener = imports.ui.tweener;
@ -26,7 +25,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                    'const Mainloop = imports.mainloop; ' +
                    'const Meta = imports.gi.Meta; ' +
                    'const Shell = imports.gi.Shell; ' +
-                    'const Tp = imports.gi.TelepathyGLib; ' +
                    'const Main = imports.ui.main; ' +
                    'const Lang = imports.lang; ' +
                    'const Tweener = imports.ui.tweener; ' +
@ -38,8 +36,6 @@ var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
                       'const it = Main.lookingGlass.getIt(); ' +
                    'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

-const HISTORY_KEY = 'looking-glass-history';
-
 function Notebook() {
    this._init();
 }
@ -99,19 +95,12 @@ Notebook.prototype = {
    selectIndex: function(index) {
        if (index == this._selectedIndex)
            return;
+        this._unselect();
        if (index < 0) {
-            this._unselect();
            this.emit('selection', null);
            return;
        }
-
-        // Focus the new tab before unmapping the old one
        let tabData = this._tabs[index];
-        if (!tabData.scrollView.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false))
-            this.actor.grab_key_focus();
-
-        this._unselect();
-
        tabData.labelBox.add_style_pseudo_class('selected');
        tabData.scrollView.show();
        this._selectedIndex = index;
@ -370,30 +359,6 @@ ObjInspector.prototype = {
    }
 };

-function addBorderPaintHook(actor) {
-    let signalId = actor.connect_after('paint',
-        function () {
-            let color = new Cogl.Color();
-            color.init_from_4ub(0xff, 0, 0, 0xc4);
-            Cogl.set_source_color(color);
-
-            let geom = actor.get_allocation_geometry();
-            let width = 2;
-
-            // clockwise order
-            Cogl.rectangle(0, 0, geom.width, width);
-            Cogl.rectangle(geom.width - width, width,
-                           geom.width, geom.height);
-            Cogl.rectangle(0, geom.height,
-                           geom.width - width, geom.height - width);
-            Cogl.rectangle(0, geom.height - width,
-                           width, width);
-        });
-
-    actor.queue_redraw();
-    return signalId;
-}
-
 function Inspector() {
    this._init();
 }
@ -529,13 +494,10 @@ Inspector.prototype = {
        let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
        this._displayText.text = '';
        this._displayText.text = position + ' ' + this._target;
-
-        if (this._borderPaintTarget != this._target) {
-            if (this._borderPaintTarget != null)
-                this._borderPaintTarget.disconnect(this._borderPaintId);
-            this._borderPaintTarget = this._target;
-            this._borderPaintId = addBorderPaintHook(this._target);
-        }
+        if (this._borderPaintTarget != null)
+            this._borderPaintTarget.disconnect(this._borderPaintId);
+        this._borderPaintTarget = this._target;
+        this._borderPaintId = Shell.add_hook_paint_red_border(this._target);
    }
 };

@ -681,10 +643,18 @@ function LookingGlass() {

 LookingGlass.prototype = {
    _init : function() {
+        this._idleHistorySaveId = 0;
+        let historyPath = global.userdatadir + '/lookingglass-history.txt';
+        this._historyFile = Gio.file_new_for_path(historyPath);
+        this._savedText = null;
+        this._historyNavIndex = -1;
+        this._history = [];
        this._borderPaintTarget = null;
        this._borderPaintId = 0;
        this._borderDestroyId = 0;

+        this._readHistory();
+
        this._open = false;

        this._offset = 0;
@ -713,7 +683,6 @@ LookingGlass.prototype = {
        let toolbar = new St.BoxLayout({ name: 'Toolbar' });
        this.actor.add_actor(toolbar);
        let inspectIcon = new St.Icon({ icon_name: 'gtk-color-picker',
-                                        icon_type: St.IconType.FULLCOLOR,
                                        icon_size: 24 });
        toolbar.add_actor(inspectIcon);
        inspectIcon.reactive = true;
@ -751,7 +720,12 @@ LookingGlass.prototype = {
        let label = new St.Label({ text: 'js>>> ' });
        entryArea.add(label);

-        this._entry = new St.Entry({ can_focus: true });
+        this._entry = new St.Entry();
+        /* unmapping the edit box will un-focus it, undo that */
+        notebook.connect('selection', Lang.bind(this, function (nb, child) {
+            if (child == this._evalBox)
+                global.stage.set_key_focus(this._entry);
+        }));
        entryArea.add(this._entry, { expand: true });

        this._windowList = new WindowList();
@ -777,11 +751,34 @@ LookingGlass.prototype = {
            if (text == '')
                return true;
            this._evaluate(text);
+            this._historyNavIndex = -1;
            return true;
        }));
-
-        this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY, 
-                                                     entry: this._entry.clutter_text });
+        this._entry.clutter_text.connect('key-press-event', Lang.bind(this, function(o, e) {
+            let symbol = e.get_key_symbol();
+            if (symbol == Clutter.Up) {
+                if (this._historyNavIndex >= this._history.length - 1)
+                    return true;
+                this._historyNavIndex++;
+                if (this._historyNavIndex == 0)
+                    this._savedText = this._entry.text;
+                this._entry.text = this._history[this._history.length - this._historyNavIndex - 1];
+                return true;
+            } else if (symbol == Clutter.Down) {
+                if (this._historyNavIndex <= 0)
+                    return true;
+                this._historyNavIndex--;
+                if (this._historyNavIndex < 0)
+                    this._entry.text = this._savedText;
+                else
+                    this._entry.text = this._history[this._history.length - this._historyNavIndex - 1];
+                return true;
+            } else {
+                this._historyNavIndex = -1;
+                this._savedText = null;
+                return false;
+            }
+        }));
    },

    _updateFont: function() {
@ -796,6 +793,29 @@ LookingGlass.prototype = {
            + 'font-family: "' + fontDesc.get_family() + '";';
    },

+    _readHistory: function () {
+        if (!this._historyFile.query_exists(null))
+            return;
+        let [result, contents, length, etag] = this._historyFile.load_contents(null);
+        this._history = contents.split('\n').filter(function (e) { return e != ''; });
+    },
+
+    _queueHistorySave: function() {
+        if (this._idleHistorySaveId > 0)
+            return;
+        this._idleHistorySaveId = Mainloop.timeout_add_seconds(5, Lang.bind(this, this._doSaveHistory));
+    },
+
+    _doSaveHistory: function () {
+        this._idleHistorySaveId = false;
+        let output = this._historyFile.replace(null, true, Gio.FileCreateFlags.NONE, null);
+        let dataOut = new Gio.DataOutputStream({ base_stream: output });
+        dataOut.put_string(this._history.join('\n'), null);
+        dataOut.put_string('\n', null);
+        dataOut.close(null);
+        return false;
+    },
+
    _pushResult: function(command, obj) {
        let index = this._results.length + this._offset;
        let result = new Result('>>> ' + command, obj, index);
@ -807,7 +827,7 @@ LookingGlass.prototype = {
        }
        if (obj instanceof Clutter.Actor) {
            this._borderPaintTarget = obj;
-            this._borderPaintId = addBorderPaintHook(obj);
+            this._borderPaintId = Shell.add_hook_paint_red_border(obj);
            this._borderDestroyId = obj.connect('destroy', Lang.bind(this, function () {
                this._borderDestroyId = 0;
                this._borderPaintTarget = null;
@ -826,7 +846,8 @@ LookingGlass.prototype = {
    },

    _evaluate : function(command) {
-        this._history.addItem(command);
+        this._history.push(command);
+        this._queueHistorySave();

        let fullCmd = commandHeader + command;

@ -910,11 +931,9 @@ LookingGlass.prototype = {
        if (!Main.pushModal(this._entry))
            return;

-        this._notebook.selectIndex(0);
        this.actor.show();
        this.actor.lower(Main.chrome.actor);
        this._open = true;
-        this._history.lastItem();

        Tweener.removeTweens(this.actor);

@ -932,6 +951,7 @@ LookingGlass.prototype = {

        this._objInspector.actor.hide();

+        this._historyNavIndex = -1;
        this._open = false;
        Tweener.removeTweens(this.actor);

--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -33,10 +33,7 @@ const MOUSE_POLL_FREQUENCY = 50;
 const CROSSHAIRS_CLIP_SIZE = [100, 100];

 // Settings
-const APPLICATIONS_SCHEMA       = 'org.gnome.desktop.a11y.applications';
-const SHOW_KEY                  = 'screen-magnifier-enabled';
-
-const MAGNIFIER_SCHEMA          = 'org.gnome.desktop.a11y.magnifier';
+const SHOW_KEY                  = 'show-magnifier';
 const SCREEN_POSITION_KEY       = 'screen-position';
 const MAG_FACTOR_KEY            = 'mag-factor';
 const LENS_MODE_KEY             = 'lens-mode';
@ -271,7 +268,7 @@ Magnifier.prototype = {

        let thickness = this._settings.get_int(CROSS_HAIRS_THICKNESS_KEY);
        let color = this._settings.get_string(CROSS_HAIRS_COLOR_KEY);
-        let opacity = this._settings.get_double(CROSS_HAIRS_OPACITY_KEY);
+        let opacity = this._settings.get_int(CROSS_HAIRS_OPACITY_KEY);
        let length = this._settings.get_int(CROSS_HAIRS_LENGTH_KEY);
        let clip = this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY);

@ -357,22 +354,22 @@ Magnifier.prototype = {

    /**
     * setCrosshairsOpacity:
-     * @opacity:    Value between 0.0 (transparent) and 1.0 (fully opaque).
+     * @opacity:    Value between 0 (transparent) and 255 (fully opaque).
     */
    setCrosshairsOpacity: function(opacity) {
        if (this._crossHairs)
-            this._crossHairs.setOpacity(opacity * 255);
+            this._crossHairs.setOpacity(opacity);
    },

    /**
     * getCrosshairsOpacity:
-     * @return:     Value between 0.0 (transparent) and 1.0 (fully opaque).
+     * @return:     Value between 0 (transparent) and 255 (fully opaque).
     */
    getCrosshairsOpacity: function() {
        if (this._crossHairs)
-            return this._crossHairs.getOpacity() / 255.0;
+            return this._crossHairs.getOpacity();
        else
-            return 0.0;
+            return 0;
    },

    /**
@ -441,8 +438,7 @@ Magnifier.prototype = {
    },

    _settingsInit: function(zoomRegion) {
-        this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
-        this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.accessibility.magnifier' });

        if (zoomRegion) {
            // Mag factor is accurate to two decimal places.
@ -466,9 +462,9 @@ Magnifier.prototype = {
        this.addCrosshairs();
        this.setCrosshairsVisible(showCrosshairs);

-        this._appSettings.connect('changed::' + SHOW_KEY,
-                                  Lang.bind(this, function() {
-            this.setActive(this._appSettings.get_boolean(SHOW_KEY));
+        this._settings.connect('changed::' + SHOW_KEY,
+                               Lang.bind(this, function() {
+            this.setActive(this._settings.get_boolean(SHOW_KEY));
        }));

        this._settings.connect('changed::' + SCREEN_POSITION_KEY,
@ -499,7 +495,7 @@ Magnifier.prototype = {

        this._settings.connect('changed::' + CROSS_HAIRS_OPACITY_KEY,
                               Lang.bind(this, function() {
-            this.setCrosshairsOpacity(this._settings.get_double(CROSS_HAIRS_OPACITY_KEY));
+            this.setCrosshairsOpacity(this._settings.get_int(CROSS_HAIRS_OPACITY_KEY));
        }));

        this._settings.connect('changed::' + CROSS_HAIRS_LENGTH_KEY,
@ -512,7 +508,7 @@ Magnifier.prototype = {
            this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
        }));

-        return this._appSettings.get_boolean(SHOW_KEY);
+        return this._settings.get_boolean(SHOW_KEY);
   },

    _updateScreenPosition: function() {
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -1,5 +1,11 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

+imports.gi.versions.Clutter = '1.0';
+imports.gi.versions.Gio = '2.0';
+imports.gi.versions.Gdk = '3.0';
+imports.gi.versions.GdkPixbuf = '2.0';
+imports.gi.versions.Gtk = '3.0';
+
 const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
 const Gdk = imports.gi.Gdk;
@ -11,11 +17,12 @@ const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Chrome = imports.ui.chrome;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const EndSessionDialog = imports.ui.endSessionDialog;
-const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const MessageTray = imports.ui.messageTray;
@ -29,7 +36,6 @@ const WindowAttentionHandler = imports.ui.windowAttentionHandler;
 const Scripting = imports.ui.scripting;
 const ShellDBus = imports.ui.shellDBus;
 const TelepathyClient = imports.ui.telepathyClient;
-const GoaClient = imports.ui.goaClient;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
@ -41,7 +47,6 @@ DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);

 let chrome = null;
 let panel = null;
-let hotCorners = [];
 let placesManager = null;
 let overview = null;
 let runDialog = null;
@ -51,7 +56,6 @@ let messageTray = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let telepathyClient = null;
-let goaClient = null;
 let ctrlAltTabManager = null;
 let recorder = null;
 let shellDBusService = null;
@ -69,17 +73,20 @@ let _cssStylesheet = null;
 let background = null;

 function start() {
-    // Monkey patch utility functions into the global proxy;
+    // Add a binding for 'global' in the global JS namespace; (gjs
+    // keeps the web browser convention of having that namespace be
+    // called 'window'.)
+    window.global = Shell.Global.get();
+
+    // Now monkey patch utility functions into the global proxy;
    // This is easier and faster than indirecting down into global
    // if we want to call back up into JS.
    global.logError = _logError;
    global.log = _logDebug;

-    // Chain up async errors reported from C
-    global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });
-
    Gio.DesktopAppInfo.set_desktop_env('GNOME');

+    global.grab_dbus_service();
    shellDBusService = new ShellDBus.GnomeShell();
    // Force a connection now; dbus.js will do this internally
    // if we use its name acquisition stuff but we aren't right
@ -87,9 +94,7 @@ function start() {
    // back into sync ones.
    DBus.session.flush();

-    // Load the calendar server. Note that we are careful about
-    // not loading any events until the user presses the clock
-    global.launch_calendar_server();
+    Environment.init();

    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
    // also initialize ShellAppSystem first.  ShellAppSystem
@ -123,14 +128,12 @@ function start() {

    // Set up stage hierarchy to group all UI actors under one container.
    uiGroup = new Clutter.Group();
-    St.set_ui_root(global.stage, uiGroup);
    global.window_group.reparent(uiGroup);
    global.overlay_group.reparent(uiGroup);
    global.stage.add_actor(uiGroup);

    placesManager = new PlaceDisplay.PlacesManager();
    xdndHandler = new XdndHandler.XdndHandler();
-    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
    overview = new Overview.Overview();
    chrome = new Chrome.Chrome();
    magnifier = new Magnifier.Magnifier();
@ -141,10 +144,10 @@ function start() {
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
    telepathyClient = new TelepathyClient.Client();
-    goaClient = new GoaClient.Client();
+    panel.startStatusArea();

-    overview.init();
-    statusIconDispatcher.start(messageTray.actor);
+    ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
+    ctrlAltTabManager.addGroup(panel.actor, _("Panel"), 'gnome-panel');

    _startDate = new Date();

@ -178,18 +181,11 @@ function start() {
    // initiate logouts.
    EndSessionDialog.init();

-    // Attempt to become a PolicyKit authentication agent
-    PolkitAuthenticationAgent.init()
-
-    global.screen.connect('monitors-changed', _relayout);
+    global.gdk_screen.connect('monitors-changed', _relayout);

    ExtensionSystem.init();
    ExtensionSystem.loadExtensions();

-    // Perform initial relayout here
-    _relayout();
-
-    panel.startStatusArea();
    panel.startupAnimation();

    let display = global.screen.get_display();
@ -197,6 +193,9 @@ function start() {

    global.stage.connect('captured-event', _globalKeyPressHandler);

+    // Perform initial relayout here
+    _relayout();
+
    _log('info', 'loaded at ' + _startDate);
    log('GNOME Shell started at ' + _startDate);

@ -208,38 +207,18 @@ function start() {
    }

    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
-
-    global.screen.connect('window-entered-monitor', _windowEnteredMonitor);
-    global.screen.connect('window-left-monitor', _windowLeftMonitor);
-
-    _nWorkspacesChanged();
+    Mainloop.idle_add(_nWorkspacesChanged);
 }

 let _workspaces = [];
 let _checkWorkspacesId = 0;

-/*
- * When the last window closed on a workspace is a dialog or splash
- * screen, we assume that it might be an initial window shown before
- * the main window of an application, and give the app a grace period
- * where it can map another window before we remove the workspace.
- */
-const LAST_WINDOW_GRACE_TIME = 1000;
-
 function _checkWorkspaces() {
    let i;
    let emptyWorkspaces = [];

-    for (i = 0; i < _workspaces.length; i++) {
-        let lastRemoved = _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))
-                emptyWorkspaces[i] = false;
-        else
-            emptyWorkspaces[i] = true;
-    }
+    for (i = 0; i < _workspaces.length; i++)
+        emptyWorkspaces[i] = true;

    let windows = global.get_window_actors();
    for (i = 0; i < windows.length; i++) {
@ -258,61 +237,16 @@ function _checkWorkspaces() {
        emptyWorkspaces.push(false);
    }

-    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-    let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
-                                    activeWorkspaceIndex < emptyWorkspaces.length - 1);
-    // Don't enter the overview when removing multiple empty workspaces at startup
-    let showOverview  = (removingCurrentWorkspace &&
-                         !emptyWorkspaces.every(function(x) { return x; }));
-
-    if (removingCurrentWorkspace) {
-        // "Merge" the empty workspace we are removing with the one at the end
-        wm.blockAnimations();
-    }
-
    // 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(_workspaces[i], global.get_current_time());
    }

-    if (removingCurrentWorkspace) {
-        global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-        wm.unblockAnimations();
-
-        if (!overview.visible && showOverview)
-            overview.show();
-    }
-
    _checkWorkspacesId = 0;
    return false;
 }

-function _windowRemoved(workspace, window) {
-    workspace._lastRemovedWindow = window;
-    _queueCheckWorkspaces();
-    Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, function() {
-        if (workspace._lastRemovedWindow == window) {
-            workspace._lastRemovedWindow = null;
-            _queueCheckWorkspaces();
-        }
-    });
-}
-
-function _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
-    // If the window left the primary monitor, that
-    // might make that workspace empty
-    if (monitorIndex == global.get_primary_monitor_index())
-        _queueCheckWorkspaces();
-}
-
-function _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
-    // If the window entered the primary monitor, that
-    // might make that workspace non-empty
-    if (monitorIndex == global.get_primary_monitor_index())
-        _queueCheckWorkspaces();
-}
-
 function _queueCheckWorkspaces() {
    if (_checkWorkspacesId == 0)
        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
@ -336,7 +270,7 @@ function _nWorkspacesChanged() {
        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
            let workspace = _workspaces[w];
            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
-            workspace._windowRemovedId = workspace.connect('window-removed', _windowRemoved);
+            workspace._windowRemovedId = workspace.connect('window-removed', _queueCheckWorkspaces);
        }

    } else {
@ -405,27 +339,6 @@ function loadTheme() {
    themeContext.set_theme (theme);
 }

-/**
- * notifyError:
- * @msg: An error message
- * @details: Additional information
- *
- * See shell_global_notify_problem().
- */
-function notifyError(msg, details) {
-    // Also print to stderr so it's logged somewhere
-    if (details)
-        log("error: " + msg + ": " + details);
-    else
-        log("error: " + msg)
-
-    let source = new MessageTray.SystemNotificationSource();
-    messageTray.add(source);
-    let notification = new MessageTray.Notification(source, msg, details);
-    notification.setTransient(true);
-    source.notify(notification);
-}
-
 /**
 * _log:
 * @category: string message type ('info', 'error')
@ -468,73 +381,9 @@ function _getAndClearErrorStack() {
 }

 function _relayout() {
-    let monitors = global.get_monitors();
-    // destroy old corners
-    for (let i = 0; i < hotCorners.length; i++)
-        hotCorners[i].destroy();
-    hotCorners = [];
-
-
    let primary = global.get_primary_monitor();
-    for (let i = 0; i < monitors.length; i++) {
-        let monitor = monitors[i];
-        let isPrimary = (monitor.x == primary.x &&
-                         monitor.y == primary.y &&
-                         monitor.width == primary.width &&
-                         monitor.height == primary.height);
-
-        let cornerX = monitor.x;
-        let cornerY = monitor.y;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-            cornerX += monitor.width;
-
-
-        let haveTopLeftCorner = true;
-
-        /* Check if we have a top left (right for RTL) corner.
-         * I.e. if there is no monitor directly above or to the left(right) */
-        let besideX;
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-            besideX = monitor.x + 1;
-        else
-            besideX = cornerX - 1;
-        let besideY = cornerY;
-        let aboveX = cornerX;
-        let aboveY = cornerY - 1;
-
-        for (let j = 0; j < monitors.length; j++) {
-            if (i == j)
-                continue;
-            let otherMonitor = monitors[j];
-            if (besideX >= otherMonitor.x &&
-                besideX < otherMonitor.x + otherMonitor.width &&
-                besideY >= otherMonitor.y &&
-                besideY < otherMonitor.y + otherMonitor.height) {
-                haveTopLeftCorner = false;
-                break;
-            }
-            if (aboveX >= otherMonitor.x &&
-                aboveX < otherMonitor.x + otherMonitor.width &&
-                aboveY >= otherMonitor.y &&
-                aboveY < otherMonitor.y + otherMonitor.height) {
-                haveTopLeftCorner = false;
-                break;
-            }
-        }
-
-        /* We only want hot corners where there is a natural top-left
-         * corner, and on the primary monitor */
-        if (!isPrimary && !haveTopLeftCorner)
-            continue;
-
-        let corner = new Panel.HotCorner(isPrimary ? panel.button : null);
-        hotCorners.push(corner);
-        corner.actor.set_position(cornerX, cornerY);
-        if (isPrimary)
-            panel.setHotCorner(corner);
-    }
-
-    panel.relayout();
+    panel.actor.set_position(primary.x, primary.y);
+    panel.actor.set_size(primary.width, Panel.PANEL_HEIGHT);
    overview.relayout();

    // To avoid updating the position and size of the workspaces
@ -543,17 +392,6 @@ function _relayout() {
    overview.hide();
 }

-function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
-    return win.get_workspace() == workspaceIndex ||
-        (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
-}
-
-function getWindowActorsForWorkspace(workspaceIndex) {
-    return global.get_window_actors().filter(function (win) {
-        return isWindowActorDisplayedOnWorkspace(win, workspaceIndex);
-    });
-}
-
 // This function encapsulates hacks to make certain global keybindings
 // work even when we are in one of our modes where global keybindings
 // are disabled with a global grab. (When there is a global grab, then
@ -595,15 +433,12 @@ function _globalKeyPressHandler(actor, event) {
    }

    switch (action) {
-        // left/right would effectively act as synonyms for up/down if we enabled them;
-        // but that could be considered confusing; we also disable them in the main view.
-        //
-        // case Meta.KeyBindingAction.WORKSPACE_LEFT:
-        //     wm.actionMoveWorkspaceLeft();
-        //     return true;
-        // case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-        //     wm.actionMoveWorkspaceRight();
-        //     return true;
+        case Meta.KeyBindingAction.WORKSPACE_LEFT:
+            wm.actionMoveWorkspaceLeft();
+            return true;
+        case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+            wm.actionMoveWorkspaceRight();
+            return true;
        case Meta.KeyBindingAction.WORKSPACE_UP:
            wm.actionMoveWorkspaceUp();
            return true;
@ -627,8 +462,10 @@ function _globalKeyPressHandler(actor, event) {

 function _findModal(actor) {
    for (let i = 0; i < modalActorFocusStack.length; i++) {
-        if (modalActorFocusStack[i].actor == actor)
+        let [stackActor, stackFocus] = modalActorFocusStack[i];
+        if (stackActor == actor) {
            return i;
+        }
    }
    return -1;
 }
@ -654,6 +491,7 @@ function _findModal(actor) {
 * Returns: true iff we successfully acquired a grab or already had one
 */
 function pushModal(actor, timestamp) {
+
    if (timestamp == undefined)
        timestamp = global.get_current_time();

@ -667,24 +505,20 @@ function pushModal(actor, timestamp) {
    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);

    modalCount += 1;
-    let actorDestroyId = actor.connect('destroy', function() {
+    actor.connect('destroy', function() {
        let index = _findModal(actor);
        if (index >= 0)
            modalActorFocusStack.splice(index, 1);
    });
    let curFocus = global.stage.get_key_focus();
-    let curFocusDestroyId;
    if (curFocus != null) {
-        curFocusDestroyId = curFocus.connect('destroy', function() {
+        curFocus.connect('destroy', function() {
            let index = _findModal(actor);
            if (index >= 0)
-                modalActorFocusStack[index].actor = null;
+                modalActorFocusStack[index][1] = null;
        });
    }
-    modalActorFocusStack.push({ actor: actor,
-                                focus: curFocus,
-                                destroyId: actorDestroyId,
-                                focusDestroyId: curFocusDestroyId });
+    modalActorFocusStack.push([actor, curFocus]);

    global.stage.set_key_focus(actor);
    return true;
@ -704,42 +538,28 @@ function pushModal(actor, timestamp) {
 * global.get_current_time() is assumed.
 */
 function popModal(actor, timestamp) {
+
    if (timestamp == undefined)
        timestamp = global.get_current_time();

-    let focusIndex = _findModal(actor);
-    if (focusIndex < 0) {
-        global.stage.set_key_focus(null);
-        global.end_modal(timestamp);
-        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-
-        throw new Error('incorrect pop');
-    }
-
    modalCount -= 1;
-
-    let record = modalActorFocusStack[focusIndex];
-    record.actor.disconnect(record.destroyId);
-
-    if (focusIndex == modalActorFocusStack.length - 1) {
-        if (record.focus)
-            record.focus.disconnect(record.focusDestroyId);
-        global.stage.set_key_focus(record.focus);
-    } else {
-        let t = modalActorFocusStack[modalActorFocusStack.length - 1];
-        if (t.focus)
-            t.focus.disconnect(t.focusDestroyId);
-        // Remove from the middle, shift the focus chain up
-        for (let i = modalActorFocusStack.length - 1; i > focusIndex; i--) {
-            modalActorFocusStack[i].focus = modalActorFocusStack[i - 1].focus;
-            modalActorFocusStack[i].focusDestroyId = modalActorFocusStack[i - 1].focusDestroyId;
+    let focusIndex = _findModal(actor);
+    if (focusIndex >= 0) {
+        if (focusIndex == modalActorFocusStack.length - 1) {
+            let [stackActor, stackFocus] = modalActorFocusStack[focusIndex];
+            global.stage.set_key_focus(stackFocus);
+        } else {
+            // Remove from the middle, shift the focus chain up
+            for (let i = focusIndex; i < modalActorFocusStack.length - 1; i++) {
+                modalActorFocusStack[i + 1][1] = modalActorFocusStack[i][1];
+            }
        }
+        modalActorFocusStack.splice(focusIndex, 1);
    }
-    modalActorFocusStack.splice(focusIndex, 1);
-
    if (modalCount > 0)
        return;

+    global.stage.set_key_focus(null);
    global.end_modal(timestamp);
    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
 }
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@ -10,6 +10,8 @@ const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Params = imports.misc.params;

@ -37,16 +39,13 @@ ModalDialog.prototype = {
        params = Params.parse(params, { styleClass: null });

        this.state = State.CLOSED;
-        this._hasModal = false;

        this._group = new St.Group({ visible: false,
                                     x: 0,
                                     y: 0 });
        Main.uiGroup.add_actor(this._group);
-
-        let constraint = new Clutter.BindConstraint({ source: global.stage,
-                                                      coordinate: Clutter.BindCoordinate.POSITION | Clutter.BindCoordinate.SIZE });
-        this._group.add_constraint(constraint);
+        global.focus_manager.add_group(this._group);
+        this._initialKeyFocus = this._group;

        this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));

@ -61,18 +60,12 @@ ModalDialog.prototype = {
        this._group.add_actor(this._backgroundBin);
        this._lightbox.highlight(this._backgroundBin);

-        this._backgroundStack = new Shell.Stack();
-        this._backgroundBin.child = this._backgroundStack;
-
-        this._eventBlocker = new Clutter.Group({ reactive: true });
-        this._backgroundStack.add_actor(this._eventBlocker);
-
        this._dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
                                                vertical:    true });
        if (params.styleClass != null) {
            this._dialogLayout.add_style_class_name(params.styleClass);
        }
-        this._backgroundStack.add_actor(this._dialogLayout);
+        this._backgroundBin.child = this._dialogLayout;

        this.contentLayout = new St.BoxLayout({ vertical: true });
        this._dialogLayout.add(this.contentLayout,
@ -81,17 +74,12 @@ ModalDialog.prototype = {
                                 x_align: St.Align.MIDDLE,
                                 y_align: St.Align.START });

-        this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
-                                                opacity:     220,
-                                                vertical:    false });
+        this._buttonLayout = new St.BoxLayout({ opacity:  220,
+                                                vertical: false });
        this._dialogLayout.add(this._buttonLayout,
                               { expand:  true,
                                 x_align: St.Align.MIDDLE,
                                 y_align: St.Align.END });
-
-        global.focus_manager.add_group(this._dialogLayout);
-        this._initialKeyFocus = this._dialogLayout;
-        this._savedKeyFocus = null;
    },

    setButtons: function(buttons) {
@ -166,23 +154,22 @@ ModalDialog.prototype = {
                           transition: 'easeOutQuad',
                           onComplete: Lang.bind(this,
                               function() {
+                                   this._initialKeyFocus.grab_key_focus();
                                   this.state = State.OPENED;
                                   this.emit('opened');
-                               })
+                               }),
                         });
    },

-    setInitialKeyFocus: function(actor) {
-        this._initialKeyFocus = actor;
-    },
-
    open: function(timestamp) {
        if (this.state == State.OPENED || this.state == State.OPENING)
            return true;

-        if (!this.pushModal(timestamp))
+        if (!Main.pushModal(this._group, timestamp))
            return false;

+        global.stage.set_key_focus(this._group);
+
        this._fadeOpen();
        return true;
    },
@ -191,9 +178,14 @@ ModalDialog.prototype = {
        if (this.state == State.CLOSED || this.state == State.CLOSING)
            return;

+        let needsPopModal;
+
+        if (this.state == State.OPENED || this.state == State.OPENING)
+            needsPopModal = true;
+        else
+            needsPopModal = false;
+
        this.state = State.CLOSING;
-        this.popModal(timestamp);
-        this._savedKeyFocus = null;

        Tweener.addTween(this._group,
                         { opacity: 0,
@ -203,46 +195,13 @@ ModalDialog.prototype = {
                               function() {
                                   this.state = State.CLOSED;
                                   this._group.hide();
+
+                                   if (needsPopModal)
+                                       Main.popModal(this._group, timestamp);
                               })
                         });
    },

-    // Drop modal status without closing the dialog; this makes the
-    // dialog insensitive as well, so it needs to be followed shortly
-    // by either a close() or a pushModal()
-    popModal: function(timestamp) {
-        if (!this._hasModal)
-            return;
-
-        let focus = global.stage.key_focus;
-        if (focus && this._group.contains(focus))
-            this._savedKeyFocus = focus;
-        else
-            this._savedKeyFocus = null;
-        Main.popModal(this._group, timestamp);
-        global.gdk_screen.get_display().sync();
-        this._hasModal = false;
-
-        this._eventBlocker.raise_top();
-    },
-
-    pushModal: function (timestamp) {
-        if (this._hasModal)
-            return true;
-        if (!Main.pushModal(this._group, timestamp))
-            return false;
-
-        this._hasModal = true;
-        if (this._savedKeyFocus) {
-            this._savedKeyFocus.grab_key_focus();
-            this._savedKeyFocus = null;
-        } else
-            this._initialKeyFocus.grab_key_focus();
-
-        this._eventBlocker.lower_bottom();
-        return true;
-    },
-
    // This method is like close, but fades the dialog out much slower,
    // and leaves the lightbox in place. Once in the faded out state,
    // the dialog can be brought back by an open call, or the lightbox
@ -261,7 +220,6 @@ ModalDialog.prototype = {
        if (this.state == State.FADED_OUT)
            return;

-        this.popModal(timestamp);
        Tweener.addTween(this._dialogLayout,
                         { opacity: 0,
                           time:    FADE_OUT_DIALOG_TIME,
@ -269,6 +227,7 @@ ModalDialog.prototype = {
                           onComplete: Lang.bind(this,
                               function() {
                                   this.state = State.FADED_OUT;
+                                   Main.popModal(this._group, timestamp);
                               })
                         });
    }
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -1,12 +1,13 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Config = imports.misc.config;
 const Main = imports.ui.main;
@ -92,6 +93,16 @@ NotificationDaemon.prototype = {
    _init: function() {
        DBus.session.exportObject('/org/freedesktop/Notifications', this);

+        this._everAcquiredName = false;
+        DBus.session.acquire_name('org.freedesktop.Notifications',
+                                  // We pass MANY_INSTANCES so that if
+                                  // notification-daemon is running, we'll
+                                  // get queued behind it and then get the
+                                  // name after killing it below
+                                  DBus.MANY_INSTANCES,
+                                  Lang.bind(this, this._acquiredName),
+                                  Lang.bind(this, this._lostName));
+
        this._sources = {};
        this._senderToPid = {};
        this._notifications = {};
@ -106,6 +117,22 @@ NotificationDaemon.prototype = {
            Lang.bind(this, this._onFocusAppChanged));
    },

+    _acquiredName: function() {
+        this._everAcquiredName = true;
+    },
+
+    _lostName: function() {
+        if (this._everAcquiredName)
+            log('Lost name org.freedesktop.Notifications!');
+        else if (GLib.getenv('GNOME_SHELL_NO_REPLACE'))
+            log('Failed to acquire org.freedesktop.Notifications');
+        else {
+            log('Failed to acquire org.freedesktop.Notifications; trying again');
+            Util.killall('notification-daemon');
+            Util.killall('notify-osd');
+        }
+    },
+
    _iconForNotificationData: function(icon, hints, size) {
        let textureCache = St.TextureCache.get_default();

@ -187,11 +214,9 @@ NotificationDaemon.prototype = {
                     actions, hints, timeout) {
        let id;

-        // Filter out chat and presence notifications from Empathy, since we
+        // Filter out notifications from Empathy, since we
        // handle that information from telepathyClient.js
-        if (appName == 'Empathy' && (hints['category'] == 'im.received' ||
-              hints['category'] == 'presence.online' ||
-              hints['category'] == 'presence.offline')) {
+        if (appName == 'Empathy') {
            // Ignore replacesId since we already sent back a
            // NotificationClosed for that id.
            id = nextNotificationId++;
@ -346,7 +371,7 @@ NotificationDaemon.prototype = {
        notification.setTransient(hints['transient'] == true);

        let sourceIconActor = source.useNotificationIcon ? this._iconForNotificationData(icon, hints, source.ICON_SIZE) : null;
-        source.processNotification(notification, sourceIconActor);
+        source.notify(notification, sourceIconActor);
    },

    CloseNotification: function(id) {
@ -390,7 +415,8 @@ NotificationDaemon.prototype = {
        for (let id in this._sources) {
            let source = this._sources[id];
            if (source.app == tracker.focus_app) {
-                source.destroyNonResidentNotifications();
+                if (source.notification && !source.notification.resident)
+                    source.notification.destroy();
                return;
            }
        }
@ -435,57 +461,20 @@ Source.prototype = {
        MessageTray.Source.prototype._init.call(this, title);

        this._pid = pid;
-        this._appStateChangedId = 0;
        this._setApp();
        if (this.app)
            this.title = this.app.get_name();
        else
            this.useNotificationIcon = true;
-        this._trayIcon = null;
+        this._isTrayIcon = false;
    },

-    processNotification: function(notification, icon) {
+    notify: function(notification, icon) {
        if (!this.app)
            this._setApp();
        if (!this.app && icon)
            this._setSummaryIcon(icon);
-
-        let tracker = Shell.WindowTracker.get_default();
-        if (notification.resident && this.app && tracker.focus_app == this.app)
-            this.pushNotification(notification);
-        else
-            this.notify(notification);
-    },
-
-    handleSummaryClick: function() {
-        if (!this._trayIcon)
-            return false;
-
-        let event = Clutter.get_current_event();
-        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
-            return false;
-
-        // Left clicks are passed through only where there aren't unacknowledged
-        // notifications, so it possible to open them in summary mode; right
-        // clicks are always forwarded, as the right click menu is not useful for
-        // tray icons
-        if (event.get_button() == 1 &&
-            this.notifications.length > 0)
-            return false;
-
-        if (Main.overview.visible) {
-            // We can't just connect to Main.overview's 'hidden' signal,
-            // because it's emitted *before* it calls popModal()...
-            let id = global.connect('notify::stage-input-mode', Lang.bind(this,
-                function () {
-                    global.disconnect(id);
-                    this._trayIcon.click(event);
-                }));
-            Main.overview.hide();
-        } else {
-            this._trayIcon.click(event);
-        }
-        return true;
+        MessageTray.Source.prototype.notify.call(this, notification);
    },

    _setApp: function() {
@ -496,13 +485,9 @@ Source.prototype = {
        if (!this.app)
            return;

-        // We only update the app if this.app is null, so we can't disconnect the old this._appStateChangedId
-        // even if it were non-zero for some reason.
-        this._appStateChangedId = this.app.connect('notify::state', Lang.bind(this,  this._appStateChanged));
-
        // Only override the icon if we were previously using
        // notification-based icons (ie, not a trayicon) or if it was unset before
-        if (!this._trayIcon) {
+        if (!this._isTrayIcon) {
            this.useNotificationIcon = false;
            this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
        }
@ -511,29 +496,15 @@ Source.prototype = {
    setTrayIcon: function(icon) {
        this._setSummaryIcon(icon);
        this.useNotificationIcon = false;
-        this._trayIcon = icon;
+        this._isTrayIcon = true;
    },

-    open: function(notification) {
-        this.destroyNonResidentNotifications();
+    _notificationClicked: function(notification) {
        this.openApp();
    },

-    _lastNotificationRemoved: function() {
-        if (!this._trayIcon)
-            this.destroy();
-    },
-
-    _appStateChanged: function() {
-        // Destroy notification sources when their apps exit.
-        // The app exiting would normally result in a tray icon being removed,
-        // so the associated source would be destroyed through the code path
-        // that handles the tray icon being removed. We should not destroy
-        // the source associated with a tray icon when the application state
-        // is Shell.AppState.STOPPED because running applications that have
-        // no open windows would also have that state. This is often the case
-        // for applications that use tray icons.
-        if (!this._trayIcon && this.app.get_state() == Shell.AppState.STOPPED)
+    _notificationRemoved: function() {
+        if (!this._isTrayIcon)
            this.destroy();
    },

@ -546,13 +517,5 @@ Source.prototype = {
            let mostRecentWindow = windows[0];
            Main.activateWindow(mostRecentWindow);
        }
-    },
-
-    destroy: function() {
-        if (this.app && this._appStateChangedId) {
-            this.app.disconnect(this._appStateChangedId);
-            this._appStateChangedId = 0;
-        }
-        MessageTray.Source.prototype.destroy.call(this);
    }
 };
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -8,6 +8,8 @@ const Signals = imports.signals;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
 const Gdk = imports.gi.Gdk;

 const AppDisplay = imports.ui.appDisplay;
@ -22,7 +24,6 @@ const PlaceDisplay = imports.ui.placeDisplay;
 const Tweener = imports.ui.tweener;
 const ViewSelector = imports.ui.viewSelector;
 const WorkspacesView = imports.ui.workspacesView;
-const WorkspaceThumbnail = imports.ui.workspaceThumbnail;

 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;
@ -73,13 +74,11 @@ ShellInfo.prototype = {
            Main.messageTray.add(this._source);
        }

-        let notification = null;
-        if (this._source.notifications.length == 0) {
+        let notification = this._source.notification;
+        if (notification == null)
            notification = new MessageTray.Notification(this._source, text, null);
-        } else {
-            notification = this._source.notifications[0];
+        else
            notification.update(text, null, { clear: true });
-        }

        notification.setTransient(true);

@ -130,6 +129,8 @@ Overview.prototype = {
        this._capturedEventId = 0;
        this._buttonPressId = 0;

+        this.shellInfo = new ShellInfo();
+
        this._workspacesDisplay = null;

        this.visible = false;           // animating to overview, in overview, animating out
@ -151,6 +152,27 @@ Overview.prototype = {
        this._group.hide();
        global.overlay_group.add_actor(this._group);

+        this.viewSelector = new ViewSelector.ViewSelector();
+        this._group.add_actor(this.viewSelector.actor);
+
+        this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
+        this.viewSelector.addViewTab(_("Windows"), this._workspacesDisplay.actor);
+
+        let appView = new AppDisplay.AllAppDisplay();
+        this.viewSelector.addViewTab(_("Applications"), appView.actor);
+
+        // Default search providers
+        this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider());
+        this.viewSelector.addSearchProvider(new AppDisplay.PrefsSearchProvider());
+        this.viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
+        this.viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider());
+
+        // TODO - recalculate everything when desktop size changes
+        this._dash = new Dash.Dash();
+        this._group.add_actor(this._dash.actor);
+        this._dash.actor.add_constraint(this.viewSelector.constrainY);
+        this._dash.actor.add_constraint(this.viewSelector.constrainHeight);
+
        this._coverPane.hide();

        // XDND
@ -170,40 +192,6 @@ Overview.prototype = {
        this.workspaces = null;
    },

-    // The members we construct that are implemented in JS might
-    // want to access the overview as Main.overview to connect
-    // signal handlers and so forth. So we create them after
-    // construction in this init() method.
-    init: function() {
-        this.shellInfo = new ShellInfo();
-
-        this.viewSelector = new ViewSelector.ViewSelector();
-        this._group.add_actor(this.viewSelector.actor);
-
-        this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
-        this.viewSelector.addViewTab('windows', _("Windows"), this._workspacesDisplay.actor, 'text-x-generic');
-
-        let appView = new AppDisplay.AllAppDisplay();
-        this.viewSelector.addViewTab('applications', _("Applications"), appView.actor, 'system-run');
-
-        // Default search providers
-        this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider());
-        this.viewSelector.addSearchProvider(new AppDisplay.PrefsSearchProvider());
-        this.viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
-        this.viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider());
-
-        // TODO - recalculate everything when desktop size changes
-        this.dash = new Dash.Dash();
-        this._group.add_actor(this.dash.actor);
-        this.dash.actor.add_constraint(this.viewSelector.constrainY);
-        this.dash.actor.add_constraint(this.viewSelector.constrainHeight);
-
-        // Translators: this is the name of the dock/favorites area on
-        // the left of the overview
-        Main.ctrlAltTabManager.addGroup(this.dash.actor, _("Dash"), 'user-bookmarks');
-
-    },
-
    _onDragBegin: function() {
        DND.addDragMonitor(this._dragMonitor);
        // Remember the workspace we started from
@ -218,18 +206,8 @@ Overview.prototype = {
            global.screen.get_workspace_by_index(this._lastActiveWorkspaceIndex).activate(time);
            this.hideTemporarily();
        }
-        this._resetWindowSwitchTimeout();
        this._lastHoveredWindow = null;
        DND.removeMonitor(this._dragMonitor);
-        this.endItemDrag();
-    },
-
-    _resetWindowSwitchTimeout: function() {
-        if (this._windowSwitchTimeoutId != 0) {
-            Mainloop.source_remove(this._windowSwitchTimeoutId);
-            this._windowSwitchTimeoutId = 0;
-            this._needsFakePointerEvent = false;
-        }
    },

    _fakePointerEvent: function() {
@ -244,10 +222,7 @@ Overview.prototype = {
    _onDragMotion: function(dragEvent) {
        let targetIsWindow = dragEvent.targetActor &&
                             dragEvent.targetActor._delegate &&
-                             dragEvent.targetActor._delegate.metaWindow &&
-                             !(dragEvent.targetActor._delegate instanceof WorkspaceThumbnail.WindowClone);
-
-        this._windowSwitchTimestamp = global.get_current_time();
+                             dragEvent.targetActor._delegate.metaWindow;

        if (targetIsWindow &&
            dragEvent.targetActor._delegate.metaWindow == this._lastHoveredWindow)
@ -255,10 +230,15 @@ Overview.prototype = {

        this._lastHoveredWindow = null;

-        this._resetWindowSwitchTimeout();
+        if (this._windowSwitchTimeoutId != 0) {
+            Mainloop.source_remove(this._windowSwitchTimeoutId);
+            this._windowSwitchTimeoutId = 0;
+            this._needsFakePointerEvent = false;
+        }

        if (targetIsWindow) {
            this._lastHoveredWindow = dragEvent.targetActor._delegate.metaWindow;
+            this._windowSwitchTimestamp = global.get_current_time();
            this._windowSwitchTimeoutId = Mainloop.timeout_add(DND_WINDOW_SWITCH_TIMEOUT,
                                            Lang.bind(this, function() {
                                                this._needsFakePointerEvent = true;
@ -441,7 +421,7 @@ Overview.prototype = {
        let primary = global.get_primary_monitor();
        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);

-        let contentY = Main.panel.actor.height;
+        let contentY = Panel.PANEL_HEIGHT;
        let contentHeight = primary.height - contentY - Main.messageTray.actor.height;

        this._group.set_position(primary.x, primary.y);
@ -450,21 +430,21 @@ Overview.prototype = {
        this._coverPane.set_position(0, contentY);
        this._coverPane.set_size(primary.width, contentHeight);

-        let dashWidth = Math.round(DASH_SPLIT_FRACTION * primary.width);
-        let viewWidth = primary.width - dashWidth - this._spacing;
+        let viewWidth = (1.0 - DASH_SPLIT_FRACTION) * primary.width - this._spacing;
        let viewHeight = contentHeight - 2 * this._spacing;
        let viewY = contentY + this._spacing;
-        let viewX = rtl ? 0 : dashWidth + this._spacing;
+        let viewX = rtl ? 0
+                        : Math.floor(DASH_SPLIT_FRACTION * primary.width) + this._spacing;

        // Set the dash's x position - y is handled by a constraint
        let dashX;
        if (rtl) {
-            this.dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
+            this._dash.actor.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
            dashX = primary.width;
        } else {
            dashX = 0;
        }
-        this.dash.actor.set_x(dashX);
+        this._dash.actor.set_x(dashX);

        this.viewSelector.actor.set_position(viewX, viewY);
        this.viewSelector.actor.set_size(viewWidth, viewHeight);
@ -476,10 +456,6 @@ Overview.prototype = {
        this.emit('item-drag-begin');
    },

-    cancelledItemDrag: function(source) {
-        this.emit('item-drag-cancelled');
-    },
-
    endItemDrag: function(source) {
        this.emit('item-drag-end');
    },
@ -488,14 +464,35 @@ Overview.prototype = {
        this.emit('window-drag-begin');
    },

-    cancelledWindowDrag: function(source) {
-        this.emit('window-drag-cancelled');
-    },
-
    endWindowDrag: function(source) {
        this.emit('window-drag-end');
    },

+    // Returns the scale the Overview has when we just start zooming out
+    // to overview mode. That is, when just the active workspace is showing.
+    getZoomedInScale : function() {
+        return 1 / this.workspaces.getScale();
+    },
+
+    // Returns the position the Overview has when we just start zooming out
+    // to overview mode. That is, when just the active workspace is showing.
+    getZoomedInPosition : function() {
+        let [posX, posY] = this.workspaces.getActiveWorkspacePosition();
+        let scale = this.getZoomedInScale();
+
+        return [- posX * scale, - posY * scale];
+    },
+
+    // Returns the current scale of the Overview.
+    getScale : function() {
+        return this.workspaces.actor.scaleX;
+    },
+
+    // Returns the current position of the Overview.
+    getPosition : function() {
+        return [this.workspaces.actor.x, this.workspaces.actor.y];
+    },
+
    // show:
    //
    // Animates the overview visible and grabs mouse and keyboard input
@ -503,7 +500,7 @@ Overview.prototype = {
        if (this._shown)
            return;
        // Do this manually instead of using _syncInputMode, to handle failure
-        if (!Main.pushModal(this._group))
+        if (!Main.pushModal(this.viewSelector.actor))
            return;
        this._modal = true;
        this._animateVisible();
@ -531,7 +528,9 @@ Overview.prototype = {
        this._group.show();
        this._background.show();

+        this.viewSelector.show();
        this._workspacesDisplay.show();
+        this._dash.show();

        this.workspaces = this._workspacesDisplay.workspacesView;
        global.overlay_group.add_actor(this.workspaces.actor);
@ -549,13 +548,30 @@ Overview.prototype = {
                             });
        }

-        this._group.opacity = 0;
-        Tweener.addTween(this._group,
-                         { opacity: 255,
+        // Create a zoom out effect. First scale the workspaces view up and
+        // position it so that the active workspace fills up the whole screen,
+        // then transform it to its normal dimensions and position.
+        // The opposite transition is used in hide().
+        this.workspaces.actor.scaleX = this.workspaces.actor.scaleY = this.getZoomedInScale();
+        [this.workspaces.actor.x, this.workspaces.actor.y] = this.getZoomedInPosition();
+        let primary = global.get_primary_monitor();
+        Tweener.addTween(this.workspaces.actor,
+                         { x: primary.x - this._group.x,
+                           y: primary.y - this._group.y,
+                           scaleX: 1,
+                           scaleY: 1,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
                           onComplete: this._showDone,
                           onCompleteScope: this
+                          });
+
+        // Make the other elements fade in.
+        this._group.opacity = 0;
+        Tweener.addTween(this._group,
+                         { opacity: 255,
+                           transition: 'easeOutQuad',
+                           time: ANIMATION_TIME
                         });

        this._coverPane.raise_top();
@ -617,6 +633,18 @@ Overview.prototype = {
            this.show();
    },

+    /**
+     * getWorkspacesForWindow:
+     * @metaWindow: A #MetaWindow
+     *
+     * Returns the Workspaces object associated with the given window.
+     * This method is not be accessible if the overview is not open
+     * and will return %null.
+     */
+    getWorkspacesForWindow: function(metaWindow) {
+        return this.workspaces;
+    },
+
    //// Private methods ////

    _syncInputMode: function() {
@ -628,20 +656,20 @@ Overview.prototype = {

        if (this._shown) {
            if (!this._modal) {
-                if (Main.pushModal(this._group))
+                if (Main.pushModal(this._dash.actor))
                    this._modal = true;
                else
                    this.hide();
            }
        } else if (this._shownTemporarily) {
            if (this._modal) {
-                Main.popModal(this._group);
+                Main.popModal(this._dash.actor);
                this._modal = false;
            }
            global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
        } else {
            if (this._modal) {
-                Main.popModal(this._group);
+                Main.popModal(this._dash.actor);
                this._modal = false;
            }
            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
@ -667,13 +695,27 @@ Overview.prototype = {

        this.workspaces.hide();

-        // Make other elements fade out.
-        Tweener.addTween(this._group,
-                         { opacity: 0,
+        // Create a zoom in effect by transforming the workspaces view so that
+        // the active workspace fills up the whole screen. The opposite
+        // transition is used in show().
+        let scale = this.getZoomedInScale();
+        let [posX, posY] = this.getZoomedInPosition();
+        Tweener.addTween(this.workspaces.actor,
+                         { x: posX,
+                           y: posY,
+                           scaleX: scale,
+                           scaleY: scale,
                           transition: 'easeOutQuad',
                           time: ANIMATION_TIME,
                           onComplete: this._hideDone,
                           onCompleteScope: this
+                          });
+
+        // Make other elements fade out.
+        Tweener.addTween(this._group,
+                         { opacity: 0,
+                           transition: 'easeOutQuad',
+                           time: ANIMATION_TIME
                         });

        this._coverPane.raise_top();
@ -692,7 +734,6 @@ Overview.prototype = {
            this._animateNotVisible();

        this._syncInputMode();
-        global.sync_pointer();
    },

    _hideDone: function() {
@ -702,6 +743,8 @@ Overview.prototype = {
        this.workspaces = null;

        this._workspacesDisplay.hide();
+        this.viewSelector.hide();
+        this._dash.hide();

        this._desktopFade.hide();
        this._background.hide();
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -1,9 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
-
 const Lang = imports.lang;
 const PopupMenu = imports.ui.popupMenu;
 const Main = imports.ui.main;
@ -22,64 +20,37 @@ Button.prototype = {
                                  track_hover: true });
        this.actor._delegate = this;
        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
-        this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
-        this.menu = new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, 0);
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPress));
+        this.menu = new PopupMenu.PopupMenu(this.actor, menuAlignment, St.Side.TOP, /* FIXME */ 0);
        this.menu.connect('open-state-changed', Lang.bind(this, this._onOpenStateChanged));
-        this.menu.actor.connect('key-press-event', Lang.bind(this, this._onMenuKeyPress));
        Main.chrome.addActor(this.menu.actor, { visibleInOverview: true,
                                                affectsStruts: false });
        this.menu.actor.hide();
    },

    _onButtonPress: function(actor, event) {
-        if (!this.menu.isOpen) {
-            // Setting the max-height won't do any good if the minimum height of the
-            // menu is higher then the screen; it's useful if part of the menu is
-            // scrollable so the minimum height is smaller than the natural height
-            let monitor = global.get_primary_monitor();
-            this.menu.actor.style = ('max-height: ' +
-                                     Math.round(monitor.height - Main.panel.actor.height) +
-                                     'px;');
-        }
        this.menu.toggle();
    },

-    _onSourceKeyPress: function(actor, event) {
+    _onKeyPress: function(actor, event) {
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
            this.menu.toggle();
            return true;
-        } else if (symbol == Clutter.KEY_Escape && this.menu.isOpen) {
-            this.menu.close();
-            return true;
        } else if (symbol == Clutter.KEY_Down) {
            if (!this.menu.isOpen)
                this.menu.toggle();
-            this.menu.actor.navigate_focus(this.actor, Gtk.DirectionType.DOWN, false);
+            this.menu.activateFirst();
            return true;
        } else
            return false;
    },

-    _onMenuKeyPress: function(actor, event) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
-            let focusManager = St.FocusManager.get_for_stage(global.stage);
-            let group = focusManager.get_group(this.actor);
-            if (group) {
-                let direction = (symbol == Clutter.KEY_Left) ? Gtk.DirectionType.LEFT : Gtk.DirectionType.RIGHT;
-                group.navigate_focus(this.actor, direction, false);
-                return true;
-            }
-        }
-        return false;
-    },
-
    _onOpenStateChanged: function(menu, open) {
        if (open)
-            this.actor.add_style_pseudo_class('active');
+            this.actor.add_style_pseudo_class('pressed');
        else
-            this.actor.remove_style_pseudo_class('active');
+            this.actor.remove_style_pseudo_class('pressed');
    }
 };

@ -97,7 +68,7 @@ SystemStatusButton.prototype = {
    __proto__: Button.prototype,

    _init: function(iconName,tooltipText) {
-        Button.prototype._init.call(this, 0.0);
+        Button.prototype._init.call(this, St.Align.START);
        this._iconActor = new St.Icon({ icon_name: iconName,
                                        icon_type: St.IconType.SYMBOLIC,
                                        style_class: 'system-status-icon' });
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -7,6 +7,8 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@ -91,9 +93,9 @@ PlaceDeviceInfo.prototype = {
        return St.TextureCache.get_default().load_gicon(null, icon, size);
    },

-    launch: function(params) {
+    launch: function(param) {
        Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            _makeLaunchContext(params));
+                                            _makeLaunchContex(params));
    },

    isRemovable: function() {
@ -167,15 +169,44 @@ PlacesManager.prototype = {
                                     icon_size: size });
            },
            function (params) {
-                // BUG: nautilus-connect-server doesn't have a desktop file, so we can't
+                // BUG: nautilus-connect-server doesn't have a desktop file, so we can'
                // launch it with the workspace from params. It's probably pretty rare
                // and odd to drag this place onto a workspace in any case

                Util.spawn(['nautilus-connect-server']);
            });

+        let networkApp = null;
+        try {
+            networkApp = Shell.AppSystem.get_default().load_from_desktop_file('gnome-network-scheme.desktop');
+        } catch(e) {
+            try {
+                networkApp = Shell.AppSystem.get_default().load_from_desktop_file('network-scheme.desktop');
+            } catch(e) {
+                log('Cannot create "Network" item, .desktop file not found or corrupt.');
+            }
+        }
+
+        if (networkApp != null) {
+            this._network = new PlaceInfo('special:network', networkApp.get_name(),
+                function(size) {
+                    return networkApp.create_icon_texture(size);
+                },
+                function (params) {
+                    params = Params.parse(params, { workspace: null,
+                                                    timestamp: 0 });
+
+                    networkApp.launch_full(params.timestamp, [],
+                                           params.workspace ? params.workspace.index() : -1);
+                });
+        }
+
        this._defaultPlaces.push(this._home);
        this._defaultPlaces.push(this._desktopMenu);
+
+        if (this._network)
+            this._defaultPlaces.push(this._network);
+
        this._defaultPlaces.push(this._connect);

        /*
@ -384,10 +415,7 @@ PlaceSearchProvider.prototype = {
            return null;
        return { 'id': resultId,
                 'name': placeInfo.name,
-                 'createIcon': function(size) {
-                                   return placeInfo.iconFactory(size);
-                               }
-               };
+                 'icon': placeInfo.iconFactory(Search.RESULT_ICON_SIZE) };
    },

    activateResult: function(id, params) {
--- a/js/ui/polkitAuthenticationAgent.js
+++ b/js/ui/polkitAuthenticationAgent.js
@ -1,410 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*-
- *
- * Copyright 2010 Red Hat, Inc
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
-*
- * Author: David Zeuthen <davidz@redhat.com>
- */
-
-const Lang = imports.lang;
-const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
-const Pango = imports.gi.Pango;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const Mainloop = imports.mainloop;
-const Polkit = imports.gi.Polkit;
-const PolkitAgent = imports.gi.PolkitAgent;
-
-const ModalDialog = imports.ui.modalDialog;
-
-function AuthenticationDialog(actionId, message, cookie, userNames) {
-    this._init(actionId, message, cookie, userNames);
-}
-
-AuthenticationDialog.prototype = {
-    __proto__: ModalDialog.ModalDialog.prototype,
-
-    _init: function(actionId, message, cookie, userNames) {
-        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'polkit-dialog' });
-
-        this.actionId = actionId;
-        this.message = message;
-        this.userNames = userNames;
-        this._wasDismissed = false;
-        this._completed = false;
-
-        let mainContentBox = new St.BoxLayout({ style_class: 'polkit-dialog-main-layout',
-                                                vertical: false });
-        this.contentLayout.add(mainContentBox,
-                               { x_fill: true,
-                                 y_fill: true });
-
-        let icon = new St.Icon({ icon_name: 'dialog-password-symbolic' });
-        mainContentBox.add(icon,
-                           { x_fill:  true,
-                             y_fill:  false,
-                             x_align: St.Align.END,
-                             y_align: St.Align.START });
-
-        let messageBox = new St.BoxLayout({ style_class: 'polkit-dialog-message-layout',
-                                            vertical: true });
-        mainContentBox.add(messageBox,
-                           { y_align: St.Align.START });
-
-        this._subjectLabel = new St.Label({ style_class: 'polkit-dialog-headline',
-                                            text: _("Authentication Required") });
-
-        messageBox.add(this._subjectLabel,
-                       { y_fill:  false,
-                         y_align: St.Align.START });
-
-        this._descriptionLabel = new St.Label({ style_class: 'polkit-dialog-description',
-                                                text: message });
-        this._descriptionLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._descriptionLabel.clutter_text.line_wrap = true;
-
-        messageBox.add(this._descriptionLabel,
-                       { y_fill:  true,
-                         y_align: St.Align.START });
-
-        if (userNames.length > 1) {
-            log('polkitAuthenticationAgent: Received ' + userNames.length +
-                ' identities that can be used for authentication. Only ' +
-                'considering the first one.');
-        }
-
-        let userName = userNames[0];
-
-        this._user = Gdm.UserManager.ref_default().get_user(userName);
-        let userRealName = this._user.get_real_name()
-        this._userLoadedId = this._user.connect('notify::is_loaded',
-                                                Lang.bind(this, this._onUserChanged));
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this, this._onUserChanged));
-
-        // Special case 'root'
-        let userIsRoot = false;
-        if (userName == 'root') {
-            userIsRoot = true;
-            userRealName = _("Administrator");
-        }
-
-        if (userIsRoot) {
-            let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-root-label',
-                                            text: userRealName }));
-            messageBox.add(userLabel);
-        } else {
-            let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
-                                             vertical: false });
-            messageBox.add(userBox);
-            this._userIcon = new St.Icon();
-            this._userIcon.hide();
-            userBox.add(this._userIcon,
-                        { x_fill:  true,
-                          y_fill:  false,
-                          x_align: St.Align.END,
-                          y_align: St.Align.START });
-            let userLabel = new St.Label(({ style_class: 'polkit-dialog-user-label',
-                                            text: userRealName }));
-            userBox.add(userLabel,
-                        { x_fill:  true,
-                          y_fill:  false,
-                          x_align: St.Align.END,
-                          y_align: St.Align.MIDDLE });
-        }
-
-        this._onUserChanged();
-
-        this._passwordBox = new St.BoxLayout({ vertical: false });
-        messageBox.add(this._passwordBox);
-        this._passwordLabel = new St.Label(({ style_class: 'polkit-dialog-password-label' }));
-        this._passwordBox.add(this._passwordLabel);
-        this._passwordEntry = new St.Entry({ style_class: 'polkit-dialog-password-entry',
-                                             text: "",
-                                             can_focus: true});
-        this._passwordEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivate));
-        this._passwordBox.add(this._passwordEntry,
-                              {expand: true });
-        this._passwordBox.hide();
-
-        this._errorMessageLabel = new St.Label({ style_class: 'polkit-dialog-error-label' });
-        this._errorMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._errorMessageLabel.clutter_text.line_wrap = true;
-        messageBox.add(this._errorMessageLabel);
-        this._errorMessageLabel.hide();
-
-        this._infoMessageLabel = new St.Label({ style_class: 'polkit-dialog-info-label' });
-        this._infoMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._infoMessageLabel.clutter_text.line_wrap = true;
-        messageBox.add(this._infoMessageLabel);
-        this._infoMessageLabel.hide();
-
-        /* text is intentionally non-blank otherwise the height is not the same as for
-         * infoMessage and errorMessageLabel - but it is still invisible because
-         * gnome-shell.css sets the color to be transparent
-         */
-        this._nullMessageLabel = new St.Label({ style_class: 'polkit-dialog-null-label',
-                                                text: 'abc'});
-        this._nullMessageLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-        this._nullMessageLabel.clutter_text.line_wrap = true;
-        messageBox.add(this._nullMessageLabel);
-        this._nullMessageLabel.show();
-
-        this.setButtons([{ label: _("Cancel"),
-                           action: Lang.bind(this, this.cancel),
-                           key:    Clutter.Escape
-                         },
-                         { label:  _("Authenticate"),
-                           action: Lang.bind(this, this._onAuthenticateButtonPressed)
-                         }]);
-
-        this._doneEmitted = false;
-
-        this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
-        this._cookie = cookie;
-
-        this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
-                                                  cookie: this._cookie });
-        this._session.connect('completed', Lang.bind(this, this._onSessionCompleted));
-        this._session.connect('request', Lang.bind(this, this._onSessionRequest));
-        this._session.connect('show-error', Lang.bind(this, this._onSessionShowError));
-        this._session.connect('show-info', Lang.bind(this, this._onSessionShowInfo));
-
-        // Delay focus grab to avoid ModalDialog stealing focus with
-        // its buttons
-        this.connect('opened',
-                     Lang.bind(this, function() {
-                         this._passwordEntry.grab_key_focus();
-                     }));
-    },
-
-    startAuthentication: function() {
-        this._session.initiate();
-    },
-
-    _ensureOpen: function() {
-        // NOTE: ModalDialog.open() is safe to call if the dialog is
-        // already open - it just returns true without side-effects
-        if (!this.open(global.get_current_time())) {
-            // This can fail if e.g. unable to get input grab
-            //
-            // In an ideal world this wouldn't happen (because the
-            // Shell is in complete control of the session) but that's
-            // just not how things work right now.
-            //
-            // One way to make this happen is by running 'sleep 3;
-            // pkexec bash' and then opening a popup menu.
-            //
-            // We could add retrying if this turns out to be a problem
-
-            log('polkitAuthenticationAgent: Failed to show modal dialog.' +
-                ' Dismissing authentication request for action-id ' + this.actionId +
-                ' cookie ' + this._cookie);
-            this._emitDone(false, true);
-        }
-    },
-
-    _emitDone: function(keepVisible, dismissed) {
-        if (!this._doneEmitted) {
-            this._doneEmitted = true;
-            this.emit('done', keepVisible, dismissed);
-        }
-    },
-
-    _onEntryActivate: function() {
-        let response = this._passwordEntry.get_text();
-        this._session.response(response);
-        // When the user responds, dismiss already shown info and
-        // error texts (if any)
-        this._errorMessageLabel.hide();
-        this._infoMessageLabel.hide();
-        this._nullMessageLabel.show();
-    },
-
-    _onAuthenticateButtonPressed: function() {
-        this._onEntryActivate();
-    },
-
-    _onSessionCompleted: function(session, gainedAuthorization) {
-        if (this._completed)
-            return;
-
-        this._completed = true;
-
-        if (!gainedAuthorization) {
-            /* Unless we are showing an existing error message from the PAM
-             * module (the PAM module could be reporting the authentication
-             * error providing authentication-method specific information),
-             * show "Sorry, that didn't work. Please try again."
-             */
-            if (!this._errorMessageLabel.visible && !this._wasDismissed) {
-                /* Translators: "that didn't work" refers to the fact that the
-                 * requested authentication was not gained; this can happen
-                 * because of an authentication error (like invalid password),
-                 * for instance. */
-                this._errorMessageLabel.set_text(_("Sorry, that didn\'t work. Please try again."));
-                this._errorMessageLabel.show();
-                this._infoMessageLabel.hide();
-                this._nullMessageLabel.hide();
-            }
-        }
-        this._emitDone(!gainedAuthorization, false);
-    },
-
-    _onSessionRequest: function(session, request, echo_on) {
-        // Cheap localization trick
-        if (request == 'Password:')
-            this._passwordLabel.set_text(_("Password:"));
-        else
-            this._passwordLabel.set_text(request);
-
-        if (echo_on)
-            this._passwordEntry.clutter_text.set_password_char('');
-        else
-            this._passwordEntry.clutter_text.set_password_char('\u25cf'); // ● U+25CF BLACK CIRCLE
-
-        this._passwordBox.show();
-        this._passwordEntry.set_text('');
-        this._passwordEntry.grab_key_focus();
-        this._ensureOpen();
-    },
-
-    _onSessionShowError: function(session, text) {
-        this._passwordEntry.set_text('');
-        this._errorMessageLabel.set_text(text);
-        this._errorMessageLabel.show();
-        this._infoMessageLabel.hide();
-        this._nullMessageLabel.hide();
-        this._ensureOpen();
-    },
-
-    _onSessionShowInfo: function(session, text) {
-        this._passwordEntry.set_text('');
-        this._infoMessageLabel.set_text(text);
-        this._infoMessageLabel.show();
-        this._errorMessageLabel.hide();
-        this._nullMessageLabel.hide();
-        this._ensureOpen();
-    },
-
-    destroySession: function() {
-        if (this._session) {
-            if (!this._completed)
-                this._session.cancel();
-            this._session = null;
-        }
-    },
-
-    _onUserChanged: function() {
-        if (this._user.is_loaded) {
-            if (this._userIcon) {
-                let iconFileName = this._user.get_icon_file();
-                let iconFile = Gio.file_new_for_path(iconFileName);
-                let icon;
-                if (iconFile.query_exists(null)) {
-                    icon = new Gio.FileIcon({file: iconFile});
-                } else {
-                    icon = new Gio.ThemedIcon({name: 'avatar-default'});
-                }
-                this._userIcon.set_gicon (icon);
-                this._userIcon.show();
-            }
-        }
-    },
-
-    cancel: function() {
-        this._wasDismissed = true;
-        this.close(global.get_current_time());
-        this._emitDone(false, true);
-    },
-
-};
-Signals.addSignalMethods(AuthenticationDialog.prototype);
-
-function AuthenticationAgent() {
-    this._init();
-}
-
-AuthenticationAgent.prototype = {
-    _init: function() {
-        this._native = new Shell.PolkitAuthenticationAgent();
-        this._native.connect('initiate', Lang.bind(this, this._onInitiate));
-        this._native.connect('cancel', Lang.bind(this, this._onCancel));
-        this._currentDialog = null;
-        this._isCompleting = false;
-    },
-
-    _onInitiate: function(nativeAgent, actionId, message, iconName, cookie, userNames) {
-        this._currentDialog = new AuthenticationDialog(actionId, message, cookie, userNames);
-
-        // We actually don't want to open the dialog until we know for
-        // sure that we're going to interact with the user. For
-        // example, if the password for the identity to auth is blank
-        // (which it will be on a live CD) then there will be no
-        // conversation at all... of course, we don't *know* that
-        // until we actually try it.
-        //
-        // See https://bugzilla.gnome.org/show_bug.cgi?id=643062 for more
-        // discussion.
-
-        this._currentDialog.connect('done', Lang.bind(this, this._onDialogDone));
-        this._currentDialog.startAuthentication();
-    },
-
-    _onCancel: function(nativeAgent) {
-        this._completeRequest(false, false);
-    },
-
-    _onDialogDone: function(dialog, keepVisible, dismissed) {
-        this._completeRequest(keepVisible, dismissed);
-    },
-
-    _reallyCompleteRequest: function(dismissed) {
-        this._currentDialog.close();
-        this._currentDialog.destroySession();
-        this._currentDialog = null;
-        this._isCompleting = false;
-
-        this._native.complete(dismissed)
-    },
-
-    _completeRequest: function(keepVisible, wasDismissed) {
-        if (this._isCompleting)
-            return;
-
-        this._isCompleting = true;
-
-        if (keepVisible) {
-            // Give the user 2 seconds to read 'Authentication Failure' before
-            // dismissing the dialog
-            Mainloop.timeout_add(2000,
-                                 Lang.bind(this,
-                                           function() {
-                                               this._reallyCompleteRequest(wasDismissed);
-                                           }));
-        } else {
-            this._reallyCompleteRequest(wasDismissed);
-        }
-    }
-}
-
-function init() {
-    let agent = new AuthenticationAgent();
-}
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -8,20 +8,19 @@ const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
 const Util = imports.misc.util;
-const History = imports.misc.history;

 const MAX_FILE_DELETED_BEFORE_INVALID = 10;

 const HISTORY_KEY = 'command-history';
-
-const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
-const DISABLE_COMMAND_LINE_KEY = 'disable-command-line';
+const HISTORY_LIMIT = 512;

 const DIALOG_GROW_TIME = 0.1;

@ -168,12 +167,19 @@ __proto__: ModalDialog.ModalDialog.prototype,
    _init : function() {
        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'run-dialog' });

-        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
        global.settings.connect('changed::development-tools', Lang.bind(this, function () {
            this._enableInternalCommands = global.settings.get_boolean('development-tools');
        }));
        this._enableInternalCommands = global.settings.get_boolean('development-tools');

+        this._history = global.settings.get_strv(HISTORY_KEY);
+        this._historyIndex = -1;
+
+        global.settings.connect('changed::' + HISTORY_KEY, Lang.bind(this, function() {
+            this._history = global.settings.get_strv(HISTORY_KEY);
+            this._historyIndex = this._history.length;
+        }));
+
        this._internalCommands = { 'lg':
                                   Lang.bind(this, function() {
                                       Main.createLookingGlass().open();
@ -208,7 +214,10 @@ __proto__: ModalDialog.ModalDialog.prototype,

        this._entryText = entry.clutter_text;
        this.contentLayout.add(entry, { y_align: St.Align.START });
-        this.setInitialKeyFocus(this._entryText);
+        this.connect('opened',
+                     Lang.bind(this, function() {
+                         this._entryText.grab_key_focus();
+                     }));

        this._errorBox = new St.BoxLayout({ style_class: 'run-dialog-error-box' });

@ -232,27 +241,26 @@ __proto__: ModalDialog.ModalDialog.prototype,
        this._pathCompleter = new Gio.FilenameCompleter();
        this._commandCompleter = new CommandCompleter();
        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
-
-        this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
-                                                     entry: this._entryText });
        this._entryText.connect('key-press-event', Lang.bind(this, function(o, e) {
            let symbol = e.get_key_symbol();
+            if (symbol == Clutter.Down) {
+                this._setCommandFromHistory(this._historyIndex++);
+                return true;
+            }
+            if (symbol == Clutter.Up) {
+                this._setCommandFromHistory(this._historyIndex--);
+                return true;
+            }
            if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
-                this.popModal();
                if (Shell.get_event_state(e) & Clutter.ModifierType.CONTROL_MASK)
                    this._run(o.get_text(), true);
                else
                    this._run(o.get_text(), false);
                if (!this._commandError)
-                    this.close();
-                else {
-                    if (!this.pushModal())
-                        this.close();
-                }
-                return true;
+                    this.close(global.get_current_time());
            }
            if (symbol == Clutter.Escape) {
-                this.close();
+                this.close(global.get_current_time());
                return true;
            }
            if (symbol == Clutter.slash) {
@ -295,10 +303,22 @@ __proto__: ModalDialog.ModalDialog.prototype,
        }
    },

+    _saveHistory : function() {
+        if (this._history.length > HISTORY_LIMIT) {
+            this._history.splice(0, this._history.length - HISTORY_LIMIT);
+        }
+        global.settings.set_strv(HISTORY_KEY, this._history);
+    },
+
    _run : function(input, inTerminal) {
        let command = input;

-        this._history.addItem(input);
+        if (this._history.length == 0 ||
+            this._history[this._history.length - 1] != input) {
+            this._history.push(input);
+            this._saveHistory();
+        }
+
        this._commandError = false;
        let f;
        if (this._enableInternalCommands)
@ -352,15 +372,28 @@ __proto__: ModalDialog.ModalDialog.prototype,
        }
    },

+    _setCommandFromHistory: function(lastI) {
+        if (this._historyIndex < 0)
+            this._historyIndex = 0;
+        if (this._historyIndex > this._history.length)
+            this._historyIndex = this._history.length;
+
+        let text = this._entryText.get_text();
+        if (text) {
+            this._history[lastI] = text;
+        }
+        if (this._history[this._historyIndex]) {
+            this._entryText.set_text(this._history[this._historyIndex]);
+        } else
+            this._entryText.set_text('');
+    },
+
    open: function() {
-        this._history.lastItem();
+        this._historyIndex = this._history.length;
        this._errorBox.hide();
        this._entryText.set_text('');
        this._commandError = false;

-        if (this._lockdownSettings.get_boolean(DISABLE_COMMAND_LINE_KEY))
-            return;
-
        ModalDialog.ModalDialog.prototype.open.call(this);
    },

--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const DBus = imports.dbus;
 const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;

@ -69,104 +68,6 @@ function waitLeisure() {
    };
 }

-const PerfHelperIface = {
-    name: 'org.gnome.Shell.PerfHelper',
-    methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' },
-              { name: 'WaitWindows', inSignature: '', outSignature: '' },
-              { name: 'DestroyWindows', inSignature: '', outSignature: ''}]
-};
-
-const PerfHelper = function () {
-    this._init();
-};
-
-PerfHelper.prototype = {
-     _init: function() {
-         DBus.session.proxifyObject(this, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper');
-     }
-};
-
-DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface);
-
-let _perfHelper = null;
-function _getPerfHelper() {
-    if (_perfHelper == null)
-        _perfHelper = new PerfHelper();
-
-    return _perfHelper;
-}
-
-/**
- * createTestWindow:
- * @width: width of window, in pixels
- * @height: height of window, in pixels
- * @alpha: whether the window should be alpha transparent
- * @maximized: whethe the window should be created maximized
- *
- * Creates a window using gnome-shell-perf-helper for testing purposes.
- * While this function can be used with yield in an automation
- * script to pause until the D-Bus call to the helper process returns,
- * because of the normal X asynchronous mapping process, to actually wait
- * until the window has been mapped and exposed, use waitTestWindows().
- */
-function createTestWindow(width, height, alpha, maximized) {
-    let cb;
-    let perfHelper = _getPerfHelper();
-
-    perfHelper.CreateWindowRemote(width, height, alpha, maximized,
-                                  function(result, excp) {
-                                      if (cb)
-                                          cb();
-                                  });
-
-    return function(callback) {
-        cb = callback;
-    };
-}
-
-/**
- * waitTestWindows:
- *
- * Used within an automation script to pause until all windows previously
- * created with createTestWindow have been mapped and exposed.
- */
-function waitTestWindows() {
-    let cb;
-    let perfHelper = _getPerfHelper();
-
-    perfHelper.WaitWindowsRemote(function(result, excp) {
-                                     if (cb)
-                                         cb();
-                                 });
-
-    return function(callback) {
-        cb = callback;
-    };
-}
-
-/**
- * destroyTestWindows:
- *
- * Destroys all windows previously created with createTestWindow().
- * While this function can be used with yield in an automation
- * script to pause until the D-Bus call to the helper process returns,
- * this doesn't guarantee that Mutter has actually finished the destroy
- * process because of normal X asynchronicity.
- */
-function destroyTestWindows() {
-    let cb;
-    let perfHelper = _getPerfHelper();
-
-    perfHelper.DestroyWindowsRemote(function(result, excp) {
-                                        if (cb)
-                                            cb();
-                                    });
-
-    return function(callback) {
-        cb = callback;
-    };
-}
-
 /**
 * defineScriptEvent
 * @name: The event will be called script.<name>
@ -246,8 +147,8 @@ function _collect(scriptModule, outputFile) {
        Shell.write_string_to_stream(out, '"events":\n');
        Shell.PerfLog.get_default().dump_events(out);

-        let monitors = global.get_monitors();
-        let primary = global.get_primary_monitor();
+        let monitors = global.get_monitors()
+        let primary = global.get_primary_monitor()
        Shell.write_string_to_stream(out, ',\n"monitors":\n[');
        for (let i = 0; i < monitors.length; i++) {
            let monitor = monitors[i];
@ -266,21 +167,7 @@ function _collect(scriptModule, outputFile) {
        Shell.write_string_to_stream(out, ',\n"metrics":\n[ ');
        let first = true;
        for (let name in scriptModule.METRICS) {
-            let metric = scriptModule.METRICS[name];
-            // Extra checks here because JSON.stringify generates
-            // invalid JSON for undefined values
-            if (metric.description == null) {
-                log("Error: No description found for metric " + name);
-                continue;
-            }
-            if (metric.units == null) {
-                log("Error: No units found for metric " + name);
-                continue;
-            }
-            if (metric.value == null) {
-                log("Error: No value found for metric " + name);
-                continue;
-            }
+            let metric = scriptModule.METRICS[name]; 

            if (!first)
                Shell.write_string_to_stream(out, ',\n  ');
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -7,11 +7,16 @@ const Signals = imports.signals;
 const Shell = imports.gi.Shell;
 const Util = imports.misc.util;

+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
 const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;

 const DISABLED_OPEN_SEARCH_PROVIDERS_KEY = 'disabled-open-search-providers';

+const RESULT_ICON_SIZE = 48;
+
 // Not currently referenced by the search API, but
 // this enumeration can be useful for provider
 // implementations.
@ -160,9 +165,8 @@ SearchProvider.prototype = {
     * getResultInfo:
     * @id: Result identifier string
     *
-     * Return an object with 'id', 'name', (both strings) and 'createIcon'
-     * (function(size) returning a Clutter.Texture) properties which describe
-     * the given search result.
+     * Return an object with 'id', 'name', (both strings) and 'icon' (Clutter.Texture)
+     * properties which describe the given search result.
     */
    getResultMeta: function(id) {
        throw new Error('Not implemented');
@ -205,6 +209,17 @@ SearchProvider.prototype = {
     */
    activateResult: function(id) {
        throw new Error('Not implemented');
+    },
+
+    /**
+     * expandSearch:
+     *
+     * Called when the user clicks on the header for this
+     * search section.  Should typically launch an external program
+     * displaying search results for that item type.
+     */
+    expandSearch: function(terms) {
+        throw new Error('Not implemented');
    }
 };
 Signals.addSignalMethods(SearchProvider.prototype);
@ -271,18 +286,24 @@ OpenSearchSystem.prototype = {
    },

    _addProvider: function(fileName) {
-        let path = global.datadir + '/search_providers/' + fileName;
-        let source = Shell.get_file_contents_utf8_sync(path);
-        let [success, name, url, langs, icon_uri] = Shell.parse_search_provider(source);
-        let provider ={ name: name,
-                        url: url,
-                        id: this._providers.length,
-                        icon_uri: icon_uri,
-                        langs: langs };
-        if (this._checkSupportedProviderLanguage(provider)) {
-            this._providers.push(provider);
-            this.emit('changed');
-        }
+        let file = Gio.file_new_for_path(global.datadir + '/search_providers/' + fileName);
+        let source = '';
+
+        file.load_contents_async(null, Lang.bind(this, function (obj, res) {
+            let [success, source] = file.load_contents_finish(res);
+            if (source) {
+                let [success, name, url, langs, icon_uri] = global.parse_search_provider(source);
+                let provider ={ name: name,
+                                url: url,
+                                id: this._providers.length,
+                                icon_uri: icon_uri,
+                                langs: langs };
+                if (this._checkSupportedProviderLanguage(provider)) {
+                    this._providers.push(provider);
+                    this.emit('changed');
+                }
+            }
+        }));
    },

    _refresh: function() {
@ -334,7 +355,7 @@ SearchSystem.prototype = {
    updateSearch: function(searchString) {
        searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
        if (searchString == '')
-            return [];
+            return null;

        let terms = searchString.split(/\s+/);
        let isSubSearch = terms.length == this._previousTerms.length;
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@ -2,8 +2,9 @@

 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
 const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
 const St = imports.gi.St;

 const DND = imports.ui.dnd;
@ -12,7 +13,7 @@ const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Search = imports.ui.search;

-const MAX_SEARCH_RESULTS_ROWS = 1;
+const MAX_SEARCH_RESULTS_ROWS = 2;


 function SearchResult(provider, metaInfo, terms) {
@ -23,10 +24,10 @@ SearchResult.prototype = {
    _init: function(provider, metaInfo, terms) {
        this.provider = provider;
        this.metaInfo = metaInfo;
-        this.actor = new St.Button({ style_class: 'search-result',
-                                     reactive: true,
-                                     x_align: St.Align.START,
-                                     y_fill: true });
+        this.actor = new St.Clickable({ style_class: 'search-result',
+                                        reactive: true,
+                                        x_align: St.Align.START,
+                                        y_fill: true });
        this.actor._delegate = this;

        let content = provider.createResultActor(metaInfo, terms);
@ -35,9 +36,10 @@ SearchResult.prototype = {
                                   reactive: true,
                                   track_hover: true });
            let icon = new IconGrid.BaseIcon(this.metaInfo['name'],
-                                             { createIcon: this.metaInfo['createIcon'] });
+                                             { createIcon: Lang.bind(this, function(size) {
+                                                 return this.metaInfo['icon'];
+                                             })});
            content.set_child(icon.actor);
-            this.actor.label_actor = icon.label;
        }
        this._content = content;
        this.actor.set_child(content);
@ -49,10 +51,6 @@ SearchResult.prototype = {
                          Lang.bind(this, function() {
                              Main.overview.beginItemDrag(this);
                          }));
-        draggable.connect('drag-cancelled',
-                          Lang.bind(this, function() {
-                              Main.overview.cancelledItemDrag(this);
-                          }));
        draggable.connect('drag-end',
                          Lang.bind(this, function() {
                              Main.overview.endItemDrag(this);
@ -71,17 +69,16 @@ SearchResult.prototype = {
        Main.overview.toggle();
    },

-    _onResultClicked: function(actor) {
+    _onResultClicked: function(actor, event) {
        this.activate();
    },

    getDragActorSource: function() {
-        // not exactly right, but alignment problems are hard to notice
-        return this._content;
+        return this.metaInfo['icon'];
    },

    getDragActor: function(stageX, stageY) {
-        return this.metaInfo['createIcon'](Main.overview.dash.iconSize);
+        return new Clutter.Clone({ source: this.metaInfo['icon'] });
    },

    shellWorkspaceLaunch: function(params) {
@ -105,30 +102,8 @@ GridSearchResults.prototype = {
        this._grid = new IconGrid.IconGrid({ rowLimit: MAX_SEARCH_RESULTS_ROWS,
                                             xAlign: St.Align.START });
        this.actor = new St.Bin({ x_align: St.Align.START });
-
        this.actor.set_child(this._grid.actor);
        this.selectionIndex = -1;
-        this._width = 0;
-        this.actor.connect('notify::width', Lang.bind(this, function() {
-            this._width = this.actor.width;
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
-                this._tryAddResults();
-            }));
-        }));
-        this._notDisplayedResult = [];
-        this._terms = [];
-    },
-
-    _tryAddResults: function() {
-        let canDisplay = this._grid.childrenInRow(this._width) * MAX_SEARCH_RESULTS_ROWS
-                         - this._grid.visibleItemsCount();
-
-        for (let i = Math.min(this._notDisplayedResult.length, canDisplay); i > 0; i--) {
-            let result = this._notDisplayedResult.shift();
-            let meta = this.provider.getResultMeta(result);
-            let display = new SearchResult(this.provider, meta, this._terms);
-            this._grid.addItem(display.actor);
-        }
    },

    getVisibleResultCount: function() {
@ -136,15 +111,15 @@ GridSearchResults.prototype = {
    },

    renderResults: function(results, terms) {
-        // copy the lists
-        this._notDisplayedResult = results.slice(0);
-        this._terms = terms.slice(0);
-        this._tryAddResults();
+        for (let i = 0; i < results.length; i++) {
+            let result = results[i];
+            let meta = this.provider.getResultMeta(result);
+            let display = new SearchResult(this.provider, meta, terms);
+            this._grid.addItem(display.actor);
+        }
    },

    clear: function () {
-        this._terms = [];
-        this._notDisplayedResult = [];
        this._grid.removeAll();
        this.selectionIndex = -1;
    },
@ -246,32 +221,40 @@ SearchResults.prototype = {
    },

    _createOpenSearchProviderButton: function(provider) {
-        let button = new St.Button({ style_class: 'dash-search-button',
-                                     reactive: true,
-                                     x_fill: true,
-                                     y_align: St.Align.MIDDLE });
+        let clickable = new St.Clickable({ style_class: 'dash-search-button',
+                                           reactive: true,
+                                           x_fill: true,
+                                           y_align: St.Align.MIDDLE });
        let bin = new St.Bin({ x_fill: false,
                               x_align:St.Align.MIDDLE });
-        button.connect('clicked', Lang.bind(this, function() {
+        clickable.connect('clicked', Lang.bind(this, function() {
            this._openSearchSystem.activateResult(provider.id);
        }));
        let title = new St.Label({ text: provider.name,
                                   style_class: 'dash-search-button-label' });

-        button.label_actor = title;
        bin.set_child(title);
-        button.set_child(bin);
-        provider.actor = button;
+        clickable.set_child(bin);
+        provider.actor = clickable;

-        this._searchProvidersBox.add(button);
+        this._searchProvidersBox.add(clickable);
    },

    createProviderMeta: function(provider) {
        let providerBox = new St.BoxLayout({ style_class: 'search-section',
                                             vertical: true });
-        let title = new St.Label({ style_class: 'search-section-header',
-                                   text: provider.title });
-        providerBox.add(title);
+        let titleButton = new St.Button({ style_class: 'search-section-header',
+                                          reactive: true,
+                                          x_fill: true,
+                                          y_fill: true });
+        titleButton.connect('clicked', Lang.bind(this, function () { this._onHeaderClicked(provider); }));
+        providerBox.add(titleButton);
+        let titleBox = new St.BoxLayout();
+        titleButton.set_child(titleBox);
+        let title = new St.Label({ text: provider.title });
+        let count = new St.Label();
+        titleBox.add(title, { expand: true });
+        titleBox.add(count);

        let resultDisplayBin = new St.Bin({ style_class: 'search-section-results',
                                            x_fill: true,
@ -284,7 +267,8 @@ SearchResults.prototype = {
        resultDisplayBin.set_child(resultDisplay.actor);

        this._providerMeta.push({ actor: providerBox,
-                                  resultDisplay: resultDisplay });
+                                  resultDisplay: resultDisplay,
+                                  count: count });
        this._content.add(providerBox);
    },

@ -333,28 +317,24 @@ SearchResults.prototype = {
        let terms = this._searchSystem.getTerms();
        this._openSearchSystem.setSearchTerms(terms);

-        // To avoid CSS transitions causing flickering
-        // of the selection when the first search result
-        // stays the same, we hide the content while
-        // filling in the results and setting the initial
-        // selection.
-        this._content.hide();
-
        for (let i = 0; i < results.length; i++) {
            let [provider, providerResults] = results[i];
            let meta = this._metaForProvider(provider);
            meta.actor.show();
            meta.resultDisplay.renderResults(providerResults, terms);
+            meta.count.set_text('' + providerResults.length);
        }

        if (this._selectedOpenSearchButton == -1)
            this.selectDown(false);

-        this._content.show();
-
        return true;
    },

+    _onHeaderClicked: function(provider) {
+        provider.expandSearch(this._searchSystem.getTerms());
+    },
+
    _modifyActorSelection: function(resultDisplay, up) {
        let success;
        let index = resultDisplay.getSelectionIndex();
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@ -14,13 +14,21 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;

+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
 const KEY_STICKY_KEYS_ENABLED = 'stickykeys-enable';
 const KEY_BOUNCE_KEYS_ENABLED = 'bouncekeys-enable';
 const KEY_SLOW_KEYS_ENABLED   = 'slowkeys-enable';
 const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';

-const APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
+const MAGNIFIER_SCHEMA = 'org.gnome.accessibility.magnifier';
+const AT_SCREEN_KEYBOARD_SCHEMA = 'org.gnome.desktop.default-applications.at.mobility';
+const AT_SCREEN_READER_SCHEMA   = 'org.gnome.desktop.default-applications.at.visual';
+
+const XSETTINGS_SCHEMA = 'org.gnome.settings-daemon.plugins.xsettings';
+const KEY_DPI = 'dpi';

 const DPI_LOW_REASONABLE_VALUE  = 50;
 const DPI_HIGH_REASONABLE_VALUE = 500;
@ -28,6 +36,7 @@ const DPI_HIGH_REASONABLE_VALUE = 500;
 const DPI_FACTOR_LARGE   = 1.25;
 const DPI_FACTOR_LARGER  = 1.5;
 const DPI_FACTOR_LARGEST = 2.0;
+const DPI_DEFAULT        = 96;

 const KEY_META_DIR       = '/apps/metacity/general';
 const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
@ -35,10 +44,25 @@ const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
 const DESKTOP_INTERFACE_SCHEMA = 'org.gnome.desktop.interface';
 const KEY_GTK_THEME      = 'gtk-theme';
 const KEY_ICON_THEME     = 'icon-theme';
-const KEY_TEXT_SCALING_FACTOR = 'text-scaling-factor';

 const HIGH_CONTRAST_THEME = 'HighContrast';

+function getDPIFromX() {
+    let screen = global.get_gdk_screen();
+    if (screen) {
+        let width_dpi = (screen.get_width() / (screen.get_width_mm() / 25.4));
+        let height_dpi = (screen.get_height() / (screen.get_height_mm() / 25.4));
+        if (width_dpi < DPI_LOW_REASONABLE_VALUE
+            || width_dpi > DPI_HIGH_REASONABLE_VALUE
+            || height_dpi < DPI_LOW_REASONABLE_VALUE
+            || height_dpi > DPI_HIGH_REASONABLE_VALUE)
+            return DPI_DEFAULT;
+        else
+            return (width_dpi + height_dpi) / 2;
+    }
+    return DPI_DEFAULT;
+}
+
 function ATIndicator() {
    this._init.apply(this, arguments);
 }
@ -56,20 +80,17 @@ ATIndicator.prototype = {
        let highContrast = this._buildHCItem();
        this.menu.addMenuItem(highContrast);

-        let magnifier = this._buildItem(_("Zoom"), APPLICATIONS_SCHEMA,
-                                                   'screen-magnifier-enabled');
+        let magnifier = this._buildItem(_("Zoom"), MAGNIFIER_SCHEMA, 'show-magnifier');
        this.menu.addMenuItem(magnifier);

        let textZoom = this._buildFontItem();
        this.menu.addMenuItem(textZoom);

-//        let screenReader = this._buildItem(_("Screen Reader"), APPLICATIONS_SCHEMA,
-//                                                               'screen-reader-enabled');
-//        this.menu.addMenuItem(screenReader);
+        let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
+        this.menu.addMenuItem(screenReader);

-//        let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
-//                                                                   'screen-keyboard-enabled');
-//        this.menu.addMenuItem(screenKeyboard);
+        let screenKeyboard = this._buildItem(_("Screen Keyboard"), AT_SCREEN_KEYBOARD_SCHEMA, 'startup');
+        this.menu.addMenuItem(screenKeyboard);

        let visualBell = this._buildItemGConf(_("Visual Alerts"), client, KEY_VISUAL_BELL);
        this.menu.addMenuItem(visualBell);
@ -88,8 +109,7 @@ ATIndicator.prototype = {

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addAction(_("Universal Access Settings"), function() {
-            let app = Shell.AppSystem.get_default().get_app('gnome-universal-access-panel.desktop');
-            app.activate(-1);
+            Util.spawnDesktop('gnome-universal-access-panel');
        });
    },

@ -147,12 +167,9 @@ ATIndicator.prototype = {
                if (enabled) {
                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                } else if(!hasHC) {
+                } else {
                    settings.set_string(KEY_GTK_THEME, gtkTheme);
                    settings.set_string(KEY_ICON_THEME, iconTheme);
-                } else {
-                    settings.reset(KEY_GTK_THEME);
-                    settings.reset(KEY_ICON_THEME);
                }
            });
        settings.connect('changed::' + KEY_GTK_THEME, function() {
@ -173,23 +190,30 @@ ATIndicator.prototype = {
    },

    _buildFontItem: function() {
-        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let settings = new Gio.Settings({ schema: XSETTINGS_SCHEMA });

-        let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
-        let initial_setting = (factor > 1.0);
+        // we assume this never changes (which is not true if resolution
+        // is changed, but we would need XRandR events for that)
+        let x_value = getDPIFromX();
+        let user_value;
+        function on_get() {
+            user_value = settings.get_double(KEY_DPI);
+            return (user_value - (DPI_FACTOR_LARGE * x_value) > -1);
+        }
+        let initial_setting = on_get();
+        let default_value = initial_setting ? x_value : user_value;
        let widget = this._buildItemExtended(_("Large Text"),
            initial_setting,
-            settings.is_writable(KEY_TEXT_SCALING_FACTOR),
+            settings.is_writable(KEY_DPI),
            function (enabled) {
                if (enabled)
-                    settings.set_double(KEY_TEXT_SCALING_FACTOR,
-                                        DPI_FACTOR_LARGE);
+                    settings.set_double(KEY_DPI, DPI_FACTOR_LARGE * default_value);
                else
-                    settings.reset(KEY_TEXT_SCALING_FACTOR);
+                    settings.set_double(KEY_DPI, default_value);
            });
-        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, function() {
-            let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
-            let active = (factor > 1.0);
+        settings.connect('changed::' + KEY_DPI, function() {
+            let active = on_get();
+            default_value = active ? x_value : user_value;
            widget.setToggleState(active);
        });
        return widget;
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@ -16,6 +16,9 @@ const MessageTray = imports.ui.messageTray;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;

+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
 const ConnectionState = {
    DISCONNECTED: 0,
    CONNECTED: 1,
@ -64,7 +67,7 @@ Indicator.prototype = {

        this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
                               new PopupMenu.PopupMenuItem(_("Send Files to Device...")),
-                               new PopupMenu.PopupMenuItem(_("Set up a New Device...")),
+                               new PopupMenu.PopupMenuItem(_("Setup a New Device...")),
                               new PopupMenu.PopupSeparatorMenuItem()];
        this._hasDevices = false;
        this._deviceSep = this._fullMenuItems[0]; // hidden if no device exists
@ -90,8 +93,7 @@ Indicator.prototype = {
        this._updateFullMenu();

        this.menu.addAction(_("Bluetooth Settings"), function() {
-            let app = Shell.AppSystem.get_default().get_app('bluetooth-properties.desktop');
-            app.activate(-1);
+            GLib.spawn_command_line_async('gnome-control-center bluetooth');
        });

        this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
@ -124,31 +126,47 @@ Indicator.prototype = {
        }
    },

+    _deviceCompare: function(d1, d2) {
+        return d1.device_path == d2.device_path &&
+            d1.bdaddr == d2.bdaddr &&
+            d1.can_connect == d2.can_connect &&
+            d1.capabilities == d2.capabilities;
+    },
+
    _updateDevices: function() {
        let devices = this._applet.get_devices();

-        let newlist = [ ];
        for (let i = 0; i < this._deviceItems.length; i++) {
            let item = this._deviceItems[i];
            let destroy = true;
            for (let j = 0; j < devices.length; j++) {
-                if (item._device.device_path == devices[j].device_path) {
-                    this._updateDeviceItem(item, devices[j]);
+                // we need to deep compare because BluetoothSimpleDevice is a boxed type
+                // (but we take advantage of that, because _skip will disappear the next
+                // time get_devices() is called)
+                if (this._deviceCompare(item._device, devices[i])) {
+                    item.label.text = devices[i].alias;
+                    devices[i]._skip = true;
                    destroy = false;
-                    break;
                }
            }
-            if (destroy)
+            if (destroy) {
                item.destroy();
-            else
-                newlist.push(item);
+                item._destroyed = true;
+            }
        }

+        let newlist = [ ];
+        for (let i = 0; i < this._deviceItems.length; i++) {
+            let item = this._deviceItems[i];
+            if (!item._destroyed)
+                newlist.push(item);
+        }
        this._deviceItems = newlist;
+
        this._hasDevices = newlist.length > 0;
        for (let i = 0; i < devices.length; i++) {
            let d = devices[i];
-            if (d._item)
+            if (d._skip)
                continue;
            let item = this._createDeviceItem(d);
            if (item) {
@ -163,55 +181,17 @@ Indicator.prototype = {
            this._deviceSep.actor.hide();
    },

-    _updateDeviceItem: function(item, device) {
-        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
-            item.destroy();
-            return;
-        }
-
-        let prevDevice = item._device;
-        let prevCapabilities = prevDevice.capabilities;
-        let prevCanConnect = prevDevice.can_connect;
-
-        // adopt the new device object
-        item._device = device;
-        device._item = item;
-
-        // update properties
-        item.label.text = device.alias;
-
-        if (prevCapabilities != device.capabilities ||
-            prevCanConnect != device.can_connect) {
-            // need to rebuild the submenu
-            item.menu.removeAll();
-            this._buildDeviceSubMenu(item, device);
-        }
-
-        // update connected property
-        if (device.can_connect)
-            item._connectedMenuitem.setToggleState(device.connected);
-    },
-
    _createDeviceItem: function(device) {
        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
            return null;
        let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
-
-        // adopt the device object, and add a back link
        item._device = device;
-        device._item = item;

-        this._buildDeviceSubMenu(item, device);
-
-        return item;
-    },
-
-    _buildDeviceSubMenu: function(item, device) {
        if (device.can_connect) {
            item._connected = device.connected;
-            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);

-            item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+            menuitem.connect('toggled', Lang.bind(this, function() {
                if (item._connected > ConnectionState.CONNECTED) {
                    // operation already in progress, revert
                    menuitem.setToggleState(menuitem.state);
@ -241,7 +221,7 @@ Indicator.prototype = {
                }
            }));

-            item.menu.addMenuItem(item._connectedMenuitem);
+            item.menu.addMenuItem(menuitem);
        }

        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
@ -287,6 +267,8 @@ Indicator.prototype = {
        default:
            break;
        }
+
+        return item;
    },

    _updateFullMenu: function() {
@ -352,7 +334,7 @@ Source.prototype = {
    __proto__: MessageTray.Source.prototype,

    _init: function() {
-        MessageTray.Source.prototype._init.call(this, _("Bluetooth"));
+        MessageTray.Source.prototype._init.call(this, _("Bluetooth Agent"));

        this._setSummaryIcon(this.createNotificationIcon());
    },
@ -386,7 +368,7 @@ AuthNotification.prototype = {
    _init: function(source, applet, device_path, name, long_name, uuid) {
        MessageTray.Notification.prototype._init.call(this,
                                                      source,
-                                                      _("Bluetooth"),
+                                                      _("Bluetooth Agent"),
                                                      _("Authorization request from %s").format(name),
                                                      { customContent: true });
        this.setResident(true);
@ -426,7 +408,7 @@ ConfirmNotification.prototype = {
    _init: function(source, applet, device_path, name, long_name, pin) {
        MessageTray.Notification.prototype._init.call(this,
                                                      source,
-                                                      _("Bluetooth"),
+                                                      _("Bluetooth Agent"),
                                                      _("Pairing confirmation for %s").format(name),
                                                      { customContent: true });
        this.setResident(true);
@ -459,7 +441,7 @@ PinNotification.prototype = {
    _init: function(source, applet, device_path, name, long_name, numeric) {
        MessageTray.Notification.prototype._init.call(this,
                                                      source,
-                                                      _("Bluetooth"),
+                                                      _("Bluetooth Agent"),
                                                      _("Pairing request for %s").format(name),
                                                      { customContent: true });
        this.setResident(true);
@ -489,15 +471,9 @@ PinNotification.prototype = {

        this.connect('action-invoked', Lang.bind(this, function(self, action) {
            if (action == 'ok') {
-                if (this._numeric) {
-                    let num = parseInt(this._entry.text);
-                    if (isNaN(num)) {
-                        // user reply was empty, or was invalid
-                        // cancel the operation
-                        num = -1;
-                    }
-                    this._applet.agent_reply_passkey(this._devicePath, num);
-                } else
+                if (this._numeric)
+                    this._applet.agent_reply_passkey(this._devicePath, parseInt(this._entry.text));
+                else
                    this._applet.agent_reply_pincode(this._devicePath, this._entry.text);
            } else {
                if (this._numeric)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@ -11,7 +11,11 @@ const St = imports.gi.St;

 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
-const Util = imports.misc.util;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const INDICATOR_SCHEMA = 'org.gnome.settings-daemon.plugins.keyboard';

 function LayoutMenuItem() {
    this._init.apply(this, arguments);
@ -58,6 +62,10 @@ XKBIndicator.prototype = {
        this._labelActors = [ ];
        this._layoutItems = [ ];

+        this._indicatorSettings = new Gio.Settings({ schema: INDICATOR_SCHEMA });
+        this._indicatorSettings.connect('changed::disable-indicator', Lang.bind(this, this._sync_config));
+
+        this._disableIndicator = false;
        this._showFlags = false;
        this._config = Gkbd.Configuration.get();
        this._config.connect('changed', Lang.bind(this, this._sync_config));
@ -67,16 +75,14 @@ XKBIndicator.prototype = {
        this._sync_config();

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addAction(_("Show Keyboard Layout..."), Lang.bind(this, function() {
-            Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
-        }));
        this.menu.addAction(_("Localization Settings"), function() {
-            let app = Shell.AppSystem.get_default().get_app('gnome-region-panel.desktop');
-            app.activate(-1);
+            GLib.spawn_command_line_async('gnome-control-center region');
        });
    },

    _sync_config: function() {
+        this._disableIndicator = this._indicatorSettings.get_boolean('disable-indicator');
+
        this._showFlags = this._config.if_flags_shown();
        if (this._showFlags) {
            this._container.set_skip_paint(this._iconActor, false);
@ -85,7 +91,7 @@ XKBIndicator.prototype = {
        }

        let groups = this._config.get_group_names();
-        if (groups.length > 1) {
+        if (groups.length > 1 && !this._disableIndicator) {
            this.actor.show();
        } else {
            this.menu.close();
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@ -11,6 +11,9 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;

+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
 const BUS_NAME = 'org.gnome.PowerManager';
 const OBJECT_PATH = '/org/gnome/PowerManager';

@ -46,7 +49,7 @@ const PowerManagerInterface = {
        { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susbut)' },
        ],
    signals: [
-        { name: 'Changed', inSignature: '' },
+        { name: 'Changed', outSignature: '' },
        ],
    properties: [
        { name: 'Icon', signature: 's', access: 'read' },
@ -69,7 +72,7 @@ Indicator.prototype = {
        this._hasPrimary = false;
        this._primaryDeviceId = null;

-        this._batteryItem = new PopupMenu.PopupMenuItem('', { reactive: false });
+        this._batteryItem = new PopupMenu.PopupMenuItem('');
        this._primaryPercentage = new St.Label();
        this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
        this.menu.addMenuItem(this._batteryItem);
@ -80,8 +83,7 @@ Indicator.prototype = {
        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

        this.menu.addAction(_("Power Settings"),function() {
-            let app = Shell.AppSystem.get_default().get_app('gnome-power-panel.desktop');
-            app.activate(-1);
+            Util.spawnDesktop('gnome-power-panel');
        });

        this._proxy.connect('Changed', Lang.bind(this, this._devicesChanged));
@ -102,27 +104,21 @@ Indicator.prototype = {
            if (device_type == UPDeviceType.BATTERY) {
                this._hasPrimary = true;
                let time = Math.round(seconds / 60);
-                if (time == 0) {
-                    // 0 is reported when UPower does not have enough data
-                    // to estimate battery life
-                    this._batteryItem.label.text = _("Estimating...");
-                } else {
-                    let minutes = time % 60;
-                    let hours = Math.floor(time / 60);
-                    let timestring;
-                    if (time > 60) {
-                        if (minutes == 0) {
-                            timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
-                        } else {
-                            /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
-                            let template = _("%d %s %d %s remaining");
+                let minutes = time % 60;
+                let hours = Math.floor(time / 60);
+                let timestring;
+                if (time > 60) {
+                    if (minutes == 0) {
+                        timestring = Gettext.ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
+                    } else {
+                        /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
+                        let template = _("%d %s %d %s remaining");

-                            timestring = template.format (hours, ngettext("hour", "hours", hours), minutes, ngettext("minute", "minutes", minutes));
-                        }
-                    } else
-                        timestring = ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
-                    this._batteryItem.label.text = timestring;
-                }
+                        timestring = template.format (hours, Gettext.ngettext("hour", "hours", hours), minutes, Gettext.ngettext("minute", "minutes", minutes));
+                    }
+                } else
+                    timestring = Gettext.ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
+                this._batteryItem.label.text = timestring;
                this._primaryPercentage.text = Math.round(percentage) + '%';
                this._batteryItem.actor.show();
                if (this._deviceItems.length > 0)
@ -134,6 +130,17 @@ Indicator.prototype = {
            }

            this._primaryDeviceId = device_id;
+            if (this._primaryDeviceId) {
+                this._batteryItem.actor.reactive = true;
+                this._batteryItem.actor.can_focus = true;
+                this._batteryItem.connect('activate', function(item) {
+                    Util.spawn(['gnome-power-statistics', '--device', device_id]);
+                });
+            } else {
+                // virtual device
+                this._batteryItem.actor.reactive = false;
+                this._batteryItem.actor.can_focus = false;
+            }
        }));
    },

@ -155,6 +162,9 @@ Indicator.prototype = {
                    continue;

                let item = new DeviceItem (devices[i]);
+                item.connect('activate', function() {
+                    Util.spawn(['gnome-power-statistics', '--device', device_id]);
+                });
                this._deviceItems.push(item);
                this.menu.addMenuItem(item, this._otherDevicePosition + position);
                position++;
@ -200,7 +210,7 @@ DeviceItem.prototype = {
    __proto__: PopupMenu.PopupBaseMenuItem.prototype,

    _init: function(device) {
-        PopupMenu.PopupBaseMenuItem.prototype._init.call(this, { reactive: false });
+        PopupMenu.PopupBaseMenuItem.prototype._init.call(this);

        let [device_id, device_type, icon, percentage, state, time] = device;

--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@ -13,9 +13,11 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;

-const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

-const VOLUME_NOTIFY_ID = 1;
+const VOLUME_MAX = 65536.0; /* PA_VOLUME_NORM */
+const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */

 function Indicator() {
    this._init.apply(this, arguments);
@ -33,8 +35,6 @@ Indicator.prototype = {
        this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
        this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput));
        this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput));
-        this._volumeMax = this._control.get_vol_max_norm();
-        this._volumeMaxAmplified = this._control.get_vol_max_amplified();

        this._output = null;
        this._outputVolumeId = 0;
@ -61,29 +61,20 @@ Indicator.prototype = {

        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
        this.menu.addAction(_("Sound Settings"), function() {
-            let app = Shell.AppSystem.get_default().get_app('gnome-sound-panel.desktop');
-            app.activate(-1);
+            Util.spawnDesktop('gnome-sound-panel');
        });

        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
        this._control.open();
    },

-    _getMaxVolume: function(property) {
-        if (this[property].get_can_decibel())
-            return this._volumeMaxAmplified;
-        else
-            return this._volumeMax;
-    },
-
    _onScrollEvent: function(actor, event) {
        let direction = event.get_scroll_direction();
        let currentVolume = this._output.volume;
-        let maxVolume = this._getMaxVolume('_output');

        if (direction == Clutter.ScrollDirection.DOWN) {
            let prev_muted = this._output.is_muted;
-            this._output.volume = Math.max(0, currentVolume - maxVolume * VOLUME_ADJUSTMENT_STEP);
+            this._output.volume = Math.max(0, currentVolume - VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
            if (this._output.volume < 1) {
                this._output.volume = 0;
                if (!prev_muted)
@ -92,12 +83,10 @@ Indicator.prototype = {
            this._output.push_volume();
        }
        else if (direction == Clutter.ScrollDirection.UP) {
-            this._output.volume = Math.min(maxVolume, currentVolume + maxVolume * VOLUME_ADJUSTMENT_STEP);
+            this._output.volume = Math.min(VOLUME_MAX, currentVolume + VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
            this._output.change_is_muted(false);
            this._output.push_volume();
        }
-
-        this._notifyVolumeChange();
    },

    _onControlReady: function() {
@ -172,14 +161,13 @@ Indicator.prototype = {
    },

    _volumeToIcon: function(volume) {
-        let maxVolume = this._getMaxVolume('_output');
        if (volume <= 0) {
            return 'audio-volume-muted';
        } else {
-            let n = Math.floor(3 * volume / maxVolume) + 1;
-            if (n < 2)
+            let v = volume / VOLUME_MAX;
+            if (v < 0.33)
                return 'audio-volume-low';
-            if (n >= 3)
+            if (v > 0.8)
                return 'audio-volume-high';
            return 'audio-volume-medium';
        }
@ -190,7 +178,7 @@ Indicator.prototype = {
            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
            return;
        }
-        let volume = value * this._getMaxVolume(property);
+        let volume = value * VOLUME_MAX;
        let prev_muted = this[property].is_muted;
        if (volume < 1) {
            this[property].volume = 0;
@ -205,15 +193,13 @@ Indicator.prototype = {
    },

    _notifyVolumeChange: function() {
-        global.cancel_theme_sound(VOLUME_NOTIFY_ID);
-        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
+        global.play_theme_sound('audio-volume-change');
    },

    _mutedChanged: function(object, param_spec, property) {
        let muted = this[property].is_muted;
        let slider = this[property+'Slider'];
-        let maxVolume = this._getMaxVolume(property);
-        slider.setValue(muted ? 0 : (this[property].volume / maxVolume));
+        slider.setValue(muted ? 0 : (this[property].volume / VOLUME_MAX));
        if (property == '_output') {
            if (muted)
                this.setIcon('audio-volume-muted');
@ -223,8 +209,7 @@ Indicator.prototype = {
    },

    _volumeChanged: function(object, param_spec, property) {
-        let maxVolume = this._getMaxVolume(property);
-        this[property+'Slider'].setValue(this[property].volume / maxVolume);
+        this[property+'Slider'].setValue(this[property].volume / VOLUME_MAX);
        if (property == '_output' && !this._output.is_muted)
            this.setIcon(this._volumeToIcon(this._output.volume));
    }
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@ -19,8 +19,7 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'a11y-keyboard': 'a11y',
    'kbd-scrolllock': 'keyboard',
    'kbd-numlock': 'keyboard',
-    'kbd-capslock': 'keyboard',
-    'ibus-ui-gtk': 'input-method'
+    'kbd-capslock': 'keyboard'
 };

 function StatusIconDispatcher() {
@ -32,6 +31,7 @@ StatusIconDispatcher.prototype = {
        this._traymanager = new Shell.TrayManager();
        this._traymanager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
        this._traymanager.connect('tray-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
+        this._traymanager.manage_stage(global.stage);

        // Yet-another-Ubuntu-workaround - we have to kill their
        // app-indicators, so that applications fall back to normal
@ -40,10 +40,6 @@ StatusIconDispatcher.prototype = {
        Util.killall('indicator-application-service');
    },

-    start: function(themeWidget) {
-        this._traymanager.manage_stage(global.stage, themeWidget);
-    },
-
    _onTrayIconAdded: function(o, icon) {
        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@ -1,14 +1,12 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Gdm = imports.gi.Gdm;
-const DBus = imports.dbus;
-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 Tp = imports.gi.TelepathyGLib;
-const UPowerGlib = imports.gi.UPowerGlib;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
@ -16,21 +14,6 @@ const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;

-const BUS_NAME = 'org.gnome.ScreenSaver';
-const OBJECT_PATH = '/org/gnome/ScreenSaver';
-
-const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
-const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
-const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
-const DISABLE_LOG_OUT_KEY = 'disable-log-out';
-
-const ScreenSaverInterface = {
-    name: BUS_NAME,
-    methods: [ { name: 'Lock', inSignature: '' } ]
-};
-
-let ScreenSaverProxy = DBus.makeProxyClass(ScreenSaverInterface);
-
 // Adapted from gdm/gui/user-switch-applet/applet.c
 //
 // Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
@ -44,24 +27,17 @@ StatusMenuButton.prototype = {
    __proto__: PanelMenu.Button.prototype,

    _init: function() {
-        PanelMenu.Button.prototype._init.call(this, 0.0);
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);
        let box = new St.BoxLayout({ name: 'panelStatusMenu' });
        this.actor.set_child(box);

-        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-
        this._gdm = Gdm.UserManager.ref_default();
        this._gdm.queue_load();

        this._user = this._gdm.get_user(GLib.get_user_name());
        this._presence = new GnomeSession.Presence();
        this._presenceItems = {};
-        this._session = new GnomeSession.SessionManager();

-        this._account_mgr = Tp.AccountManager.dup()
-
-        this._upClient = new UPowerGlib.Client();
-        this._screenSaverProxy = new ScreenSaverProxy(DBus.session, BUS_NAME, OBJECT_PATH);
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._iconBox = new St.Bin();
@ -85,17 +61,6 @@ StatusMenuButton.prototype = {
        this._gdm.connect('notify::is-loaded', Lang.bind(this, this._updateSwitchUser));
        this._gdm.connect('user-added', Lang.bind(this, this._updateSwitchUser));
        this._gdm.connect('user-removed', Lang.bind(this, this._updateSwitchUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
-                                       Lang.bind(this, this._updateSwitchUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       Lang.bind(this, this._updateLogout));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
-                                       Lang.bind(this, this._updateLockScreen));
-        this._updateSwitchUser();
-        this._updateLogout();
-        this._updateLockScreen();
-
-        this._upClient.connect('notify::can-suspend', Lang.bind(this, this._updateSuspendOrPowerOff));
    },

    _onDestroy: function() {
@ -110,56 +75,11 @@ StatusMenuButton.prototype = {
          this._name.set_text("");
    },

-    _updateSessionSeparator: function() {
-        let showSeparator = this._loginScreenItem.actor.visible ||
-                            this._logoutItem.actor.visible ||
-                            this._lockScreenItem.actor.visible;
-        if (showSeparator)
-            this._sessionSeparator.actor.show();
-        else
-            this._sessionSeparator.actor.hide();
-    },
-
    _updateSwitchUser: function() {
-        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
-        if (allowSwitch && this._gdm.can_switch ())
+        if (this._gdm.can_switch ())
            this._loginScreenItem.actor.show();
        else
            this._loginScreenItem.actor.hide();
-        this._updateSessionSeparator();
-    },
-
-    _updateLogout: function() {
-        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-        if (allowLogout)
-            this._logoutItem.actor.show();
-        else
-            this._logoutItem.actor.hide();
-        this._updateSessionSeparator();
-    },
-
-    _updateLockScreen: function() {
-        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        if (allowLockScreen)
-            this._lockScreenItem.actor.show();
-        else
-            this._lockScreenItem.actor.hide();
-        this._updateSessionSeparator();
-    },
-
-    _updateSuspendOrPowerOff: function() {
-        this._haveSuspend = this._upClient.get_can_suspend();
-
-        if (!this._suspendOrPowerOffItem)
-            return;
-
-        // If we can't suspend show Power Off... instead
-        // and disable the alt key
-        if (!this._haveSuspend) {
-            this._suspendOrPowerOffItem.updateText(_("Power Off..."), null);
-        } else {
-            this._suspendOrPowerOffItem.updateText(_("Suspend"), _("Power Off..."));
-        }
    },

    _updatePresenceIcon: function(presence, status) {
@ -179,12 +99,12 @@ StatusMenuButton.prototype = {
    _createSubMenu: function() {
        let item;

-        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available');
+        item = new PopupMenu.PopupImageMenuItem(_("Available"), 'user-available', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.AVAILABLE));
        this.menu.addMenuItem(item);
        this._presenceItems[GnomeSession.PresenceStatus.AVAILABLE] = item;

-        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy');
+        item = new PopupMenu.PopupImageMenuItem(_("Busy"), 'user-busy', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.BUSY));
        this.menu.addMenuItem(item);
        this._presenceItems[GnomeSession.PresenceStatus.BUSY] = item;
@ -206,7 +126,6 @@ StatusMenuButton.prototype = {
        item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
        this.menu.addMenuItem(item);
-        this._lockScreenItem = item;

        item = new PopupMenu.PopupMenuItem(_("Switch User"));
        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
@ -216,41 +135,36 @@ StatusMenuButton.prototype = {
        item = new PopupMenu.PopupMenuItem(_("Log Out..."));
        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
        this.menu.addMenuItem(item);
-        this._logoutItem = item;

        item = new PopupMenu.PopupSeparatorMenuItem();
        this.menu.addMenuItem(item);
-        this._sessionSeparator = item;

-        item = new PopupMenu.PopupAlternatingMenuItem(_("Suspend"),
-                                                      _("Power Off..."));
+        item = new PopupMenu.PopupMenuItem(_("Suspend..."));
+        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Shut Down..."));
+        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
        this.menu.addMenuItem(item);
-        this._suspendOrPowerOffItem = item;
-        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
-        this._updateSuspendOrPowerOff();
    },

    _setPresenceStatus: function(item, event, status) {
        this._presence.setStatus(status);
-
-        this._setIMStatus(status);
    },

    _onMyAccountActivate: function() {
        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().get_app('gnome-user-accounts-panel.desktop');
-        app.activate(-1);
+        Util.spawnDesktop('gnome-user-accounts-panel');
    },

    _onPreferencesActivate: function() {
        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().get_app('gnome-control-center.desktop');
-        app.activate(-1);
+        Util.spawnDesktop('gnome-control-center');
    },

    _onLockScreenActivate: function() {
        Main.overview.hide();
-        this._screenSaverProxy.LockRemote();
+        Util.spawn(['gnome-screensaver-command', '--lock']);
    },

    _onLoginScreenActivate: function() {
@ -261,45 +175,11 @@ StatusMenuButton.prototype = {

    _onQuitSessionActivate: function() {
        Main.overview.hide();
-        this._session.LogoutRemote(0);
+        Util.spawn(['gnome-session-save', '--logout-dialog']);
    },

-    _onSuspendOrPowerOffActivate: function() {
+    _onShutDownActivate: function() {
        Main.overview.hide();
-
-        if (this._haveSuspend &&
-            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._screenSaverProxy.LockRemote(Lang.bind(this, function() {
-                this._upClient.suspend_sync(null);
-            }));
-        } else {
-            this._session.ShutdownRemote();
-        }
-    },
-
-    _setIMStatus: function(session_status) {
-        let [presence_type, presence_status, msg] = this._account_mgr.get_most_available_presence();
-        let type, status;
-
-        // We change the IM presence only if there are connected accounts
-        if (presence_type == Tp.ConnectionPresenceType.UNSET ||
-            presence_type == Tp.ConnectionPresenceType.OFFLINE ||
-            presence_type == Tp.ConnectionPresenceType.UNKNOWN ||
-            presence_type == Tp.ConnectionPresenceType.ERROR)
-          return;
-
-        if (session_status == GnomeSession.PresenceStatus.AVAILABLE) {
-            type = Tp.ConnectionPresenceType.AVAILABLE;
-            status = "available";
-        }
-        else if (session_status == GnomeSession.PresenceStatus.BUSY) {
-            type = Tp.ConnectionPresenceType.BUSY;
-            status = "busy";
-        }
-        else {
-          return;
-        }
-
-        this._account_mgr.set_all_requested_presences(type, status, msg);
+        Util.spawn(['gnome-session-save', '--shutdown-dialog']);
    }
 };
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@ -4,16 +4,17 @@ const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
-const Tpl = imports.gi.TelepathyLogger;
-const Tp = imports.gi.TelepathyGLib;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

-const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const Telepathy = imports.misc.telepathy;

+let contactManager;
+let channelDispatcher;

 // See Notification.appendMessage
 const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
@ -21,324 +22,556 @@ const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
 const SCROLLBACK_RECENT_LENGTH = 20;
 const SCROLLBACK_IDLE_LENGTH = 5;

-// See Source._displayPendingMessages
-const SCROLLBACK_HISTORY_LINES = 10;
+// A 'Qualified_Property_Value_Map' that represents a single-user
+// text-based chat.
+let singleUserTextChannel = {};
+singleUserTextChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.CHANNEL_TEXT_NAME;
+singleUserTextChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.CONTACT;
+
+// Some protocols only support 'multi-user' chats, and single-user
+// chats are just treated as multi-user chats with only one other
+// participant. Telepathy uses HandleType.NONE for all chats in these
+// protocols; there's no good way for us to tell if the channel is
+// single- or multi-user.
+let oneOrMoreUserTextChannel = {};
+oneOrMoreUserTextChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.CHANNEL_TEXT_NAME;
+oneOrMoreUserTextChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.NONE;
+
+// The (non-chat) channel indicating the users whose presence
+// information we subscribe to
+let subscribedContactsChannel = {};
+subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.ChannelType'] = Telepathy.CHANNEL_CONTACT_LIST_NAME;
+subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.TargetHandleType'] = Telepathy.HandleType.LIST;
+subscribedContactsChannel[Telepathy.CHANNEL_NAME + '.TargetID'] = 'subscribe';

 const NotificationDirection = {
    SENT: 'chat-sent',
    RECEIVED: 'chat-received'
 };

-let contactFeatures = [Tp.ContactFeature.ALIAS,
-                        Tp.ContactFeature.AVATAR_DATA,
-                        Tp.ContactFeature.PRESENCE];
-
 // This is GNOME Shell's implementation of the Telepathy 'Client'
 // interface. Specifically, the shell is a Telepathy 'Observer', which
 // lets us see messages even if they belong to another app (eg,
 // Empathy).

-function makeMessageFromTpMessage(tpMessage, direction) {
-    let [text, flags] = tpMessage.to_text();
-    return {
-        messageType: tpMessage.get_message_type(),
-        text: text,
-        sender: tpMessage.sender.alias,
-        timestamp: tpMessage.get_received_timestamp(),
-        direction: direction
-    };
-}
-
-
-function makeMessageFromTplEvent(event) {
-    let sent = event.get_sender().get_entity_type() == Tpl.EntityType.SELF;
-    let direction = sent ? NotificationDirection.SENT : NotificationDirection.RECEIVED;
-
-    return {
-        messageType: event.get_message_type(),
-        text: event.get_message(),
-        sender: event.get_sender().get_alias(),
-        timestamp: event.get_timestamp(),
-        direction: direction
-    };
-}
-
 function Client() {
    this._init();
 };

 Client.prototype = {
    _init : function() {
-        // channel path -> Source
+        let name = Telepathy.CLIENT_NAME + '.GnomeShell';
+        DBus.session.exportObject(Telepathy.nameToPath(name), this);
+        DBus.session.acquire_name(name, DBus.SINGLE_INSTANCE,
+                                  function (name) { /* FIXME: acquired */ },
+                                  function (name) { /* FIXME: lost */ });
+
+        this._accounts = {};
        this._sources = {};

-        // Set up a SimpleObserver, which will call _observeChannels whenever a
-        // channel matching its filters is detected.
-        // The second argument, recover, means _observeChannels will be run
-        // for any existing channel as well.
-        let dbus = Tp.DBusDaemon.dup();
-        this._observer = Shell.TpClient.new(dbus);
-        this._observer.set_observe_channels_func(
-            Lang.bind(this, this._observeChannels));
+        contactManager = new ContactManager();
+        contactManager.connect('presence-changed', Lang.bind(this, this._presenceChanged));

-        try {
-            this._observer.register();
-        } catch (e) {
-            throw new Error('Couldn\'t register SimpleObserver. Error: \n' + e);
-        }
+        channelDispatcher = new Telepathy.ChannelDispatcher(DBus.session,
+                                                            Telepathy.CHANNEL_DISPATCHER_NAME,
+                                                            Telepathy.nameToPath(Telepathy.CHANNEL_DISPATCHER_NAME));
+
+        // Acquire existing connections. (Needed to make things work
+        // through a restart.)
+        let accountManager = new Telepathy.AccountManager(DBus.session,
+                                                          Telepathy.ACCOUNT_MANAGER_NAME,
+                                                          Telepathy.nameToPath(Telepathy.ACCOUNT_MANAGER_NAME));
+        accountManager.GetRemote('ValidAccounts', Lang.bind(this,
+            function (accounts, err) {
+                if (!accounts)
+                    return;
+
+                for (let i = 0; i < accounts.length; i++)
+                    this._gotAccount(accounts[i]);
+            }));
+        accountManager.connect('AccountValidityChanged', Lang.bind(this, this._accountValidityChanged));
    },

-    _observeChannels: function(observer, account, conn, channels,
-                               dispatchOp, requests, context) {
-        // If the self_contact doesn't have the ALIAS, make sure
-        // to fetch it before trying to grab the channels.
-        let self_contact = conn.get_self_contact();
-        if (self_contact.has_feature(Tp.ContactFeature.ALIAS)) {
-            this._finishObserveChannels(account, conn, channels, context);
-        } else {
-            Shell.get_self_contact_features(conn,
-                                            contactFeatures.length, contactFeatures,
-                                            Lang.bind(this, function() {
-                                                this._finishObserveChannels(account, conn, channels, context);
-                                            }));
-            context.delay();
-        }
+    _accountValidityChanged: function(accountManager, accountPath, valid) {
+        if (!valid) {
+            delete this._accounts[accountPath];
+            // We don't need to clean up connections, sources, etc; they'll
+            // get Closed and cleaned up independently.
+        } else
+            this._gotAccount(accountPath);
    },

-    _finishObserveChannels: function(account, conn, channels, context) {
-        let len = channels.length;
-        for (let i = 0; i < len; i++) {
-            let channel = channels[i];
-            let [targetHandle, targetHandleType] = channel.get_handle();
+    _gotAccount: function(accountPath) {
+        let account = new Telepathy.Account(DBus.session,
+                                            Telepathy.ACCOUNT_MANAGER_NAME,
+                                            accountPath);
+        this._accounts[accountPath] = account;
+        account.GetRemote('Connection', Lang.bind(this,
+            function (connPath, err) {
+                if (!connPath || connPath == '/')
+                    return;

-            /* Only observe contact text channels */
-            if ((!(channel instanceof Tp.TextChannel)) ||
-               targetHandleType != Tp.HandleType.CONTACT)
-               continue;
-
-            /* Request a TpContact */
-            Shell.get_tp_contacts(conn, 1, [targetHandle],
-                    contactFeatures.length, contactFeatures,
-                    Lang.bind(this,  function (connection, contacts, failed) {
-                        if (contacts.length < 1)
+                let connReq = new Telepathy.ConnectionRequests(DBus.session,
+                                                               Telepathy.pathToName(connPath),
+                                                               connPath);
+                connReq.GetRemote('Channels', Lang.bind(this,
+                    function(channels, err) {
+                        if (!channels)
                            return;

-                        /* We got the TpContact */
-                        this._createSource(account, conn, channel, contacts[0]);
-                    }), null);
-        }
+                        this._addChannels(accountPath, connPath, channels);
+                    }));

-        context.accept();
+                contactManager.addConnection(connPath);
+            }));
    },

-    _createSource: function(account, conn, channel, contact) {
-        if (this._sources[channel.get_object_path()])
+    get Interfaces() {
+        return [ Telepathy.CLIENT_OBSERVER_NAME ];
+    },
+
+    get ObserverChannelFilter() {
+        return [ singleUserTextChannel, oneOrMoreUserTextChannel ];
+    },
+
+    ObserveChannels: function(accountPath, connPath, channels,
+                              dispatchOperation, requestsSatisfied,
+                              observerInfo) {
+        this._addChannels(accountPath, connPath, channels);
+    },
+
+    _addChannels: function(accountPath, connPath, channelDetailsList) {
+        for (let i = 0; i < channelDetailsList.length; i++) {
+            let [channelPath, props] = channelDetailsList[i];
+
+            // If this is being called from the startup code then it
+            // won't have passed through our filters, so we need to
+            // check the channel/targetHandle type ourselves.
+
+            let channelType = props[Telepathy.CHANNEL_NAME + '.ChannelType'];
+            if (channelType != Telepathy.CHANNEL_TEXT_NAME)
+                continue;
+
+            let targetHandleType = props[Telepathy.CHANNEL_NAME + '.TargetHandleType'];
+            if (targetHandleType != Telepathy.HandleType.CONTACT &&
+                targetHandleType != Telepathy.HandleType.NONE)
+                continue;
+
+            let targetHandle = props[Telepathy.CHANNEL_NAME + '.TargetHandle'];
+            let targetId = props[Telepathy.CHANNEL_NAME + '.TargetID'];
+
+            if (this._sources[connPath + ':' + targetHandle])
+                continue;
+
+            let source = new Source(accountPath, connPath, channelPath,
+                                    targetHandle, targetHandleType, targetId);
+            this._sources[connPath + ':' + targetHandle] = source;
+            source.connect('destroy', Lang.bind(this,
+                function() {
+                    delete this._sources[connPath + ':' + targetHandle];
+                }));
+        }
+    },
+
+    _presenceChanged: function(contactManager, connPath, handle,
+                               type, message) {
+        let source = this._sources[connPath + ':' + handle];
+        if (!source)
            return;

-        let source = new Source(account, conn, channel, contact);
-
-        this._sources[channel.get_object_path()] = source;
-        source.connect('destroy', Lang.bind(this,
-                       function() {
-                           delete this._sources[channel.get_object_path()];
-                       }));
+        source.setPresence(type, message);
    }
 };
+DBus.conformExport(Client.prototype, Telepathy.ClientIface);
+DBus.conformExport(Client.prototype, Telepathy.ClientObserverIface);

-function Source(account, conn, channel, contact) {
-    this._init(account, conn, channel, contact);
+
+function ContactManager() {
+    this._init();
+};
+
+ContactManager.prototype = {
+    _init: function() {
+        this._connections = {};
+        // Note that if we changed this to '/telepathy/avatars' then
+        // we would share cache files with empathy. But since this is
+        // not documented/guaranteed, it seems a little sketchy
+        this._cacheDir = GLib.get_user_cache_dir() + '/gnome-shell/avatars';
+    },
+
+    addConnection: function(connPath) {
+        let info = this._connections[connPath];
+        if (info)
+            return info;
+
+        info = {};
+
+        // Figure out the cache subdirectory for this connection by
+        // parsing the connection manager name (eg, 'gabble') and
+        // protocol name (eg, 'jabber') from the Connection's path.
+        // Telepathy requires the D-Bus path for a connection to have
+        // a specific form, and explicitly says that clients are
+        // allowed to parse it.
+        let match = connPath.match(/\/org\/freedesktop\/Telepathy\/Connection\/([^\/]*\/[^\/]*)\/.*/);
+        if (!match)
+            throw new Error('Could not parse connection path ' + connPath);
+
+        info.cacheDir = this._cacheDir + '/' + match[1];
+        GLib.mkdir_with_parents(info.cacheDir, 0x1c0); // 0x1c0 = octal 0700
+
+        // info.names[handle] is @handle's real name
+        // info.tokens[handle] is the token for @handle's avatar
+        info.names = {};
+        info.tokens = {};
+
+        // info.icons[handle] is an array of the icon actors currently
+        // being displayed for @handle. These will be updated
+        // automatically if @handle's avatar changes.
+        info.icons = {};
+
+        let connName = Telepathy.pathToName(connPath);
+
+        info.connectionAvatars = new Telepathy.ConnectionAvatars(DBus.session, connName, connPath);
+        info.updatedId = info.connectionAvatars.connect(
+            'AvatarUpdated', Lang.bind(this, this._avatarUpdated));
+        info.retrievedId = info.connectionAvatars.connect(
+            'AvatarRetrieved', Lang.bind(this, this._avatarRetrieved));
+
+        info.connectionContacts = new Telepathy.ConnectionContacts(DBus.session, connName, connPath);
+
+        info.connectionPresence = new Telepathy.ConnectionSimplePresence(DBus.session, connName, connPath);
+        info.presenceChangedId = info.connectionPresence.connect(
+            'PresencesChanged', Lang.bind(this, this._presencesChanged));
+
+        let conn = new Telepathy.Connection(DBus.session, connName, connPath);
+        info.statusChangedId = conn.connect('StatusChanged', Lang.bind(this,
+            function (status, reason) {
+                if (status == Telepathy.ConnectionStatus.DISCONNECTED)
+                    this._removeConnection(conn);
+            }));
+
+        let connReq = new Telepathy.ConnectionRequests(DBus.session,
+                                                       connName, connPath);
+        connReq.EnsureChannelRemote(subscribedContactsChannel, Lang.bind(this,
+            function (result, err) {
+                if (!result)
+                    return;
+
+                let [mine, channelPath, props] = result;
+                this._gotContactsChannel(connPath, channelPath, props);
+            }));
+
+        this._connections[connPath] = info;
+        return info;
+    },
+
+    _gotContactsChannel: function(connPath, channelPath, props) {
+        let info = this._connections[connPath];
+        if (!info)
+            return;
+
+        info.contactsGroup = new Telepathy.ChannelGroup(DBus.session,
+                                                        Telepathy.pathToName(connPath),
+                                                        channelPath);
+        info.contactsListChangedId =
+            info.contactsGroup.connect('MembersChanged', Lang.bind(this, this._contactsListChanged, info));
+
+        info.contactsGroup.GetRemote('Members', Lang.bind(this,
+            function(contacts, err) {
+                if (!contacts)
+                    return;
+
+                info.connectionContacts.GetContactAttributesRemote(
+                    contacts, [Telepathy.CONNECTION_ALIASING_NAME], false,
+                    Lang.bind(this, this._gotContactAttributes, info));
+            }));
+    },
+
+    _contactsListChanged: function(group, message, added, removed,
+                                   local_pending, remote_pending,
+                                   actor, reason, info) {
+        for (let i = 0; i < removed.length; i++)
+            delete info.names[removed[i]];
+
+        info.connectionContacts.GetContactAttributesRemote(
+            added, [Telepathy.CONNECTION_ALIASING_NAME], false,
+            Lang.bind(this, this._gotContactAttributes, info));
+    },
+
+    _gotContactAttributes: function(attrs, err, info) {
+        if (!attrs)
+            return;
+
+        for (let handle in attrs)
+            info.names[handle] = attrs[handle][Telepathy.CONNECTION_ALIASING_NAME + '/alias'];
+    },
+
+    _presencesChanged: function(conn, presences, err) {
+        if (!presences)
+            return;
+
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        for (let handle in presences) {
+            let [type, status, message] = presences[handle];
+            this.emit('presence-changed', conn.getPath(), handle, type, message);
+        }
+    },
+
+    _removeConnection: function(conn) {
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        conn.disconnect(info.statusChangedId);
+        info.connectionAvatars.disconnect(info.updatedId);
+        info.connectionAvatars.disconnect(info.retrievedId);
+        info.connectionPresence.disconnect(info.presenceChangedId);
+        info.contactsGroup.disconnect(info.contactsListChangedId);
+
+        delete this._connections[conn.getPath()];
+    },
+
+    _getFileForToken: function(info, token) {
+        return info.cacheDir + '/' + Telepathy.escapeAsIdentifier(token);
+    },
+
+    _setIcon: function(iconBox, info, handle) {
+        let textureCache = St.TextureCache.get_default();
+        let token = info.tokens[handle];
+        let file;
+
+        if (token) {
+            file = this._getFileForToken(info, token);
+            if (!GLib.file_test(file, GLib.FileTest.EXISTS))
+                file = null;
+        }
+
+        if (file) {
+            let uri = GLib.filename_to_uri(file, null);
+            iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size);
+        } else {
+            iconBox.child = new St.Icon({ icon_name: 'stock_person',
+                                          icon_type: St.IconType.FULLCOLOR,
+                                          icon_size: iconBox._size });
+        }
+    },
+
+    _updateIcons: function(info, handle) {
+        if (!info.icons[handle])
+            return;
+
+        for (let i = 0; i < info.icons[handle].length; i++) {
+            let iconBox = info.icons[handle][i];
+            this._setIcon(iconBox, info, handle);
+        }
+    },
+
+    _avatarUpdated: function(conn, handle, token) {
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        if (info.tokens[handle] == token)
+            return;
+
+        info.tokens[handle] = token;
+        if (token != '') {
+            let file = this._getFileForToken(info, token);
+            if (!GLib.file_test(file, GLib.FileTest.EXISTS)) {
+                info.connectionAvatars.RequestAvatarsRemote([handle]);
+                return;
+            }
+        }
+
+        this._updateIcons(info, handle);
+    },
+
+    _avatarRetrieved: function(conn, handle, token, avatarData, mimeType) {
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            return;
+
+        let file = this._getFileForToken(info, token);
+        let success = false;
+        try {
+            success = GLib.file_set_contents(file, avatarData, avatarData.length);
+        } catch (e) {
+            logError(e, 'Error caching avatar data');
+        }
+
+        if (success)
+            this._updateIcons(info, handle);
+    },
+
+    createAvatar: function(conn, handle, size) {
+        let iconBox = new St.Bin({ style_class: 'avatar-box' });
+        iconBox._size = size;
+
+        let info = this._connections[conn.getPath()];
+        if (!info)
+            info = this.addConnection(conn.getPath());
+
+        if (!info.icons[handle])
+            info.icons[handle] = [];
+        info.icons[handle].push(iconBox);
+
+        iconBox.connect('destroy', Lang.bind(this,
+            function() {
+                let i = info.icons[handle].indexOf(iconBox);
+                if (i != -1)
+                    info.icons[handle].splice(i, 1);
+            }));
+
+        // If we already have the icon cached and know its token, this
+        // will fill it in. Otherwise it will fill in the default
+        // icon.
+        this._setIcon(iconBox, info, handle);
+
+        // Asynchronously load the real avatar if we don't have it yet.
+        if (info.tokens[handle] == null) {
+            info.connectionAvatars.GetKnownAvatarTokensRemote([handle], Lang.bind(this,
+                function (tokens, err) {
+                    let token = tokens && tokens[handle] ? tokens[handle] : '';
+                    this._avatarUpdated(conn, handle, token);
+                }));
+        }
+
+        return iconBox;
+    }
+};
+Signals.addSignalMethods(ContactManager.prototype);
+
+
+function Source(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
+    this._init(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId);
 }

 Source.prototype = {
    __proto__:  MessageTray.Source.prototype,

-    _init: function(account, conn, channel, contact) {
-        MessageTray.Source.prototype._init.call(this, contact.get_alias());
+    _init: function(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
+        MessageTray.Source.prototype._init.call(this, targetId);

        this.isChat = true;

-        this._account = account;
-        this._contact = contact;
+        this._accountPath = accountPath;

-        this._conn = conn;
-        this._channel = channel;
-        this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));
+        let connName = Telepathy.pathToName(connPath);
+        this._conn = new Telepathy.Connection(DBus.session, connName, connPath);
+        this._channel = new Telepathy.Channel(DBus.session, connName, channelPath);
+        this._closedId = this._channel.connect('Closed', Lang.bind(this, this._channelClosed));
+
+        this._targetHandle = targetHandle;
+        this._targetHandleType = targetHandleType;
+        this._targetId = targetId;
+
+        if (targetHandleType == Telepathy.HandleType.CONTACT) {
+            let aliasing = new Telepathy.ConnectionAliasing(DBus.session, connName, connPath);
+            aliasing.RequestAliasesRemote([this._targetHandle], Lang.bind(this,
+                function (aliases, err) {
+                    if (aliases && aliases.length)
+                        this.title = aliases[0];
+                }));
+        }

        this._notification = new Notification(this);
        this._notification.setUrgency(MessageTray.Urgency.HIGH);

-        this._presence = contact.get_presence_type();
+        // Since we only create sources when receiving a message, this
+        // is a plausible default
+        this._presence = Telepathy.ConnectionPresenceType.AVAILABLE;

-        this._sentId = this._channel.connect('message-sent', Lang.bind(this, this._messageSent));
-        this._receivedId = this._channel.connect('message-received', Lang.bind(this, this._messageReceived));
+        this._channelText = new Telepathy.ChannelText(DBus.session, connName, channelPath);
+        this._sentId = this._channelText.connect('Sent', Lang.bind(this, this._messageSent));
+        this._receivedId = this._channelText.connect('Received', Lang.bind(this, this._messageReceived));
+
+        this._channelText.ListPendingMessagesRemote(false, Lang.bind(this, this._gotPendingMessages));

        this._setSummaryIcon(this.createNotificationIcon());
-
-        this._notifyAliasId = this._contact.connect('notify::alias', Lang.bind(this, this._updateAlias));
-        this._notifyAvatarId = this._contact.connect('notify::avatar-file', Lang.bind(this, this._updateAvatarIcon));
-        this._presenceChangedId = this._contact.connect('presence-changed', Lang.bind(this, this._presenceChanged));
-
-        // Add ourselves as a source.
-        Main.messageTray.add(this);
-        this.pushNotification(this._notification);
-
-        this._getLogMessages();
-    },
-
-    _updateAlias: function() {
-        let oldAlias = this.title;
-        this.title = this._contact.get_alias();
-        this._notification.appendAliasChange(oldAlias, this.title);
-        this.pushNotification(this._notification);
    },

    createNotificationIcon: function() {
-        this._iconBox = new St.Bin({ style_class: 'avatar-box' });
-        this._iconBox._size = this.ICON_SIZE;
-
-        this._updateAvatarIcon();
-
-        return this._iconBox;
+        return contactManager.createAvatar(this._conn, this._targetHandle,
+                                           this.ICON_SIZE);
    },

-    _updateAvatarIcon: function() {
-        let textureCache = St.TextureCache.get_default();
-        let file = this._contact.get_avatar_file();
-
-        if (file) {
-            let uri = file.get_uri();
-            this._iconBox.child = textureCache.load_uri_async(uri, this._iconBox._size, this._iconBox._size);
-        } else {
-            this._iconBox.child = new St.Icon({ icon_name: 'avatar-default',
-                                                icon_type: St.IconType.FULLCOLOR,
-                                                icon_size: this._iconBox._size });
-        }
+    _notificationClicked: function(notification) {
+        channelDispatcher.EnsureChannelRemote(this._accountPath,
+                                              { 'org.freedesktop.Telepathy.Channel.ChannelType': Telepathy.CHANNEL_TEXT_NAME,
+                                                'org.freedesktop.Telepathy.Channel.TargetHandle': this._targetHandle,
+                                                'org.freedesktop.Telepathy.Channel.TargetHandleType': this._targetHandleType },
+                                              global.get_current_time(),
+                                              '',
+                                              Lang.bind(this, this._gotChannelRequest));
    },

-    open: function(notification) {
-        let props = {};
-        props[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
-        [props[Tp.PROP_CHANNEL_TARGET_HANDLE], props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE]] = this._channel.get_handle();
-
-        let req = Tp.AccountChannelRequest.new(this._account, props, global.get_current_time());
-
-        req.ensure_channel_async('', null, null);
-    },
-
-    _getLogMessages: function() {
-        let logManager = Tpl.LogManager.dup_singleton();
-        let entity = Tpl.Entity.new_from_tp_contact(this._contact, Tpl.EntityType.CONTACT);
-        Shell.get_contact_events(logManager,
-                                 this._account, entity,
-                                 SCROLLBACK_HISTORY_LINES,
-                                 Lang.bind(this, this._displayPendingMessages));
-    },
-
-    _displayPendingMessages: function(logManager, result) {
-        let [success, events] = logManager.get_filtered_events_finish(result);
-
-        let logMessages = events.map(makeMessageFromTplEvent);
-
-        let pendingTpMessages = this._channel.get_pending_messages();
-        let pendingMessages = pendingTpMessages.map(function (tpMessage) { return makeMessageFromTpMessage(tpMessage, NotificationDirection.RECEIVED); });
-
-        let showTimestamp = false;
-
-        for (let i = 0; i < logMessages.length; i++) {
-            let logMessage = logMessages[i];
-            let isPending = false;
-
-            // Skip any log messages that are also in pendingMessages
-            for (let j = 0; j < pendingMessages.length; j++) {
-                let pending = pendingMessages[j];
-                if (logMessage.timestamp == pending.timestamp && logMessage.text == pending.text) {
-                    isPending = true;
-                    break;
-                }
-            }
-
-            if (!isPending) {
-                showTimestamp = true;
-                this._notification.appendMessage(logMessage, true, ['chat-log-message']);
-            }
+    _gotChannelRequest: function (chanReqPath, ex) {
+        if (ex) {
+            log ('EnsureChannelRemote failed? ' + ex);
+            return;
        }

-        if (showTimestamp)
-            this._notification.appendTimestamp();
+        let chanReq = new Telepathy.ChannelRequest(DBus.session, Telepathy.CHANNEL_DISPATCHER_NAME, chanReqPath);
+        chanReq.ProceedRemote();
+    },

-        for (let i = 0; i < pendingMessages.length; i++)
-            this._notification.appendMessage(pendingMessages[i], true);
+    _gotPendingMessages: function(msgs, err) {
+        if (!msgs)
+            return;

-        if (pendingMessages.length > 0)
-            this.notify();
+        for (let i = 0; i < msgs.length; i++)
+            this._messageReceived.apply(this, [this._channel].concat(msgs[i]));
    },

    _channelClosed: function() {
        this._channel.disconnect(this._closedId);
-        this._channel.disconnect(this._receivedId);
-        this._channel.disconnect(this._sentId);
-
-        this._contact.disconnect(this._notifyAliasId);
-        this._contact.disconnect(this._notifyAvatarId);
-        this._contact.disconnect(this._presenceChangedId);
-
+        this._channelText.disconnect(this._receivedId);
+        this._channelText.disconnect(this._sentId);
        this.destroy();
    },

-    _messageReceived: function(channel, message) {
-        if (message.get_message_type() == Tp.ChannelTextMessageType.DELIVERY_REPORT)
-            return;
-
-        message = makeMessageFromTpMessage(message, NotificationDirection.RECEIVED);
-        this._notification.appendMessage(message);
+    _messageReceived: function(channel, id, timestamp, sender,
+                               type, flags, text) {
+        this._notification.appendMessage(text, timestamp, NotificationDirection.RECEIVED);
        this.notify();
    },

    // This is called for both messages we send from
    // our client and other clients as well.
-    _messageSent: function(channel, message, flags, token) {
-        message = makeMessageFromTpMessage(message, NotificationDirection.SENT);
-        this._notification.appendMessage(message);
+    _messageSent: function(channel, timestamp, type, text) {
+        this._notification.appendMessage(text, timestamp, NotificationDirection.SENT);
    },

    notify: function() {
+        if (!Main.messageTray.contains(this))
+            Main.messageTray.add(this);
+
        MessageTray.Source.prototype.notify.call(this, this._notification);
    },

    respond: function(text) {
-        let type;
-        if (text.slice(0, 4) == '/me ') {
-            type = Tp.ChannelTextMessageType.ACTION;
-            text = text.slice(4);
-        } else {
-            type = Tp.ChannelTextMessageType.NORMAL;
-        }
-
-        let msg = Tp.ClientMessage.new_text(type, text);
-        this._channel.send_message_async(msg, 0, null);
+        this._channelText.SendRemote(Telepathy.ChannelTextMessageType.NORMAL, text);
    },

-    _presenceChanged: function (contact, presence, type, status, message) {
-        let msg, shouldNotify, title;
+    setPresence: function(presence, message) {
+        let msg, shouldNotify;

-        if (this._presence == presence)
-          return;
-
-        title = GLib.markup_escape_text(this.title, -1);
-
-        if (presence == Tp.ConnectionPresenceType.AVAILABLE) {
-            msg = _("%s is online.").format(title);
-            shouldNotify = (this._presence == Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.OFFLINE ||
-                   presence == Tp.ConnectionPresenceType.EXTENDED_AWAY) {
-            presence = Tp.ConnectionPresenceType.OFFLINE;
-            msg = _("%s is offline.").format(title);
-            shouldNotify = (this._presence != Tp.ConnectionPresenceType.OFFLINE);
-        } else if (presence == Tp.ConnectionPresenceType.AWAY) {
-            msg = _("%s is away.").format(title);
+        if (presence == Telepathy.ConnectionPresenceType.AVAILABLE) {
+            msg = _("%s is online.").format(this.title);
+            shouldNotify = (this._presence == Telepathy.ConnectionPresenceType.OFFLINE);
+        } else if (presence == Telepathy.ConnectionPresenceType.OFFLINE ||
+                   presence == Telepathy.ConnectionPresenceType.EXTENDED_AWAY) {
+            presence = Telepathy.ConnectionPresenceType.OFFLINE;
+            msg = _("%s is offline.").format(this.title);
+            shouldNotify = (this._presence != Telepathy.ConnectionPresenceType.OFFLINE);
+        } else if (presence == Telepathy.ConnectionPresenceType.AWAY) {
+            msg = _("%s is away.").format(this.title);
            shouldNotify = false;
-        } else if (presence == Tp.ConnectionPresenceType.BUSY) {
-            msg = _("%s is busy.").format(title);
+        } else if (presence == Telepathy.ConnectionPresenceType.BUSY) {
+            msg = _("%s is busy.").format(this.title);
            shouldNotify = false;
        } else
            return;
@ -365,57 +598,20 @@ Notification.prototype = {
        MessageTray.Notification.prototype._init.call(this, source, source.title, null, { customContent: true });
        this.setResident(true);

-        this._responseEntry = new St.Entry({ style_class: 'chat-response',
-                                             can_focus: true });
+        this._responseEntry = new St.Entry({ style_class: 'chat-response' });
        this._responseEntry.clutter_text.connect('activate', Lang.bind(this, this._onEntryActivated));
        this.setActionArea(this._responseEntry);

-        this._oldMaxScrollAdjustment = 0;
-        this._createScrollArea();
-
-        this._scrollArea.vscroll.adjustment.connect('changed', Lang.bind(this, function(adjustment) {
-            let currentValue = adjustment.value + adjustment.page_size;
-            if (currentValue == this._oldMaxScrollAdjustment)
-                this.scrollTo(St.Side.BOTTOM);
-            this._oldMaxScrollAdjustment = adjustment.upper;
-        }));
-
-        this._inputHistory = new History.HistoryManager({ entry: this._responseEntry.clutter_text });
-
        this._history = [];
        this._timestampTimeoutId = 0;
    },

-    /**
-     * appendMessage:
-     * @message: An object with the properties:
-     *   text: the body of the message,
-     *   messageType: a #Tp.ChannelTextMessageType,
-     *   sender: the name of the sender,
-     *   timestamp: the time the message was sent
-     *   direction: a #NotificationDirection
-     * 
-     * @noTimestamp: Whether to add a timestamp. If %true, no timestamp
-     *   will be added, regardless of the difference since the
-     *   last timestamp
-     * @styles: A list of CSS class names.
-     */
-    appendMessage: function(message, noTimestamp, styles) {
-        let messageBody = GLib.markup_escape_text(message.text, -1);
-        styles = styles || [];
-        styles.push(message.direction);
-
-        if (message.messageType == Tp.ChannelTextMessageType.ACTION) {
-            let senderAlias = GLib.markup_escape_text(message.sender, -1);
-            messageBody = '<i>%s</i> %s'.format(senderAlias, messageBody);
-            styles.push('chat-action');
-        }
-
-        this.update(this.source.title, messageBody, { customContent: true, bannerMarkup: true });
-        this._append(messageBody, styles, message.timestamp, noTimestamp);
+    appendMessage: function(text, timestamp, direction) {
+        this.update(this.source.title, text, { customContent: true });
+        this._append(text, direction, timestamp);
    },

-    _append: function(text, styles, timestamp, noTimestamp) {
+    _append: function(text, style, timestamp) {
        let currentTime = (Date.now() / 1000);
        if (!timestamp)
            timestamp = currentTime;
@ -427,22 +623,20 @@ Notification.prototype = {
        if (this._timestampTimeoutId)
            Mainloop.source_remove(this._timestampTimeoutId);

-        let body = this.addBody(text, true);
-        for (let i = 0; i < styles.length; i ++)
-            body.add_style_class_name(styles[i]);
+        let body = this.addBody(text);
+        body.add_style_class_name(style);
+        this.scrollTo(St.Side.BOTTOM);

        this._history.unshift({ actor: body, time: timestamp, realMessage: true });

-        if (!noTimestamp) {
-            if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME)
-                this.appendTimestamp();
-            else
-                // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
-                // from the timestamp of the message.
-                this._timestampTimeoutId = Mainloop.timeout_add_seconds(
-                    SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
-                    Lang.bind(this, this.appendTimestamp));
-        }
+        if (timestamp < currentTime - SCROLLBACK_IMMEDIATE_TIME)
+            this._appendTimestamp();
+        else
+            // Schedule a new timestamp in SCROLLBACK_IMMEDIATE_TIME
+            // from the timestamp of the message.
+            this._timestampTimeoutId = Mainloop.timeout_add_seconds(
+                SCROLLBACK_IMMEDIATE_TIME - (currentTime - timestamp),
+                Lang.bind(this, this._appendTimestamp));

        if (this._history.length > 1) {
            // Keep the scrollback from growing too long. If the most
@ -463,41 +657,15 @@ Notification.prototype = {
        }
    },

-    _formatTimestamp: function(date) {
-        let now = new Date();
-
-        var daysAgo = (now.getTime() - date.getTime()) / (24 * 60 * 60 * 1000);
-
-        let format;
-
-        // Show a week day and time if date is in the last week
-        if (daysAgo < 1 || (daysAgo < 7 && now.getDay() != date.getDay())) {
-            /* Translators: this is a time format string followed by a date.
-             If applicable, replace %X with a strftime format valid for your
-             locale, without seconds. */
-            // xgettext:no-c-format
-            format = _("Sent at %X on %A");
-
-        // FIXME: The next two are stolen from calendar.js with the comment to avoid
-        // a string-freeze break. They should be replaced with better strings
-        // with 'Sent at', appropriate context and appropriate translator comment.
-
-        } else if (date.getYear() == now.getYear()) {
-            /* Translators: Shown on calendar heading when selected day occurs on current year */
-            format = C_("calendar heading", "%A, %B %d");
-        } else {
-            /* Translators: Shown on calendar heading when selected day occurs on different year */
-            format = C_("calendar heading", "%A, %B %d, %Y");
-        }
-
-        return date.toLocaleFormat(format);
-    },
-
-    appendTimestamp: function() {
+    _appendTimestamp: function() {
        let lastMessageTime = this._history[0].time;
        let lastMessageDate = new Date(lastMessageTime * 1000);

-        let timeLabel = this.addBody(this._formatTimestamp(lastMessageDate), false, { expand: true, x_fill: false, x_align: St.Align.END });
+        /* Translators: this is a time format string followed by a date.
+           If applicable, replace %X with a strftime format valid for your
+           locale, without seconds. */
+        // xgettext:no-c-format
+        let timeLabel = this.addBody(lastMessageDate.toLocaleFormat(_("Sent at %X on %A")), false, { expand: true, x_fill: false, x_align: St.Align.END });
        timeLabel.add_style_class_name('chat-meta-message');
        this._history.unshift({ actor: timeLabel, time: lastMessageTime, realMessage: false });

@ -507,25 +675,19 @@ Notification.prototype = {

    appendPresence: function(text, asTitle) {
        if (asTitle)
-            this.update(text, null, { customContent: true, titleMarkup: true });
+            this.update(text, null, { customContent: true });
        else
            this.update(this.source.title, null, { customContent: true });
-        let label = this.addBody(text, true);
+        let label = this.addBody(text);
        label.add_style_class_name('chat-meta-message');
        this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false});
    },

-    appendAliasChange: function(oldAlias, newAlias) {
-        oldAlias = GLib.markup_escape_text(oldAlias, -1);
-        newAlias = GLib.markup_escape_text(newAlias, -1);
-
-        /* Translators: this is the other person changing their old IM name to their new
-           IM name. */
-        let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
-        let label = this.addBody(message, true);
-        label.add_style_class_name('chat-meta-message');
-        this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false });
-        this.update(newAlias, null, { customContent: true });
+    grabFocus: function(lockTray) {
+        // Need to call the base class function first so that
+        // it saves where the key focus was before.
+        MessageTray.Notification.prototype.grabFocus.call(this, lockTray);
+        global.stage.set_key_focus(this._responseEntry.clutter_text);
    },

    _onEntryActivated: function() {
@ -533,8 +695,6 @@ Notification.prototype = {
        if (text == '')
            return;

-        this._inputHistory.addItem(text);
-
        // Telepathy sends out the Sent signal for us.
        // see Source._messageSent
        this._responseEntry.set_text('');
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@ -62,16 +62,9 @@ function addTween(target, tweeningParameters) {
 function _wrapTweening(target, tweeningParameters) {
    let state = _getTweenState(target);

-    if (!state.destroyedId) {
-        if (target instanceof Clutter.Actor) {
-            state.actor = target;
-            state.destroyedId = target.connect('destroy', _actorDestroyed);
-        } else if (target.actor && target.actor instanceof Clutter.Actor) {
-            state.actor = target.actor;
-            state.destroyedId = target.actor.connect('destroy', function() { _actorDestroyed(target); });
-        }
-    }
-
+    if (target instanceof Clutter.Actor && !state.destroyedId)
+        state.destroyedId = target.connect('destroy', _actorDestroyed);
+    
    _addHandler(target, tweeningParameters, 'onStart', _tweenStarted);
    _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
 }
@ -89,7 +82,7 @@ function _resetTweenState(target) {

    if (state) {
        if (state.destroyedId)
-            state.actor.disconnect(state.destroyedId);
+            target.disconnect(state.destroyedId);
        if (state.idleCompletedId)
            Mainloop.source_remove(state.idleCompletedId);
    }
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@ -1,25 +1,178 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Main = imports.ui.main;
 const Search = imports.ui.search;
 const SearchDisplay = imports.ui.searchDisplay;
 const Tweener = imports.ui.tweener;

-function BaseTab(titleActor, pageActor, name, a11yIcon) {
-    this._init(titleActor, pageActor, name, a11yIcon);
+
+function SearchEntry(focusBase) {
+    this._init(focusBase);
+}
+
+SearchEntry.prototype = {
+    _init : function(focusBase) {
+        this.actor = new St.Entry({ name: 'searchEntry',
+                                    hint_text: _("Search your computer") });
+        this.entry = this.actor.clutter_text;
+
+        this.actor.clutter_text.connect('text-changed', Lang.bind(this,
+            function() {
+                if (this.isActive())
+                    this.actor.set_secondary_icon_from_file(global.imagedir +
+                                                            'close-black.svg');
+                else
+                    this.actor.set_secondary_icon_from_file(null);
+            }));
+        this.actor.connect('secondary-icon-clicked', Lang.bind(this,
+            function() {
+                this.reset();
+            }));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        global.stage.connect('notify::key-focus', Lang.bind(this, this._updateCursorVisibility));
+
+        this.pane = null;
+
+        this._capturedEventId = 0;
+        this._focusBase = focusBase;
+    },
+
+    _updateCursorVisibility: function() {
+        let focus = global.stage.get_key_focus();
+        if (focus == this._focusBase || focus == this.entry)
+            this.entry.set_cursor_visible(true);
+        else
+            this.entry.set_cursor_visible(false);
+    },
+
+    show: function() {
+        if (this._capturedEventId == 0)
+            this._capturedEventId = global.stage.connect('captured-event',
+                                 Lang.bind(this, this._onCapturedEvent));
+        this.entry.set_cursor_visible(true);
+        this.entry.set_selection(0, 0);
+    },
+
+    hide: function() {
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+    },
+
+    reset: function () {
+        let [x, y, mask] = global.get_pointer();
+        let actor = global.stage.get_actor_at_pos (Clutter.PickMode.REACTIVE,
+                                                   x, y);
+        // this.actor is never hovered directly, only its clutter_text and icon
+        let hovered = this.actor == actor.get_parent();
+
+        this.actor.set_hover(hovered);
+
+        this.entry.text = '';
+
+        // Return focus to the viewSelector
+        global.stage.set_key_focus(this._focusBase);
+
+        this.entry.set_cursor_visible(true);
+        this.entry.set_selection(0, 0);
+    },
+
+    getText: function () {
+        return this.entry.get_text().replace(/^\s+/g, '').replace(/\s+$/g, '');
+    },
+
+    // some search term has been entered
+    isActive: function() {
+        return this.actor.get_text() != '';
+    },
+
+    // the entry does not show the hint
+    _isActivated: function() {
+        return this.entry.text == this.actor.get_text();
+    },
+
+    _onCapturedEvent: function(actor, event) {
+        let source = event.get_source();
+        let panelEvent = source && Main.panel.actor.contains(source);
+
+        switch (event.type()) {
+            case Clutter.EventType.BUTTON_PRESS:
+                // the user clicked outside after activating the entry, but
+                // with no search term entered - cancel the search
+                if (source != this.entry && this.entry.text == '') {
+                    this.reset();
+                    // allow only panel events to continue
+                    return !panelEvent;
+                }
+                return false;
+            case Clutter.EventType.KEY_PRESS:
+                // If some "special" actor grabbed the focus (run
+                // dialog, looking glass); we don't want to interfere
+                // with that
+                let focus = global.stage.get_key_focus();
+                if (focus != this._focusBase && focus != this.entry)
+                    return false;
+
+                let sym = event.get_key_symbol();
+
+                // If we have an active search, Escape cancels it - if we
+                // haven't, the key is ignored
+                if (sym == Clutter.Escape)
+                    if (this._isActivated()) {
+                        this.reset();
+                        return true;
+                    } else {
+                        return false;
+                    }
+
+                 // Ignore non-printable keys
+                 if (!Clutter.keysym_to_unicode(sym))
+                     return false;
+
+                // Search started - move the key focus to the entry and
+                // "repeat" the event
+                if (!this._isActivated()) {
+                    global.stage.set_key_focus(this.entry);
+                    this.entry.event(event, false);
+                }
+
+                return false;
+            default:
+                // Suppress all other events outside the panel while the entry
+                // is activated and no search has been entered - any click
+                // outside the entry will cancel the search
+                return (this.entry.text == '' && !panelEvent);
+        }
+    },
+
+    _onDestroy: function() {
+        if (this._capturedEventId > 0) {
+            global.stage.disconnect(this._capturedEventId);
+            this._capturedEventId = 0;
+        }
+    }
+};
+Signals.addSignalMethods(SearchEntry.prototype);
+
+
+function BaseTab(titleActor, pageActor) {
+    this._init(titleActor, pageActor);
 }

 BaseTab.prototype = {
-    _init: function(titleActor, pageActor, name, a11yIcon) {
+    _init: function(titleActor, pageActor) {
        this.title = titleActor;
        this.page = new St.Bin({ child: pageActor,
                                 x_align: St.Align.START,
@ -28,25 +181,14 @@ BaseTab.prototype = {
                                 y_fill: true,
                                 style_class: 'view-tab-page' });

-        if (this.title.can_focus) {
-            Main.ctrlAltTabManager.addGroup(this.title, name, a11yIcon);
-        } else {
-            Main.ctrlAltTabManager.addGroup(this.page, name, a11yIcon,
-                                            { proxy: this.title,
-                                              focusCallback: Lang.bind(this, this._a11yFocus) });
-        }
-
        this.visible = false;
    },

-    show: function(animate) {
+    show: function() {
        this.visible = true;
+        this.page.opacity = 0;
        this.page.show();

-        if (!animate)
-            return;
-
-        this.page.opacity = 0;
        Tweener.addTween(this.page,
                         { opacity: 255,
                           time: 0.1,
@ -66,11 +208,6 @@ BaseTab.prototype = {
                         });
    },

-    _a11yFocus: function() {
-        this._activate();
-        this.page.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    },
-
    _activate: function() {
        this.emit('activated');
    }
@ -78,70 +215,48 @@ BaseTab.prototype = {
 Signals.addSignalMethods(BaseTab.prototype);


-function ViewTab(id, label, pageActor, a11yIcon) {
-    this._init(id, label, pageActor, a11yIcon);
+function ViewTab(label, pageActor) {
+    this._init(label, pageActor);
 }

 ViewTab.prototype = {
    __proto__: BaseTab.prototype,

-    _init: function(id, label, pageActor, a11yIcon) {
-        this.id = id;
-
+    _init: function(label, pageActor) {
        let titleActor = new St.Button({ label: label,
                                         style_class: 'view-tab-title' });
        titleActor.connect('clicked', Lang.bind(this, this._activate));

-        BaseTab.prototype._init.call(this, titleActor, pageActor, label, a11yIcon);
+        BaseTab.prototype._init.call(this, titleActor, pageActor);
    }
 };


-function SearchTab() {
-    this._init();
+function SearchTab(focusBase) {
+    this._init(focusBase);
 }

 SearchTab.prototype = {
    __proto__: BaseTab.prototype,

-    _init: function() {
-        this.active = false;
+    _init: function(focusBase) {
+        this._searchActive = false;
        this._searchPending = false;
+        this._keyPressId = 0;
        this._searchTimeoutId = 0;
+        this._focusBase = focusBase;

        this._searchSystem = new Search.SearchSystem();
        this._openSearchSystem = new Search.OpenSearchSystem();

-        this._entry = new St.Entry({ name: 'searchEntry',
-                                     /* Translators: this is the text displayed
-                                        in the search entry when no search is
-                                        active; it should not exceed ~30
-                                        characters. */
-                                     hint_text: _("Type to search..."),
-                                     track_hover: true,
-                                     can_focus: true });
-        this._text = this._entry.clutter_text;
-        this._text.connect('key-press-event', Lang.bind(this, this._onKeyPress));
-
-        this._inactiveIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                           icon_name: 'edit-find',
-                                           icon_type: St.IconType.SYMBOLIC });
-        this._activeIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                         icon_name: 'edit-clear',
-                                         icon_type: St.IconType.SYMBOLIC });
-        this._entry.set_secondary_icon(this._inactiveIcon);
-
-        this._iconClickedId = 0;
-
+        this._searchEntry = new SearchEntry(focusBase);
        this._searchResults = new SearchDisplay.SearchResults(this._searchSystem, this._openSearchSystem);
        BaseTab.prototype._init.call(this,
-                                     this._entry,
-                                     this._searchResults.actor,
-                                     _("Search"),
-                                     'edit-find');
-
-        this._text.connect('text-changed', Lang.bind(this, this._onTextChanged));
-        this._text.connect('activate', Lang.bind(this, function (se) {
+                                     this._searchEntry.actor,
+                                     this._searchResults.actor);
+        this._searchEntry.entry.connect('text-changed',
+                                        Lang.bind(this, this._onTextChanged));
+        this._searchEntry.entry.connect('activate', Lang.bind(this, function (se) {
            if (this._searchTimeoutId > 0) {
                Mainloop.source_remove(this._searchTimeoutId);
                this._doSearch();
@ -149,54 +264,31 @@ SearchTab.prototype = {
            this._searchResults.activateSelected();
            return true;
        }));
+    },

-        this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped));
+    setFindAsYouType: function(enabled) {
+        if (enabled)
+            this._searchEntry.show();
+        else
+            this._searchEntry.hide();
+    },

-        global.stage.connect('notify::key-focus', Lang.bind(this, this._updateCursorVisibility));
+    show: function() {
+        BaseTab.prototype.show.call(this);

-        this._capturedEventId = 0;
+        if (this._keyPressId == 0)
+            this._keyPressId = this._searchEntry.entry.connect('key-press-event',
+                                                               Lang.bind(this, this._onKeyPress));
    },

    hide: function() {
        BaseTab.prototype.hide.call(this);

-        // Leave the entry focused when it doesn't have any text;
-        // when replacing a selected search term, Clutter emits
-        // two 'text-changed' signals, one for deleting the previous
-        // text and one for the new one - the second one is handled
-        // incorrectly when we remove focus
-        // (https://bugzilla.gnome.org/show_bug.cgi?id=636341) */
-        if (this._text.text != '')
-            this._reset();
-    },
-
-    _reset: function () {
-        this._text.text = '';
-
-        global.stage.set_key_focus(null);
-
-        this._text.set_cursor_visible(true);
-        this._text.set_selection(0, 0);
-    },
-
-    _updateCursorVisibility: function() {
-        let focus = global.stage.get_key_focus();
-        this._text.set_cursor_visible(focus == this._text);
-    },
-
-    _onMapped: function() {
-        if (this._entry.mapped) {
-            // Enable 'find-as-you-type'
-            this._capturedEventId = global.stage.connect('captured-event',
-                                 Lang.bind(this, this._onCapturedEvent));
-            this._text.set_cursor_visible(true);
-            this._text.set_selection(0, 0);
-        } else {
-            // Disable 'find-as-you-type'
-            if (this._capturedEventId > 0)
-                global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
+        if (this._keyPressId > 0) {
+            this._searchEntry.entry.disconnect(this._keyPressId);
+            this._keyPressId = 0;
        }
+        this._searchEntry.reset();
    },

    addSearchProvider: function(provider) {
@ -204,42 +296,19 @@ SearchTab.prototype = {
        this._searchResults.createProviderMeta(provider);
    },

-    startSearch: function(event) {
-        global.stage.set_key_focus(this._text);
-        this._text.event(event, false);
-    },
-
-    // the entry does not show the hint
-    _isActivated: function() {
-        return this._text.text == this._entry.get_text();
-    },
-
    _onTextChanged: function (se, prop) {
-        let searchPreviouslyActive = this.active;
-        this.active = this._entry.get_text() != '';
-        this._searchPending = this.active && !searchPreviouslyActive;
+        let searchPreviouslyActive = this._searchActive;
+        this._searchActive = this._searchEntry.isActive();
+        this._searchPending = this._searchActive && !searchPreviouslyActive;
        if (this._searchPending) {
            this._searchResults.startingSearch();
        }
-        if (this.active) {
-            this._entry.set_secondary_icon(this._activeIcon);
-
-            if (this._iconClickedId == 0) {
-                this._iconClickedId = this._entry.connect('secondary-icon-clicked',
-                    Lang.bind(this, function() {
-                        this._reset();
-                    }));
-            }
+        if (this._searchActive) {
            this._activate();
        } else {
-            if (this._iconClickedId > 0)
-                this._entry.disconnect(this._iconClickedId);
-            this._iconClickedId = 0;
-
-            this._entry.set_secondary_icon(this._inactiveIcon);
            this.emit('search-cancelled');
        }
-        if (!this.active) {
+        if (!this._searchActive) {
            if (this._searchTimeoutId > 0) {
                Mainloop.source_remove(this._searchTimeoutId);
                this._searchTimeoutId = 0;
@ -254,43 +323,24 @@ SearchTab.prototype = {
    _onKeyPress: function(entry, event) {
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.Up) {
-            if (!this.active)
+            if (!this._searchActive)
                return true;
            this._searchResults.selectUp(false);

            return true;
        } else if (symbol == Clutter.Down) {
-            if (!this.active)
+            if (!this._searchActive)
                return true;

            this._searchResults.selectDown(false);
            return true;
-        } else if (symbol == Clutter.Escape) {
-            if (this._isActivated()) {
-                this._reset();
-                return true;
-            }
        }
-
-        return false;
-    },
-
-    _onCapturedEvent: function(actor, event) {
-        if (event.type() == Clutter.EventType.BUTTON_PRESS) {
-            let source = event.get_source();
-            if (source != this._text && this._text.text == '') {
-                // the user clicked outside after activating the entry, but
-                // with no search term entered - cancel the search
-                this._reset();
-            }
-        }
-
        return false;
    },

    _doSearch: function () {
        this._searchTimeoutId = 0;
-        let text = this._text.get_text().replace(/^\s+/g, '').replace(/\s+$/g, '');
+        let text = this._searchEntry.getText();
        this._searchResults.updateSearch(text);

        return false;
@ -339,7 +389,7 @@ ViewSelector.prototype = {
        this._tabs = [];
        this._activeTab = null;

-        this._searchTab = new SearchTab();
+        this._searchTab = new SearchTab(this.actor);
        this._searchArea.set_child(this._searchTab.title);
        this._addTab(this._searchTab);

@ -348,24 +398,9 @@ ViewSelector.prototype = {
                this._switchTab(this._activeTab);
            }));

-        Main.overview.connect('item-drag-begin',
-                              Lang.bind(this, this._switchDefaultTab));
-
-        this._stageKeyPressId = 0;
-        Main.overview.connect('showing', Lang.bind(this,
-            function () {
-                this._switchDefaultTab();
-                this._stageKeyPressId = global.stage.connect('key-press-event',
-                                                             Lang.bind(this, this._onStageKeyPress));
-            }));
-        Main.overview.connect('hiding', Lang.bind(this,
-            function () {
-                this._switchDefaultTab();
-                if (this._stageKeyPressId != 0) {
-                    global.stage.disconnect(this._stageKeyPressId);
-                    this._stageKeyPressId = 0;
-                }
-            }));
+        this._keyPressId = 0;
+        this._itemDragBeginId = 0;
+        this._overviewHidingId = 0;

        // Public constraints which may be used to tie actors' height or
        // vertical position to the current tab's content; as the content's
@ -389,16 +424,14 @@ ViewSelector.prototype = {
        }));
    },

-    addViewTab: function(id, title, pageActor, a11yIcon) {
-        let viewTab = new ViewTab(id, title, pageActor, a11yIcon);
+    addViewTab: function(title, pageActor) {
+        let viewTab = new ViewTab(title, pageActor);
        this._tabs.push(viewTab);
        this._tabBox.add(viewTab.title);
        this._addTab(viewTab);
    },

    _switchTab: function(tab) {
-        let firstSwitch = this._activeTab == null;
-
        if (this._activeTab && this._activeTab.visible) {
            if (this._activeTab == tab)
                return;
@ -414,13 +447,11 @@ ViewSelector.prototype = {
            }
        }

-        // Only fade when switching between tabs,
-        // not when setting the initially selected one.
        if (!tab.visible)
-            tab.show(!firstSwitch);
+            tab.show();

        // Pull a Meg Ryan:
-        if (!firstSwitch && Main.overview.workspaces) {
+        if (Main.overview && Main.overview.workspaces) {
            if (tab != this._tabs[0]) {
                Tweener.addTween(Main.overview.workspaces.actor,
                                 { opacity: 0,
@ -443,14 +474,6 @@ ViewSelector.prototype = {
        }
    },

-    switchTab: function(id) {
-        for (let i = 0; i < this._tabs.length; i++)
-            if (this._tabs[i].id == id) {
-                this._switchTab(this._tabs[i]);
-                break;
-            }
-    },
-
    _switchDefaultTab: function() {
        if (this._tabs.length > 0)
            this._switchTab(this._tabs[0]);
@ -532,31 +555,63 @@ ViewSelector.prototype = {
            }));
    },

-    _onStageKeyPress: function(actor, event) {
+    _onKeyPress: function(actor, event) {
        let modifiers = Shell.get_event_state(event);
        let symbol = event.get_key_symbol();
-
        if (symbol == Clutter.Escape) {
            Main.overview.hide();
            return true;
        } else if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
            if (symbol == Clutter.Page_Up) {
-                if (!this._searchTab.active)
+                if (!this._searchActive)
                    this._prevTab();
                return true;
            } else if (symbol == Clutter.Page_Down) {
-                if (!this._searchTab.active)
+                if (!this._searchActive)
                    this._nextTab();
                return true;
            }
-        } else if (Clutter.keysym_to_unicode(symbol)) {
-            this._searchTab.startSearch(event);
        }
        return false;
    },

    addSearchProvider: function(provider) {
        this._searchTab.addSearchProvider(provider);
+    },
+
+    show: function() {
+        this._searchTab.setFindAsYouType(true);
+
+        if (this._itemDragBeginId == 0)
+            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
+                                                          Lang.bind(this, this._switchDefaultTab));
+        if (this._overviewHidingId == 0)
+            this._overviewHidingId = Main.overview.connect('hiding',
+                                                           Lang.bind(this, this._switchDefaultTab));
+        if (this._keyPressId == 0)
+            this._keyPressId = this.actor.connect('key-press-event',
+                                                  Lang.bind(this, this._onKeyPress));
+
+        this._switchDefaultTab();
+    },
+
+    hide: function() {
+        this._searchTab.setFindAsYouType(false);
+
+        if (this._keyPressId > 0) {
+            this.actor.disconnect(this._keyPressId);
+            this._keyPressId = 0;
+        }
+
+        if (this._itemDragBeginId > 0) {
+            Main.overview.disconnect(this._itemDragBeginId);
+            this._itemDragBeginId = 0;
+        }
+
+        if (this._overviewHidingId > 0) {
+            Main.overview.disconnect(this._overviewHidingId);
+            this._overviewHidingId = 0;
+        }
    }
 };
 Signals.addSignalMethods(ViewSelector.prototype);
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@ -2,6 +2,8 @@

 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
@ -13,11 +15,12 @@ function WindowAttentionHandler() {
 WindowAttentionHandler.prototype = {
    _init : function() {
        this._startupIds = {};
-        this._tracker = Shell.WindowTracker.get_default();
-        this._tracker.connect('startup-sequence-changed', Lang.bind(this, this._onStartupSequenceChanged));
+        this._sources = {};

        let display = global.screen.get_display();
        display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
+        let tracker = Shell.WindowTracker.get_default();
+        tracker.connect('startup-sequence-changed', Lang.bind(this, this._onStartupSequenceChanged));
    },

    _onStartupSequenceChanged : function(tracker) {
@ -54,16 +57,28 @@ WindowAttentionHandler.prototype = {
        if (!window || window.has_focus() || window.is_skip_taskbar())
            return;

-        let app = this._tracker.get_window_app(window);
-        let source = new Source(app, window);
-        Main.messageTray.add(source);
+        let tracker = Shell.WindowTracker.get_default();
+        let app = tracker.get_window_app(window);
+        let appId = app.get_id();
+
+        let source = this._sources[appId];
+        if (source == null) {
+            source = new Source(app, window);
+            this._sources[appId] = source;
+            Main.messageTray.add(source);
+            source.connect('destroy', Lang.bind(this, function() { delete this._sources[appId]; }));
+        }

        let notification = new MessageTray.Notification(source, this._getTitle(app, window), this._getBanner(app, window));
        source.notify(notification);

-        source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function(win) {
-                                    notification.update(this._getTitle(app, win), this._getBanner(app, win));
-                              })));
+        window.connect('notify::title', Lang.bind(this, function(win) {
+                                                            notification.update(this._getTitle(app, win), this._getBanner(app, win));
+                                                        }));
+        window.connect('notify::demands-attention', Lang.bind(this, function() { source.destroy(); }));
+        window.connect('focus', Lang.bind(this, function() { source.destroy(); }));
+        window.connect('unmanaged', Lang.bind(this, function() { source.destroy(); }));
+
    }
 };

@ -79,27 +94,13 @@ Source.prototype = {
        this._window = window;
        this._app = app;
        this._setSummaryIcon(this.createNotificationIcon());
-
-        this.signalIDs = [];
-        this.signalIDs.push(this._window.connect('notify::demands-attention', Lang.bind(this, function() { this.destroy(); })));
-        this.signalIDs.push(this._window.connect('focus', Lang.bind(this, function() { this.destroy(); })));
-        this.signalIDs.push(this._window.connect('unmanaged', Lang.bind(this, function() { this.destroy(); })));
-
-        this.connect('destroy', Lang.bind(this, this._onDestroy));
-    },
-
-    _onDestroy : function() {
-        for(let i = 0; i < this.signalIDs.length; i++) {
-           this._window.disconnect(this.signalIDs[i]);
-        }
-        this.signalIDs = [];
    },

    createNotificationIcon : function() {
        return this._app.create_icon_texture(this.ICON_SIZE);
    },

-    open : function(notification) {
+    _notificationClicked : function(notification) {
        Main.activateWindow(this._window);
        this.destroy();
    }
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -93,8 +93,6 @@ WindowManager.prototype = {

        this._dimmedWindows = [];

-        this._animationBlockCount = 0;
-
        this._switchData = null;
        this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
        this._shellwm.connect('kill-window-effects', Lang.bind(this, function (shellwm, actor) {
@ -118,16 +116,14 @@ WindowManager.prototype = {
        this.setKeybindingHandler('switch_to_workspace_up', Lang.bind(this, this._showWorkspaceSwitcher));
        this.setKeybindingHandler('switch_to_workspace_down', Lang.bind(this, this._showWorkspaceSwitcher));
        this.setKeybindingHandler('switch_windows', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch_group', Lang.bind(this, this._startAppSwitcher));
-        this.setKeybindingHandler('switch_panels', Lang.bind(this, this._startA11ySwitcher));

        Main.overview.connect('showing', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
-                this._undimWindow(this._dimmedWindows[i], true);
+                this._undimParentWindow(this._dimmedWindows[i], true);
        }));
        Main.overview.connect('hiding', Lang.bind(this, function() {
            for (let i = 0; i < this._dimmedWindows.length; i++)
-                this._dimWindow(this._dimmedWindows[i], true);
+                this._dimParentWindow(this._dimmedWindows[i], true);
        }));
    },

@ -141,16 +137,8 @@ WindowManager.prototype = {
            this._shellwm.connect('keybinding::' + keybinding, handler);
    },

-    blockAnimations: function() {
-        this._animationBlockCount++;
-    },
-
-    unblockAnimations: function() {
-        this._animationBlockCount = Math.max(0, this._animationBlockCount - 1);
-    },
-
    _shouldAnimate : function(actor) {
-        if (Main.overview.visible || this._animationsBlocked > 0)
+        if (Main.overview.visible)
            return false;
        if (actor && (actor.meta_window.get_window_type() != Meta.WindowType.NORMAL))
            return false;
@ -234,39 +222,41 @@ WindowManager.prototype = {
    _unmaximizeWindowDone : function(shellwm, actor) {
    },

-    _hasAttachedDialogs: function(window, ignoreWindow) {
+    _parentHasOtherAttachedDialog: function(parent, self) {
        var count = 0;
-        window.foreach_transient(function(win) {
-            if (win != ignoreWindow && win.get_window_type() == Meta.WindowType.MODAL_DIALOG)
+        parent.foreach_transient(function(win) {
+            if (win.get_window_type() == Meta.WindowType.MODAL_DIALOG && win != self)
                count++;
            return false;
        });
        return count != 0;
    },

-    _checkDimming: function(window, ignoreWindow) {
-        let shouldDim = Meta.prefs_get_attach_modal_dialogs() && this._hasAttachedDialogs(window, ignoreWindow);
-
-        if (shouldDim && !window._dimmed) {
-            window._dimmed = true;
-            this._dimmedWindows.push(window);
-            if (!Main.overview.visible)
-                this._dimWindow(window, true);
-        } else if (!shouldDim && window._dimmed) {
-            window._dimmed = false;
-            this._dimmedWindows = this._dimmedWindows.filter(function(win) {
-                                                                 return win != window;
-                                                             });
-            if (!Main.overview.visible)
-                this._undimWindow(window, true);
+    _markParentWindowAsDimmable: function(actor, animate) {
+        if (Meta.prefs_get_attach_modal_dialogs()) {
+            this._dimmedWindows.push(actor);
+            if (this._shouldAnimate())
+                this._dimParentWindow(actor, animate);
        }
    },

-    _dimWindow: function(window, animate) {
-        let actor = window.get_compositor_private();
-        if (!actor)
+    _unmarkParentWindowAsDimmable: function(actor, animate) {
+        if (!Main.overview.visible)
+            this._undimParentWindow(actor, true);
+        this._dimmedWindows = this._dimmedWindows.filter(function(win) {
+            return win != actor;
+        });
+    },
+
+    _dimParentWindow: function(actor, animate) {
+        let meta = actor.get_meta_window();
+        let parent = meta.get_transient_for();
+        if (!parent)
            return;
-        let texture = actor.get_texture();
+        let parentActor = parent.get_compositor_private();
+        if (!parentActor || this._parentHasOtherAttachedDialog(parent, meta))
+            return;
+        let texture = parentActor.get_texture();
        if (animate)
            Tweener.addTween(getWindowDimmer(texture),
                             { dimFraction: 1.0,
@ -277,11 +267,15 @@ WindowManager.prototype = {
            getWindowDimmer(texture).dimFraction = 1.0;
    },

-    _undimWindow: function(window, animate) {
-        let actor = window.get_compositor_private();
-        if (!actor)
+    _undimParentWindow: function(actor, animate) {
+        let meta = actor.get_meta_window();
+        let parent = meta.get_transient_for();
+        if (!parent)
            return;
-        let texture = actor.get_texture();
+        let parentActor = parent.get_compositor_private();
+        if (!parentActor || this._parentHasOtherAttachedDialog(parent, meta))
+            return;
+        let texture = parentActor.get_texture();
        if (animate)
            Tweener.addTween(getWindowDimmer(texture),
                             { dimFraction: 0.0,
@ -298,19 +292,17 @@ WindowManager.prototype = {
            let type = actor.meta_window.get_window_type();
            if (type == actor._windowType)
                return;
-            if (type == Meta.WindowType.MODAL_DIALOG ||
-                actor._windowType == Meta.WindowType.MODAL_DIALOG) {
-                let parent = actor.get_meta_window().get_transient_for();
-                if (parent)
-                    this._checkDimming(parent);
-            }
+            if (type == Meta.WindowType.MODAL_DIALOG)
+                this._markParentWindowAsDimmable(actor, true);
+            else if (actor._windowType == Meta.WindowType.MODAL_DIALOG)
+                this._unmarkParentWindowAsDimmable(actor, true);

            actor._windowType = type;
        }));
        if (actor.meta_window.get_window_type() == Meta.WindowType.MODAL_DIALOG
            && Meta.prefs_get_attach_modal_dialogs()
            && actor.get_meta_window().get_transient_for()) {
-            this._checkDimming(actor.get_meta_window().get_transient_for());
+            this._markParentWindowAsDimmable(actor, true);
            if (this._shouldAnimate()) {
                actor.set_scale(1.0, 0.0);
                actor.show();
@ -370,20 +362,14 @@ WindowManager.prototype = {
    },

    _destroyWindow : function(shellwm, actor) {
-        let window = actor.meta_window;
-        let parent = window.get_transient_for();
+        let parent = actor.meta_window.get_transient_for();
        if (actor._notifyWindowTypeSignalId) {
-            window.disconnect(actor._notifyWindowTypeSignalId);
+            actor.meta_window.disconnect(actor._notifyWindowTypeSignalId);
            actor._notifyWindowTypeSignalId = 0;
        }
-        if (window._dimmed) {
-            this._dimmedWindows = this._dimmedWindows.filter(function(win) {
-                                                                 return win != window;
-                                                             });
-        }
-        while (window.get_window_type() == Meta.WindowType.MODAL_DIALOG
+        while (actor.meta_window.get_window_type() == Meta.WindowType.MODAL_DIALOG
               && parent) {
-            this._checkDimming(parent, window);
+            this._unmarkParentWindowAsDimmable(actor, true);
            if (!Meta.prefs_get_attach_modal_dialogs()
                || !this._shouldAnimate())
                break;
@ -534,14 +520,10 @@ WindowManager.prototype = {

        let tabPopup = new AltTab.AltTabPopup();

-        if (!tabPopup.show(backwards, binding == 'switch_group'))
+        if (!tabPopup.show(backwards))
            tabPopup.destroy();
    },

-    _startA11ySwitcher : function(shellwm, binding, window, backwards) {
-        Main.ctrlAltTabManager.popup(backwards);
-    },
-
    _showWorkspaceSwitcher : function(shellwm, binding, window, backwards) {
        if (global.screen.n_workspaces == 1)
            return;
@ -549,16 +531,14 @@ WindowManager.prototype = {
        if (this._workspaceSwitcherPopup == null)
            this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();

-        if (binding == 'switch_to_workspace_up')
+        if (binding == 'switch_to_workspace_left')
+            this.actionMoveWorkspaceLeft();
+        else if (binding == 'switch_to_workspace_right')
+            this.actionMoveWorkspaceRight();
+        else if (binding == 'switch_to_workspace_up')
            this.actionMoveWorkspaceUp();
        else if (binding == 'switch_to_workspace_down')
            this.actionMoveWorkspaceDown();
-        // left/right would effectively act as synonyms for up/down if we enabled them;
-        // but that could be considered confusing.
-        // else if (binding == 'switch_to_workspace_left')
-        //   this.actionMoveWorkspaceLeft();
-        // else if (binding == 'switch_to_workspace_right')
-        //   this.actionMoveWorkspaceRight();
    },

    actionMoveWorkspaceLeft: function() {
@ -574,7 +554,7 @@ WindowManager.prototype = {
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.UP, indexToActivate);
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, indexToActivate);
    },

    actionMoveWorkspaceRight: function() {
@ -590,7 +570,7 @@ WindowManager.prototype = {
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.DOWN, indexToActivate);
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
    },

    actionMoveWorkspaceUp: function() {
@ -603,7 +583,7 @@ WindowManager.prototype = {
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.UP, indexToActivate);
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, indexToActivate);
    },

    actionMoveWorkspaceDown: function() {
@ -616,6 +596,6 @@ WindowManager.prototype = {
            global.screen.get_workspace_by_index(indexToActivate).activate(global.get_current_time());

        if (!Main.overview.visible)
-            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.DOWN, indexToActivate);
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, indexToActivate);
    }
 };
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -107,8 +107,6 @@ WindowClone.prototype = {
        this._sizeChangedId = this.realWindow.connect('size-changed', Lang.bind(this, function() {
            this.emit('size-changed');
        }));
-        this._realWindowDestroyId = this.realWindow.connect('destroy',
-            Lang.bind(this, this._disconnectRealWindowSignals));

        this.actor.connect('button-release-event',
                           Lang.bind(this, this._onButtonRelease));
@ -125,7 +123,6 @@ WindowClone.prototype = {
                                              dragActorMaxSize: WINDOW_DND_SIZE,
                                              dragActorOpacity: DRAGGING_WINDOW_OPACITY });
        this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));
-        this._draggable.connect('drag-cancelled', Lang.bind(this, this._onDragCancelled));
        this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd));
        this.inDrag = false;

@ -163,18 +160,9 @@ WindowClone.prototype = {
        }
    },

-    _disconnectRealWindowSignals: function() {
-        if (this._sizeChangedId > 0)
-            this.realWindow.disconnect(this._sizeChangedId);
-        this._sizeChangedId = 0;
-
-        if (this._realWindowDestroyId > 0)
-            this.realWindow.disconnect(this._realWindowDestroyId);
-        this._realWindowDestroyId = 0;
-    },
-
    _onDestroy: function() {
-        this._disconnectRealWindowSignals();
+        this.realWindow.disconnect(this._sizeChangedId);
+        this._sizeChangedId = 0;

        this.metaWindow._delegate = null;
        this.actor._delegate = null;
@ -221,15 +209,8 @@ WindowClone.prototype = {

        let [width, height] = this.actor.get_transformed_size();

-        let monitorIndex = this.metaWindow.get_monitor();
-        let availArea = global.get_monitors()[monitorIndex];
-        if (monitorIndex == global.get_primary_monitor_index()) {
-            availArea.y += Main.panel.actor.height;
-            availArea.height -= Main.panel.actor.height;
-        }
-
-        this.actor.x = _clamp(this.actor.x, availArea.x, availArea.x + availArea.width - width);
-        this.actor.y = _clamp(this.actor.y, availArea.y, availArea.y + availArea.height - height);
+        this.actor.x = _clamp(this.actor.x, 0, global.screen_width  - width);
+        this.actor.y = _clamp(this.actor.y, Panel.PANEL_HEIGHT, global.screen_height - height);
    },

    _zoomStart : function () {
@ -237,7 +218,7 @@ WindowClone.prototype = {
        this.emit('zoom-start');

        if (!this._zoomLightbox)
-            this._zoomLightbox = new Lightbox.Lightbox(Main.uiGroup,
+            this._zoomLightbox = new Lightbox.Lightbox(global.stage,
                                                       { fadeTime: LIGHTBOX_FADE_TIME });
        this._zoomLightbox.show();

@ -248,7 +229,7 @@ WindowClone.prototype = {
        this._zoomGlobalOrig.setPosition.apply(this._zoomGlobalOrig, this.actor.get_transformed_position());
        this._zoomGlobalOrig.setScale(width / this.actor.width, height / this.actor.height);

-        this.actor.reparent(Main.uiGroup);
+        this.actor.reparent(global.stage);
        this._zoomLightbox.highlight(this.actor);

        [this.actor.x, this.actor.y]             = this._zoomGlobalOrig.getPosition();
@ -296,19 +277,10 @@ WindowClone.prototype = {
    },

    _onDragBegin : function (draggable, time) {
-        if (this._zooming)
-            this._zoomEnd();
-
-        [this.dragOrigX, this.dragOrigY] = this.actor.get_position();
-        this.dragOrigScale = this.actor.scale_x;
        this.inDrag = true;
        this.emit('drag-begin');
    },

-    _onDragCancelled : function (draggable, time) {
-        this.emit('drag-cancelled');
-    },
-
    _onDragEnd : function (draggable, time, snapback) {
        this.inDrag = false;

@ -344,7 +316,6 @@ WindowOverlay.prototype = {

        this._windowClone = windowClone;
        this._parentActor = parentActor;
-        this._hidden = false;

        let title = new St.Label({ style_class: 'window-caption',
                                   text: metaWindow.title });
@ -390,21 +361,23 @@ WindowOverlay.prototype = {
    },

    hide: function() {
-        this._hidden = true;
        this.closeButton.hide();
        this.title.hide();
    },

    show: function() {
-        this._hidden = false;
-        if (this._windowClone.actor.has_pointer)
+        let [x, y, mask] = global.get_pointer();
+        let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE,
+                                                  x, y);
+        if (actor == this._windowClone.actor) {
            this.closeButton.show();
+        }
        this.title.show();
    },

    fadeIn: function() {
-        this.show();
        this.title.opacity = 0;
+        this.title.show();
        this._parentActor.raise_top();
        Tweener.addTween(this.title,
                        { opacity: 255,
@ -435,13 +408,8 @@ WindowOverlay.prototype = {
        let button = this.closeButton;
        let title = this.title;

-        let buttonX;
-        let buttonY = cloneY - (button.height - button._overlap);
-        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
-            buttonX = cloneX - (button.width - button._overlap);
-        else
-            buttonX = cloneX + (cloneWidth - button._overlap);
-
+        let buttonX = cloneX + cloneWidth - button._overlap;
+        let buttonY = cloneY - button.height + button._overlap;
        button.set_position(Math.floor(buttonX), Math.floor(buttonY));

        if (!title.fullWidth)
@ -496,12 +464,6 @@ WindowOverlay.prototype = {
    },

    _onEnter: function() {
-        // We might get enter events on the clone while the overlay is
-        // hidden, e.g. during animations, we ignore these events,
-        // as the close button will be shown as needed when the overlays
-        // are shown again
-        if (this._hidden)
-            return;
        this._parentActor.raise_top();
        this.closeButton.show();
        this.emit('show-close-button');
@ -542,47 +504,46 @@ WindowOverlay.prototype = {
 Signals.addSignalMethods(WindowOverlay.prototype);

 const WindowPositionFlags = {
-    INITIAL: 1 << 0,
+    ZOOM: 1 << 0,
    ANIMATE: 1 << 1
 };

 /**
- * @metaWorkspace: a #Meta.Workspace, or null
+ * @metaWorkspace: a #Meta.Workspace
 */
-function Workspace(metaWorkspace, monitorIndex) {
-    this._init(metaWorkspace, monitorIndex);
+function Workspace(metaWorkspace) {
+    this._init(metaWorkspace);
 }

 Workspace.prototype = {
-    _init : function(metaWorkspace, monitorIndex) {
+    _init : function(metaWorkspace) {
        // When dragging a window, we use this slot for reserve space.
        this._reservedSlot = null;
        this.metaWorkspace = metaWorkspace;
-        this._x = 0;
-        this._y = 0;
-        this._width = 0;
-        this._height = 0;
-
-        this.monitorIndex = monitorIndex;
-        this._monitor = global.get_monitors()[this.monitorIndex];
        this._windowOverlaysGroup = new Clutter.Group();
        // Without this the drop area will be overlapped.
        this._windowOverlaysGroup.set_size(0, 0);

        this.actor = new Clutter.Group();
-        this.actor.set_size(0, 0);
-
-        this._dropRect = new Clutter.Rectangle({ opacity: 0 });
-        this._dropRect._delegate = this;
-
-        this.actor.add_actor(this._dropRect);
-        this.actor.add_actor(this._windowOverlaysGroup);
+        this.actor._delegate = this;

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

+        // Items in _windowOverlaysGroup should not be scaled, so we don't
+        // add them to this.actor, but to its parent whenever it changes
+        this.actor.connect('parent-set', Lang.bind(this, this._onParentSet));
+
+        // Auto-sizing is unreliable in the presence of ClutterClone, so rather than
+        // implicitly counting on the workspace actor to be sized to the size of the
+        // included desktop actor clone, set the size explicitly to the screen size.
+        // See http://bugzilla.openedhand.com/show_bug.cgi?id=1755
+        this.actor.width = global.screen_width;
+        this.actor.height = global.screen_height;
+        this.scale = 1.0;
+
        let windows = global.get_window_actors().filter(this._isMyWindow, this);

-        // Create clones for windows that should be
+        // Create clones for remaining windows that should be
        // visible in the Overview
        this._windows = [];
        this._windowOverlays = [];
@ -592,38 +553,19 @@ Workspace.prototype = {
            }
        }

+        // A filter for what windows we display
+        this._showOnlyWindows = null;
+
        // Track window changes
-        if (this.metaWorkspace) {
-            this._windowAddedId = this.metaWorkspace.connect('window-added',
-                                                             Lang.bind(this, this._windowAdded));
-            this._windowRemovedId = this.metaWorkspace.connect('window-removed',
-                                                               Lang.bind(this, this._windowRemoved));
-        }
-        this._windowEnteredMonitorId = global.screen.connect('window-entered-monitor',
-                                                           Lang.bind(this, this._windowEnteredMonitor));
-        this._windowLeftMonitorId = global.screen.connect('window-left-monitor',
-                                                           Lang.bind(this, this._windowLeftMonitor));
+        this._windowAddedId = this.metaWorkspace.connect('window-added',
+                                                          Lang.bind(this, this._windowAdded));
+        this._windowRemovedId = this.metaWorkspace.connect('window-removed',
+                                                            Lang.bind(this, this._windowRemoved));
        this._repositionWindowsId = 0;

        this.leavingOverview = false;
    },

-    setGeometry: function(x, y, width, height) {
-        this._x = x;
-        this._y = y;
-        this._width = width;
-        this._height = height;
-
-        // This is sometimes called during allocation, so we do this later
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
-            function () {
-                this._dropRect.set_position(x, y);
-                this._dropRect.set_size(width, height);
-                return false;
-            }));
-
-    },
-
    _lookupIndex: function (metaWindow) {
        for (let i = 0; i < this._windows.length; i++) {
            if (this._windows[i].metaWindow == metaWindow) {
@ -633,6 +575,29 @@ Workspace.prototype = {
        return -1;
    },

+    _onParentSet: function(actor, old_parent) {
+        let new_parent = this.actor.get_parent();
+        if (new_parent == null)
+            return;
+
+        if (old_parent)
+            this._windowOverlaysGroup.reparent(new_parent);
+        else
+            new_parent.add_actor(this._windowOverlaysGroup);
+    },
+
+    /**
+     * lookupCloneForMetaWindow:
+     * @metaWindow: A #MetaWindow
+     *
+     * Given a #MetaWindow instance, find the WindowClone object
+     * which represents it in the workspaces display.
+     */
+    lookupCloneForMetaWindow: function (metaWindow) {
+        let index = this._lookupIndex (metaWindow);
+        return index < 0 ? null : this._windows[index];
+    },
+
    containsMetaWindow: function (metaWindow) {
        return this._lookupIndex(metaWindow) >= 0;
    },
@ -641,6 +606,48 @@ Workspace.prototype = {
        return this._windows.length == 0;
    },

+    setShowOnlyWindows: function(showOnlyWindows, reposition) {
+        this._showOnlyWindows = showOnlyWindows;
+        this._resetCloneVisibility();
+        if (reposition)
+            this.positionWindows(WindowPositionFlags.ANIMATE);
+    },
+
+    /**
+     * setLightboxMode:
+     * @showLightbox: If true, dim background and allow highlighting a specific window
+     *
+     * This function also resets the highlighted window state.
+     */
+    setLightboxMode: function (showLightbox) {
+        if (!this._lightbox)
+            this._lightbox = new Lightbox.Lightbox(this.actor,
+                                                   { fadeTime: LIGHTBOX_FADE_TIME });
+
+        if (showLightbox)
+            this._lightbox.show();
+        else
+            this._lightbox.hide();
+    },
+
+    /**
+     * setHighlightWindow:
+     * @metaWindow: A #MetaWindow
+     *
+     * Draw the user's attention to the given window @metaWindow.
+     */
+    setHighlightWindow: function (metaWindow) {
+        if (!this._lightbox)
+            return;
+
+        let actor;
+        if (metaWindow != null) {
+            let clone = this.lookupCloneForMetaWindow(metaWindow);
+            actor = clone.actor;
+        }
+        this._lightbox.highlight(actor);
+    },
+
    /**
     * setReactive:
     * @reactive: %true iff the workspace should be reactive
@ -651,6 +658,47 @@ Workspace.prototype = {
        this.actor.reactive = reactive;
    },

+    _isCloneVisible: function(clone) {
+        return this._showOnlyWindows == null || (clone.metaWindow in this._showOnlyWindows);
+    },
+
+    /**
+     * _getVisibleClones:
+     *
+     * Returns a list WindowClone objects where the clone isn't filtered
+     * out by any application filter.
+     * The returned array will always be newly allocated; it is not in any
+     * defined order, and thus it's convenient to call .sort() with your
+     * choice of sorting function.
+     */
+    _getVisibleClones: function() {
+        let visible = [];
+
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+
+            if (!this._isCloneVisible(clone))
+                continue;
+
+            visible.push(clone);
+        }
+        return visible;
+    },
+
+    _resetCloneVisibility: function () {
+        for (let i = 0; i < this._windows.length; i++) {
+            let clone = this._windows[i];
+            let overlay = this._windowOverlays[i];
+
+            if (!this._isCloneVisible(clone)) {
+                clone.actor.hide();
+                overlay.hide();
+            } else {
+                clone.actor.show();
+            }
+        }
+    },
+
    // Only use this for n <= 20 say
    _factorial: function(n) {
        let result = 1;
@ -711,20 +759,10 @@ Workspace.prototype = {
        let xDelta, yDelta, distanceSquared;
        let actorWidth, actorHeight;

-        let x = actor.x;
-        let y = actor.y;
-        let scale = actor.scale_x;
-
-        if (actor._delegate.inDrag) {
-            x = actor._delegate.dragOrigX;
-            y = actor._delegate.dragOrigY;
-            scale = actor._delegate.dragOrigScale;
-        }
-
-        actorWidth = actor.width * scale;
-        actorHeight = actor.height * scale;
-        xDelta = x + actorWidth / 2.0 - xCenter * this._width - this._x;
-        yDelta = y + actorHeight / 2.0 - yCenter * this._height - this._y;
+        actorWidth = actor.width * actor.scale_x;
+        actorHeight = actor.height * actor.scale_y;
+        xDelta = actor.x + actorWidth / 2.0 - xCenter * global.screen_width;
+        yDelta = actor.y + actorHeight / 2.0 - yCenter * global.screen_height;
        distanceSquared = xDelta * xDelta + yDelta * yDelta;

        return distanceSquared;
@ -749,12 +787,6 @@ Workspace.prototype = {
                let delta = this._computeWindowMotion(cloneActor, slot);

                motion += delta;
-
-                // Bail out early if we're already larger than the
-                // previous best
-                if (minimumMotionPermutation != null &&
-                    motion > minimumMotion)
-                    continue;
            }

            if (minimumMotionPermutation == null || motion < minimumMotion) {
@ -815,35 +847,38 @@ Workspace.prototype = {
    },

    /**
-     * _getSlotGeometry:
+     * _getSlotRelativeGeometry:
     * @slot: A layout slot
     *
-     * Returns: the screen-relative [x, y, width, height]
+     * Returns: the workspace-relative [x, y, width, height]
     * of a given window layout slot.
     */
-    _getSlotGeometry: function(slot) {
+    _getSlotRelativeGeometry: function(slot) {
        let [xCenter, yCenter, fraction] = slot;

-        let width = this._width * fraction;
-        let height = this._height * fraction;
+        let width = global.screen_width * fraction;
+        let height = global.screen_height * fraction;

-        let x = this._x + xCenter * this._width - width / 2 ;
-        let y = this._y + yCenter * this._height - height / 2;
+        let x = xCenter * global.screen_width - width / 2;
+        let y = yCenter * global.screen_height - height / 2;

        return [x, y, width, height];
    },

    /**
-     * _computeWindowLayout:
+     * _computeWindowRelativeLayout:
     * @metaWindow: A #MetaWindow
     * @slot: A layout slot
     *
     * Given a window and slot to fit it in, compute its
-     * screen-relative [x, y, scale] where scale applies
+     * workspace-relative [x, y, scale] where scale applies
     * to both X and Y directions.
     */
-    _computeWindowLayout: function(metaWindow, slot) {
-        let [x, y, width, height] = this._getSlotGeometry(slot);
+    _computeWindowRelativeLayout: function(metaWindow, slot) {
+        let [xCenter, yCenter, fraction] = slot;
+        let [x, y, width, height] = this._getSlotRelativeGeometry(slot);
+
+        xCenter = xCenter * global.screen_width;

        let rect = metaWindow.get_outer_rect();
        let buttonOuterHeight, captionHeight;
@ -851,19 +886,23 @@ Workspace.prototype = {

        if (this._windowOverlays[0]) {
            [buttonOuterHeight, captionHeight] = this._windowOverlays[0].chromeHeights();
-            buttonOuterWidth = this._windowOverlays[0].chromeWidth();
+            buttonOuterWidth = this._windowOverlays[0].chromeWidth() / this.scale;
        } else
            [buttonOuterHeight, captionHeight] = [0, 0];
+        buttonOuterHeight /= this.scale;
+        captionHeight /= this.scale;

-        let scale = Math.min((width - buttonOuterWidth) / rect.width,
-                             (height - buttonOuterHeight - captionHeight) / rect.height,
-                             1.0);
+        let desiredWidth = global.screen_width * fraction;
+        let desiredHeight = global.screen_height * fraction;
+        let scale = Math.min((desiredWidth - buttonOuterWidth) / rect.width,
+                             (desiredHeight - buttonOuterHeight - captionHeight) / rect.height,
+                             1.0 / this.scale);

-        x = Math.floor(x + (width - scale * rect.width) / 2);
+        x = Math.floor(xCenter - 0.5 * scale * rect.width);

        // We want to center the window in case we have just one
        if (metaWindow.get_workspace().n_windows == 1)
-            y = Math.floor(y + (height - scale * rect.height) / 2);
+            y = Math.floor(yCenter * global.screen_height - 0.5 * scale * rect.height);
        else
            y = Math.floor(y + height - rect.height * scale - captionHeight);

@ -871,9 +910,6 @@ Workspace.prototype = {
    },

    setReservedSlot: function(clone) {
-        if (this._reservedSlot == clone)
-            return;
-
        if (clone && this.containsMetaWindow(clone.metaWindow)) {
            this._reservedSlot = null;
            this.positionWindows(WindowPositionFlags.ANIMATE);
@ -889,7 +925,7 @@ Workspace.prototype = {
    /**
     * positionWindows:
     * @flags:
-     *  INITIAL - this is the initial positioning of the windows.
+     *  ZOOM - workspace is moving at the same time and we need to take that into account.
     *  ANIMATE - Indicates that we need animate changing position.
     */
    positionWindows : function(flags) {
@ -898,23 +934,25 @@ Workspace.prototype = {
            this._repositionWindowsId = 0;
        }

-        let clones = this._windows.slice();
-        if (this._reservedSlot)
-            clones.push(this._reservedSlot);
+        let totalVisible = 0;

-        let initialPositioning = flags & WindowPositionFlags.INITIAL;
+        let visibleClones = this._getVisibleClones();
+        if (this._reservedSlot)
+            visibleClones.push(this._reservedSlot);
+
+        let workspaceZooming = flags & WindowPositionFlags.ZOOM;
        let animate = flags & WindowPositionFlags.ANIMATE;

        // Start the animations
-        let slots = this._computeAllWindowSlots(clones.length);
-        clones = this._orderWindowsByMotionAndStartup(clones, slots);
+        let slots = this._computeAllWindowSlots(visibleClones.length);
+        visibleClones = this._orderWindowsByMotionAndStartup(visibleClones, slots);

        let currentWorkspace = global.screen.get_active_workspace();
-        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;
+        let isOnCurrentWorkspace = this.metaWorkspace == currentWorkspace;

-        for (let i = 0; i < clones.length; i++) {
+        for (let i = 0; i < visibleClones.length; i++) {
            let slot = slots[i];
-            let clone = clones[i];
+            let clone = visibleClones[i];
            let metaWindow = clone.metaWindow;
            let mainIndex = this._lookupIndex(metaWindow);
            let overlay = this._windowOverlays[mainIndex];
@ -924,7 +962,7 @@ Workspace.prototype = {
            if (clone.inDrag)
                continue;

-            let [x, y, scale] = this._computeWindowLayout(metaWindow, slot);
+            let [x, y, scale] = this._computeWindowRelativeLayout(metaWindow, slot);

            if (overlay)
                overlay.hide();
@ -933,7 +971,7 @@ Workspace.prototype = {
                    /* Hidden windows should fade in and grow
                     * therefore we need to resize them now so they
                     * can be scaled up later */
-                     if (initialPositioning) {
+                     if (workspaceZooming) {
                         clone.actor.opacity = 0;
                         clone.actor.scale_x = 0;
                         clone.actor.scale_y = 0;
@ -954,6 +992,7 @@ Workspace.prototype = {
                                   y: y,
                                   scale_x: scale,
                                   scale_y: scale,
+                                   workspace_relative: workspaceZooming ? this : null,
                                   time: Overview.ANIMATION_TIME,
                                   transition: 'easeOutQuad',
                                   onComplete: Lang.bind(this, function() {
@ -969,16 +1008,16 @@ Workspace.prototype = {
    },

    syncStacking: function(stackIndices) {
-        let clones = this._windows.slice();
-        clones.sort(function (a, b) { return stackIndices[a.metaWindow.get_stable_sequence()] - stackIndices[b.metaWindow.get_stable_sequence()]; });
+        let visibleClones = this._getVisibleClones();
+        visibleClones.sort(function (a, b) { return stackIndices[a.metaWindow.get_stable_sequence()] - stackIndices[b.metaWindow.get_stable_sequence()]; });

-        for (let i = 0; i < clones.length; i++) {
-            let clone = clones[i];
+        for (let i = 0; i < visibleClones.length; i++) {
+            let clone = visibleClones[i];
            let metaWindow = clone.metaWindow;
            if (i == 0) {
-                clone.setStackAbove(this._dropRect);
+                clone.setStackAbove(null);
            } else {
-                let previousClone = clones[i - 1];
+                let previousClone = visibleClones[i - 1];
                clone.setStackAbove(previousClone.actor);
            }
        }
@ -996,8 +1035,13 @@ Workspace.prototype = {
        // be after the workspace animation finishes.
        let [cloneX, cloneY] = clone.actor.get_position();
        let [cloneWidth, cloneHeight] = clone.actor.get_size();
-        cloneWidth = clone.actor.scale_x * cloneWidth;
-        cloneHeight = clone.actor.scale_y * cloneHeight;
+        cloneX = this.x + this.scale * cloneX;
+        cloneY = this.y + this.scale * cloneY;
+        cloneWidth = this.scale * clone.actor.scale_x * cloneWidth;
+        cloneHeight = this.scale * clone.actor.scale_y * cloneHeight;
+
+        if (!this._windowOverlaysGroup.visible)
+            this._windowOverlaysGroup.show();

        if (overlay) {
            overlay.updatePositions(cloneX, cloneY, cloneWidth, cloneHeight);
@ -1013,8 +1057,16 @@ Workspace.prototype = {
        for (let i = 0; i < this._windows.length; i++) {
            let clone = this._windows[i];
            let overlay = this._windowOverlays[i];
-            this._showWindowOverlay(clone, overlay,
-                                    this.metaWorkspace == null || this.metaWorkspace == currentWorkspace);
+            if (this._showOnlyWindows != null && !(clone.metaWindow in this._showOnlyWindows))
+                continue;
+            this._showWindowOverlay(clone, overlay, this.metaWorkspace == currentWorkspace);
+        }
+    },
+
+    _hideAllOverlays: function() {
+        for (let i = 0; i < this._windows.length; i++) {
+            let overlay = this._windowOverlays[i];
+            overlay.hide();
        }
    },

@ -1023,10 +1075,12 @@ Workspace.prototype = {
            return true;

        let [x, y, mask] = global.get_pointer();
+        let wsWidth = this.actor.width * this.scale;
+        let wsHeight = this.actor.height * this.scale;

        let pointerHasMoved = (this._cursorX != x && this._cursorY != y);
-        let inWorkspace = (this._x < x && x < this._x + this._width &&
-                           this._y < y && y < this._y + this._height);
+        let inWorkspace = (this.x < x && x < this.x + wsWidth &&
+                           this.y < y && y < this.y + wsHeight);

        if (pointerHasMoved && inWorkspace) {
            // store current cursor position
@ -1040,9 +1094,6 @@ Workspace.prototype = {
    },

    showWindowsOverlays: function() {
-        if (this.leavingOverview)
-            return;
-
        this._windowOverlaysGroup.show();
        this._showAllOverlays();
    },
@ -1051,7 +1102,7 @@ Workspace.prototype = {
        this._windowOverlaysGroup.hide();
    },

-    _doRemoveWindow : function(metaWin) {
+    _windowRemoved : function(metaWorkspace, metaWin) {
        let win = metaWin.get_compositor_private();

        // find the position of the window in our list
@ -1060,10 +1111,6 @@ Workspace.prototype = {
        if (index == -1)
            return;

-        // Check if window still should be here
-        if (win && this._isMyWindow(win))
-            return;
-
        let clone = this._windows[index];

        this._windows.splice(index, 1);
@ -1107,7 +1154,7 @@ Workspace.prototype = {
            Lang.bind(this, this._delayedWindowRepositioning));
    },

-    _doAddWindow : function(metaWin) {
+    _windowAdded : function(metaWorkspace, metaWin) {
        if (this.leavingOverview)
            return;

@ -1118,65 +1165,31 @@ Workspace.prototype = {
            // the compositor finds out about them...
            Mainloop.idle_add(Lang.bind(this,
                                        function () {
-                                            if (this.actor &&
-                                                metaWin.get_compositor_private() &&
-                                                metaWin.get_workspace() == this.metaWorkspace)
-                                                this._doAddWindow(metaWin);
+                                            if (this.actor && metaWin.get_compositor_private())
+                                                this._windowAdded(metaWorkspace, metaWin);
                                            return false;
                                        }));
            return;
        }

-        // We might have the window in our list already if it was on all workspaces and
-        // now was moved to this workspace
-        if (this._lookupIndex (metaWin) != -1)
-            return;
-
-        if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
+        if (!this._isOverviewWindow(win))
            return;

        let clone = this._addWindowClone(win);

        if (win._overviewHint) {
-            let x = win._overviewHint.x - this.actor.x;
-            let y = win._overviewHint.y - this.actor.y;
-            let scale = win._overviewHint.scale;
+            let x = (win._overviewHint.x - this.actor.x) / this.scale;
+            let y = (win._overviewHint.y - this.actor.y) / this.scale;
+            let scale = win._overviewHint.scale / this.scale;
            delete win._overviewHint;

            clone.actor.set_position (x, y);
            clone.actor.set_scale (scale, scale);
-        } else {
-            // Position new windows at the top corner of the workspace rather
-            // than where they were placed for real to avoid the window
-            // being clipped to the workspaceView. Its not really more
-            // natural for the window to suddenly appear in the overview
-            // on some seemingly random location anyway.
-            clone.actor.set_position (this._x, this._y);
        }

        this.positionWindows(WindowPositionFlags.ANIMATE);
    },

-    _windowAdded : function(metaWorkspace, metaWin) {
-        this._doAddWindow(metaWin);
-    },
-
-    _windowRemoved : function(metaWorkspace, metaWin) {
-        this._doRemoveWindow(metaWin);
-    },
-
-    _windowEnteredMonitor : function(metaScreen, monitorIndex, metaWin) {
-        if (monitorIndex == this.monitorIndex) {
-            this._doAddWindow(metaWin);
-        }
-    },
-
-    _windowLeftMonitor : function(metaScreen, monitorIndex, metaWin) {
-        if (monitorIndex == this.monitorIndex) {
-            this._doRemoveWindow(metaWin);
-        }
-    },
-
    // check for maximized windows on the workspace
    hasMaximizedWindows: function() {
        for (let i = 0; i < this._windows.length; i++) {
@ -1191,11 +1204,14 @@ Workspace.prototype = {

    // Animate the full-screen to Overview transition.
    zoomToOverview : function() {
+        this.actor.set_position(this.x, this.y);
+        this.actor.set_scale(this.scale, this.scale);
+
        // Position and scale the windows.
        if (Main.overview.animationInProgress)
-            this.positionWindows(WindowPositionFlags.ANIMATE | WindowPositionFlags.INITIAL);
+            this.positionWindows(WindowPositionFlags.ANIMATE | WindowPositionFlags.ZOOM);
        else
-            this.positionWindows(WindowPositionFlags.INITIAL);
+            this.positionWindows(WindowPositionFlags.ZOOM);
    },

    // Animates the return from Overview mode
@ -1204,7 +1220,7 @@ Workspace.prototype = {

        this.leavingOverview = true;

-        this.hideWindowsOverlays();
+        this._hideAllOverlays();

        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
@ -1213,7 +1229,7 @@ Workspace.prototype = {
        this._overviewHiddenId = Main.overview.connect('hidden', Lang.bind(this,
                                                                           this._doneLeavingOverview));

-        if (this.metaWorkspace != null && this.metaWorkspace != currentWorkspace)
+        if (this._metaWorkspace == currentWorkspace)
            return;

        // Position and scale the windows.
@ -1228,6 +1244,7 @@ Workspace.prototype = {
                                   y: clone.origY,
                                   scale_x: 1.0,
                                   scale_y: 1.0,
+                                   workspace_relative: this,
                                   time: Overview.ANIMATION_TIME,
                                   opacity: 255,
                                   transition: 'easeOutQuad'
@ -1238,6 +1255,7 @@ Workspace.prototype = {
                                 { scale_x: 0,
                                   scale_y: 0,
                                   opacity: 0,
+                                   workspace_relative: this,
                                   time: Overview.ANIMATION_TIME,
                                   transition: 'easeOutQuad'
                                 });
@ -1257,12 +1275,8 @@ Workspace.prototype = {
        }
        Tweener.removeTweens(actor);

-        if (this.metaWorkspace) {
-            this.metaWorkspace.disconnect(this._windowAddedId);
-            this.metaWorkspace.disconnect(this._windowRemovedId);
-        }
-        global.screen.disconnect(this._windowEnteredMonitorId);
-        global.screen.disconnect(this._windowLeftMonitorId);
+        this.metaWorkspace.disconnect(this._windowAddedId);
+        this.metaWorkspace.disconnect(this._windowRemovedId);

        if (this._repositionWindowsId > 0)
            Mainloop.source_remove(this._repositionWindowsId);
@ -1281,10 +1295,10 @@ Workspace.prototype = {
        this.leavingOverview = false;
    },

-    // Tests if @win belongs to this workspaces and monitor
+    // Tests if @win belongs to this workspaces
    _isMyWindow : function (win) {
-        return (this.metaWorkspace == null || Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index())) &&
-            (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex);
+        return win.get_workspace() == this.metaWorkspace.index() ||
+            (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
    },

    // Tests if @win should be shown in the Overview
@ -1305,10 +1319,6 @@ Workspace.prototype = {
                          Main.overview.beginWindowDrag();
                          overlay.hide();
                      }));
-        clone.connect('drag-cancelled',
-                      Lang.bind(this, function(clone) {
-                          Main.overview.cancelledWindowDrag();
-                      }));
        clone.connect('drag-end',
                      Lang.bind(this, function(clone) {
                          Main.overview.endWindowDrag();
@ -1372,15 +1382,18 @@ Workspace.prototype = {
    },

    _onCloneSelected : function (clone, time) {
-        let wsIndex = undefined;
-        if (this.metaWorkspace)
-            wsIndex = this.metaWorkspace.index();
-        Main.activateWindow(clone.metaWindow, time, wsIndex);
+        Main.activateWindow(clone.metaWindow, time,
+                            this.metaWorkspace.index());
+    },
+
+    _removeSelf : function(actor, event) {
+        screen.remove_workspace(this.metaWorkspace, event.get_time());
+        return true;
    },

    // Draggable target interface
    handleDragOver : function(source, actor, x, y, time) {
-        if (source.realWindow && !this._isMyWindow(source.realWindow))
+        if (source instanceof WindowClone)
            return DND.DragMotionResult.MOVE_DROP;
        if (source.shellWorkspaceLaunch)
            return DND.DragMotionResult.COPY_DROP;
@ -1403,15 +1416,7 @@ Workspace.prototype = {
            };

            let metaWindow = win.get_meta_window();
-
-            // We need to move the window before changing the workspace, because
-            // the move itself could cause a workspace change if the window enters
-            // the primary monitor
-            if (metaWindow.get_monitor() != this.monitorIndex)
-                metaWindow.move_to_monitor(this.monitorIndex);
-
-            let index = this.metaWorkspace ? this.metaWorkspace.index() : global.screen.get_active_workspace_index();
-            metaWindow.change_workspace_by_index(index,
+            metaWindow.change_workspace_by_index(this.metaWorkspace.index(),
                                                 false, // don't create workspace
                                                 time);
            return true;
@ -1426,3 +1431,56 @@ Workspace.prototype = {
 };

 Signals.addSignalMethods(Workspace.prototype);
+
+// Create a SpecialPropertyModifier to let us move windows in a
+// straight line on the screen even though their containing workspace
+// is also moving.
+Tweener.registerSpecialPropertyModifier('workspace_relative', _workspaceRelativeModifier, _workspaceRelativeGet);
+
+function _workspaceRelativeModifier(workspace) {
+    let [startX, startY] = Main.overview.getPosition();
+    let overviewPosX, overviewPosY, overviewScale;
+
+    if (!workspace)
+        return [];
+
+    if (workspace.leavingOverview) {
+        let [zoomedInX, zoomedInY] = Main.overview.getZoomedInPosition();
+        overviewPosX = { begin: startX, end: zoomedInX };
+        overviewPosY = { begin: startY, end: zoomedInY };
+        overviewScale = { begin: Main.overview.getScale(),
+                          end: Main.overview.getZoomedInScale() };
+    } else {
+        overviewPosX = { begin: startX, end: 0 };
+        overviewPosY = { begin: startY, end: 0 };
+        overviewScale = { begin: Main.overview.getScale(), end: 1 };
+    }
+
+    return [ { name: 'x',
+               parameters: { workspacePos: workspace.x,
+                             overviewPos: overviewPosX,
+                             overviewScale: overviewScale } },
+             { name: 'y',
+               parameters: { workspacePos: workspace.y,
+                             overviewPos: overviewPosY,
+                             overviewScale: overviewScale } }
+           ];
+}
+
+function _workspaceRelativeGet(begin, end, time, params) {
+    let curOverviewPos = (1 - time) * params.overviewPos.begin +
+                         time * params.overviewPos.end;
+    let curOverviewScale = (1 - time) * params.overviewScale.begin +
+                           time * params.overviewScale.end;
+
+    // Calculate the screen position of the window.
+    let screen = (1 - time) *
+                 ((begin + params.workspacePos) * params.overviewScale.begin +
+                  params.overviewPos.begin) +
+                 time *
+                 ((end + params.workspacePos) * params.overviewScale.end +
+                 params.overviewPos.end);
+
+    // Return the workspace coordinates.
+    return (screen - curOverviewPos) / curOverviewScale - params.workspacePos;
+}
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -12,8 +12,8 @@ const Tweener = imports.ui.tweener;
 const ANIMATION_TIME = 0.1;
 const DISPLAY_TIMEOUT = 600;

-const UP = -1;
-const DOWN = 1;
+const LEFT = -1;
+const RIGHT = 1;

 function WorkspaceSwitcherPopup() {
    this._init();
@ -32,8 +32,6 @@ WorkspaceSwitcherPopup.prototype = {
        this._container = new St.BoxLayout({ style_class: 'workspace-switcher-container' });
        this._list = new Shell.GenericContainer({ style_class: 'workspace-switcher' });
        this._itemSpacing = 0;
-        this._childHeight = 0;
-        this._childWidth = 0;
        this._list.connect('style-changed', Lang.bind(this, function() {
                                                        this._itemSpacing = this._list.get_theme_node().get_length('spacing');
                                                     }));
@ -49,59 +47,63 @@ WorkspaceSwitcherPopup.prototype = {

        this._position();

-        this.actor.hide();
-
+        this.actor.show();
        this._timeoutId = Mainloop.timeout_add(DISPLAY_TIMEOUT, Lang.bind(this, this._onTimeout));
    },

-    _getPreferredHeight : function (actor, forWidth, alloc) {
+    _getPreferredWidth : function (actor, forHeight, alloc) {
        let children = this._list.get_children();
        let primary = global.get_primary_monitor();

-        let availHeight = primary.height;
-        availHeight -= Main.panel.actor.height;
-        availHeight -= this.actor.get_theme_node().get_vertical_padding();
-        availHeight -= this._container.get_theme_node().get_vertical_padding();
-        availHeight -= this._list.get_theme_node().get_vertical_padding();
+        let availwidth = primary.width;
+        availwidth -= this.actor.get_theme_node().get_horizontal_padding();
+        availwidth -= this._container.get_theme_node().get_horizontal_padding();
+        availwidth -= this._list.get_theme_node().get_horizontal_padding();

-        let height = 0;
+        let width = 0;
        for (let i = 0; i < children.length; i++) {
-            let [childMinHeight, childNaturalHeight] = children[i].get_preferred_height(-1);
-            let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(childNaturalHeight);
-            height += childNaturalHeight * primary.width / primary.height;
+            let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(-1);
+            let [childMinHeight, childNaturalHeight] = children[i].get_preferred_height(childNaturalWidth);
+            width += childNaturalHeight * primary.width / primary.height;
        }

        let spacing = this._itemSpacing * (global.screen.n_workspaces - 1);
-        height += spacing;
-        height = Math.min(height, availHeight);
+        width += spacing;
+        width = Math.min(width, availwidth);

-        this._childHeight = (height - spacing) / global.screen.n_workspaces;
+        this._childWidth = (width - spacing) / global.screen.n_workspaces;

-        alloc.min_size = height;
-        alloc.natural_size = height;
+        alloc.min_size = width;
+        alloc.natural_size = width;
    },

-    _getPreferredWidth : function (actor, forHeight, alloc) {
+    _getPreferredHeight : function (actor, forWidth, alloc) {
        let primary = global.get_primary_monitor();
-        this._childWidth = Math.round(this._childHeight * primary.width / primary.height);
+        this._childHeight = Math.round(this._childWidth * primary.height / primary.width);

-        alloc.min_size = this._childWidth;
-        alloc.natural_size = this._childWidth;
+        alloc.min_size = this._childHeight;
+        alloc.natural_size = this._childHeight;
    },

    _allocate : function (actor, box, flags) {
        let children = this._list.get_children();
        let childBox = new Clutter.ActorBox();

-        let y = box.y1;
-        let prevChildBoxY2 = box.y1 - this._itemSpacing;
+        let rtl = (St.Widget.get_default_direction() == St.TextDirection.RTL);
+        let x = box.x1;
+        let prevChildBoxX2 = box.x1 - this._itemSpacing;
        for (let i = 0; i < children.length; i++) {
-            childBox.x1 = box.x1;
-            childBox.x2 = box.x1 + this._childWidth;
-            childBox.y1 = prevChildBoxY2 + this._itemSpacing;
-            childBox.y2 = Math.round(y + this._childHeight);
-            y += this._childHeight + this._itemSpacing;
-            prevChildBoxY2 = childBox.y2;
+            childBox.x1 = prevChildBoxX2 + this._itemSpacing;
+            childBox.x2 = Math.round(x + this._childWidth);
+            childBox.y1 = box.y1;
+            childBox.y2 = box.y1 + this._childHeight;
+            x += this._childWidth + this._itemSpacing;
+            prevChildBoxX2 = childBox.x2;
+            if (rtl) {
+                let ltrChildBoxX1 = childBox.x1;
+                childBox.x1 = box.x2 - (childBox.x2 - box.x1);
+                childBox.x2 = box.x2 - (ltrChildBoxX1 - box.x1);
+            }
            children[i].allocate(childBox, flags);
        }
    },
@ -112,10 +114,10 @@ WorkspaceSwitcherPopup.prototype = {
        for (let i = 0; i < global.screen.n_workspaces; i++) {
            let indicator = null;

-           if (i == activeWorkspaceIndex && direction == UP)
-               indicator = new St.Bin({ style_class: 'ws-switcher-active-up' });
-           else if(i == activeWorkspaceIndex && direction == DOWN)
-               indicator = new St.Bin({ style_class: 'ws-switcher-active-down' });
+           if (i == activeWorkspaceIndex && direction == LEFT)
+               indicator = new St.Bin({ style_class: 'ws-switcher-active-left' });
+           else if(i == activeWorkspaceIndex && direction == RIGHT)
+               indicator = new St.Bin({ style_class: 'ws-switcher-active-right' });
           else
               indicator = new St.Bin({ style_class: 'ws-switcher-box' });

@ -127,8 +129,7 @@ WorkspaceSwitcherPopup.prototype = {
    _position: function() {
        let primary = global.get_primary_monitor();
        this._container.x = primary.x + Math.floor((primary.width - this._container.width) / 2);
-        this._container.y = primary.y + Main.panel.actor.height +
-                            Math.floor(((primary.height - Main.panel.actor.height) - this._container.height) / 2);
+        this._container.y = primary.y + Math.floor((primary.height - this._container.height) / 2);
    },

    _show : function() {
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -3,22 +3,16 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
-const WorkspacesView = imports.ui.workspacesView;

-// The maximum size of a thumbnail is 1/8 the width and height of the screen
-let MAX_THUMBNAIL_SCALE = 1/8.;
-
-const RESCALE_ANIMATION_TIME = 0.2;
-const SLIDE_ANIMATION_TIME = 0.2;
+// Fraction of original screen size for thumbnails
+let THUMBNAIL_SCALE = 1/8.;

 function WindowClone(realWindow) {
    this._init(realWindow);
@ -27,15 +21,15 @@ function WindowClone(realWindow) {
 WindowClone.prototype = {
    _init : function(realWindow) {
        this.actor = new Clutter.Clone({ source: realWindow.get_texture(),
+                                         clip_to_allocation: true,
                                         reactive: true });
        this.actor._delegate = this;
        this.realWindow = realWindow;
        this.metaWindow = realWindow.meta_window;
+        this.metaWindow._delegate = this;

        this._positionChangedId = this.realWindow.connect('position-changed',
                                                          Lang.bind(this, this._onPositionChanged));
-        this._realWindowDestroyedId = this.realWindow.connect('destroy',
-                                                              Lang.bind(this, this._disconnectRealWindowSignals));
        this._onPositionChanged();

        this.actor.connect('button-release-event',
@ -50,6 +44,8 @@ WindowClone.prototype = {
        this._draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));
        this._draggable.connect('drag-end', Lang.bind(this, this._onDragEnd));
        this.inDrag = false;
+
+        this._selected = false;
    },

    setStackAbove: function (actor) {
@ -69,23 +65,15 @@ WindowClone.prototype = {
        this.actor.set_position(this.realWindow.x, this.realWindow.y);
    },

-    _disconnectRealWindowSignals: function() {
+    _onDestroy: function() {
+        this.metaWindow._delegate = null;
+        this.actor._delegate = null;
+
        if (this._positionChangedId != 0) {
            this.realWindow.disconnect(this._positionChangedId);
            this._positionChangedId = 0;
        }

-        if (this._realWindowDestroyedId != 0) {
-            this.realWindow.disconnect(this._realWindowDestroyedId);
-            this._realWindowDestroyedId = 0;
-        }
-    },
-
-    _onDestroy: function() {
-        this._disconnectRealWindowSignals();
-
-        this.actor._delegate = null;
-
        if (this.inDrag) {
            this.emit('drag-end');
            this.inDrag = false;
@ -95,9 +83,8 @@ WindowClone.prototype = {
    },

    _onButtonRelease : function (actor, event) {
+        this._selected = true;
        this.emit('selected', event.get_time());
-
-        return true;
    },

    _onDragBegin : function (draggable, time) {
@ -125,17 +112,6 @@ WindowClone.prototype = {
 Signals.addSignalMethods(WindowClone.prototype);


-const ThumbnailState = {
-    NEW   :         0,
-    ANIMATING_IN :  1,
-    NORMAL:         2,
-    REMOVING :      3,
-    ANIMATING_OUT : 4,
-    ANIMATED_OUT :  5,
-    COLLAPSING :    6,
-    DESTROYED :     7
-};
-
 /**
 * @metaWorkspace: a #Meta.Workspace
 */
@ -145,16 +121,15 @@ function WorkspaceThumbnail(metaWorkspace) {

 WorkspaceThumbnail.prototype = {
    _init : function(metaWorkspace) {
+        // When dragging a window, we use this slot for reserve space.
        this.metaWorkspace = metaWorkspace;
-        this.monitorIndex = global.get_primary_monitor_index();

-        this.actor = new St.Group({ reactive: true,
-                                    clip_to_allocation: true,
-                                    style_class: 'workspace-thumbnail' });
+        this.actor = new St.Bin({ reactive: true,
+                                  style_class: 'workspace-thumbnail' });
        this.actor._delegate = this;

-        this._contents = new Clutter.Group();
-        this.actor.add_actor(this._contents);
+        this._group = new Clutter.Group();
+        this.actor.add_actor(this._group);

        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
        this.actor.connect('button-press-event', Lang.bind(this,
@ -163,15 +138,15 @@ WorkspaceThumbnail.prototype = {
            }));
        this.actor.connect('button-release-event', Lang.bind(this,
            function(actor, event) {
-                this._activate();
+                this.metaWorkspace.activate(event.get_time());
                return true;
            }));

        this._background = new Clutter.Clone({ source: global.background_actor });
-        this._contents.add_actor(this._background);
+        this._group.add_actor(this._background);

-        let monitor = global.get_primary_monitor();
-        this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
+        this._group.set_size(THUMBNAIL_SCALE * global.screen_width, THUMBNAIL_SCALE * global.screen_height);
+        this._group.set_scale(THUMBNAIL_SCALE, THUMBNAIL_SCALE);

        let windows = global.get_window_actors().filter(this._isMyWindow, this);

@ -188,21 +163,6 @@ WorkspaceThumbnail.prototype = {
                                                          Lang.bind(this, this._windowAdded));
        this._windowRemovedId = this.metaWorkspace.connect('window-removed',
                                                           Lang.bind(this, this._windowRemoved));
-        this._windowEnteredMonitorId = global.screen.connect('window-entered-monitor',
-                                                           Lang.bind(this, this._windowEnteredMonitor));
-        this._windowLeftMonitorId = global.screen.connect('window-left-monitor',
-                                                           Lang.bind(this, this._windowLeftMonitor));
-
-        this.state = ThumbnailState.NORMAL;
-        this._slidePosition = 0; // Fully slid in
-        this._collapseFraction = 0; // Not collapsed
-    },
-
-    setPorthole: function(x, y, width, height) {
-        this._portholeX = x;
-        this._portholeY = y;
-        this.actor.set_size(width, height);
-        this._contents.set_position(-x, -y);
    },

    _lookupIndex: function (metaWindow) {
@ -229,25 +189,7 @@ WorkspaceThumbnail.prototype = {
        }
    },

-    set slidePosition(slidePosition) {
-        this._slidePosition = slidePosition;
-        this.actor.queue_relayout();
-    },
-
-    get slidePosition() {
-        return this._slidePosition;
-    },
-
-    set collapseFraction(collapseFraction) {
-        this._collapseFraction = collapseFraction;
-        this.actor.queue_relayout();
-    },
-
-    get collapseFraction() {
-        return this._collapseFraction;
-    },
-
-    _doRemoveWindow : function(metaWin) {
+    _windowRemoved : function(metaWorkspace, metaWin) {
        let win = metaWin.get_compositor_private();

        // find the position of the window in our list
@ -256,16 +198,12 @@ WorkspaceThumbnail.prototype = {
        if (index == -1)
            return;

-        // Check if window still should be here
-        if (win && this._isMyWindow(win))
-            return;
-
        let clone = this._windows[index];
        this._windows.splice(index, 1);
        clone.destroy();
    },

-    _doAddWindow : function(metaWin) {
+    _windowAdded : function(metaWorkspace, metaWin) {
        if (this.leavingOverview)
            return;

@ -276,46 +214,19 @@ WorkspaceThumbnail.prototype = {
            // the compositor finds out about them...
            Mainloop.idle_add(Lang.bind(this,
                                        function () {
-                                            if (this.actor &&
-                                                metaWin.get_compositor_private() &&
-                                                metaWin.get_workspace() == this.metaWorkspace)
-                                                this._doAddWindow(metaWin);
+                                            if (this.actor && metaWin.get_compositor_private())
+                                                this._windowAdded(metaWorkspace, metaWin);
                                            return false;
                                        }));
            return;
        }

-        // We might have the window in our list already if it was on all workspaces and
-        // now was moved to this workspace
-        if (this._lookupIndex (metaWin) != -1)
-            return;
-
-        if (!this._isMyWindow(win) || !this._isOverviewWindow(win))
+        if (!this._isOverviewWindow(win))
            return;

        let clone = this._addWindowClone(win);
    },

-    _windowAdded : function(metaWorkspace, metaWin) {
-        this._doAddWindow(metaWin);
-    },
-
-    _windowRemoved : function(metaWorkspace, metaWin) {
-        this._doRemoveWindow(metaWin);
-    },
-
-    _windowEnteredMonitor : function(metaScreen, monitorIndex, metaWin) {
-        if (monitorIndex == this.monitorIndex) {
-            this._doAddWindow(metaWin);
-        }
-    },
-
-    _windowLeftMonitor : function(metaScreen, monitorIndex, metaWin) {
-        if (monitorIndex == this.monitorIndex) {
-            this._doRemoveWindow(metaWin);
-        }
-    },
-
    destroy : function() {
        this.actor.destroy();
    },
@ -323,17 +234,15 @@ WorkspaceThumbnail.prototype = {
    _onDestroy: function(actor) {
        this.metaWorkspace.disconnect(this._windowAddedId);
        this.metaWorkspace.disconnect(this._windowRemovedId);
-        global.screen.disconnect(this._windowEnteredMonitorId);
-        global.screen.disconnect(this._windowLeftMonitorId);

        this._windows = [];
        this.actor = null;
    },

-    // Tests if @win belongs to this workspace and monitor
+    // Tests if @win belongs to this workspaces
    _isMyWindow : function (win) {
-        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index()) &&
-            (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex);
+        return win.get_workspace() == this.metaWorkspace.index() ||
+            (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
    },

    // Tests if @win should be shown in the Overview
@ -347,7 +256,7 @@ WorkspaceThumbnail.prototype = {
        let clone = new WindowClone(win);

        clone.connect('selected',
-                      Lang.bind(this, this._activate));
+                      Lang.bind(this, this._onCloneSelected));
        clone.connect('drag-begin',
                      Lang.bind(this, function(clone) {
                          Main.overview.beginWindowDrag();
@ -356,40 +265,20 @@ WorkspaceThumbnail.prototype = {
                      Lang.bind(this, function(clone) {
                          Main.overview.endWindowDrag();
                      }));
-        this._contents.add_actor(clone.actor);
-
-        if (this._windows.length == 0)
-            clone.setStackAbove(this._background);
-        else
-            clone.setStackAbove(this._windows[this._windows.length - 1].actor);
+        this._group.add_actor(clone.actor);

        this._windows.push(clone);

        return clone;
    },

-    _activate : function (clone, time) {
-        if (this.state > ThumbnailState.NORMAL)
-            return;
-
-        // a click on the already current workspace should go back to the main view
-        if (this.metaWorkspace == global.screen.get_active_workspace())
-            Main.overview.hide();
-        else
-            this.metaWorkspace.activate(time);
+    _onCloneSelected : function (clone, time) {
+        this.metaWorkspace.activate(time);
    },

    // Draggable target interface
    handleDragOver : function(source, actor, x, y, time) {
-        if (source == Main.xdndHandler) {
-            this.metaWorkspace.activate(time);
-            return DND.DragMotionResult.CONTINUE;
-        }
-
-        if (this.state > ThumbnailState.NORMAL)
-            return DND.DragMotionResult.CONTINUE;
-
-        if (source.realWindow && !this._isMyWindow(source.realWindow))
+        if (source.realWindow)
            return DND.DragMotionResult.MOVE_DROP;
        if (source.shellWorkspaceLaunch)
            return DND.DragMotionResult.COPY_DROP;
@ -398,22 +287,12 @@ WorkspaceThumbnail.prototype = {
    },

    acceptDrop : function(source, actor, x, y, time) {
-        if (this.state > ThumbnailState.NORMAL)
-            return false;
-
        if (source.realWindow) {
            let win = source.realWindow;
            if (this._isMyWindow(win))
                return false;

            let metaWindow = win.get_meta_window();
-
-            // We need to move the window before changing the workspace, because
-            // the move itself could cause a workspace change if the window enters
-            // the primary monitor
-            if (metaWindow.get_monitor() != this.monitorIndex)
-                metaWindow.move_to_monitor(this.monitorIndex);
-
            metaWindow.change_workspace_by_index(this.metaWorkspace.index(),
                                                 false, // don't create workspace
                                                 time);
@ -429,459 +308,3 @@ WorkspaceThumbnail.prototype = {
 };

 Signals.addSignalMethods(WorkspaceThumbnail.prototype);
-
-
-function ThumbnailsBox() {
-    this._init();
-}
-
-ThumbnailsBox.prototype = {
-    _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'workspace-thumbnails',
-                                                  request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT });
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-
-        // When we animate the scale, we don't animate the requested size of the thumbnails, rather
-        // we ask for our final size and then animate within that size. This slightly simplifies the
-        // interaction with the main workspace windows (instead of constantly reallocating them
-        // to a new size, they get a new size once, then use the standard window animation code
-        // allocate the windows to their new positions), however it causes problems for drawing
-        // the background and border wrapped around the thumbnail as we animate - we can't just pack
-        // the container into a box and set style properties on the box since that box would wrap
-        // around the final size not the animating size. So instead we fake the background with
-        // an actor underneath the content and adjust the allocation of our children to leave space
-        // for the border and padding of the background actor.
-        this._background = new St.Bin({ style_class: 'workspace-thumbnails-background' });
-
-        this.actor.add_actor(this._background);
-
-        let indicator = new St.Bin({ style_class: 'workspace-thumbnail-indicator' });
-
-        // We don't want the indicator to affect drag-and-drop
-        Shell.util_set_hidden_from_pick(indicator, true);
-
-        this._indicator = indicator;
-        this.actor.add_actor(indicator);
-
-        this._targetScale = 0;
-        this._scale = 0;
-        this._pendingScaleUpdate = false;
-        this._stateUpdateQueued = false;
-        this._animatingIndicator = false;
-        this._indicatorY = 0; // only used when _animatingIndicator is true
-
-        this._stateCounts = {};
-        for (let key in ThumbnailState)
-            this._stateCounts[ThumbnailState[key]] = 0;
-
-        this._thumbnails = [];
-    },
-
-    show: function() {
-        this._switchWorkspaceNotifyId =
-            global.window_manager.connect('switch-workspace',
-                                          Lang.bind(this, this._activeWorkspaceChanged));
-
-        this._targetScale = 0;
-        this._scale = 0;
-        this._pendingScaleUpdate = false;
-        this._stateUpdateQueued = false;
-
-        this._stateCounts = {};
-        for (let key in ThumbnailState)
-            this._stateCounts[ThumbnailState[key]] = 0;
-
-        // The "porthole" is the portion of the screen that we show in the workspaces
-        let panelHeight = Main.panel.actor.height;
-        let monitor = global.get_primary_monitor();
-        this._porthole = {
-            x: monitor.x,
-            y: monitor.y + panelHeight,
-            width: monitor.width,
-            height: monitor.height - panelHeight
-        };
-
-        this.addThumbnails(0, global.screen.n_workspaces);
-    },
-
-    hide: function() {
-        if (this._switchWorkspaceNotifyId > 0) {
-            global.window_manager.disconnect(this._switchWorkspaceNotifyId);
-            this._switchWorkspaceNotifyId = 0;
-        }
-
-        for (let w = 0; w < this._thumbnails.length; w++)
-            this._thumbnails[w].destroy();
-        this._thumbnails = [];
-    },
-
-    addThumbnails: function(start, count) {
-        for (let k = start; k < start + count; k++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(k);
-            let thumbnail = new WorkspaceThumbnail(metaWorkspace);
-            thumbnail.setPorthole(this._porthole.x, this._porthole.y,
-                                  this._porthole.width, this._porthole.height);
-            this._thumbnails.push(thumbnail);
-            this.actor.add_actor(thumbnail.actor);
-
-            if (start > 0) { // not the initial fill
-                thumbnail.state = ThumbnailState.NEW;
-                thumbnail.slidePosition = 1; // start slid out
-                this._haveNewThumbnails = true;
-            } else {
-                thumbnail.state = ThumbnailState.NORMAL;
-            }
-
-            this._stateCounts[thumbnail.state]++;
-        }
-
-        this._queueUpdateStates();
-
-        // The thumbnails indicator actually needs to be on top of the thumbnails
-        this._indicator.raise_top();
-    },
-
-    removeThumbmails: function(start, count) {
-        let currentPos = 0;
-        for (let k = 0; k < this._thumbnails.length; k++) {
-            let thumbnail = this._thumbnails[k];
-
-            if (thumbnail.state > ThumbnailState.NORMAL)
-                continue;
-
-            if (currentPos >= start && currentPos < start + count)
-                this._setThumbnailState(thumbnail, ThumbnailState.REMOVING);
-
-            currentPos++;
-        }
-
-        this._queueUpdateStates();
-    },
-
-    syncStacking: function(stackIndices) {
-        for (let i = 0; i < this._thumbnails.length; i++)
-            this._thumbnails[i].syncStacking(stackIndices);
-    },
-
-    set scale(scale) {
-        this._scale = scale;
-        this.actor.queue_relayout();
-    },
-
-    get scale() {
-        return this._scale;
-    },
-
-    set indicatorY(indicatorY) {
-        this._indicatorY = indicatorY;
-        this.actor.queue_relayout();
-    },
-
-    get indicatorY() {
-        return this._indicatorY;
-    },
-
-    _setThumbnailState: function(thumbnail, state) {
-        this._stateCounts[thumbnail.state]--;
-        thumbnail.state = state;
-        this._stateCounts[thumbnail.state]++;
-    },
-
-    _iterateStateThumbnails: function(state, callback) {
-        if (this._stateCounts[state] == 0)
-            return;
-
-        for (let i = 0; i < this._thumbnails.length; i++) {
-            if (this._thumbnails[i].state == state)
-                callback.call(this, this._thumbnails[i]);
-        }
-    },
-
-    _tweenScale: function() {
-        Tweener.addTween(this,
-                         { scale: this._targetScale,
-                           time: RESCALE_ANIMATION_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: this._queueUpdateStates,
-                           onCompleteScope: this });
-    },
-
-    _updateStates: function() {
-        this._stateUpdateQueued = false;
-
-        // If we are animating the indicator, wait
-        if (this._animatingIndicator)
-            return;
-
-        // Then slide out any thumbnails that have been destroyed
-        this._iterateStateThumbnails(ThumbnailState.REMOVING,
-            function(thumbnail) {
-                this._setThumbnailState(thumbnail, ThumbnailState.ANIMATING_OUT);
-
-                Tweener.addTween(thumbnail,
-                                 { slidePosition: 1,
-                                   time: SLIDE_ANIMATION_TIME,
-                                   transition: 'linear',
-                                   onComplete: function() {
-                                       this._setThumbnailState(thumbnail, ThumbnailState.ANIMATED_OUT);
-                                       this._queueUpdateStates();
-                                   },
-                                   onCompleteScope: this
-                                 });
-            });
-
-        // As long as things are sliding out, don't proceed
-        if (this._stateCounts[ThumbnailState.ANIMATING_OUT] > 0)
-            return;
-
-        // Once that's complete, we can start scaling to the new size and collapse any removed thumbnails
-        this._iterateStateThumbnails(ThumbnailState.ANIMATED_OUT,
-            function(thumbnail) {
-                this.actor.set_skip_paint(thumbnail.actor, true);
-                this._setThumbnailState(thumbnail, ThumbnailState.COLLAPSING);
-                Tweener.addTween(thumbnail,
-                                 { collapseFraction: 1,
-                                   time: RESCALE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: function() {
-                                       this._stateCounts[thumbnail.state]--;
-                                       thumbnail.state = ThumbnailState.DESTROYED;
-
-                                       let index = this._thumbnails.indexOf(thumbnail);
-                                       this._thumbnails.splice(index, 1);
-                                       thumbnail.destroy();
-
-                                       this._queueUpdateStates();
-                                   },
-                                   onCompleteScope: this
-                                 });
-                });
-
-        if (this._pendingScaleUpdate) {
-            this._tweenScale();
-            this._pendingScaleUpdate = false;
-        }
-
-        // Wait until that's done
-        if (this._scale != this._targetScale || this._stateCounts[ThumbnailState.COLLAPSING] > 0)
-            return;
-
-        // And then slide in any new thumbnails
-        this._iterateStateThumbnails(ThumbnailState.NEW,
-            function(thumbnail) {
-                this._setThumbnailState(thumbnail, ThumbnailState.ANIMATING_IN);
-                Tweener.addTween(thumbnail,
-                                 { slidePosition: 0,
-                                   time: SLIDE_ANIMATION_TIME,
-                                   transition: 'easeOutQuad',
-                                   onComplete: function() {
-                                       this._setThumbnailState(thumbnail, ThumbnailState.NORMAL);
-                                   },
-                                   onCompleteScope: this
-                                 });
-            });
-    },
-
-    _queueUpdateStates: function() {
-        if (this._stateUpdateQueued)
-            return;
-
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                       Lang.bind(this, this._updateStates));
-
-        this._stateUpdateQueued = true;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        // See comment about this._background in _init()
-        let themeNode = this._background.get_theme_node();
-
-        forWidth = themeNode.adjust_for_width(forWidth);
-
-        // Note that for getPreferredWidth/Height we cheat a bit and skip propagating
-        // the size request to our children because we know how big they are and know
-        // that the actors aren't depending on the virtual functions being called.
-
-        if (this._thumbnails.length == 0)
-            return;
-
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let nWorkspaces = global.screen.n_workspaces;
-        let totalSpacing = (nWorkspaces - 1) * spacing;
-
-        [alloc.min_size, alloc.natural_size] =
-            themeNode.adjust_preferred_height(totalSpacing,
-                                              totalSpacing + nWorkspaces * this._porthole.height * MAX_THUMBNAIL_SCALE);
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        // See comment about this._background in _init()
-        let themeNode = this._background.get_theme_node();
-
-        if (this._thumbnails.length == 0)
-            return;
-
-        // We don't animate our preferred width, which is always reported according
-        // to the actual number of current workspaces, we just animate within that
-
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let nWorkspaces = global.screen.n_workspaces;
-        let totalSpacing = (nWorkspaces - 1) * spacing;
-
-        let avail = forHeight - totalSpacing;
-
-        let scale = (avail / nWorkspaces) / this._porthole.height;
-        scale = Math.min(scale, MAX_THUMBNAIL_SCALE);
-
-        let width = Math.round(this._porthole.width * scale);
-        [alloc.min_size, alloc.natural_size] =
-            themeNode.adjust_preferred_width(width, width);
-    },
-
-    _allocate: function(actor, box, flags) {
-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
-
-        // See comment about this._background in _init()
-        let themeNode = this._background.get_theme_node();
-        let contentBox = themeNode.get_content_box(box);
-
-        if (this._thumbnails.length == 0) // not visible
-            return;
-
-        let portholeWidth = this._porthole.width;
-        let portholeHeight = this._porthole.height;
-        let spacing = this.actor.get_theme_node().get_length('spacing');
-
-        // Compute the scale we'll need once everything is updated
-        let nWorkspaces = global.screen.n_workspaces;
-        let totalSpacing = (nWorkspaces - 1) * spacing;
-        let avail = (contentBox.y2 - contentBox.y1) - totalSpacing;
-
-        let newScale = (avail / nWorkspaces) / portholeHeight;
-        newScale = Math.min(newScale, MAX_THUMBNAIL_SCALE);
-
-        if (newScale != this._targetScale) {
-            if (this._targetScale > 0) {
-                // We don't do the tween immediately because we need to observe the ordering
-                // in queueUpdateStates - if workspaces have been removed we need to slide them
-                // out as the first thing.
-                this._targetScale = newScale;
-                this._pendingScaleUpdate = true;
-            } else {
-                this._targetScale = this._scale = newScale;
-            }
-
-            this._queueUpdateStates();
-        }
-
-        let thumbnailHeight = portholeHeight * this._scale;
-        let thumbnailWidth = Math.round(portholeWidth * this._scale);
-        let roundedHScale = thumbnailWidth / portholeWidth;
-
-        let slideOffset; // X offset when thumbnail is fully slid offscreen
-        if (rtl)
-            slideOffset = - (thumbnailWidth + themeNode.get_padding(St.Side.LEFT));
-        else
-            slideOffset = thumbnailWidth + themeNode.get_padding(St.Side.RIGHT);
-
-        let childBox = new Clutter.ActorBox();
-
-        // The background is horizontally restricted to correspond to the current thumbnail size
-        // but otherwise covers the entire allocation
-        if (rtl) {
-            childBox.x1 = box.x1;
-            childBox.x2 = box.x2 - ((contentBox.x2 - contentBox.x1) - thumbnailWidth);
-        } else {
-            childBox.x1 = box.x1 + ((contentBox.x2 - contentBox.x1) - thumbnailWidth);
-            childBox.x2 = box.x2;
-        }
-        childBox.y1 = box.y1;
-        childBox.y2 = box.y2;
-        this._background.allocate(childBox, flags);
-
-        let indicatorY = this._indicatorY;
-        // when not animating, the workspace position overrides this._indicatorY
-        let indicatorWorkspace = !this._animatingIndicator ? global.screen.get_active_workspace() : null;
-
-        let y = contentBox.y1;
-
-        for (let i = 0; i < this._thumbnails.length; i++) {
-            let thumbnail = this._thumbnails[i];
-
-            if (i > 0)
-                y += spacing - Math.round(thumbnail.collapseFraction * spacing);
-
-            // We might end up with thumbnailHeight being something like 99.33
-            // pixels. To make this work and not end up with a gap at the bottom,
-            // we need some thumbnails to be 99 pixels and some 100 pixels height;
-            // we compute an actual scale separately for each thumbnail.
-            let y1 = Math.round(y);
-            let y2 = Math.round(y + thumbnailHeight);
-            let roundedVScale = (y2 - y1) / portholeHeight;
-
-            let x1, x2;
-            if (rtl) {
-                x1 = contentBox.x1 + slideOffset * thumbnail.slidePosition;
-                x2 = x1 + thumbnailWidth;
-            } else {
-                x1 = contentBox.x2 - thumbnailWidth + slideOffset * thumbnail.slidePosition;
-                x2 = x1 + thumbnailWidth;
-            }
-
-            if (thumbnail.metaWorkspace == indicatorWorkspace)
-                indicatorY = y1;
-
-            // Allocating a scaled actor is funny - x1/y1 correspond to the origin
-            // of the actor, but x2/y2 are increased by the *unscaled* size.
-            childBox.x1 = x1;
-            childBox.x2 = x1 + portholeWidth;
-            childBox.y1 = y1;
-            childBox.y2 = y1 + portholeHeight;
-
-            thumbnail.actor.set_scale(roundedHScale, roundedVScale);
-            thumbnail.actor.allocate(childBox, flags);
-
-            // We round the collapsing portion so that we don't get thumbnails resizing
-            // during an animation due to differences in rounded, but leave the uncollapsed
-            // portion unrounded so that non-animating we end up with the right total
-            y += thumbnailHeight - Math.round(thumbnailHeight * thumbnail.collapseFraction);
-        }
-
-        if (rtl) {
-            childBox.x1 = contentBox.x1;
-            childBox.x2 = contentBox.x1 + thumbnailWidth;
-        } else {
-            childBox.x1 = contentBox.x2 - thumbnailWidth;
-            childBox.x2 = contentBox.x2;
-        }
-        childBox.y1 = indicatorY;
-        childBox.y2 = childBox.y1 + thumbnailHeight;
-        this._indicator.allocate(childBox, flags);
-    },
-
-    _activeWorkspaceChanged: function(wm, from, to, direction) {
-        let thumbnail;
-        let activeWorkspace = global.screen.get_active_workspace();
-        for (let i = 0; i < this._thumbnails.length; i++) {
-            if (this._thumbnails[i].metaWorkspace == activeWorkspace) {
-                thumbnail = this._thumbnails[i];
-                break;
-            }
-        }
-
-        this._animatingIndicator = true;
-        this.indicatorY = this._indicator.allocation.y1;
-        Tweener.addTween(this,
-                         { indicatorY: thumbnail.actor.allocation.y1,
-                           time: WorkspacesView.WORKSPACE_SWITCH_TIME,
-                           transition: 'easeOutQuad',
-                           onComplete: function() {
-                               this._animatingIndicator = false;
-                               this._queueUpdateStates();
-                           },
-                           onCompleteScope: this
-                         });
-    }
-};
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -7,6 +7,8 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Signals = imports.signals;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;

 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@ -20,18 +22,20 @@ const WORKSPACE_SWITCH_TIME = 0.25;
 const MAX_WORKSPACES = 16;


+const CONTROLS_POP_IN_FRACTION = 0.8;
 const CONTROLS_POP_IN_TIME = 0.1;


-function WorkspacesView(workspaces) {
-    this._init(workspaces);
+function WorkspacesView(width, height, x, y, zoomScale, workspaces) {
+    this._init(width, height, x, y, zoomScale, workspaces);
 }

 WorkspacesView.prototype = {
-    _init: function(workspaces) {
+    _init: function(width, height, x, y, zoomScale, workspaces) {
        this.actor = new St.Group({ style_class: 'workspaces-view' });
+        this.actor.set_clip(x, y, width, height);

-        // The actor itself isn't a drop target, so we don't want to pick on its area
+        // The actor itself isn't a drop target, so we don't want to pick on its aea
        this.actor.set_size(0, 0);

        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
@ -40,17 +44,19 @@ WorkspacesView.prototype = {
            function() {
                let node = this.actor.get_theme_node();
                this._spacing = node.get_length('spacing');
-                this._updateWorkspaceActors(false);
+                this._computeWorkspacePositions();
            }));
        this.actor.connect('notify::mapped',
                           Lang.bind(this, this._onMappedChanged));

-        this._width = 0;
-        this._height = 0;
-        this._x = 0;
-        this._y = 0;
-        this._workspaceRatioSpacing = 0;
+        this._width = width;
+        this._height = height;
+        this._x = x;
+        this._y = y;
+        this._zoomScale = zoomScale;
        this._spacing = 0;
+        this._activeWorkspaceX = 0; // x offset of active ws while dragging
+        this._activeWorkspaceY = 0; // y offset of active ws while dragging
        this._lostWorkspaces = [];
        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
@ -66,18 +72,6 @@ WorkspacesView.prototype = {
            this._workspaces[w].actor.reparent(this.actor);
        this._workspaces[activeWorkspaceIndex].actor.raise_top();

-        this._extraWorkspaces = [];
-        let monitors = global.get_monitors();
-        let m = 0;
-        for (let i = 0; i < monitors.length; i++) {
-            if (i == global.get_primary_monitor_index())
-                continue;
-            let ws = new Workspace.Workspace(null, i);
-            this._extraWorkspaces[m++] = ws;
-            ws.setGeometry(monitors[i].x, monitors[i].y, monitors[i].width, monitors[i].height);
-            global.overlay_group.add_actor(ws.actor);
-        }
-
        // Position/scale the desktop windows and their children after the
        // workspaces have been created. This cannot be done first because
        // window movement depends on the Workspaces object being accessible
@ -87,13 +81,6 @@ WorkspacesView.prototype = {
                                 Lang.bind(this, function() {
                for (let w = 0; w < this._workspaces.length; w++)
                    this._workspaces[w].zoomToOverview();
-                for (let w = 0; w < this._extraWorkspaces.length; w++)
-                    this._extraWorkspaces[w].zoomToOverview();
-        }));
-        this._overviewShownId =
-            Main.overview.connect('shown',
-                                 Lang.bind(this, function() {
-                this.actor.set_clip(this._x, this._y, this._width, this._height);
        }));

        this._scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@ -107,6 +94,9 @@ WorkspacesView.prototype = {

        this._timeoutId = 0;

+        this._windowSelectionAppId = null;
+        this._highlightWindow = null;
+
        this._switchWorkspaceNotifyId =
            global.window_manager.connect('switch-workspace',
                                          Lang.bind(this, this._activeWorkspaceChanged));
@ -123,20 +113,6 @@ WorkspacesView.prototype = {
        this._swipeScrollEndId = 0;
    },

-    setGeometry: function(x, y, width, height, spacing) {
-      if (this._x == x && this._y == y &&
-          this._width == width && this._height == height)
-          return;
-        this._width = width;
-        this._height = height;
-        this._x = x;
-        this._y = y;
-        this._workspaceRatioSpacing = spacing;
-
-        for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setGeometry(x, y, width, height);
-    },
-
    _lookupWorkspaceForMetaWindow: function (metaWindow) {
        for (let i = 0; i < this._workspaces.length; i++) {
            if (this._workspaces[i].containsMetaWindow(metaWindow))
@ -145,52 +121,173 @@ WorkspacesView.prototype = {
        return null;
    },

+    setHighlightWindow: function (metaWindow) {
+        // Looping over all workspaces is easier than keeping track of the last
+        // highlighted window while trying to handle the window or workspace possibly
+        // going away.
+        for (let i = 0; i < this._workspaces.length; i++) {
+            this._workspaces[i].setHighlightWindow(null);
+        }
+        if (metaWindow != null) {
+            let workspace = this._lookupWorkspaceForMetaWindow(metaWindow);
+            workspace.setHighlightWindow(metaWindow);
+        }
+    },
+
    getActiveWorkspace: function() {
        let active = global.screen.get_active_workspace_index();
        return this._workspaces[active];
    },

+    _clearApplicationWindowSelection: function(reposition) {
+        if (this._windowSelectionAppId == null)
+            return;
+        this._windowSelectionAppId = null;
+
+        for (let i = 0; i < this._workspaces.length; i++) {
+            this._workspaces[i].setLightboxMode(false);
+            this._workspaces[i].setShowOnlyWindows(null, reposition);
+        }
+    },
+
+    /**
+     * setApplicationWindowSelection:
+     * @appid: Application identifier string
+     *
+     * Enter a mode which shows only the windows owned by the
+     * given application, and allow highlighting of a specific
+     * window with setHighlightWindow().
+     */
+    setApplicationWindowSelection: function (appId) {
+        if (appId == null) {
+            this._clearApplicationWindowSelection(true);
+            return;
+        }
+
+        if (appId == this._windowSelectionAppId)
+            return;
+
+        this._windowSelectionAppId = appId;
+
+        let appSys = Shell.AppSystem.get_default();
+
+        let showOnlyWindows = {};
+        let app = appSys.get_app(appId);
+        let windows = app.get_windows();
+        for (let i = 0; i < windows.length; i++) {
+            showOnlyWindows[windows[i]] = 1;
+        }
+
+        for (let i = 0; i < this._workspaces.length; i++) {
+            this._workspaces[i].setLightboxMode(true);
+            this._workspaces[i].setShowOnlyWindows(showOnlyWindows, true);
+        }
+    },
+
    hide: function() {
        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
        let activeWorkspace = this._workspaces[activeWorkspaceIndex];

-        activeWorkspace.actor.raise_top();
+        if (this._windowSelectionAppId != null)
+            this._clearApplicationWindowSelection(false);

-       this.actor.remove_clip(this._x, this._y, this._width, this._height);
+        activeWorkspace.actor.raise_top();

        for (let w = 0; w < this._workspaces.length; w++)
            this._workspaces[w].zoomFromOverview();
-        for (let w = 0; w < this._extraWorkspaces.length; w++)
-            this._extraWorkspaces[w].zoomFromOverview();
    },

    destroy: function() {
        this.actor.destroy();
    },

+    getScale: function() {
+        return this._workspaces[0].scale;
+    },
+
    syncStacking: function(stackIndices) {
        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].syncStacking(stackIndices);
-        for (let i = 0; i < this._extraWorkspaces.length; i++)
-            this._extraWorkspaces[i].syncStacking(stackIndices);
    },

-    updateWindowPositions: function() {
-        for (let w = 0; w < this._workspaces.length; w++)
-            this._workspaces[w].positionWindows(Workspace.WindowPositionFlags.ANIMATE);
+    // Get the grid position of the active workspace.
+    getActiveWorkspacePosition: function() {
+        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        let activeWorkspace = this._workspaces[activeWorkspaceIndex];
+
+        return [activeWorkspace.x, activeWorkspace.y];
+    },
+
+    zoomOut: function() {
+        if (this._zoomOut)
+            return;
+
+        this._zoomOut = true;
+        this._computeWorkspacePositions();
+        this._updateWorkspaceActors(true);
+    },
+
+    zoomIn: function() {
+        if (!this._zoomOut)
+            return;
+
+        this._zoomOut = false;
+        this._computeWorkspacePositions();
+        this._updateWorkspaceActors(true);
+    },
+
+    // Compute the position, scale and opacity of the workspaces, but don't
+    // actually change the actors to match
+    _computeWorkspacePositions: function() {
+        let active = global.screen.get_active_workspace_index();
+        let zoomScale = this._zoomOut ? this._zoomScale : 1;
+        let scale = zoomScale * this._width / global.screen_width;
+
+        let _width = this._workspaces[0].actor.width * scale;
+        let _height = this._workspaces[0].actor.height * scale;
+
+        this._activeWorkspaceX = (this._width - _width) / 2;
+        this._activeWorkspaceY = (this._height - _height) / 2;
+
+        for (let w = 0; w < this._workspaces.length; w++) {
+            let workspace = this._workspaces[w];
+
+            workspace.opacity = (this._inDrag && w != active) ? 200 : 255;
+
+            workspace.scale = scale;
+            workspace.x = this._x + this._activeWorkspaceX;
+
+            // We adjust the center because the zoomScale is to leave space for
+            // the expanded workspace control so we want to zoom to either the
+            // left part of the area or the right part of the area
+            let offset = 0.5 * (1 - this._zoomScale) * this._width;
+            let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+            if (this._zoomOut)
+                workspace.x += rtl ? offset : - offset;
+
+            // We divide by zoomScale so that adjacent workspaces are always offscreen
+            // except when we are switching between workspaces
+            workspace.y = this._y + this._activeWorkspaceY
+                              + (w - active) * (_height + this._spacing) / zoomScale;
+        }
    },

    _scrollToActive: function(showAnimation) {
        let active = global.screen.get_active_workspace_index();

+        this._computeWorkspacePositions();
        this._updateWorkspaceActors(showAnimation);
        this._updateScrollAdjustment(active, showAnimation);
    },

-    // Update workspace actors parameters
+    // Update workspace actors parameters to the values calculated in
+    // _computeWorkspacePositions()
    // @showAnimation: iff %true, transition between states
    _updateWorkspaceActors: function(showAnimation) {
        let active = global.screen.get_active_workspace_index();
+        let targetWorkspaceNewY = this._y + this._activeWorkspaceY;
+        let targetWorkspaceCurrentY = this._workspaces[active].y;
+        let dy = targetWorkspaceNewY - targetWorkspaceCurrentY;

        this._animating = showAnimation;

@ -199,10 +296,14 @@ WorkspacesView.prototype = {

            Tweener.removeTweens(workspace.actor);

-            let y = (w - active) * (this._height + this._spacing + this._workspaceRatioSpacing);
+            workspace.y += dy;

            if (showAnimation) {
-                let params = { y: y,
+                let params = { x: workspace.x,
+                               y: workspace.y,
+                               scale_x: workspace.scale,
+                               scale_y: workspace.scale,
+                               opacity: workspace.opacity,
                               time: WORKSPACE_SWITCH_TIME,
                               transition: 'easeOutQuad'
                             };
@ -219,7 +320,9 @@ WorkspacesView.prototype = {
                }
                Tweener.addTween(workspace.actor, params);
            } else {
-                workspace.actor.set_position(0, y);
+                workspace.actor.set_scale(workspace.scale, workspace.scale);
+                workspace.actor.set_position(workspace.x, workspace.y);
+                workspace.actor.opacity = workspace.opacity;
                if (w == 0)
                    this._updateVisibility();
            }
@ -230,6 +333,7 @@ WorkspacesView.prototype = {

            Tweener.removeTweens(workspace.actor);

+            workspace.y += dy;
            workspace.actor.show();
            workspace.hideWindowsOverlays();

@ -273,6 +377,7 @@ WorkspacesView.prototype = {
            this._lostWorkspaces[l].destroy();
        this._lostWorkspaces = [];

+        this._computeWorkspacePositions();
        this._updateWorkspaceActors(false);
    },

@ -314,6 +419,7 @@ WorkspacesView.prototype = {
            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++)
                this.actor.add_actor(this._workspaces[w].actor);

+            this._computeWorkspacePositions();
            this._updateWorkspaceActors(false);
        } else {
            this._lostWorkspaces = lostWorkspaces;
@ -330,16 +436,10 @@ WorkspacesView.prototype = {
    },

    _onDestroy: function() {
-        for (let i = 0; i < this._extraWorkspaces.length; i++)
-            this._extraWorkspaces[i].destroy();
        this._scrollAdjustment.run_dispose();
        Main.overview.disconnect(this._overviewShowingId);
-        Main.overview.disconnect(this._overviewShownId);
        global.window_manager.disconnect(this._switchWorkspaceNotifyId);

-        if (this._inDrag)
-            this._dragEnd();
-
        if (this._timeoutId) {
            Mainloop.source_remove(this._timeoutId);
            this._timeoutId = 0;
@ -382,7 +482,6 @@ WorkspacesView.prototype = {
            return;

        this._inDrag = true;
-        this._firstDragMotion = true;

        this._dragMonitor = {
            dragMotion: Lang.bind(this, this._onDragMotion)
@ -394,14 +493,6 @@ WorkspacesView.prototype = {
        if (Main.overview.animationInProgress)
             return DND.DragMotionResult.CONTINUE;

-        if (this._firstDragMotion) {
-            this._firstDragMotion = false;
-            for (let i = 0; i < this._workspaces.length; i++)
-                this._workspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
-            for (let i = 0; i < this._extraWorkspaces.length; i++)
-                this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate);
-        }
-
        let primary = global.get_primary_monitor();

        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
@ -415,6 +506,7 @@ WorkspacesView.prototype = {
        let switchTop = (dragEvent.y <= topEdge && topWorkspace);
        if (switchTop && this._dragOverLastY != topEdge) {
            topWorkspace.metaWorkspace.activate(global.get_current_time());
+            topWorkspace.setReservedSlot(dragEvent.dragActor._delegate);
            this._dragOverLastY = topEdge;

            return DND.DragMotionResult.CONTINUE;
@ -423,6 +515,7 @@ WorkspacesView.prototype = {
        let switchBottom = (dragEvent.y >= bottomEdge && bottomWorkspace);
        if (switchBottom && this._dragOverLastY != bottomEdge) {
            bottomWorkspace.metaWorkspace.activate(global.get_current_time());
+            bottomWorkspace.setReservedSlot(dragEvent.dragActor._delegate);
            this._dragOverLastY = bottomEdge;

            return DND.DragMotionResult.CONTINUE;
@ -434,14 +527,20 @@ WorkspacesView.prototype = {
        if (topWorkspace) {
            if (topWorkspace.actor.contains(dragEvent.targetActor)) {
                hoverWorkspace = topWorkspace;
+                topWorkspace.opacity = topWorkspace.actor.opacity = 255;
                result = topWorkspace.handleDragOver(dragEvent.source, dragEvent.dragActor);
+            } else {
+                topWorkspace.opacity = topWorkspace.actor.opacity = 200;
            }
        }

        if (bottomWorkspace) {
            if (bottomWorkspace.actor.contains(dragEvent.targetActor)) {
                hoverWorkspace = bottomWorkspace;
+                bottomWorkspace.opacity = bottomWorkspace.actor.opacity = 255;
                result = bottomWorkspace.handleDragOver(dragEvent.source, dragEvent.dragActor);
+            } else {
+                bottomWorkspace.opacity = bottomWorkspace.actor.opacity = 200;
            }
        }

@ -451,6 +550,7 @@ WorkspacesView.prototype = {
                this._timeoutId = Mainloop.timeout_add_seconds(1,
                    Lang.bind(this, function() {
                       hoverWorkspace.metaWorkspace.activate(global.get_current_time());
+                       hoverWorkspace.setReservedSlot(dragEvent.dragActor._delegate);
                       return false;
                    }));
        } else {
@ -473,8 +573,6 @@ WorkspacesView.prototype = {

        for (let i = 0; i < this._workspaces.length; i++)
            this._workspaces[i].setReservedSlot(null);
-        for (let i = 0; i < this._extraWorkspaces.length; i++)
-            this._extraWorkspaces[i].setReservedSlot(null);
    },

    _swipeScrollBegin: function() {
@ -498,6 +596,12 @@ WorkspacesView.prototype = {
                Main.overview.hide();
        }

+        if (result == Overview.SwipeScrollResult.SWIPE)
+            // The active workspace has changed; while swipe-scrolling
+            // has already taken care of the positioning, the cached
+            // positions need to be updated
+            this._computeWorkspacePositions();
+
        // Make sure title captions etc are shown as necessary
        this._updateVisibility();
    },
@ -525,12 +629,12 @@ WorkspacesView.prototype = {
            return;

        let currentY = firstWorkspaceY;
-        let newY =  - adj.value / (adj.upper - 1) * workspacesHeight;
+        let newY = this._y - adj.value / (adj.upper - 1) * workspacesHeight;

        let dy = newY - currentY;

        for (let i = 0; i < this._workspaces.length; i++) {
-            this._workspaces[i].hideWindowsOverlays();
+            this._workspaces[i]._hideAllOverlays();
            this._workspaces[i].actor.visible = Math.abs(i - adj.value) <= 1;
            this._workspaces[i].actor.y += dy;
        }
@ -543,6 +647,75 @@ WorkspacesView.prototype = {
 Signals.addSignalMethods(WorkspacesView.prototype);


+function WorkspaceControlsContainer(controls) {
+    this._init(controls);
+}
+
+WorkspaceControlsContainer.prototype = {
+    _init: function(controls) {
+        this.actor = new Shell.GenericContainer({ clip_to_allocation: true });
+        this.actor.connect('get-preferred-width',
+                           Lang.bind(this, this._getPreferredWidth));
+        this.actor.connect('get-preferred-height',
+                           Lang.bind(this, this._getPreferredHeight));
+        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+
+        this.actor.add_actor(controls);
+
+        this._controls = controls;
+    },
+
+    show: function() {
+        this._controls.x = this._poppedInX();
+    },
+
+    hide: function() {
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        let [minWidth, natWidth] = this._controls.get_preferred_width(-1);
+        alloc.min_size = minWidth;
+        alloc.natural_size = natWidth;
+    },
+
+    // Always request the full width ...
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let [minHeight, natHeight] = this._controls.get_preferred_height(-1);
+        alloc.min_size = minHeight;
+        alloc.natural_size = natHeight;
+    },
+
+    // ... even when the controls are popped in, to keep the width constant.
+    // This is necessary as the workspace size is determined once before
+    // entering the overview, when the controls are popped in - if the width
+    // varied, the workspaces would be given too much width, and the controls
+    // would be overlapped by the workspaces when popped out, rendering them
+    // useless.
+    _allocate: function(actor, box, flags) {
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = this._controls.x;
+        childBox.x2 = this._controls.x + this._controls.width;
+        childBox.y1 = 0;
+        childBox.y2 = box.y2 - box.y1;
+        this._controls.allocate(childBox, flags);
+    },
+
+    _poppedInX: function() {
+        let x = CONTROLS_POP_IN_FRACTION * this._controls.width;
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+            return -x;
+        return x;
+    },
+
+    popOut: function() {
+        Tweener.addTween(this._controls,
+                         { x: 0,
+                           time: CONTROLS_POP_IN_TIME,
+                           transition: 'easeOutQuad' });
+    },
+
+};
+
 function WorkspacesDisplay() {
    this._init();
 }
@ -553,12 +726,9 @@ WorkspacesDisplay.prototype = {
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this.actor.set_clip_to_allocation(true);

-        let controls = new St.Bin({ style_class: 'workspace-controls',
-                                    request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT,
-                                    y_align: St.Align.START,
-                                    y_fill: true });
+        let controls = new St.BoxLayout({ vertical: true,
+                                          style_class: 'workspace-controls' });
        this._controls = controls;
        this.actor.add_actor(controls);

@ -566,69 +736,107 @@ WorkspacesDisplay.prototype = {
        controls.track_hover = true;
        controls.connect('notify::hover',
                         Lang.bind(this, this._onControlsHoverChanged));
-        controls.connect('scroll-event',
-                         Lang.bind(this, this._onScrollEvent));

-        this._monitorIndex = global.get_primary_monitor_index();
-        this._monitor = global.get_monitors()[this._monitorIndex];
+        this._thumbnailsBox = new St.BoxLayout({ vertical: true,
+                                                 style_class: 'workspace-thumbnails' });
+        controls.add(this._thumbnailsBox, { expand: false });

-        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
-        controls.add_actor(this._thumbnailsBox.actor);
+        let indicator = new St.Bin({ style_class: 'workspace-thumbnail-indicator',
+                                     fixed_position_set: true });
+
+        // We don't want the indicator to affect drag-and-drop
+        Shell.util_set_hidden_from_pick(indicator, true);
+
+        this._thumbnailIndicator = indicator;
+        this._thumbnailsBox.add(this._thumbnailIndicator);
+        this._thumbnailIndicatorConstraints = [];
+        this._thumbnailIndicatorConstraints.push(new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.X }));
+        this._thumbnailIndicatorConstraints.push(new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.Y }));
+        this._thumbnailIndicatorConstraints.push(new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.WIDTH }));
+        this._thumbnailIndicatorConstraints.push(new Clutter.BindConstraint({ coordinate: Clutter.BindCoordinate.HEIGHT }));
+        this._thumbnailIndicatorConstraints.forEach(function(constraint) {
+                                                        indicator.add_constraint(constraint);
+                                                    });

        this.workspacesView = null;

        this._inDrag = false;
-        this._cancelledDrag = false;
-
-        this._alwaysZoomOut = false;
        this._zoomOut = false;
-        this._zoomFraction = 0;
-
-        this._updateAlwaysZoom();
-
-        global.screen.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom));
-        Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){
-            this._alwaysZoomOut = true;
-        }));
-
-        Main.xdndHandler.connect('drag-end', Lang.bind(this, function(){
-            this._alwaysZoomOut = false;
-            this._updateAlwaysZoom();
-        }));

        this._nWorkspacesNotifyId = 0;
        this._switchWorkspaceNotifyId = 0;

        this._itemDragBeginId = 0;
-        this._itemDragCancelledId = 0;
        this._itemDragEndId = 0;
        this._windowDragBeginId = 0;
-        this._windowDragCancelledId = 0;
        this._windowDragEndId = 0;
    },

   show: function() {
-        this._zoomOut = this._alwaysZoomOut;
-        this._zoomFraction = this._alwaysZoomOut ? 1 : 0;
-        this._updateZoom();
-
        this._controls.show();
-        this._thumbnailsBox.show();

        this._workspaces = [];
+        this._workspaceThumbnails = [];
        for (let i = 0; i < global.screen.n_workspaces; i++) {
            let metaWorkspace = global.screen.get_workspace_by_index(i);
-            this._workspaces[i] = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
+            this._workspaces[i] = new Workspace.Workspace(metaWorkspace);
+
+            let thumbnail = new WorkspaceThumbnail.WorkspaceThumbnail(metaWorkspace);
+            this._workspaceThumbnails[i] = thumbnail;
+            this._thumbnailsBox.add(thumbnail.actor);
        }

+        // The thumbnails indicator actually needs to be on top of the thumbnails, but
+        // there is also something more subtle going on as well - actors in a StBoxLayout
+        // are allocated from bottom to to top (start to end), and we need the
+        // thumnail indicator to be allocated after the actors it is constrained to.
+        this._thumbnailIndicator.raise_top();
+
+        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+
+        let totalAllocation = this.actor.allocation;
+        let totalWidth = totalAllocation.x2 - totalAllocation.x1;
+        let totalHeight = totalAllocation.y2 - totalAllocation.y1;
+
+        let [controlsMin, controlsNatural] = this._controls.get_preferred_width(-1);
+        let controlsReserved = controlsNatural * (1 - CONTROLS_POP_IN_FRACTION);
+
+        totalWidth -= controlsReserved;
+
+        // Workspaces expect to have the same ratio as the screen, so take
+        // this into account when fitting the workspace into the available space
+        let width, height;
+        let totalRatio = totalWidth / totalHeight;
+        let wsRatio = global.screen_width / global.screen_height;
+        if (wsRatio > totalRatio) {
+            width = totalWidth;
+            height = Math.floor(totalWidth / wsRatio);
+        } else {
+            width = Math.floor(totalHeight * wsRatio);
+            height = totalHeight;
+        }
+
+        // Position workspaces in the available space
+        let [x, y] = this.actor.get_transformed_position();
+        x = Math.floor(x + Math.abs(totalWidth - width) / 2);
+        y = Math.floor(y + Math.abs(totalHeight - height) / 2);
+
+        if (rtl)
+            x += controlsReserved;
+
+        let zoomScale = (totalWidth - controlsNatural) / totalWidth;
+        let newView = new WorkspacesView(width, height, x, y, zoomScale, this._workspaces);
+
        if (this.workspacesView)
            this.workspacesView.destroy();
-        this.workspacesView = new WorkspacesView(this._workspaces);
-        this._updateWorkspacesGeometry();
+        this.workspacesView = newView;

        this._nWorkspacesNotifyId =
            global.screen.connect('notify::n-workspaces',
                                  Lang.bind(this, this._workspacesChanged));
+        this._switchWorkspaceNotifyId =
+            global.window_manager.connect('switch-workspace',
+                                          Lang.bind(this, this._activeWorkspaceChanged));

        this._restackedNotifyId =
            global.screen.connect('restacked',
@ -637,33 +845,34 @@ WorkspacesDisplay.prototype = {
        if (this._itemDragBeginId == 0)
            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
                                                          Lang.bind(this, this._dragBegin));
-        if (this._itemDragCancelledId == 0)
-            this._itemDragCancelledId = Main.overview.connect('item-drag-cancelled',
-                                                              Lang.bind(this, this._dragCancelled));
        if (this._itemDragEndId == 0)
            this._itemDragEndId = Main.overview.connect('item-drag-end',
                                                        Lang.bind(this, this._dragEnd));
        if (this._windowDragBeginId == 0)
            this._windowDragBeginId = Main.overview.connect('window-drag-begin',
                                                            Lang.bind(this, this._dragBegin));
-        if (this._windowDragCancelledId == 0)
-            this._windowDragCancelledId = Main.overview.connect('window-drag-cancelled',
-                                                            Lang.bind(this, this._dragCancelled));
        if (this._windowDragEndId == 0)
            this._windowDragEndId = Main.overview.connect('window-drag-end',
                                                          Lang.bind(this, this._dragEnd));

        this._onRestacked();
+        this._constrainThumbnailIndicator();
+        this._zoomOut = false;
+        this._zoomFraction = 0;
+        this._updateZoom();
    },

    hide: function() {
        this._controls.hide();
-        this._thumbnailsBox.hide();

        if (this._nWorkspacesNotifyId > 0) {
            global.screen.disconnect(this._nWorkspacesNotifyId);
            this._nWorkspacesNotifyId = 0;
        }
+        if (this._switchWorkspaceNotifyId > 0) {
+            global.window_manager.disconnect(this._switchWorkspaceNotifyId);
+            this._switchWorkspaceNotifyId = 0;
+        }
        if (this._restackedNotifyId > 0){
            global.screen.disconnect(this._restackedNotifyId);
            this._restackedNotifyId = 0;
@ -672,11 +881,7 @@ WorkspacesDisplay.prototype = {
            Main.overview.disconnect(this._itemDragBeginId);
            this._itemDragBeginId = 0;
        }
-        if (this._itemDragCancelledId > 0) {
-            Main.overview.disconnect(this._itemDragCancelledId);
-            this._itemDragCancelledId = 0;
-        }
-        if (this._itemDragEndId > 0) {
+        if (this._itemEndBeginId > 0) {
            Main.overview.disconnect(this._itemDragEndId);
            this._itemDragEndId = 0;
        }
@ -684,10 +889,6 @@ WorkspacesDisplay.prototype = {
            Main.overview.disconnect(this._windowDragBeginId);
            this._windowDragBeginId = 0;
        }
-        if (this._windowDragCancelledId > 0) {
-            Main.overview.disconnect(this._windowDragCancelledId);
-            this._windowDragCancelledId = 0;
-        }
        if (this._windowDragEndId > 0) {
            Main.overview.disconnect(this._windowDragEndId);
            this._windowDragEndId = 0;
@ -695,9 +896,11 @@ WorkspacesDisplay.prototype = {

        this.workspacesView.destroy();
        this.workspacesView = null;
+        this._unconstrainThumbnailIndicator();
        for (let w = 0; w < this._workspaces.length; w++) {
            this._workspaces[w].disconnectAll();
            this._workspaces[w].destroy();
+            this._workspaceThumbnails[w].destroy();
        }
    },

@ -711,23 +914,6 @@ WorkspacesDisplay.prototype = {
        return this._zoomFraction;
    },

-    _updateAlwaysZoom: function()  {
-        this._alwaysZoomOut = false;
-
-        let monitors = global.get_monitors();
-        let primary = global.get_primary_monitor();
-
-        /* Look for any monitor to the right of the primary, if there is
-         * one, we always keep zoom out, otherwise its hard to reach
-         * the thumbnail area without passing into the next monitor. */
-        for (let i = 0; i < monitors.length; i++) {
-            if (monitors[i].x >= primary.x + primary.width) {
-                this._alwaysZoomOut = true;
-                break;
-            }
-        }
-    },
-
    _getPreferredWidth: function (actor, forHeight, alloc) {
        // pass through the call in case the child needs it, but report 0x0
        this._controls.get_preferred_width(forHeight);
@ -747,8 +933,7 @@ WorkspacesDisplay.prototype = {
        let [controlsMin, controlsNatural] = this._controls.get_preferred_width(box.y2 - box.y1);

        // Amount of space on the screen we reserve for the visible control
-        let controlsVisible = this._controls.get_theme_node().get_length('visible-width');
-        let controlsReserved = controlsVisible * (1 - this._zoomFraction) + controlsNatural * this._zoomFraction;
+        let controlsReserved = controlsNatural * (1 - (1 - this._zoomFraction) * CONTROLS_POP_IN_FRACTION);

        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
        if (rtl) {
@ -762,42 +947,43 @@ WorkspacesDisplay.prototype = {
        childBox.y1 = 0;
        childBox.y2 = box.y2- box.y1;
        this._controls.allocate(childBox, flags);
-
-        this._updateWorkspacesGeometry();
    },

-    _updateWorkspacesGeometry: function() {
-        if (!this.workspacesView)
-            return;
+    _constrainThumbnailIndicator: function() {
+        let active = global.screen.get_active_workspace_index();
+        let thumbnail = this._workspaceThumbnails[active];

-        let fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
-        let fullHeight = this.actor.allocation.y2 - this.actor.allocation.y1;
+        this._thumbnailIndicatorConstraints.forEach(function(constraint) {
+                                                        constraint.set_source(thumbnail.actor);
+                                                        constraint.set_enabled(true);
+                                                    });
+    },

-        let width = fullWidth;
-        let height = fullHeight;
+    _unconstrainThumbnailIndicator: function() {
+        this._thumbnailIndicatorConstraints.forEach(function(constraint) {
+                                                        constraint.set_enabled(false);
+                                                    });
+    },

-        let [controlsMin, controlsNatural] = this._controls.get_preferred_width(height);
-        let controlsVisible = this._controls.get_theme_node().get_length('visible-width');
+    _activeWorkspaceChanged: function(wm, from, to, direction) {
+        let active = global.screen.get_active_workspace_index();
+        let thumbnail = this._workspaceThumbnails[active];

-        let [x, y] = this.actor.get_transformed_position();
+        this._unconstrainThumbnailIndicator();
+        let oldAllocation = this._thumbnailIndicator.allocation;
+        this._thumbnailIndicator.x = oldAllocation.x1;
+        this._thumbnailIndicator.y = oldAllocation.y1;
+        this._thumbnailIndicator.width = oldAllocation.x2 - oldAllocation.x1;
+        this._thumbnailIndicator.height = oldAllocation.y2 - oldAllocation.y1;

-        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
-
-        if (this._zoomOut) {
-            width -= controlsNatural;
-            if (rtl)
-                x += controlsNatural;
-        } else {
-            width -= controlsVisible;
-            if (rtl)
-                x += controlsVisible;
-        }
-
-        height = (fullHeight / fullWidth) * width;
-        let difference = fullHeight - height;
-        y += difference / 2;
-
-        this.workspacesView.setGeometry(x, y, width, height, difference);
+        Tweener.addTween(this._thumbnailIndicator,
+                         { x: thumbnail.actor.allocation.x1,
+                           y: thumbnail.actor.allocation.y1,
+                           time: WORKSPACE_SWITCH_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                                                 this._constrainThumbnailIndicator)
+                         });
    },

    _onRestacked: function() {
@ -810,7 +996,8 @@ WorkspacesDisplay.prototype = {
        }

        this.workspacesView.syncStacking(stackIndices);
-        this._thumbnailsBox.syncStacking(stackIndices);
+        for (let i = 0; i < this._workspaceThumbnails.length; i++)
+            this._workspaceThumbnails[i].syncStacking(stackIndices);
    },

    _workspacesChanged: function() {
@ -826,10 +1013,13 @@ WorkspacesDisplay.prototype = {
            // Assume workspaces are only added at the end
            for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
                let metaWorkspace = global.screen.get_workspace_by_index(w);
-                this._workspaces[w] = new Workspace.Workspace(metaWorkspace, this._monitorIndex);
-            }
+                this._workspaces[w] = new Workspace.Workspace(metaWorkspace);

-            this._thumbnailsBox.addThumbnails(oldNumWorkspaces, newNumWorkspaces - oldNumWorkspaces);
+                let thumbnail = new WorkspaceThumbnail.WorkspaceThumbnail(metaWorkspace);
+                this._workspaceThumbnails[w] = thumbnail;
+                this._thumbnailsBox.add(thumbnail.actor);
+            }
+            this._thumbnailIndicator.raise_top();
        } else {
            // Assume workspaces are only removed sequentially
            // (e.g. 2,3,4 - not 2,4,7)
@ -851,9 +1041,17 @@ WorkspacesDisplay.prototype = {
            for (let l = 0; l < lostWorkspaces.length; l++)
                lostWorkspaces[l].setReactive(false);

-            this._thumbnailsBox.removeThumbmails(removedIndex, removedNum);
+            for (let k = removedIndex; k < removedIndex + removedNum; k++)
+                this._workspaceThumbnails[k].destroy();
+            this._workspaceThumbnails.splice(removedIndex, removedNum);
        }

+        // If we removed the current workspace then we'll be animating workspace indicator
+        // to an adjacent workspace, but that is wrong, since now that adjacent workspace
+        // is in the current slot, so remove the animation
+        Tweener.removeTweens(this._thumbnailIndicator);
+        this._constrainThumbnailIndicator();
+
        this.workspacesView.updateWorkspaces(oldNumWorkspaces,
                                             newNumWorkspaces,
                                             lostWorkspaces);
@ -863,10 +1061,9 @@ WorkspacesDisplay.prototype = {
        if (Main.overview.animationInProgress)
            return;

-        let shouldZoom = this._alwaysZoomOut || this._controls.hover || (this._inDrag && !this._cancelledDrag);
+        let shouldZoom = this._controls.hover || this._inDrag;
        if (shouldZoom != this._zoomOut) {
            this._zoomOut = shouldZoom;
-            this._updateWorkspacesGeometry();

            if (!this.workspacesView)
                return;
@ -876,7 +1073,10 @@ WorkspacesDisplay.prototype = {
                               time: WORKSPACE_SWITCH_TIME,
                               transition: 'easeOutQuad' });

-            this.workspacesView.updateWindowPositions();
+            if (shouldZoom)
+                this.workspacesView.zoomOut();
+            else
+                this.workspacesView.zoomIn();
        }
    },

@ -886,12 +1086,6 @@ WorkspacesDisplay.prototype = {

    _dragBegin: function() {
        this._inDrag = true;
-        this._cancelledDrag = false;
-        this._updateZoom();
-    },
-
-    _dragCancelled: function() {
-        this._cancelledDrag = true;
        this._updateZoom();
    },

@ -905,17 +1099,6 @@ WorkspacesDisplay.prototype = {
        // might as well avoid it.
        Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
                       Lang.bind(this, this._updateZoom));
-    },
-
-    _onScrollEvent: function (actor, event) {
-        switch ( event.get_scroll_direction() ) {
-        case Clutter.ScrollDirection.UP:
-            Main.wm.actionMoveWorkspaceUp();
-            break;
-        case Clutter.ScrollDirection.DOWN:
-            Main.wm.actionMoveWorkspaceDown();
-            break;
-        }
    }
 };
 Signals.addSignalMethods(WorkspacesDisplay.prototype);
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
+const Mainloop = imports.mainloop;
 const DND = imports.ui.dnd;

 function XdndHandler() {
@ -40,14 +41,9 @@ XdndHandler.prototype = {
    // Called when the user cancels the drag (i.e release the button)
    _onLeave: function() {
        if (this._windowGroupVisibilityHandlerId != 0) {
-            global.window_group.disconnect(this._windowGroupVisibilityHandlerId);
+            Mainloop.source_remove(this._windowGroupVisibilityHandlerId);
            this._windowGroupVisibilityHandlerId = 0;
        }
-        if (this._cursorWindowClone) {
-            this._cursorWindowClone.destroy();
-            this._cursorWindowClone = null;
-        }
-
        this.emit('drag-end');
    },

@ -81,7 +77,8 @@ XdndHandler.prototype = {
            // Make sure that the clone has the same position as the source
            this._cursorWindowClone.add_constraint(constraint_position);
        } else {
-            if (this._cursorWindowClone) {
+            if (this._cursorWindowClone)
+            {
                this._cursorWindowClone.destroy();
                this._cursorWindowClone = null;
            }
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1,36 +1,25 @@
-af
-an
 ar
 bg
-bn
-bn_IN
 ca
 cs
 da
 de
 el
 en_GB
-eo
 es
 et
-eu
 fa
 fi
 fr
 ga
 gl
-gu
 he
-hi
 hu
 id
 it
 ja
 ko
-kn
 lt
-lv
-mr
 nb
 nl
 nn
@ -40,7 +29,6 @@ pt
 pt_BR
 ro
 ru
-sk
 sl
 sr
 sr@latin
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,5 +1,6 @@
 data/gnome-shell.desktop.in.in
 data/org.gnome.shell.gschema.xml.in
+data/org.gnome.accessibility.magnifier.gschema.xml.in
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
@ -13,15 +14,12 @@ js/ui/messageTray.js
 js/ui/overview.js
 js/ui/panel.js
 js/ui/placeDisplay.js
-js/ui/polkitAuthenticationAgent.js
 js/ui/popupMenu.js
 js/ui/runDialog.js
-js/ui/searchDisplay.js
 js/ui/statusMenu.js
 js/ui/status/accessibility.js
 js/ui/status/bluetooth.js
 js/ui/status/keyboard.js
-js/ui/status/network.js
 js/ui/status/power.js
 js/ui/status/volume.js
 js/ui/telepathyClient.js
@ -30,11 +28,7 @@ js/ui/windowAttentionHandler.js
 js/ui/workspacesView.js
 src/gvc/gvc-mixer-control.c
 src/gdmuser/gdm-user.c
-src/main.c
-src/shell-app.c
 src/shell-app-system.c
 src/shell-global.c
-src/shell-mobile-providers.c
-src/shell-polkit-authentication-agent.c
 src/shell-util.c

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen W. Taylor	87ce301faa	Handle changes in window position for workspace thumbnails Connect to the 'position-set' signal of MetaWindowActor and move actors when the source windows move.	2011-02-02 23:45:57 -05:00
Owen W. Taylor	1ab526dc64	Improve workspace controls slide-in positioning Intead of using a St.Group and tweening the position of the controls actor, use a St.GenericLayout and tween a Javascript property. This allows us to more reliably track the height of the overall workspace display and propagate it to the controls actor. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	c11162f794	Don't switch to a workspace when dragging it to launch on that workspace With workspace thumbnails, we don't switch workspaces when dragging windows between workspaces or adding new workspaces, so we also shouldn't switch on launch. * Add workspace parameters to shell_doc_system_open(), shell_app_activate, shell_app_open_new_window() * Pass a 'params' object when activating items in the overview with two currently defined parameters: workspace and timestamp. (timestamp is only implemented where it is easy and doesn't require interface changes - using the global current timestamp for the shell is almost always right or at least good enough.) https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	8e5d613bfa	Avoid popping the workspace controls in and out at the end of DND At the end of a drag operation, we would invoke the code to slide the controls in (because we were no longer DND'ing and not hovering) and then immediately afterwards invoke the code to slide it back out when we got the ENTER event from the end of DND. While the immediately overridden tween probably won't have any visible effect it's better to avoid this, so wait to update the zoom state until BEFORE_REDRAW. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	8786da0044	Remove now unnecessary workspace controls With automatic workspace management, explicit controls to add and remove workspaces are no longer necessary. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:57 -05:00
Owen W. Taylor	3d5cb0f30a	Add automatic workspace management Automatically add and remove workspaces so that the last workspace is always empty and no workspaces are empty other than that workspace. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	fb28f77c85	Don't activate newly added workspaces With workspace thumbnails, we want to make workspace switching something that happens largely under the users control, so don't switch to newly added workspaces in the overview. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	58c8006f1f	Add workspace thumbnails to the overview Add workspace thumbnails to the workspace controls area. The user can click on the thumbnail to switch workspaces and can also drag windows out of the thumbnail to other workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	277cff3013	Move restacking handling from WorkspacesView to WorkspacesDisplay Moving the base tracking of restacking to WorkspacesDisplay will allow us to use it to update stacking in the workspace thumbnails as well as in the main workspaces. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:56 -05:00
Owen W. Taylor	cde3ce2e27	Use a single "zoomed out" view for both workspace controls hover and DND Instead of having a separation between popping the controls out on hover and zooming out for DND, always do both at once. This is necessary because when we added workspace thumbnails the controls will get bigger, so we need to make sure we zoom out far enough so that the windows don't overlap the controls. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:45:54 -05:00
Owen W. Taylor	57a4ad2d00	Don't check for Workspaces.WindowClone for window drops When checking the type of a DND source, instead of checking 'instanceof Workspaces.WindowClone' accept any actor with realWindow and metaWindow properties. This will be useful to support a separate type of actor dragged from workspace thumbnails. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:42:46 -05:00
Owen W. Taylor	8bc0caa21b	Remove workspace indicators Once we have workspace thumbnails in the overview, workspace indicators will no longer be needed. https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:42:43 -05:00
Owen W. Taylor	ae478c2344	Switch to a vertical layout for workspaces The new plans for a row of workspace thumbnails on the right side of the overview means that the mental model we present to the user will be vertical, so switch the Metacity workspace layout to be vertical and adjust the keybinding handling, animations, and workspace layout in the overview to match. (This commit does not change the workspace switching indicator pending finalization of what we want to do with that - it still shows workspaces arranged vertically.) https://bugzilla.gnome.org/show_bug.cgi?id=640996	2011-02-02 23:42:01 -05:00
Owen W. Taylor	0dfdc9371e	Fix hover state after DND During a drag-and-drop, our pointer grab keeps enter/leave events from being delivered. That means that after the DND ends, whatever actor is under the pointer won't have received the enter event it should have, and any state or hover effect dependent on that won't work right. By remembering the first-leave and last-enter events we can figure out what widgets we need to call st_widget_sync_hover() on after the drag. https://bugzilla.gnome.org/show_bug.cgi?id=640974	2011-02-02 23:42:01 -05:00