Bump version to 2.91.2

St: add keyboard support to StClickable and StButton
Allow triggering clicks with space/return https://bugzilla.gnome.org/show_bug.cgi?id=633853
2010-11-08 15:14:20 -05:00 · 2010-11-08 13:06:41 -05:00 · 2010-11-08 13:06:41 -05:00 · 2010-11-08 13:06:41 -05:00 · 2010-11-08 15:21:44 -02:00 · 2010-11-05 19:02:53 +01:00
298 changed files with 61705 additions and 21741 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,12 +18,21 @@ config
 configure
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
+data/gnome-shell-clock-preferences.desktop
+data/gnome-shell-clock-preferences.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
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
 libtool
+m4/
 omf.make
 po/*.gmo
+po/gnome-shell.pot
 po/Makefile.in.in
 po/POTFILES
 po/stamp-it
@ -36,9 +45,11 @@ src/Makefile
 src/Makefile.in
 src/gnomeshell-taskpanel
 src/gnome-shell
+src/gnome-shell-clock-preferences
 src/test-recorder
 src/test-recorder.ogg
 src/test-theme
+src/st.h
 stamp-h1
 tests/run-test.sh
 xmldocs.make
--- a/Makefile.am
+++ b/Makefile.am
@ -1,9 +1,13 @@
-SUBDIRS = data js src tests po
+# Point to our macro directory and pick up user flags from the environment
+ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
+
+SUBDIRS = data js src tests po man

 EXTRA_DIST =		\
 	.project	\
 	.settings	\
-	autogen.sh
+	autogen.sh	\
+	tools/check-for-missing.py

 # These are files checked into Git that we don't want to distribute
 DIST_EXCLUDE =					\
@ -14,14 +18,4 @@ DIST_EXCLUDE =					\

 distcheck-hook:
 	@echo "Checking disted files against files in git"
-	@failed=false; \
-	exclude=`(for p in $(DIST_EXCLUDE) ; do echo --exclude=$$p ; done)`; \
-	for f in `cd $(srcdir) && git ls-files $$exclude` ; do \
-		if ! test -e $(distdir)/$$f ; then \
-			echo File missing from distribution: $$f ; \
-			failed=true ; \
-		fi \
-	done ; \
-	if $$failed ; then \
-		exit 1 ; \
-	fi
+	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)
--- a/autogen.sh
+++ b/autogen.sh
@ -5,7 +5,6 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

 PKG_NAME="gnome-shell"
-REQUIRED_AUTOMAKE_VERSION=1.10

 (test -f $srcdir/configure.ac \
  && test -d $srcdir/src) || {
@ -15,7 +14,7 @@ REQUIRED_AUTOMAKE_VERSION=1.10
 }

 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from GNOME Subversion (or from"
+    echo "You need to install gnome-common from GNOME Git (or from"
    echo "your OS vendor's package manager)."
    exit 1
 }
--- a/configure.ac
+++ b/configure.ac
@ -1,33 +1,40 @@
-AC_INIT(gnome-shell, 2.28.1)
+AC_PREREQ(2.63)
+AC_INIT([gnome-shell],[2.91.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])

-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([src/shell-global.c])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([config])

-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign])
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign])
 AM_MAINTAINER_MODE

-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

-AC_CONFIG_HEADERS(config.h)
-
-AC_DISABLE_STATIC
+# Checks for programs.
 AC_PROG_CC
 # Needed for per-target cflags, like in gnomeshell-taskpanel
 AM_PROG_CC_C_O
-AM_PROG_LIBTOOL
+
+# Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])

 GETTEXT_PACKAGE=gnome-shell
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                   [The prefix for our gettext translation domains.])
-
-PKG_PROG_PKG_CONFIG(0.16)
-
 IT_PROG_INTLTOOL(0.26)
 AM_GLIB_GNU_GETTEXT

+PKG_PROG_PKG_CONFIG([0.22])
+
+# GConf stuff
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 AM_GCONF_SOURCE_2

+GLIB_GSETTINGS
+
 # Get a value to substitute into gnome-shell.in
 AM_PATH_PYTHON([2.5])
 AC_SUBST(PYTHON)
@ -50,17 +57,41 @@ fi

 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

+CLUTTER_MIN_VERSION=1.3.14
+GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11
+GJS_MIN_VERSION=0.7
+MUTTER_MIN_VERSION=2.91.0
+GTK_MIN_VERSION=2.91.0
+GIO_MIN_VERSION=2.25.9
+
 # Collect more than 20 libraries for a prize!
-PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins
-                                 gjs-gi-1.0 libgnome-menu $recorder_modules gconf-2.0
-                                 gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0
-                                 gnome-desktop-2.0 >= 2.26 libstartup-notification-1.0
-                                 gobject-introspection-1.0 >= 0.6.5)
+PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
+                                 gio-unix-2.0 dbus-glib-1
+                                 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)
+
+saved_CFLAGS=$CFLAGS
+saved_LIBS=$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)
+CFLAGS=$saved_CFLAGS
+LIBS=$saved_LIBS
+
 PKG_CHECK_MODULES(TIDY, clutter-1.0)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-2.0 libcroco-0.6)
-PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
-PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
-PKG_CHECK_MODULES(TRAY, gtk+-2.0)
+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)

 MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin
 # FIXME: metacity-plugins.pc should point directly to its .gir file
@ -72,10 +103,13 @@ AC_SUBST(MUTTER_PLUGIN_DIR)

 GJS_JS_DIR=`$PKG_CONFIG --variable=jsdir gjs-1.0`
 GJS_JS_NATIVE_DIR=`$PKG_CONFIG --variable=jsnativedir gjs-1.0`
+GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
 AC_SUBST(GJS_JS_DIR)
 AC_SUBST(GJS_JS_NATIVE_DIR)
+AC_SUBST(GJS_CONSOLE)

 AC_CHECK_FUNCS(fdwalk)
+AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_HEADERS([sys/resource.h])

 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
@ -94,8 +128,7 @@ AC_SUBST(TYPELIBDIR)
 # Stay command-line compatible with the gnome-common configure option. Here
 # minimum/yes/maximum are the same, however.
 AC_ARG_ENABLE(compile_warnings,
-  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                 [Turn on compiler warnings]),,
+  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
  enable_compile_warnings=error)

 changequote(,)dnl
@ -122,13 +155,21 @@ changequote([,])dnl
 AC_PATH_PROG(mutter, [mutter])
 AC_SUBST(mutter)

-AC_OUTPUT([
+AC_MSG_CHECKING([if mutter was compiled with GTK+-3.0])
+if $PKG_CONFIG --libs libmutter-private | grep gtk-x11-3 >/dev/null; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([GNOME Shell requires Mutter to be compiled against GTK+-3.0])
+fi
+
+AC_CONFIG_FILES([
  Makefile
  data/Makefile
  js/Makefile
-  js/misc/Makefile
-  js/ui/Makefile
  src/Makefile
  tests/Makefile
  po/Makefile.in
+  man/Makefile
 ])
+AC_OUTPUT
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -1,49 +1,101 @@
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop
+desktop_DATA = gnome-shell.desktop gnome-shell-clock-preferences.desktop

 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
-gnome-shell.desktop.in: gnome-shell.desktop.in.in
+%.desktop.in:%.desktop.in.in
 	$(AM_V_GEN) sed -e "s|@bindir[@]|$(bindir)|" \
 	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    $< > $@ || rm $@

 # Placeholder until we add intltool
-gnome-shell.desktop: gnome-shell.desktop.in
+%.desktop:%.desktop.in
 	$(AM_V_GEN) sed s/^_// < $< > $@ || rm $@

+dist_pkgdata_DATA = clock-preferences.ui
+
 imagesdir = $(pkgdatadir)/images
 dist_images_DATA =				\
-	add-workspace.svg			\
-	app-well-glow.png			\
 	close-black.svg				\
-	magnifier.svg				\
-	remove-workspace.svg
+	magnifier.svg

 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
-	theme/gnome-shell.css			\
-	theme/close.svg                 \
+	theme/add-workspace.svg			\
 	theme/close-window.svg			\
-	theme/scroll-button-down.png		\
+	theme/close.svg				\
+	theme/corner-ripple.png			\
+	theme/dialog-error.svg			\
+	theme/gnome-shell.css			\
+	theme/mosaic-view-active.svg		\
+	theme/mosaic-view.svg			\
+	theme/move-window-on-new.svg		\
+	theme/process-working.png		\
+	theme/remove-workspace.svg		\
 	theme/scroll-button-down-hover.png	\
-	theme/scroll-button-up.png		\
+	theme/scroll-button-down.png		\
 	theme/scroll-button-up-hover.png	\
-	theme/scroll-vhandle.png        \
-	theme/section-back.svg          \
-	theme/section-more.svg
+	theme/scroll-button-up.png		\
+	theme/scroll-hhandle.svg		\
+	theme/scroll-vhandle.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-left.svg		\
+	theme/ws-switch-arrow-right.svg

-schemadir  = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = gnome-shell.schemas
+gsettings_SCHEMAS =					\
+	org.gnome.accessibility.magnifier.gschema.xml	\
+	org.gnome.shell.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+
+# We need to compile schemas at make time
+# to run from source tree
+gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. .
+
+all-local: gschemas.compiled
+
+
+# GConf schemas: provide defaults for keys from Metacity we are overriding
+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

 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(gconfschema_DATA)

-EXTRA_DIST =					\
-	gnome-shell.desktop.in.in		\
-	$(schema_DATA)

-CLEANFILES =					\
-	gnome-shell.desktop.in			\
-	$(desktop_DATA)
+
+EXTRA_DIST =						\
+	gnome-shell.desktop.in.in			\
+	gnome-shell-clock-preferences.desktop.in.in	\
+	$(menu_DATA)					\
+	$(gconfschema_DATA)				\
+	$(shaders_DATA)					\
+	org.gnome.accessibility.magnifier.gschema.xml.in \
+	org.gnome.shell.gschema.xml.in
+
+CLEANFILES =						\
+	gnome-shell.desktop.in				\
+	gnome-shell-clock-preferences.desktop.in	\
+	$(desktop_DATA)					\
+	$(gsettings_SCHEMAS)				\
+	gschemas.compiled

--- a/data/add-workspace.svg
+++ b/data/add-workspace.svg
@ -1,70 +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="59.995201"
-   height="59.995102"
-   id="svg3113"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="add-workspace.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3115">
-    <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="perspective3121" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="641"
-     inkscape:window-height="683"
-     inkscape:window-x="4"
-     inkscape:window-y="54" />
-  <metadata
-     id="metadata3118">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-498.57383,-439.50749)">
-    <path
-       id="path3269"
-       d="M 528.57143,439.91129 C 512.23433,439.91129 498.97763,453.16795 498.97763,469.50504 C 498.97763,485.84214 512.23433,499.09881 528.57143,499.09879 C 544.90853,499.09879 558.16513,485.84215 558.16523,469.50504 C 558.16523,453.16794 544.90853,439.9113 528.57143,439.91129 z M 525.29023,451.16129 L 531.88393,451.16129 C 533.75363,451.16129 535.25893,452.66659 535.25893,454.53629 L 535.25893,462.84879 L 543.54023,462.84879 C 545.40973,462.84879 546.91523,464.35409 546.91523,466.22379 L 546.91523,472.81754 C 546.91523,474.68728 545.40993,476.19255 543.54023,476.19254 L 535.25893,476.19254 L 535.25893,484.47379 C 535.25893,486.34353 533.75363,487.8488 531.88393,487.84879 L 525.29023,487.84879 C 523.42053,487.84881 521.91523,486.34351 521.91523,484.47379 L 521.91523,476.19254 L 513.60263,476.19254 C 511.73313,476.19257 510.22773,474.68726 510.22763,472.81754 L 510.22763,466.22379 C 510.22763,464.35407 511.73303,462.8488 513.60263,462.84879 L 521.91523,462.84879 L 521.91523,454.53629 C 521.91523,452.66657 523.42043,451.1613 525.29023,451.16129 z"
-       style="opacity:0.30701785;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.807603px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-  </g>
-</svg>
--- a/data/app-well-glow.png
+++ b/data/app-well-glow.png
--- a/data/clock-preferences.ui
+++ b/data/clock-preferences.ui
@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<interface domain="gnome-shell">
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkDialog" id="prefs-dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Clock Preferences</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">18</property>
+            <child>
+              <object class="GtkFrame" id="frame1">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <property name="right_padding">6</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkRadioButton" id="12hr_radio">
+                            <property name="label" translatable="yes">_12 hour format</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="24hr_radio">
+                            <property name="label" translatable="yes">_24 hour format</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">12hr_radio</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label_format">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Clock Format</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFrame" id="frame2">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">none</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkVBox" id="vbox2">
+                        <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkCheckButton" id="date_check">
+                            <property name="label" translatable="yes">Show the _date</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="seconds_check">
+                            <property name="label" translatable="yes">Show seco_nds</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label_display">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Panel Display</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">6</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="prefs_close_button">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">prefs_close_button</action-widget>
+    </action-widgets>
+  </object>
+</interface>
--- a/data/close-black.svg
+++ b/data/close-black.svg
@ -62,5 +62,5 @@
   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:#000000" />
-</svg>
+   style="fill-opacity:1;fill:#545454" />
+</svg>
--- a/data/gnome-shell-clock-preferences.desktop.in.in
+++ b/data/gnome-shell-clock-preferences.desktop.in.in
@ -0,0 +1,15 @@
+[Desktop Entry]
+_Name=Clock
+_Comment=Customize the panel clock
+Exec=@bindir@/gnome-shell-clock-preferences
+Icon=gnome-panel-clock
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;
+OnlyShowIn=GNOME;
+X-GNOME-ShellOnly=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-shell
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=@VERSION@
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@ -1,108 +1,84 @@
 <gconfschemafile>
    <schemalist>

+      <!-- Metacity overrides -->
      <schema>
-        <key>/schemas/desktop/gnome/shell/development_tools</key>
-        <applyto>/desktop/gnome/shell/development_tools</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/attach_modal_dialogs</key>
+        <applyto>/desktop/gnome/shell/windows/attach_modal_dialogs</applyto>
        <owner>gnome-shell</owner>
        <type>bool</type>
        <default>true</default>
        <locale name="C">
-            <short>Enable internal tools useful for developers and testers from Alt-F2</short>
-            <long>
-                Allows access to internal debugging and monitoring tools using
-                the Alt-F2 dialog.
-            </long>
+          <short>Attach modal dialog to the parent window</short>
+          <long>
+             This key overrides /apps/mutter/general/attach_modal_dialogs when
+             running GNOME Shell.
+          </long>
        </locale>
      </schema>

      <schema>
-        <key>/schemas/desktop/gnome/shell/app_monitor/enable_monitoring</key>
-	<applyto>/desktop/gnome/shell/app_monitor/enable_monitoring</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short>Whether to collect stats about applications usage</short>
-	  <long>
-	    The shell normally monitors active applications in order to present the most used ones (e.g. in launchers). While this data will be kept private, you may want to disable this for privacy reasons. Please note that doing so won't remove already saved data.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/favorite_apps</key>
-	<applyto>/desktop/gnome/shell/favorite_apps</applyto>
-	<owner>gnome-shell</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[mozilla-firefox.desktop,evolution.desktop,openoffice.org-writer.desktop]</default>
-	<locale name="C">
-	  <short>List of desktop file IDs for favorite applications</short>
-	  <long>
-        The applications corresponding to these identifiers will be displayed in the favorites area.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/visible</key>
-	<applyto>/desktop/gnome/shell/sidebar/visible</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>false</default>
-	<locale name="C">
-	  <short>Whether or not to display the sidebar</short>
-	  <long>
-	    Determines whether or not the sidebar is visible.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/expanded</key>
-	<applyto>/desktop/gnome/shell/sidebar/expanded</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short>Whether the sidebar should be in the expanded (wide) mode</short>
-	  <long>
-	    Controls the expanded/collapsed state of the sidebar.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/widgets</key>
-	<applyto>/desktop/gnome/shell/sidebar/widgets</applyto>
-	<owner>gnome-shell</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[imports.ui.widget.ClockWidget,imports.ui.widget.AppsWidget,imports.ui.widget.RecentDocsWidget]</default>
-	<locale name="C">
-	  <short>The widgets to display in the sidebar</short>
-	  <long>
-	    The widgets to display in the sidebar, in order from top to bottom. Each widget "name" is actually a JavaScript expression referring to a widget constructor object.
-	  </long>
-	</locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/disabled_extensions</key>
-        <applyto>/desktop/gnome/shell/disabled_extensions</applyto>
+        <key>/schemas/desktop/gnome/shell/windows/button_layout</key>
+        <applyto>/desktop/gnome/shell/windows/button_layout</applyto>
        <owner>gnome-shell</owner>
-        <type>list</type>
-        <list_type>string</list_type>
-        <default>[]</default>
+        <type>string</type>
+        <default>:minimize,maximize,close</default>
        <locale name="C">
-          <short>Uuids of extensions to disable</short>
+           <short>Arrangement of buttons on the titlebar</short>
+           <long>
+             Arrangement of buttons on the titlebar. The
+             value should be a string, such as
+             "menu:minimize,maximize,spacer,close"; the colon separates the
+             left corner of the window from the right corner, and
+             the button names are comma-separated. Duplicate buttons
+             are not allowed. Unknown button names are silently ignored
+             so that buttons can be added in future gnome-shell versions
+             without breaking older versions.
+             A special spacer tag can be used to insert some space between
+             two adjacent buttons.
+
+             This key overrides /apps/metacity/general/button_layout when
+             running GNOME Shell.
+           </long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/desktop/gnome/shell/windows/side_by_side_tiling</key>
+        <applyto>/desktop/gnome/shell/windows/side_by_side_tiling</applyto>
+        <owner>gnome-shell</owner>
+        <type>bool</type>
+        <default>true</default>
+        <locale name="C">
+          <short>enable side-by-side tiling when dropping windows on screen edges</short>
          <long>
-            GNOME Shell extensions have a uuid property; this key lists extensions which should not be loaded.
-         </long>
+             If enabled, dropping windows on screen edges maximizes them
+             vertically and resizes them horizontally to cover half of the
+             available area.
+
+             This key overrides /apps/metacity/general/side_by_side_tiling when
+             running GNOME Shell.
+          </long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/desktop/gnome/shell/windows/theme</key>
+        <applyto>/desktop/gnome/shell/windows/theme</applyto>
+        <owner>gnome-shell</owner>
+        <type>string</type>
+        <default>Adwaita</default>
+        <locale name="C">
+          <short>Current theme</short>
+          <long>
+            The theme determines the appearance of window borders,
+            titlebar, and so forth.
+
+            This key overrides /apps/metacity/general/theme when
+            running GNOME Shell.
+          </long>
        </locale>
      </schema>

  </schemalist>
-
 </gconfschemafile>
--- a/data/gs-applications.menu
+++ b/data/gs-applications.menu
@ -0,0 +1,45 @@
+<Menu>
+    <DefaultLayout>
+        <Menuname>Apps</Menuname>
+        <Menuname>Games</Menuname>
+        <Menuname>Tools</Menuname>
+    </DefaultLayout>
+	<Name>Applications</Name>
+	<AppDir>/usr/local/share/applications</AppDir>
+	<DefaultAppDirs/>
+	<Menu>
+		<Name>Games</Name>
+		<Include>
+			<And>
+				<Category>Game</Category>
+			</And>
+		</Include>
+	</Menu>
+	<Menu>
+		<Name>Tools</Name>
+		<Include>
+			<Category>Development</Category>
+			<And>
+				<Category>System</Category>
+				<Not>
+					<Category>Settings</Category>
+				</Not>
+			</And>
+			<Category>Utility</Category>
+		</Include>
+	</Menu>
+	<Menu>
+		<Name>Apps</Name>
+		<OnlyUnallocated/>
+		<Include>
+			<And>
+				<Or>
+					<Category>Documentation</Category>
+					<Not><Category>Core</Category></Not>
+				</Or>
+				<Not><Category>Settings</Category></Not>
+				<Not><Category>Screensaver</Category></Not>
+			</And>
+		</Include>
+	</Menu>
+</Menu>
--- 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
@ -0,0 +1,158 @@
+<schemalist>
+  <schema id="org.gnome.shell" path="/apps/gnome-shell/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="development-tools" type="b">
+      <default>true</default>
+      <_summary>
+        Enable internal tools useful for developers and testers from Alt-F2
+      </_summary>
+      <_description>
+        Allows access to internal debugging and monitoring tools
+        using the Alt-F2 dialog.
+      </_description>
+    </key>
+    <key name="disabled-extensions" type="as">
+      <default>[]</default>
+      <_summary>Uuids of extensions to disable</_summary>
+      <_description>
+        GNOME Shell extensions have a uuid property;
+        this key lists extensions which should not be loaded.
+      </_description>
+    </key>
+    <key name="enable-app-monitoring" type="b">
+      <default>true</default>
+      <_summary>Whether to collect stats about applications usage</_summary>
+      <_description>
+        The shell normally monitors active applications in order to present
+        the most used ones (e.g. in launchers). While this data will be
+        kept private, you may want to disable this for privacy reasons.
+        Please note that doing so won't remove already saved data.
+      </_description>
+    </key>
+    <key name="favorite-apps" type="as">
+      <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'openoffice.org-writer.desktop' ]</default>
+      <_summary>List of desktop file IDs for favorite applications</_summary>
+      <_description>
+        The applications corresponding to these identifiers
+        will be displayed in the favorites area.
+      </_description>
+    </key>
+    <key name="command-history" type="as">
+      <default>[]</default>
+      <_summary>History for command (Alt-F2) dialog</_summary>
+    </key>
+    <key name="workspaces-view" type="s">
+      <default>'single'</default>
+      <_summary>Overview workspace view mode</_summary>
+      <_description>
+        The selected workspace view mode in the overview.
+        Supported values are "single" and "grid".
+      </_description>
+      <choices>
+        <choice value="single"/>
+        <choice value="grid"/>
+      </choices>
+    </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="/apps/gnome-shell/calendar/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="show-weekdate" type="b">
+      <default>false</default>
+      <_summary>Show the week date in the calendar</_summary>
+      <_description>
+        If true, display the ISO week date in the calendar.
+      </_description>
+      </key>
+  </schema>
+
+  <schema id="org.gnome.shell.clock" path="/apps/gnome-shell/clock/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="format" type="s">
+      <default l10n="messages" context="hour_format">
+      <!-- TRANSLATORS: This is the default hour format, choose ONLY '12-hour' or '24-hour'. -->
+        "12-hour"
+      </default>
+      <_summary>Hour format</_summary>
+      <_description>
+        This key specifies the hour format used by the panel clock.
+        Possible values are "12-hour", "24-hour", "unix" and "custom". If set
+        to "unix", the clock will display time in seconds since Epoch,
+        i.e. 1970-01-01. If set to "custom", the clock will display time
+        according to the format specified in the custom_format key. Note that
+        if set to either "unix" or "custom", the show_date and show_seconds
+        keys are ignored.
+      </_description>
+      <choices>
+        <choice value="12-hour"/>
+        <choice value="24-hour"/>
+        <choice value="unix"/>
+        <choice value="custom"/>
+      </choices>
+    </key>
+    <key name="custom-format" type="s">
+      <default>''</default>
+      <_summary>Custom format of the clock</_summary>
+      <_description>
+        This key specifies the format used by the panel clock when the format
+        key is set to "custom". You can use conversion specifiers understood
+        by strftime() to obtain a specific format. See the strftime() manual
+        for more information.
+      </_description>
+    </key>
+    <key name="show-seconds" type="b">
+      <default>false</default>
+      <_summary>Show time with seconds</_summary>
+      <_description>
+        If true and format is either "12-hour" or "24-hour", display seconds in time.
+      </_description>
+    </key>
+    <key name="show-date" type="b">
+      <default>false</default>
+      <_summary>Show date in clock</_summary>
+      <_description>
+        If true and format is either "12-hour" or "24-hour",
+        display date in the clock, in addition to time.
+      </_description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.shell.recorder" path="/apps/gnome-shell/recorder/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key name="framerate" type="i">
+      <default>15</default>
+      <_summary>Framerate used for recording screencasts.</_summary>
+      <_description>
+        The framerate of the resulting screencast recordered
+        by GNOME Shell's screencast recorder in frames-per-second.
+      </_description>
+    </key>
+    <key name="pipeline" type="s">
+      <default>''</default>
+      <_summary>The gstreamer pipeline used to encode the screencast</_summary>
+      <_description>
+        Sets the GStreamer pipeline used to encode recordings.
+        It follows the syntax used for gst-launch. The pipeline should have
+        an unconnected sink pad where the recorded video is recorded. It will
+        normally have a unconnected source pad; output from that pad
+        will be written into the output file. However the pipeline can also
+        take care of its own output - this might be used to send the output
+        to an icecast server via shout2send or similar. When unset or set
+        to an empty value, the default pipeline will be used. This is currently
+        'videorate ! theoraenc ! oggmux' and records to Ogg Theora.
+      </_description>
+    </key>
+    <key name="file-extension" type="s">
+      <default>'ogv'</default>
+      <_summary>File extension used for storing the screencast</_summary>
+      <_description>
+        The filename for recorded screencasts will be a unique filename
+        based on the current date, and use this extension. It should be
+        changed when recording to a different container format.
+      </_description>
+    </key>
+  </schema>
+</schemalist>
--- a/data/remove-workspace.svg
+++ b/data/remove-workspace.svg
@ -1,71 +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="59.995201"
-   height="59.995102"
-   id="svg3113"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="remove-workspace.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3115">
-    <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="perspective3121" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.5"
-     inkscape:cx="-8.1974244"
-     inkscape:cy="38.948933"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1400"
-     inkscape:window-height="971"
-     inkscape:window-x="454"
-     inkscape:window-y="105" />
-  <metadata
-     id="metadata3118">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-498.57383,-439.50749)">
-    <path
-       style="opacity:0.30701785;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.807603px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 30 0.40625 C 13.662899 0.40624999 0.40625 13.66291 0.40625 30 C 0.40624999 46.337101 13.6629 59.59377 30 59.59375 C 46.337099 59.593749 59.59365 46.33711 59.59375 30 C 59.59375 13.662901 46.3371 0.40626 30 0.40625 z M 15.03125 23.34375 L 44.96875 23.34375 C 46.83825 23.343751 48.34375 24.84905 48.34375 26.71875 L 48.34375 33.3125 C 48.34375 35.182239 46.83845 36.68751 44.96875 36.6875 L 15.03125 36.6875 C 13.16175 36.687529 11.65635 35.18222 11.65625 33.3125 L 11.65625 26.71875 C 11.65625 24.849031 13.16165 23.34376 15.03125 23.34375 z "
-       transform="translate(498.57383,439.50749)"
-       id="path2382" />
-  </g>
-</svg>
--- a/data/shaders/dim-window.glsl
+++ b/data/shaders/dim-window.glsl
@ -0,0 +1,26 @@
+#version 110
+uniform sampler2D sampler0;
+uniform float fraction;
+uniform float height;
+const float c = -0.2;
+const float border_max_height = 60.0;
+
+mat4 contrast = mat4 (1.0 + c, 0.0, 0.0, 0.0,
+                      0.0, 1.0 + c, 0.0, 0.0,
+                      0.0, 0.0, 1.0 + c, 0.0,
+                      0.0, 0.0, 0.0, 1.0);
+vec4 off = vec4(0.633, 0.633, 0.633, 0);
+void main()
+{
+  vec4 color = texture2D(sampler0, gl_TexCoord[0].st);
+  float y = height * gl_TexCoord[0][1];
+
+  // To reduce contrast, blend with a mid gray
+  gl_FragColor = color * contrast - off * c;
+
+  // We only fully dim at a distance of BORDER_MAX_HEIGHT from the edge and
+  // when the fraction is 1.0. For other locations and fractions we linearly
+  // interpolate back to the original undimmed color.
+  gl_FragColor = color + (gl_FragColor - color) * min(y / border_max_height, 1.0);
+  gl_FragColor = color + (gl_FragColor - color) * fraction;
+}
--- a/data/theme/add-workspace.svg
+++ b/data/theme/add-workspace.svg
@ -0,0 +1,98 @@
+<?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="23"
+   height="15"
+   id="svg6375"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="New document 13">
+  <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="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="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,-17)">
+    <g
+       style="display:inline"
+       id="g6243"
+       transform="translate(-986.28859,-658.2796)">
+      <rect
+         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect5318"
+         width="22"
+         height="14"
+         x="986.89801"
+         y="675.86743"
+         rx="0.49999979"
+         ry="0.5" />
+      <g
+         id="g5320"
+         transform="translate(402.77304,-12.882544)">
+        <path
+           id="path5322"
+           d="m 595.125,692.53048 0,6.43903"
+           style="fill:none;stroke:#666666;stroke-width:1.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           id="path5324"
+           d="m 598.34451,695.75 -6.43902,0"
+           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" />
+      </g>
+    </g>
+  </g>
+</svg>
--- a/data/theme/corner-ripple.png
+++ b/data/theme/corner-ripple.png
--- a/data/theme/dialog-error.svg
+++ b/data/theme/dialog-error.svg
@ -0,0 +1,222 @@
+<?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="24"
+   height="24"
+   id="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="dialog-error.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/gnome-icon-theme/scalable/actions/process-stop.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   version="1.0">
+  <defs
+     id="defs4910">
+    <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="perspective25" />
+    <radialGradient
+       gradientTransform="matrix(1.349881,0,0,1.349881,-3.498814,-1.810859)"
+       gradientUnits="userSpaceOnUse"
+       r="9.7183542"
+       fy="4.9892726"
+       fx="9.6893959"
+       cy="4.9892726"
+       cx="9.6893959"
+       id="radialGradient5177"
+       xlink:href="#linearGradient5171"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="matrix(2.417917,0,0,2.417917,-14.17917,-4.903184)"
+       gradientUnits="userSpaceOnUse"
+       r="9.7785711"
+       fy="3.458019"
+       fx="10"
+       cy="3.458019"
+       cx="10"
+       id="radialGradient5157"
+       xlink:href="#linearGradient5151"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.928125,0,0,0.3143011,0.7718789,12.358015)"
+       r="9.0598059"
+       fy="18.022524"
+       fx="10.739184"
+       cy="18.022524"
+       cx="10.739184"
+       id="radialGradient5145"
+       xlink:href="#linearGradient5139"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5139"
+       inkscape:collect="always">
+      <stop
+         id="stop5141"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5143"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5151"
+       inkscape:collect="always">
+      <stop
+         id="stop5153"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" />
+      <stop
+         id="stop5155"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5171">
+      <stop
+         id="stop5173"
+         offset="0"
+         style="stop-color:#fe3a00;stop-opacity:1" />
+      <stop
+         id="stop5175"
+         offset="1"
+         style="stop-color:#c00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="24.442987"
+     inkscape:cy="10.142308"
+     inkscape:current-layer="g7001"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1674"
+     inkscape:window-height="970"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     width="48px"
+     height="48px"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4913">
+    <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>Stop Process</dc:title>
+        <dc:date>December 2006</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Andreas Nilsson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>stop</rdf:li>
+            <rdf:li>halt</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-24)">
+    <g
+       inkscape:label="Layer 1"
+       id="g7001"
+       transform="matrix(1.4566048,0,0,1.4455352,0.4112881,1.2324709)">
+      <path
+         transform="matrix(0.91468137,0,0,0.70055266,-1.8812476,17.474032)"
+         d="m 19.79899,18.022524 a 9.0598059,3.0935922 0 1 1 -18.1196115,0 9.0598059,3.0935922 0 1 1 18.1196115,0 z"
+         sodipodi:ry="3.0935922"
+         sodipodi:rx="9.0598059"
+         sodipodi:cy="18.022524"
+         sodipodi:cx="10.739184"
+         id="path5137"
+         style="color:#000000;fill:url(#radialGradient5145);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.87347736,0,0,0.83068052,-0.79308842,15.602788)"
+         d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
+         sodipodi:ry="9.25"
+         sodipodi:rx="9.25"
+         sodipodi:cy="9.625"
+         sodipodi:cx="10"
+         id="path4262"
+         style="color:#000000;fill:url(#radialGradient5177);fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.47435912;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"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:0.35393258;color:#000000;fill:none;stroke:url(#radialGradient5157);stroke-width:0.49999994;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"
+         id="path5149"
+         sodipodi:cx="10"
+         sodipodi:cy="9.625"
+         sodipodi:rx="9.25"
+         sodipodi:ry="9.25"
+         d="m 19.25,9.625 a 9.25,9.25 0 1 1 -18.5,0 9.25,9.25 0 1 1 18.5,0 z"
+         transform="matrix(0.82868359,0,0,0.78808147,-0.34515141,16.012803)" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5159"
+         d="m 4.834121,20.642783 6.215127,5.91061"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219134;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.21219146;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="M 11.04925,20.622826 4.8159529,26.553393"
+         id="path5161"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</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/process-working.png
+++ b/data/theme/process-working.png
--- a/data/theme/remove-workspace.svg
+++ b/data/theme/remove-workspace.svg
@ -0,0 +1,92 @@
+<?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="23"
+   height="15"
+   id="svg5501"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="add-workspace.svg">
+  <defs
+     id="defs5503">
+    <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="perspective5509" />
+    <inkscape:perspective
+       id="perspective5314"
+       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.074583208"
+     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"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox="true" />
+  <metadata
+     id="metadata5506">
+    <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,-17)">
+    <g
+       style="display:inline"
+       id="g6239"
+       transform="translate(-953.97989,-657.32287)">
+      <rect
+         style="fill:#000000;fill-opacity:0.98770495;stroke:#666666;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="rect5318-6"
+         width="22"
+         height="14"
+         x="954.5"
+         y="675"
+         rx="0.49999979"
+         ry="0.5" />
+      <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 968.71951,682 -6.43902,0"
+         id="path5324-5" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/scroll-hhandle.svg
+++ b/data/theme/scroll-hhandle.svg
@ -0,0 +1,64 @@
+<?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="10"
+   height="4"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="scroll-hhandle.svg">
+  <defs
+     id="defs4">
+  </defs>
+  <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="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3592"
+       width="2"
+       height="4"
+       x="0"
+       y="0"
+       rx="0"
+       ry="0" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3592"
+       id="use2825"
+       transform="translate(8,0)"
+       width="10"
+       height="4" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use2825"
+       id="use2827"
+       transform="translate(-4,0)"
+       width="10"
+       height="4" />
+  </g>
+</svg>
--- a/data/theme/scroll-vhandle.png
+++ b/data/theme/scroll-vhandle.png
--- a/data/theme/scroll-vhandle.svg
+++ b/data/theme/scroll-vhandle.svg
@ -0,0 +1,62 @@
+<?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="4"
+   height="10"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="scroll-hhandle.svg">
+  <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="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect3592"
+       width="2"
+       height="4"
+       x="0"
+       y="-4"
+       rx="0"
+       ry="0"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#rect3592"
+       id="use3705"
+       transform="translate(0,4)"
+       width="4"
+       height="10" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use3705"
+       id="use3707"
+       transform="translate(0,4)"
+       width="4"
+       height="10" />
+  </g>
+</svg>
--- a/data/theme/section-back.svg
+++ b/data/theme/section-back.svg
@ -1,7 +0,0 @@
-<?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="12" height="16" viewBox="0 0 12 16" enable-background="new 0 0 29 18" xml:space="preserve" sodipodi:version="0.32" inkscape:version="0.46+devel" sodipodi:docname="back.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="12.592456" inkscape:cy="8.2696842" inkscape:window-x="145" inkscape:window-y="38" 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>
-
-
-
-<path style="fill: rgb(255, 255, 255); fill-opacity: 1; stroke: none;" d="M 10,2 10,14 2,8 10,2 z" id="path43"/></svg>
--- 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/separator-white.png
+++ b/data/theme/separator-white.png
--- a/data/theme/single-view-active.svg
+++ b/data/theme/single-view-active.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-active.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:#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/toggle-off-intl.svg
+++ b/data/theme/toggle-off-intl.svg
@ -0,0 +1,126 @@
+<?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="64"
+   height="22"
+   id="svg3273"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 14">
+  <defs
+     id="defs3275">
+    <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="perspective3281" />
+    <inkscape:perspective
+       id="perspective3261"
+       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="32.000004"
+     inkscape:cy="10.999997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3278">
+    <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(-343,-521.36218)">
+    <g
+       id="g17454"
+       transform="translate(-453,448.36218)"
+       style="display:inline">
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74.5"
+         x="-859.5"
+         height="19"
+         width="63.000004"
+         id="rect17456"
+         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;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;enable-background:accumulate" />
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74"
+         x="-828"
+         height="20"
+         width="31"
+         id="rect17458"
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+      <g
+         transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+         id="g17460"
+         style="display:inline">
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 803.6322,115.48629 0,4.29495"
+           id="path17462"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 806.62805,115.48629 0,4.29495"
+           id="path17464"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 809.6239,115.48629 0,4.29495"
+           id="path17466"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.96875012;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;enable-background:accumulate"
+         id="path18722"
+         sodipodi:cx="47.6875"
+         sodipodi:cy="11.5625"
+         sodipodi:rx="3.9375"
+         sodipodi:ry="3.9375"
+         d="m 51.625,11.5625 c 0,2.174621 -1.762879,3.9375 -3.9375,3.9375 -2.174621,0 -3.9375,-1.762879 -3.9375,-3.9375 0,-2.1746212 1.762879,-3.9375 3.9375,-3.9375 2.174621,0 3.9375,1.7628788 3.9375,3.9375 z"
+         transform="matrix(1.0158729,0,0,1.0158729,795.55556,72.25399)" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/toggle-off-us.svg
+++ b/data/theme/toggle-off-us.svg
@ -0,0 +1,138 @@
+<?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="64"
+   height="22"
+   id="svg3012"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 6">
+  <defs
+     id="defs3014">
+    <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="perspective3020" />
+    <inkscape:perspective
+       id="perspective2997"
+       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="32.000004"
+     inkscape:cy="10.999997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3017">
+    <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(-343,-521.36218)">
+    <g
+       id="g17454"
+       transform="translate(-453,448.36218)"
+       style="display:inline">
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74.5"
+         x="-859.5"
+         height="19"
+         width="63.000004"
+         id="rect17456"
+         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:0.99999994;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;enable-background:accumulate" />
+      <rect
+         transform="scale(-1,1)"
+         ry="4"
+         rx="4"
+         y="74"
+         x="-828"
+         height="20"
+         width="31"
+         id="rect17458"
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+      <g
+         transform="matrix(-1,0,0,1,1619.1239,-33.986291)"
+         id="g17460"
+         style="display:inline">
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 803.6322,115.48629 0,4.29495"
+           id="path17462"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 806.62805,115.48629 0,4.29495"
+           id="path17464"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           d="m 809.6239,115.48629 0,4.29495"
+           id="path17466"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         id="text17468"
+         transform="translate(0.34375,0)">
+        <path
+           d="m 837.28518,80.750726 c 0.63282,6e-6 1.19566,0.123947 1.68852,0.371824 0.49284,0.247888 0.8807,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42431,1.649149 0,0.635748 -0.13853,1.200045 -0.41556,1.692892 -0.27706,0.489934 -0.66638,0.870507 -1.16797,1.141719 -0.5016,0.271213 -1.07756,0.406819 -1.72789,0.406819 -0.42869,0 -0.83551,-0.06562 -1.22045,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03674,-0.581795 -0.30329,-0.256631 -0.54534,-0.589085 -0.72615,-0.997363 -0.17789,-0.408276 -0.26684,-0.869045 -0.26683,-1.382311 -10e-6,-0.638658 0.13997,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06297,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40683,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41412,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38933,0.129779 -0.57305,0.240592 -0.18081,0.107907 -0.33974,0.242055 -0.47681,0.402445 -0.13706,0.160399 -0.24642,0.358705 -0.32808,0.594918 -0.0816,0.233306 -0.12248,0.491395 -0.12248,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622903 0.41702,0.408278 0.93758,0.612416 1.56166,0.612416 0.25954,0 0.51034,-0.04229 0.7524,-0.126858 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376198 0.20705,-0.166226 0.37328,-0.392236 0.49868,-0.678032 0.12539,-0.285792 0.18809,-0.610956 0.1881,-0.975492 -10e-6,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20415,-0.453475 -0.34995,-0.61679 -0.14291,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18599"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 843.5362,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10673,0 0,-6.216022 4.31754,0 0,1.014861 -3.21081,0"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18601"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc" />
+        <path
+           d="m 849.71285,81.831203 0,1.17917 2.94834,0 0,1.014861 -2.94834,0 0,3.00713 -1.10672,0 0,-6.216022 4.31753,0 0,1.014861 -3.21081,0"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18603"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccc" />
+      </g>
+    </g>
+  </g>
+</svg>
--- a/data/theme/toggle-on-intl.svg
+++ b/data/theme/toggle-on-intl.svg
@ -0,0 +1,122 @@
+<?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="65"
+   height="22"
+   id="svg3199"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 11">
+  <defs
+     id="defs3201">
+    <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="perspective3207" />
+    <inkscape:perspective
+       id="perspective3187"
+       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="32.500004"
+     inkscape:cy="10.999997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3204">
+    <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(-342.5,-521.36218)">
+    <g
+       style="display:inline"
+       transform="translate(-453.5,448.36218)"
+       id="g16453">
+      <rect
+         style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994;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;enable-background:accumulate"
+         id="rect16256-9-4"
+         width="63.000004"
+         height="19"
+         x="-859.5"
+         y="74.5"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         id="rect16258-5-4"
+         width="31"
+         height="20"
+         x="-860"
+         y="74"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <g
+         style="display:inline"
+         id="g16298-3-6"
+         transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-3-5"
+           d="m 803.6322,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-0-2-0"
+           d="m 806.62805,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-8-7-1"
+           d="m 809.6239,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      </g>
+      <path
+         style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:square;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"
+         d="m 16,27.9375 0,10.125"
+         id="path19232"
+         inkscape:connector-curvature="0"
+         transform="translate(796,51.00002)" />
+    </g>
+  </g>
+</svg>
--- a/data/theme/toggle-on-us.svg
+++ b/data/theme/toggle-on-us.svg
@ -0,0 +1,128 @@
+<?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="65"
+   height="22"
+   id="svg2857"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs2859">
+    <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="perspective2865" />
+    <inkscape:perspective
+       id="perspective2843"
+       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="1"
+     inkscape:cx="-69.642856"
+     inkscape:cy="42.428569"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="609"
+     inkscape:window-height="501"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2862">
+    <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(-444.64286,-781.36218)">
+    <g
+       style="display:inline"
+       transform="translate(-351.35714,708.36218)"
+       id="g16453">
+      <rect
+         style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:0.99999994;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;enable-background:accumulate"
+         id="rect16256-9-4"
+         width="63.000004"
+         height="19"
+         x="-859.5"
+         y="74.5"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#5f5f5f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+         id="rect16258-5-4"
+         width="31"
+         height="20"
+         x="-860"
+         y="74"
+         rx="4"
+         ry="4"
+         transform="scale(-1,1)" />
+      <g
+         style="display:inline"
+         id="g16298-3-6"
+         transform="matrix(-1,0,0,1,1651.1322,-33.986291)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-3-5"
+           d="m 803.6322,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-0-2-0"
+           d="m 806.62805,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path16265-8-7-1"
+           d="m 809.6239,115.48629 0,4.29495"
+           style="fill:none;stroke:#5f5f5f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      </g>
+      <g
+         style="font-size:8.95877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+         id="text42229-3-0">
+        <path
+           d="m 808.01473,80.573953 c 0.63283,6e-6 1.19567,0.123947 1.68852,0.371824 0.49284,0.247888 0.88071,0.609505 1.16359,1.084851 0.28287,0.472439 0.42431,1.022155 0.42432,1.649149 -10e-6,0.635748 -0.13853,1.200045 -0.41557,1.692892 -0.27705,0.489934 -0.66637,0.870506 -1.16796,1.141719 -0.50161,0.271212 -1.07757,0.406819 -1.72789,0.406819 -0.4287,0 -0.83552,-0.06562 -1.22046,-0.196848 -0.38495,-0.134148 -0.73053,-0.32808 -1.03673,-0.581795 -0.3033,-0.256631 -0.54535,-0.589085 -0.72615,-0.997363 -0.1779,-0.408276 -0.26684,-0.869045 -0.26684,-1.382311 0,-0.638658 0.13998,-1.200039 0.41994,-1.684144 0.27996,-0.487011 0.66782,-0.858835 1.16359,-1.115472 0.49576,-0.259541 1.06298,-0.389315 1.70164,-0.389321 m 0.57305,1.089225 c -0.20123,-0.05249 -0.40682,-0.07873 -0.61679,-0.07874 -0.20998,5e-6 -0.41411,0.02625 -0.61242,0.07874 -0.19831,0.04958 -0.38932,0.129779 -0.57304,0.240592 -0.18081,0.107907 -0.33975,0.242055 -0.47681,0.402445 -0.13707,0.160399 -0.24643,0.358705 -0.32808,0.594918 -0.0817,0.233305 -0.12249,0.491395 -0.12249,0.774269 0,0.67366 0.20851,1.214627 0.62554,1.622902 0.41703,0.408279 0.93758,0.612417 1.56166,0.612416 0.25955,10e-7 0.51035,-0.04228 0.7524,-0.126857 0.24496,-0.08457 0.47097,-0.20997 0.67803,-0.376199 0.20705,-0.166225 0.37328,-0.392236 0.49868,-0.678031 0.1254,-0.285792 0.1881,-0.610956 0.1881,-0.975492 0,-0.297455 -0.0437,-0.568668 -0.13123,-0.813638 -0.0875,-0.247878 -0.20414,-0.453475 -0.34995,-0.61679 -0.1429,-0.163307 -0.31059,-0.301829 -0.50306,-0.415568 -0.18956,-0.11373 -0.38641,-0.195385 -0.59054,-0.244967"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18606" />
+        <path
+           d="m 813.15903,80.639569 1.21608,0 3.4689,4.776844 0,-4.776844 1.10235,0 0,6.216022 -1.22921,0 -3.45577,-4.785594 0,4.785594 -1.10235,0 0,-6.216022"
+           style="line-height:125%;fill:#ffffff;fill-opacity:1;marker:none;font-family:Cantarell;-inkscape-font-specification:Cantarell Bold"
+           id="path18608" />
+      </g>
+    </g>
+  </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
@ -0,0 +1,331 @@
+<?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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg25070">
+  <defs
+     id="defs25072">
+    <linearGradient
+       x1="-86.552246"
+       y1="185.439"
+       x2="-83.37072"
+       y2="197.31261"
+       id="linearGradient24957"
+       xlink:href="#linearGradient4034-0-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(6,0)" />
+    <linearGradient
+       id="linearGradient4034-0-4">
+      <stop
+         id="stop4036-5-7"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4038-9-6"
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter24765">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix24767" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix24769" />
+    </filter>
+    <linearGradient
+       x1="-74.520325"
+       y1="169.06032"
+       x2="-74.520325"
+       y2="205.94189"
+       id="linearGradient24955"
+       xlink:href="#linearGradient4632-1-3-9-3-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,0)" />
+    <linearGradient
+       id="linearGradient4632-1-3-9-3-2">
+      <stop
+         id="stop4634-1-8-3-9-0"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4636-1-9-9-8-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.0274937" />
+      <stop
+         id="stop4638-8-3-9-6-6"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0.274937" />
+      <stop
+         id="stop4640-8-5-7-8-9"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.38707438" />
+      <stop
+         id="stop4642-5-41-9-6-9"
+         style="stop-color:#d9dad8;stop-opacity:1"
+         offset="0.66528589" />
+      <stop
+         id="stop4644-5-2-7-9-2"
+         style="stop-color:#dfe0dd;stop-opacity:1"
+         offset="0.76745707" />
+      <stop
+         id="stop4646-3-2-3-7-3"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-33.412369"
+       cy="185.74171"
+       r="2.3554697"
+       fx="-33.412369"
+       fy="185.74171"
+       id="radialGradient24959"
+       xlink:href="#linearGradient4869-4-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075,0,0,1.0075,-5.4544,-1.25141)" />
+    <linearGradient
+       id="linearGradient4869-4-1">
+      <stop
+         id="stop4871-6-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4879-7-4"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.31807542" />
+      <stop
+         id="stop4877-6-1"
+         style="stop-color:#c8c9c6;stop-opacity:1"
+         offset="0.74691135" />
+      <stop
+         id="stop4873-1-0"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25011">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25013" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25015" />
+    </filter>
+    <radialGradient
+       cx="-33.412369"
+       cy="185.74171"
+       r="2.3554697"
+       fx="-33.412369"
+       fy="185.74171"
+       id="radialGradient24961"
+       xlink:href="#linearGradient4869-4-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0075,0,0,1.0075,-5.4544,-1.25141)" />
+    <linearGradient
+       id="linearGradient4869-4-0">
+      <stop
+         id="stop4871-6-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4879-7-5"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.31807542" />
+      <stop
+         id="stop4877-6-5"
+         style="stop-color:#c8c9c6;stop-opacity:1"
+         offset="0.74691135" />
+      <stop
+         id="stop4873-1-4"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25023">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25025" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25027" />
+    </filter>
+    <linearGradient
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898"
+       id="linearGradient24963"
+       xlink:href="#linearGradient4941"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4941">
+      <stop
+         id="stop4943"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4945"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25033">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25035" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25037" />
+    </filter>
+    <linearGradient
+       x1="-39.858727"
+       y1="184.61784"
+       x2="-38.244785"
+       y2="188.84898"
+       id="linearGradient24965"
+       xlink:href="#linearGradient4941-7"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4941-7">
+      <stop
+         id="stop4943-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4945-5"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25043">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25045" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25047" />
+    </filter>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25049">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25051" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25053" />
+    </filter>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter25055">
+      <feColorMatrix
+         result="fbSourceGraphic"
+         values="1"
+         type="saturate"
+         id="feColorMatrix25057" />
+      <feColorMatrix
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"
+         in="fbSourceGraphic"
+         id="feColorMatrix25059" />
+    </filter>
+  </defs>
+  <g
+     transform="translate(0,48)"
+     id="layer1">
+    <g
+       transform="matrix(-2,0,0,2,-97.2497,-374.967)"
+       id="g4030-1-8"
+       style="stroke:#000000;stroke-opacity:1;display:inline">
+      <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" />
+    </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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+  </g>
+</svg>
--- a/js/Makefile.am
+++ b/js/Makefile.am
@ -1 +1,53 @@
-SUBDIRS = misc ui
+
+jsdir = $(pkgdatadir)/js
+
+nobase_dist_js_DATA = 	\
+	misc/docInfo.js		\
+	misc/fileUtils.js	\
+	misc/format.js		\
+	misc/gnomeSession.js	\
+	misc/params.js		\
+	misc/telepathy.js	\
+	perf/core.js		\
+	prefs/clockPreferences.js \
+	ui/altTab.js		\
+	ui/appDisplay.js	\
+	ui/appFavorites.js	\
+	ui/boxpointer.js	\
+	ui/calendar.js		\
+	ui/chrome.js		\
+	ui/dash.js		\
+	ui/dnd.js		\
+	ui/docDisplay.js	\
+	ui/environment.js	\
+	ui/extensionSystem.js	\
+	ui/genericDisplay.js	\
+	ui/iconGrid.js		\
+	ui/lightbox.js		\
+	ui/link.js		\
+	ui/lookingGlass.js	\
+	ui/magnifier.js		\
+	ui/magnifierDBus.js	\
+	ui/main.js		\
+	ui/messageTray.js	\
+	ui/notificationDaemon.js \
+	ui/overview.js		\
+	ui/panel.js		\
+	ui/panelMenu.js		\
+	ui/placeDisplay.js	\
+	ui/popupMenu.js		\
+	ui/runDialog.js		\
+	ui/scripting.js		\
+	ui/search.js		\
+	ui/shellDBus.js		\
+	ui/statusIconDispatcher.js	\
+	ui/statusMenu.js	\
+	ui/status/accessibility.js	\
+	ui/status/volume.js	\
+	ui/telepathyClient.js	\
+	ui/tweener.js		\
+	ui/windowAttentionHandler.js	\
+	ui/windowManager.js	\
+	ui/workspace.js		\
+	ui/workspacesView.js	\
+	ui/workspaceSwitcherPopup.js
--- a/js/misc/Makefile.am
+++ b/js/misc/Makefile.am
@ -1,6 +0,0 @@
-jsmiscdir = $(pkgdatadir)/js/misc
-
-dist_jsmisc_DATA =		\
-	docInfo.js		\
-	format.js		\
-	params.js
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@ -1,14 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
+const St = imports.gi.St;
 const Shell = imports.gi.Shell;
-
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Search = imports.ui.search;
-const Main = imports.ui.main;

 const THUMBNAIL_ICON_MARGIN = 2;

@ -22,7 +18,7 @@ DocInfo.prototype = {
        // We actually used get_modified() instead of get_visited()
        // here, as GtkRecentInfo doesn't updated get_visited()
        // correctly. See http://bugzilla.gnome.org/show_bug.cgi?id=567094
-        this.timestamp = recentInfo.get_modified().getTime() / 1000;
+        this.timestamp = recentInfo.get_modified();
        this.name = recentInfo.get_display_name();
        this._lowerName = this.name.toLowerCase();
        this.uri = recentInfo.get_uri();
@ -30,7 +26,7 @@ DocInfo.prototype = {
    },

    createIcon : function(size) {
-        return Shell.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
+        return St.TextureCache.get_default().load_recent_thumbnail(size, this.recentInfo);
    },

    launch : function() {
@ -43,15 +39,12 @@ DocInfo.prototype = {
            let term = terms[i];
            let idx = this._lowerName.indexOf(term);
            if (idx == 0) {
-                if (mtype != Search.MatchType.NONE)
-                    return Search.MatchType.MULTIPLE;
                mtype = Search.MatchType.PREFIX;
            } else if (idx > 0) {
-                if (mtype != Search.MatchType.NONE)
-                    return Search.MatchType.MULTIPLE;
-                mtype = Search.MatchType.SUBSTRING;
+                if (mtype == Search.MatchType.NONE)
+                    mtype = Search.MatchType.SUBSTRING;
            } else {
-                continue;
+                return Search.MatchType.NONE;
            }
        }
        return mtype;
@ -113,40 +106,36 @@ DocManager.prototype = {
        return this._docSystem.queue_existence_check(count);
    },

-    initialSearch: function(terms) {
-        let multipleMatches = [];
+    _searchDocs: function(items, terms) {
+        let multiplePrefixMatches = [];
        let prefixMatches = [];
+        let multipleSubtringMatches = [];
        let substringMatches = [];
-        for (let i = 0; i < this._infosByTimestamp.length; i++) {
-            let item = this._infosByTimestamp[i];
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(item.uri);
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixMatches.push(item.uri);
            else if (mtype == Search.MatchType.PREFIX)
                prefixMatches.push(item.uri);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubtringMatches.push(item.uri);
            else if (mtype == Search.MatchType.SUBSTRING)
                substringMatches.push(item.uri);
         }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
+        return multiplePrefixMatches.concat(prefixMatches.concat(multipleSubtringMatches.concat(substringMatches)));
+    },
+
+    initialSearch: function(terms) {
+        return this._searchDocs(this._infosByTimestamp, terms);
    },

    subsearch: function(previousResults, terms) {
-        let multipleMatches = [];
-        let prefixMatches = [];
-        let substringMatches = [];
-        for (let i = 0; i < previousResults.length; i++) {
-            let uri = previousResults[i];
-            let item = this._infosByUri[uri];
-            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(uri);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixMatches.push(uri);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringMatches.push(uri);
-        }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
+        return this._searchDocs(previousResults.map(Lang.bind(this,
+            function(url) {
+                return this._infosByUri[url];
+            })), terms);
    }
-}
+};

 Signals.addSignalMethods(DocManager.prototype);
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@ -0,0 +1,22 @@
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+
+function listDirAsync(file, callback) {
+    let allFiles = [];
+    file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME,
+                                  Gio.FileQueryInfoFlags.NONE,
+                                  GLib.PRIORITY_LOW, null, function (obj, res) {
+        let enumerator = obj.enumerate_children_finish(res);
+        function onNextFileComplete(obj, res) {
+            let files = obj.next_files_finish(res);
+            if (files.length) {
+                allFiles = allFiles.concat(files);
+                enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+            } else {
+                enumerator.close(null);
+                callback(allFiles);
+            }
+        }
+        enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, onNextFileComplete);
+    });
+}
--- a/js/misc/format.js
+++ b/js/misc/format.js
@ -6,8 +6,10 @@
 * It has to be set up using String.prototype.format = Format.format;
 * Usage:
 * "somestring %s %d".format('hello', 5);
- * It supports %s, %d and %f, for %f it also support precisions like
- * "%.2f".format(1.526)
+ * It supports %s, %d, %x and %f, for %f it also support precisions like
+ * "%.2f".format(1.526). All specifiers can be prefixed with a minimum
+ * field width, e.g. "%5s".format("foo"). Unless the width is prefixed
+ * with '0', the formatted string will be padded with spaces.
 */

 function format() {
@ -15,30 +17,44 @@ function format() {
    let i = 0;
    let args = arguments;

-    return str.replace(/%(?:\.([0-9]+))?(.)/g, function (str, precisionGroup, genericGroup) {
+    return str.replace(/%([0-9]+)?(?:\.([0-9]+))?(.)/g, function (str, widthGroup, precisionGroup, genericGroup) {

                    if (precisionGroup != '' && genericGroup != 'f')
                        throw new Error("Precision can only be specified for 'f'");

+                    let fillChar = (widthGroup[0] == '0') ? '0' : ' ';
+                    let width = parseInt(widthGroup, 10) || 0;
+
+                    function fillWidth(s, c, w) {
+                        let fill = '';
+                        for (let i = 0; i < w; i++)
+                            fill += c;
+                        return fill.substr(s.length) + s;
+                    }
+
+                    let s = '';
                    switch (genericGroup) {
                        case '%':
                            return '%';
                            break;
                        case 's':
-                            return args[i++].toString();
+                            s = args[i++].toString();
                            break;
                        case 'd':
-                            return parseInt(args[i++]);
+                            s = parseInt(args[i++]).toString();
+                            break;
+                        case 'x':
+                            s = parseInt(args[i++]).toString(16);
                            break;
                        case 'f':
                            if (precisionGroup == '')
-                                return parseFloat(args[i++]);
+                                s = parseFloat(args[i++]).toString();
                            else
-                                return parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
+                                s = parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
                            break;
                        default:
                            throw new Error('Unsupported conversion character %' + genericGroup);
                    }
-                    return ""; // Suppress warning
+                    return fillWidth(s, fillChar, width);
                });
 }
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@ -0,0 +1,45 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const Lang = imports.lang;
+
+const PresenceIface = {
+    name: 'org.gnome.SessionManager.Presence',
+    methods: [{ name: 'SetStatus',
+                inSignature: 'u' }],
+    properties: [{ name: 'status',
+                   signature: 'u',
+                   access: 'readwrite' }],
+    signals: [{ name: 'StatusChanged',
+                inSignature: 'u' }]
+};
+
+const PresenceStatus = {
+    AVAILABLE: 0,
+    INVISIBLE: 1,
+    BUSY: 2,
+    IDLE: 3
+};
+
+function Presence() {
+    this._init();
+}
+
+Presence.prototype = {
+    _init: function() {
+        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
+    },
+
+    getStatus: function(callback) {
+        this.GetRemote('status', Lang.bind(this,
+            function(status, ex) {
+                if (!ex)
+                    callback(this, status);
+            }));
+    },
+
+    setStatus: function(status) {
+        this.SetStatusRemote(status);
+    }
+};
+DBus.proxifyPrototype(Presence.prototype, PresenceIface);
--- a/js/misc/params.js
+++ b/js/misc/params.js
@ -2,7 +2,7 @@

 // parse:
 // @params: caller-provided parameter object, or %null
-// @default: function-provided defaults object
+// @defaults: function-provided defaults object
 // @allowExtras: whether or not to allow properties not in @default
 //
 // Examines @params and fills in default values from @defaults for
@ -10,24 +10,26 @@
 // @allowExtras is not %true, it will throw an error if @params
 // contains any properties that aren't in @defaults.
 //
-// If @params is %null, this returns @defaults.
+// If @params is %null, this returns the values from @defaults.
 //
-// Return value: the updated params
+// Return value: a new object, containing the merged parameters from
+// @params and @defaults
 function parse(params, defaults, allowExtras) {
+    let ret = {}, prop;
+
    if (!params)
-        return defaults;
+        params = {};

-    if (!allowExtras) {
-	for (let prop in params) {
-	    if (!(prop in defaults))
-		throw new Error('Unrecognized parameter "' + prop + '"');
-	}
+    for (prop in params) {
+        if (!(prop in defaults) && !allowExtras)
+            throw new Error('Unrecognized parameter "' + prop + '"');
+        ret[prop] = params[prop];
    }

-    for (let prop in defaults) {
-	if (!(prop in params))
-	    params[prop] = defaults[prop];
+    for (prop in defaults) {
+        if (!(prop in params))
+            ret[prop] = defaults[prop];
    }

-    return params;
+    return ret;
 }
--- a/js/misc/telepathy.js
+++ b/js/misc/telepathy.js
@ -0,0 +1,359 @@
+/* -*- 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' }
+    ]
+};
+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/perf/core.js
+++ b/js/perf/core.js
@ -0,0 +1,140 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Main = imports.ui.main;
+const Scripting = imports.ui.scripting;
+
+// This performance script measure the most important (core) performance
+// metrics for the shell. By looking at the output metrics of this script
+// someone should be able to get an idea of how well the shell is performing
+// on a particular system.
+
+let METRICS = {
+    overviewLatencyFirst:
+    { description: "Time to first frame after triggering overview, first time",
+      units: "us" },
+    overviewFpsFirst:
+    { description: "Frame rate when going to the overview, first time",
+      units: "frames / s" },
+    overviewLatencySubsequent:
+    { description: "Time to first frame after triggering overview, second time",
+      units: "us"},
+    overviewFpsSubsequent:
+    { description: "Frames rate when going to the overview, second time",
+      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" }
+};
+
+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");
+
+    Main.overview.connect('shown', function() {
+                              Scripting.scriptEvent('overviewShowDone');
+                          });
+
+    yield Scripting.sleep(1000);
+    yield Scripting.waitLeisure();
+    for (let i = 0; i < 2; i++) {
+        Scripting.scriptEvent('overviewShowStart');
+        Main.overview.show();
+
+        yield Scripting.waitLeisure();
+        Main.overview.hide();
+        yield Scripting.waitLeisure();
+
+        global.gc();
+        yield Scripting.sleep(1000);
+        Scripting.collectStatistics();
+        Scripting.scriptEvent('afterShowHide');
+    }
+}
+
+let showingOverview = false;
+let finishedShowingOverview = false;
+let overviewShowStart;
+let overviewFrames;
+let overviewLatency;
+let mallocUsedSize = 0;
+let overviewShowCount = 0;
+let firstOverviewUsedSize;
+let haveSwapComplete = false;
+
+function script_overviewShowStart(time) {
+    showingOverview = true;
+    finishedShowingOverview = false;
+    overviewShowStart = time;
+    overviewFrames = 0;
+}
+
+function script_overviewShowDone(time) {
+    // We've set up the state at the end of the zoom out, but we
+    // need to wait for one more frame to paint before we count
+    // ourselves as done.
+    finishedShowingOverview = true;
+}
+
+function script_afterShowHide(time) {
+    if (overviewShowCount == 1) {
+        METRICS.usedAfterOverview.value = mallocUsedSize;
+    } else {
+        METRICS.leakedAfterOverview.value = mallocUsedSize - METRICS.usedAfterOverview.value;
+    }
+}
+
+function malloc_usedSize(time, bytes) {
+    mallocUsedSize = bytes;
+}
+
+function _frameDone(time) {
+    if (showingOverview) {
+        if (overviewFrames == 0)
+            overviewLatency = time - overviewShowStart;
+
+        overviewFrames++;
+    }
+
+    if (finishedShowingOverview) {
+        showingOverview = false;
+        finishedShowingOverview = false;
+        overviewShowCount++;
+
+        let dt = (time - (overviewShowStart + overviewLatency)) / 1000000;
+
+        // If we see a start frame and an end frame, that would
+        // be 1 frame for a FPS computation, hence the '- 1'
+        let fps = (overviewFrames - 1) / dt;
+
+        if (overviewShowCount == 1) {
+            METRICS.overviewLatencyFirst.value = overviewLatency;
+            METRICS.overviewFpsFirst.value = fps;
+        } else {
+            METRICS.overviewLatencySubsequent.value = overviewLatency;
+            METRICS.overviewFpsSubsequent.value = fps;
+        }
+    }
+}
+
+function glx_swapComplete(time, swapTime) {
+    haveSwapComplete = true;
+
+    _frameDone(swapTime);
+}
+
+function clutter_stagePaintDone(time) {
+    // If we aren't receiving GLXBufferSwapComplete events, then we approximate
+    // the time the user sees a frame with the time we finished doing drawing
+    // commands for the frame. This doesn't take into account the time for
+    // the GPU to finish painting, and the time for waiting for the buffer
+    // swap, but if this are uniform - every frame takes the same time to draw -
+    // then it won't upset our FPS calculation, though the latency value
+    // will be slightly too low.
+
+    if (!haveSwapComplete)
+        _frameDone(time);
+}
--- a/js/prefs/clockPreferences.js
+++ b/js/prefs/clockPreferences.js
@ -0,0 +1,97 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+
+const Lang = imports.lang;
+const Signals = imports.signals;
+
+const Gettext = imports.gettext;
+
+const FORMAT_KEY       = 'format';
+const SHOW_DATE_KEY    = 'show-date';
+const SHOW_SECONDS_KEY = 'show-seconds';
+
+
+function ClockPreferences(uiFile) {
+    this._init(uiFile);
+};
+
+ClockPreferences.prototype = {
+    _init: function(uiFile) {
+        let builder = new Gtk.Builder();
+        builder.add_from_file(uiFile);
+
+        this._dialog = builder.get_object('prefs-dialog');
+        this._dialog.connect('response', Lang.bind(this, this._onResponse));
+
+        this._12hrRadio = builder.get_object('12hr_radio');
+        this._24hrRadio = builder.get_object('24hr_radio');
+        this._dateCheck = builder.get_object('date_check');
+        this._secondsCheck = builder.get_object('seconds_check');
+
+        delete builder;
+
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.clock' });
+        this._notifyId = this._settings.connect('changed',
+                                                Lang.bind(this,
+                                                          this._updateDialog));
+
+        this._12hrRadio.connect('toggled', Lang.bind(this,
+            function() {
+                let format = this._12hrRadio.active ? '12-hour' : '24-hour';
+                this._settings.set_string(FORMAT_KEY, format);
+            }));
+        this._dateCheck.connect('toggled', Lang.bind(this,
+            function() {
+                this._settings.set_boolean(SHOW_DATE_KEY,
+                                           this._dateCheck.active);
+            }));
+        this._secondsCheck.connect('toggled', Lang.bind(this,
+            function() {
+                this._settings.set_boolean(SHOW_SECONDS_KEY,
+                                           this._secondsCheck.active);
+            }));
+
+        this._updateDialog();
+    },
+
+    show: function() {
+        this._dialog.show_all();
+    },
+
+    _updateDialog: function() {
+        let format = this._settings.get_string(FORMAT_KEY);
+        this._12hrRadio.active = (format == "12-hour");
+        this._24hrRadio.active = (format == "24-hour");
+
+        this._dateCheck.active = this._settings.get_boolean(SHOW_DATE_KEY);
+        this._secondsCheck.active = this._settings.get_boolean(SHOW_SECONDS_KEY);
+    },
+
+    _onResponse: function() {
+        this._dialog.destroy();
+        this._settings.disconnect(this._notifyId);
+        this.emit('destroy');
+    }
+};
+Signals.addSignalMethods(ClockPreferences.prototype);
+
+function main(params) {
+    if ('progName' in params)
+        GLib.set_prgname(params['progName']);
+    if ('localeDir' in params)
+        Gettext.bindtextdomain('gnome-shell', params['localeDir']);
+
+    Gtk.init(null, null);
+
+    let clockPrefs = new ClockPreferences(params['uiFile']);
+    clockPrefs.connect('destroy',
+                       function() {
+                           Gtk.main_quit();
+                       });
+    clockPrefs.show();
+
+    Gtk.main();
+}
--- a/js/ui/Makefile.am
+++ b/js/ui/Makefile.am
@ -1,31 +0,0 @@
-jsuidir = $(pkgdatadir)/js/ui
-
-dist_jsui_DATA =		\
-	altTab.js		\
-	appDisplay.js		\
-	appFavorites.js		\
-	calendar.js		\
-	chrome.js		\
-	dash.js			\
-	dnd.js			\
-	docDisplay.js		\
-	environment.js		\
-	extensionSystem.js  \
-	genericDisplay.js	\
-	lightbox.js		\
-	link.js			\
-	lookingGlass.js		\
-	main.js			\
-	overview.js		\
-	panel.js		\
-	placeDisplay.js		\
-	runDialog.js		\
-	search.js           \
-	shellDBus.js		\
-	sidebar.js		\
-	statusMenu.js		\
-	tweener.js		\
-	widget.js		\
-	widgetBox.js		\
-	windowManager.js	\
-	workspaces.js
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -1,12 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -14,21 +11,17 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

-const POPUP_ARROW_COLOR = new Clutter.Color();
-POPUP_ARROW_COLOR.from_pixel(0xffffffff);
-const POPUP_UNFOCUSED_ARROW_COLOR = new Clutter.Color();
-POPUP_UNFOCUSED_ARROW_COLOR.from_pixel(0x808080ff);
-const TRANSPARENT_COLOR = new Clutter.Color();
-TRANSPARENT_COLOR.from_pixel(0x00000000);
-
 const POPUP_APPICON_SIZE = 96;
-const POPUP_LIST_SPACING = 8;
+const POPUP_SCROLL_TIME = 0.10; // seconds
+const POPUP_FADE_TIME = 0.1; // seconds

 const DISABLE_HOVER_TIMEOUT = 500; // milliseconds

-const THUMBNAIL_SIZE = 256;
+const THUMBNAIL_DEFAULT_SIZE = 256;
 const THUMBNAIL_POPUP_TIME = 500; // milliseconds
-const THUMBNAIL_FADE_TIME = 0.2; // seconds
+const THUMBNAIL_FADE_TIME = 0.1; // seconds
+
+const iconSizes = [96, 64, 48, 32, 22];

 function mod(a, b) {
    return (a + b) % b;
@ -40,18 +33,19 @@ function AltTabPopup() {

 AltTabPopup.prototype = {
    _init : function() {
-        this.actor = new Clutter.Group({ reactive: true,
-                                         x: 0,
-                                         y: 0,
-                                         width: global.screen_width,
-                                         height: global.screen_height });
+        this.actor = new Shell.GenericContainer({ name: 'altTabPopup',
+                                                    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));

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

        this._haveModal = false;

        this._currentApp = 0;
-        this._currentWindow = 0;
+        this._currentWindow = -1;
        this._thumbnailTimeoutId = 0;
        this._motionTimeoutId = 0;

@ -59,12 +53,71 @@ AltTabPopup.prototype = {
        // the switcher appears underneath the current pointer location
        this._disableHover();

-        global.stage.add_actor(this.actor);
+        Main.uiGroup.add_actor(this.actor);
+    },
+
+    _getPreferredWidth: function (actor, forHeight, alloc) {
+        alloc.min_size = global.screen_width;
+        alloc.natural_size = global.screen_width;
+    },
+
+    _getPreferredHeight: function (actor, forWidth, alloc) {
+        alloc.min_size = global.screen_height;
+        alloc.natural_size = global.screen_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 rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+        let vPadding = this.actor.get_theme_node().get_vertical_padding();
+        let hPadding = leftPadding + rightPadding;
+
+        // Allocate the appSwitcher
+        // We select a size based on an icon size that does not overflow the screen
+        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(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);
+
+        // Allocate the thumbnails
+        // We try to avoid overflowing the screen so we base the resulting size on
+        // those calculations
+        if (this._thumbnails) {
+            let icon = this._appIcons[this._currentApp].actor;
+            // Force a stage relayout to make sure we get the correct position
+            global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, 0, 0);
+            let [posX, posY] = icon.get_transformed_position();
+            let thumbnailCenter = posX + icon.width / 2;
+            let [childMinWidth, childNaturalWidth] = this._thumbnails.actor.get_preferred_width(-1);
+            childBox.x1 = Math.max(primary.x + leftPadding, Math.floor(thumbnailCenter - childNaturalWidth / 2));
+            if (childBox.x1 + childNaturalWidth > primary.x + primary.width - hPadding) {
+                let offset = childBox.x1 + childNaturalWidth - primary.width + hPadding;
+                childBox.x1 = Math.max(primary.x + leftPadding, childBox.x1 - offset - hPadding);
+            }
+
+            let spacing = this.actor.get_theme_node().get_length('spacing');
+
+            childBox.x2 = childBox.x1 +  childNaturalWidth;
+            if (childBox.x2 > primary.x + primary.width - rightPadding)
+                childBox.x2 = primary.x + primary.width - rightPadding;
+            childBox.y1 = this._appSwitcher.actor.allocation.y2 + spacing;
+            this._thumbnails.addClones(primary.height - bottomPadding - childBox.y1);
+            let [childMinHeight, childNaturalHeight] = this._thumbnails.actor.get_preferred_height(-1);
+            childBox.y2 = childBox.y1 + childNaturalHeight;
+            this._thumbnails.actor.allocate(childBox, flags);
+        }
    },

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

        if (!apps.length)
            return false;
@ -84,10 +137,6 @@ AltTabPopup.prototype = {
        this._appSwitcher.connect('item-activated', Lang.bind(this, this._appActivated));
        this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));

-        let primary = global.get_primary_monitor();
-        this._appSwitcher.actor.x = primary.x + Math.floor((primary.width - this._appSwitcher.actor.width) / 2);
-        this._appSwitcher.actor.y = primary.y + Math.floor((primary.height - this._appSwitcher.actor.height) / 2);
-
        this._appIcons = this._appSwitcher.icons;

        // Make the initial selection
@ -112,8 +161,9 @@ AltTabPopup.prototype = {
                    this._select(0, 1, true);
                else
                    this._select(1);
-            } else
+            } else {
                this._select(1);
+            }
        }

        // There's a race condition; if the user released Alt before
@ -121,12 +171,20 @@ AltTabPopup.prototype = {
        // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
        // details.) So we check now. (Have to do this after updating
        // selection.)
-        let mods = global.get_modifier_keys();
+        let [x, y, mods] = global.get_pointer();
        if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
            this._finish();
            return false;
        }

+        this.actor.opacity = 0;
+        this.actor.show();
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });
+
        return true;
    },

@ -138,10 +196,16 @@ AltTabPopup.prototype = {
    },

    _nextWindow : function() {
+        // We actually want the second window if we're in the unset state
+        if (this._currentWindow == -1)
+            this._currentWindow = 0;
        return mod(this._currentWindow + 1,
                   this._appIcons[this._currentApp].cachedWindows.length);
    },
    _previousWindow : function() {
+        // Also assume second window here
+        if (this._currentWindow == -1)
+            this._currentWindow = 1;
        return mod(this._currentWindow - 1,
                   this._appIcons[this._currentApp].cachedWindows.length);
    },
@ -149,48 +213,56 @@ AltTabPopup.prototype = {
    _keyPressEvent : function(actor, event) {
        let keysym = event.get_key_symbol();
        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();

-        // The WASD stuff is for debugging in Xephyr, where the arrow
-        // keys aren't mapped correctly
-
        if (keysym == Clutter.grave)
-            this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
+            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 (keysym == Clutter.Tab) {
-                if (shift && this._currentWindow == 0)
-                    this._select(this._previousApp());
-                else if (!shift && this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
+                if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
                    this._select(this._nextApp());
                else
-                    this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
-            } else if (keysym == Clutter.Left || keysym == Clutter.a)
+                    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 || keysym == Clutter.d)
+            else if (keysym == Clutter.Right)
                this._select(this._currentApp, this._nextWindow());
-            else if (keysym == Clutter.Up || keysym == Clutter.w)
+            else if (keysym == Clutter.Up)
                this._select(this._currentApp, null, true);
        } else {
            if (keysym == Clutter.Tab)
-                this._select(shift ? this._previousApp() : this._nextApp());
-            else if (keysym == Clutter.Left || keysym == Clutter.a)
-                this._select(this._previousApp());
-            else if (keysym == Clutter.Right || keysym == Clutter.d)
                this._select(this._nextApp());
-            else if (keysym == Clutter.Down || keysym == Clutter.s)
-                this._select(this._currentApp, this._currentWindow);
+            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)
+                this._select(this._nextApp());
+            else if (keysym == Clutter.Down)
+                this._select(this._currentApp, 0);
        }

        return true;
    },

    _keyReleaseEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
+        let [x, y, mods] = global.get_pointer();
+        let state = mods & Clutter.ModifierType.MOD1_MASK;

-        if (keysym == Clutter.Alt_L || keysym == Clutter.Alt_R)
+        if (state == 0)
            this._finish();

        return true;
@ -200,7 +272,7 @@ AltTabPopup.prototype = {
        let direction = event.get_scroll_direction();
        if (direction == Clutter.ScrollDirection.UP) {
            if (this._thumbnailsFocused) {
-                if (this._currentWindow == 0)
+                if (this._currentWindow == 0 || this._currentWindow == -1)
                    this._select(this._previousApp());
                else
                    this._select(this._currentApp, this._previousWindow());
@ -234,10 +306,17 @@ AltTabPopup.prototype = {
    _appActivated : function(appSwitcher, n) {
        // If the user clicks on the selected app, activate the
        // selected window; otherwise (eg, they click on an app while
-        // !mouseActive) activate the first window of the clicked-on
-        // app.
-        let window = (n == this._currentApp) ? this._currentWindow : 0;
-        Main.activateWindow(this._appIcons[n].cachedWindows[window]);
+        // !mouseActive) activate the the clicked-on app.
+        if (n == this._currentApp) {
+            let window;
+            if (this._currentWindow >= 0)
+                window = this._appIcons[this._currentApp].cachedWindows[this._currentWindow];
+            else
+                window = null;
+            this._appIcons[this._currentApp].app.activate_window(window, global.get_current_time());
+        } else {
+            this._appIcons[n].app.activate_window(null, global.get_current_time());
+        }
        this.destroy();
    },

@ -249,7 +328,8 @@ AltTabPopup.prototype = {
    },

    _windowActivated : function(thumbnailList, n) {
-        Main.activateWindow(this._appIcons[this._currentApp].cachedWindows[n]);
+        let appIcon = this._appIcons[this._currentApp];
+        Main.activateWindow(appIcon.cachedWindows[n]);
        this.destroy();
    },

@ -276,19 +356,33 @@ AltTabPopup.prototype = {

    _finish : function() {
        let app = this._appIcons[this._currentApp];
-        let window = app.cachedWindows[this._currentWindow];
-        Main.activateWindow(window);
+        if (this._currentWindow >= 0) {
+            Main.activateWindow(app.cachedWindows[this._currentWindow]);
+        } else {
+            app.app.activate_window(null, global.get_current_time());
+        }
        this.destroy();
    },

    destroy : function() {
-        this.actor.destroy();
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: POPUP_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.actor.destroy();
+                               })
+                         });
    },

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

+        if (this._thumbnails)
+            this._destroyThumbnails();
+
        if (this._keyPressEventId)
            global.stage.disconnect(this._keyPressEventId);
        if (this._keyReleaseEventId)
@ -339,7 +433,7 @@ AltTabPopup.prototype = {
        this._thumbnailsFocused = (window != null) && !forceAppFocus;

        this._currentApp = app;
-        this._currentWindow = window ? window : 0;
+        this._currentWindow = window ? window : -1;
        this._appSwitcher.highlight(app, this._thumbnailsFocused);

        if (window != null) {
@ -351,18 +445,23 @@ AltTabPopup.prototype = {
                   !forceAppFocus) {
            this._thumbnailTimeoutId = Mainloop.timeout_add (
                THUMBNAIL_POPUP_TIME,
-                Lang.bind(this, function () {
-                              this._select(this._currentApp, 0, true);
-                              return false;
-                          }));
+                Lang.bind(this, this._timeoutPopupThumbnails));
        }
    },

+    _timeoutPopupThumbnails: function() {
+        if (!this._thumbnails)
+            this._createThumbnails();
+        this._thumbnailTimeoutId = 0;
+        this._thumbnailsFocused = false;
+        return false;
+    },
+
    _destroyThumbnails : function() {
        Tweener.addTween(this._thumbnails.actor,
                         { opacity: 0,
                           time: THUMBNAIL_FADE_TIME,
-                           transition: "easeOutQuad",
+                           transition: 'easeOutQuad',
                           onComplete: function() { this.destroy(); }
                         });
        this._thumbnails = null;
@ -375,38 +474,11 @@ AltTabPopup.prototype = {

        this.actor.add_actor(this._thumbnails.actor);

-        let thumbnailCenter;
-        if (this._thumbnails.actor.width < this._appSwitcher.actor.width) {
-            // Center the thumbnails under the corresponding AppIcon.
-            // If this is being called when the switcher is first
-            // being brought up, then nothing will have been assigned
-            // an allocation yet, and the get_transformed_position()
-            // call will return 0,0.
-            // (http://bugzilla.openedhand.com/show_bug.cgi?id=1115).
-            // Calling clutter_actor_get_allocation_box() would force
-            // it to properly allocate itself, but we can't call that
-            // because it has an out-caller-allocates arg. So we use
-            // clutter_stage_get_actor_at_pos(), which will force a
-            // reallocation as a side effect.
-            global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, 0, 0);
-
-            let icon = this._appIcons[this._currentApp].actor;
-            let [stageX, stageY] = icon.get_transformed_position();
-            thumbnailCenter = stageX + icon.width / 2;
-        } else {
-            // Center the thumbnails on the monitor
-            let primary = global.get_primary_monitor();
-            thumbnailCenter = primary.x + primary.width / 2;
-        }
-
-        this._thumbnails.actor.x = Math.floor(thumbnailCenter - this._thumbnails.actor.width / 2);
-        this._thumbnails.actor.y = this._appSwitcher.actor.y + this._appSwitcher.actor.height + POPUP_LIST_SPACING;
-
        this._thumbnails.actor.opacity = 0;
        Tweener.addTween(this._thumbnails.actor,
                         { opacity: 255,
                           time: THUMBNAIL_FADE_TIME,
-                           transition: "easeOutQuad"
+                           transition: 'easeOutQuad'
                         });
    }
 };
@ -417,23 +489,99 @@ function SwitcherList(squareItems) {

 SwitcherList.prototype = {
    _init : function(squareItems) {
-        this.actor = new St.Bin({ style_class: 'switcher-list' });
+        this.actor = new Shell.GenericContainer({ style_class: 'switcher-list' });
+        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._allocateTop));

        // Here we use a GenericContainer so that we can force all the
        // children except the separator to have the same width.
-        this._list = new Shell.GenericContainer();
-        this._list.spacing = POPUP_LIST_SPACING;
+        this._list = new Shell.GenericContainer({ style_class: 'switcher-list-item-container' });
+        this._list.spacing = 0;
+        this._list.connect('style-changed', Lang.bind(this, function() {
+                                                        this._list.spacing = this._list.get_theme_node().get_length('spacing');
+                                                     }));

        this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
        this._list.connect('allocate', Lang.bind(this, this._allocate));

-        this.actor.add_actor(this._list);
+        this._clipBin = new St.Bin({style_class: 'cbin'});
+        this._clipBin.child = this._list;
+        this.actor.add_actor(this._clipBin);
+
+        this._leftGradient = new St.BoxLayout({style_class: 'thumbnail-scroll-gradient-left', vertical: true});
+        this._rightGradient = new St.BoxLayout({style_class: 'thumbnail-scroll-gradient-right', vertical: true});
+        this.actor.add_actor(this._leftGradient);
+        this.actor.add_actor(this._rightGradient);
+
+        // Those arrows indicate whether scrolling in one direction is possible
+        this._leftArrow = new St.DrawingArea({ style_class: 'switcher-arrow',
+                                               pseudo_class: 'highlighted' });
+        this._leftArrow.connect('repaint', Lang.bind(this,
+                                            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 (area) {
+                                                Shell.draw_box_pointer(area, Shell.PointerDirection.RIGHT);
+                                            }));
+
+        this.actor.add_actor(this._leftArrow);
+        this.actor.add_actor(this._rightArrow);

        this._items = [];
        this._highlighted = -1;
        this._separator = null;
        this._squareItems = squareItems;
+        this._minSize = 0;
+        this._scrollableRight = true;
+        this._scrollableLeft = false;
+    },
+
+    _allocateTop: function(actor, box, flags) {
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+
+        let childBox = new Clutter.ActorBox();
+        let scrollable = this._minSize > box.x2 - box.x1;
+
+        this._clipBin.allocate(box, flags);
+
+        childBox.x1 = 0;
+        childBox.y1 = 0;
+        childBox.x2 = this._leftGradient.width;
+        childBox.y2 = this.actor.height;
+        this._leftGradient.allocate(childBox, flags);
+        this._leftGradient.opacity = (this._scrollableLeft && scrollable) ? 255 : 0;
+
+        childBox.x1 = (this.actor.allocation.x2 - this.actor.allocation.x1) - this._rightGradient.width;
+        childBox.y1 = 0;
+        childBox.x2 = childBox.x1 + this._rightGradient.width;
+        childBox.y2 = this.actor.height;
+        this._rightGradient.allocate(childBox, flags);
+        this._rightGradient.opacity = (this._scrollableRight && scrollable) ? 255 : 0;
+
+        let arrowWidth = Math.floor(leftPadding / 3);
+        let arrowHeight = arrowWidth * 2;
+        childBox.x1 = leftPadding / 2;
+        childBox.y1 = this.actor.height / 2 - arrowWidth;
+        childBox.x2 = childBox.x1 + arrowWidth;
+        childBox.y2 = childBox.y1 + arrowHeight;
+        this._leftArrow.allocate(childBox, flags);
+        this._leftArrow.opacity = this._leftGradient.opacity;
+
+        arrowWidth = Math.floor(rightPadding / 3);
+        arrowHeight = arrowWidth * 2;
+        childBox.x1 = this.actor.width - arrowWidth - rightPadding / 2;
+        childBox.y1 = this.actor.height / 2 - arrowWidth;
+        childBox.x2 = childBox.x1 + arrowWidth;
+        childBox.y2 = childBox.y1 + arrowHeight;
+        this._rightArrow.allocate(childBox, flags);
+        this._rightArrow.opacity = this._rightGradient.opacity;
    },

    addItem : function(item) {
@ -455,7 +603,7 @@ SwitcherList.prototype = {
    },

    addSeparator: function () {
-        let box = new St.Bin({ style_class: 'separator' })
+        let box = new St.Bin({ style_class: 'separator' });
        this._separator = box;
        this._list.add_actor(box);
    },
@ -472,6 +620,49 @@ SwitcherList.prototype = {
            else
                this._items[this._highlighted].style_class = 'selected-item-box';
        }
+
+        let monitor = global.get_primary_monitor();
+        let itemSize = this._items[index].allocation.x2 - this._items[index].allocation.x1;
+        let [posX, posY] = this._items[index].get_transformed_position();
+        posX += this.actor.x;
+        if (posX + itemSize > monitor.width + monitor.x)
+            this._scrollToRight();
+        else if (posX < 0)
+            this._scrollToLeft();
+
+    },
+
+    _scrollToLeft : function() {
+        let x = this._items[this._highlighted].allocation.x1;
+        this._scrollableRight = true;
+        Tweener.addTween(this._list, { anchor_x: x,
+                                        time: POPUP_SCROLL_TIME,
+                                        transition: 'easeOutQuad',
+                                        onComplete: Lang.bind(this, function () {
+                                                                        if (this._highlighted == 0) {
+                                                                            this._scrollableLeft = false;
+                                                                            this.actor.queue_relayout();
+                                                                        }
+                                                             })
+                        });
+    },
+
+    _scrollToRight : function() {
+        this._scrollableLeft = true;
+        let monitor = global.get_primary_monitor();
+        let padding = this.actor.get_theme_node().get_horizontal_padding();
+        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
+        let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + parentPadding;
+        Tweener.addTween(this._list, { anchor_x: x,
+                                        time: POPUP_SCROLL_TIME,
+                                        transition: 'easeOutQuad',
+                                        onComplete: Lang.bind(this, function () {
+                                                                        if (this._highlighted == this._items.length - 1) {
+                                                                            this._scrollableRight = false;
+                                                                            this.actor.queue_relayout();
+                                                                        }
+                                                             })
+                        });
    },

    _itemActivated: function(n) {
@ -512,7 +703,8 @@ SwitcherList.prototype = {

        let totalSpacing = this._list.spacing * (this._items.length - 1);
        alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
-        alloc.nat_size = this._items.length * maxChildNat + separatorWidth + totalSpacing;
+        alloc.natural_size = alloc.min_size;
+        this._minSize = alloc.min_size;
    },

    _getPreferredHeight: function (actor, forWidth, alloc) {
@ -528,11 +720,11 @@ SwitcherList.prototype = {
        if (this._squareItems) {
            let [childMin, childNat] = this._maxChildWidth(-1);
            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
+            maxChildNat = maxChildMin;
        }

        alloc.min_size = maxChildMin;
-        alloc.nat_size = maxChildNat;
+        alloc.natural_size = maxChildNat;
    },

    _allocate: function (actor, box, flags) {
@ -553,6 +745,18 @@ SwitcherList.prototype = {
        let x = 0;
        let children = this._list.get_children();
        let childBox = new Clutter.ActorBox();
+
+        let primary = global.get_primary_monitor();
+        let parentRightPadding = this.actor.get_parent().get_theme_node().get_padding(St.Side.RIGHT);
+        if (this.actor.allocation.x2 == primary.x + primary.width - parentRightPadding) {
+            if (this._squareItems)
+                childWidth = childHeight;
+            else {
+                let [childMin, childNat] = children[0].get_preferred_width(childHeight);
+                childWidth = childMin;
+            }
+        }
+
        for (let i = 0; i < children.length; i++) {
            if (this._items.indexOf(children[i]) != -1) {
                let [childMin, childNat] = children[i].get_preferred_height(childWidth);
@ -577,6 +781,14 @@ SwitcherList.prototype = {
                // we don't allocate it.
            }
        }
+
+        let leftPadding = this.actor.get_theme_node().get_padding(St.Side.LEFT);
+        let rightPadding = this.actor.get_theme_node().get_padding(St.Side.RIGHT);
+        let topPadding = this.actor.get_theme_node().get_padding(St.Side.TOP);
+        let bottomPadding = this.actor.get_theme_node().get_padding(St.Side.BOTTOM);
+
+        // Clip the area for scrolling
+        this._clipBin.set_clip(0, -topPadding, (this.actor.allocation.x2 - this.actor.allocation.x1) - leftPadding - rightPadding, this.actor.height + bottomPadding);
    }
 };

@ -589,14 +801,22 @@ function AppIcon(app) {
 AppIcon.prototype = {
    _init: function(app) {
        this.app = app;
-        this.actor = new St.BoxLayout({ style_class: "alt-tab-app",
+        this.actor = new St.BoxLayout({ style_class: 'alt-tab-app',
                                         vertical: true });
-        this._icon = this.app.create_icon_texture(POPUP_APPICON_SIZE);
-        this.actor.add(this._icon, { x_fill: false, y_fill: false } );
-        this._label = new St.Label({ text: this.app.get_name() });
-        this.actor.add(this._label, { x_fill: false });
+        this.icon = null;
+        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() });
+        this.actor.add(this.label, { x_fill: false });
+    },
+
+    set_size: function(size) {
+        this.icon = this.app.create_icon_texture(size);
+        this._iconBin.set_size(size, size);
+        this._iconBin.child = this.icon;
    }
-}
+};

 function AppSwitcher(apps) {
    this._init(apps);
@ -636,6 +856,48 @@ AppSwitcher.prototype = {
            this._addIcon(otherIcons[i]);

        this._curApp = -1;
+        this._iconSize = 0;
+    },
+
+    _getPreferredHeight: function (actor, forWidth, alloc) {
+        let j = 0;
+        while(this._items.length > 1 && this._items[j].style_class != 'item-box') {
+                j++;
+        }
+        let iconPadding = this._items[j].get_theme_node().get_horizontal_padding();
+        let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
+        let iconSpacing = iconNaturalHeight + iconPadding;
+        let totalSpacing = this._list.spacing * (this._items.length - 1);
+        if (this._separator)
+           totalSpacing += this._separator.width + this._list.spacing;
+
+        // We just assume the whole screen here due to weirdness happing with the passed width
+        let focus = global.get_focus_monitor();
+        let parentPadding = this.actor.get_parent().get_theme_node().get_horizontal_padding();
+        let availWidth = focus.width - parentPadding - this.actor.get_theme_node().get_horizontal_padding();
+        let height = 0;
+
+        for(let i =  0; i < iconSizes.length; i++) {
+                this._iconSize = iconSizes[i];
+                height = iconSizes[i] + iconSpacing;
+                let w = height * this._items.length + totalSpacing;
+                if (w <= availWidth)
+                        break;
+        }
+
+        if (this._items.length == 1) {
+            this._iconSize = iconSizes[0];
+            height = iconSizes[0] + iconSpacing;
+        }
+
+        for(let i = 0; i < this.icons.length; i++) {
+            if (this.icons[i].icon != null)
+                break;
+            this.icons[i].set_size(this._iconSize);
+        }
+
+        alloc.min_size = height;
+        alloc.natural_size = height;
    },

    _allocate: function (actor, box, flags) {
@ -663,16 +925,13 @@ AppSwitcher.prototype = {
    // thumbnails are visible (ie, when the app icon is supposed to be
    // in justOutline mode). Apps with multiple windows will normally
    // show a dim arrow, but show a bright arrow when they are
-    // highlighted; their redraw handler will use the right color
-    // based on this._curApp; we just need to do a queue_relayout() to
-    // force it to redraw. (queue_redraw() doesn't work because
-    // ShellDrawingArea only redraws on allocate.)
+    // highlighted.
    highlight : function(n, justOutline) {
        if (this._curApp != -1) {
            if (this.icons[this._curApp].cachedWindows.length == 1)
                this._arrows[this._curApp].hide();
            else
-                this._arrows[this._curApp].queue_relayout();
+                this._arrows[this._curApp].remove_style_pseudo_class('highlighted');
        }

        SwitcherList.prototype.highlight.call(this, n, justOutline);
@ -682,7 +941,7 @@ AppSwitcher.prototype = {
            if (justOutline && this.icons[this._curApp].cachedWindows.length == 1)
                this._arrows[this._curApp].show();
            else
-                this._arrows[this._curApp].queue_relayout();
+                this._arrows[this._curApp].add_style_pseudo_class('highlighted');
        }
    },

@ -691,12 +950,10 @@ AppSwitcher.prototype = {
        this.addItem(appIcon.actor);

        let n = this._arrows.length;
-        let arrow = new St.DrawingArea();
-        arrow.connect('redraw', Lang.bind(this,
-            function (area, texture) {
-                Shell.draw_box_pointer(texture, Shell.PointerDirection.DOWN,
-                                       TRANSPARENT_COLOR,
-                                       this._curApp == n ? POPUP_ARROW_COLOR : POPUP_UNFOCUSED_ARROW_COLOR);
+        let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
+        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);
@ -731,44 +988,72 @@ ThumbnailList.prototype = {

        let activeWorkspace = global.screen.get_active_workspace();

-        // We fake the value of "separatorAdded" when the app has no window
+        // We fake the value of 'separatorAdded' when the app has no window
        // on the current workspace, to avoid displaying a useless separator in
        // that case.
        let separatorAdded = windows.length == 0 || windows[0].get_workspace() != activeWorkspace;

+        this._labels = new Array();
+        this._thumbnailBins = new Array();
+        this._clones = new Array();
+        this._windows = windows;
+
        for (let i = 0; i < windows.length; i++) {
            if (!separatorAdded && windows[i].get_workspace() != activeWorkspace) {
              this.addSeparator();
              separatorAdded = true;
            }

-            let mutterWindow = windows[i].get_compositor_private();
-            let windowTexture = mutterWindow.get_texture ();
-            let [width, height] = windowTexture.get_size();
-            let scale = Math.min(1.0, THUMBNAIL_SIZE / width, THUMBNAIL_SIZE / height);
-
-            let box = new St.BoxLayout({ style_class: "thumbnail-box",
+            let box = new St.BoxLayout({ style_class: 'thumbnail-box',
                                         vertical: true });

-            let bin = new St.Bin({ style_class: "thumbnail" });
-            let clone = new Clutter.Clone ({ source: windowTexture,
-                                             reactive: true,
-                                             width: width * scale,
-                                             height: height * scale });
+            let bin = new St.Bin({ style_class: 'thumbnail' });

-            bin.add_actor(clone);
            box.add_actor(bin);
+            this._thumbnailBins.push(bin);

            let title = windows[i].get_title();
            if (title) {
                let name = new St.Label({ text: title });
                // St.Label doesn't support text-align so use a Bin
                let bin = new St.Bin({ x_align: St.Align.MIDDLE });
+                this._labels.push(bin);
                bin.add_actor(name);
                box.add_actor(bin);
            }

            this.addItem(box);
        }
+    },
+
+    addClones : function (availHeight) {
+        if (!this._thumbnailBins.length)
+            return;
+        let totalPadding = this._items[0].get_theme_node().get_horizontal_padding() + this._items[0].get_theme_node().get_vertical_padding();
+        totalPadding += this.actor.get_theme_node().get_horizontal_padding() + this.actor.get_theme_node().get_vertical_padding();
+        let [labelMinHeight, labelNaturalHeight] = this._labels[0].get_preferred_height(-1);
+        let spacing = this._items[0].child.get_theme_node().get_length('spacing');
+
+        availHeight = Math.min(availHeight - labelNaturalHeight - totalPadding - spacing, THUMBNAIL_DEFAULT_SIZE);
+        let binHeight = availHeight + this._items[0].get_theme_node().get_vertical_padding() + this.actor.get_theme_node().get_vertical_padding() - spacing;
+        binHeight = Math.min(THUMBNAIL_DEFAULT_SIZE, binHeight);
+
+        for (let i = 0; i < this._thumbnailBins.length; i++) {
+            let mutterWindow = this._windows[i].get_compositor_private();
+            let windowTexture = mutterWindow.get_texture ();
+            let [width, height] = windowTexture.get_size();
+            let scale = Math.min(1.0, THUMBNAIL_DEFAULT_SIZE / width, availHeight / height);
+            let clone = new Clutter.Clone ({ source: windowTexture,
+                                                reactive: true,
+                                                width: width * scale,
+                                                height: height * scale });
+
+            this._thumbnailBins[i].set_height(binHeight);
+            this._thumbnailBins[i].add_actor(clone);
+            this._clones.push(clone);
+        }
+
+        // Make sure we only do this once
+        this._thumbnailBins = new Array();
    }
 };
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -3,19 +3,21 @@
 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;

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

 AppFavorites.prototype = {
-    FAVORITE_APPS_KEY: 'favorite_apps',
+    FAVORITE_APPS_KEY: 'favorite-apps',

    _init: function() {
        this._favorites = {};
-        this._gconf = Shell.GConf.get_default();
-        this._gconf.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
+        global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
        this._reload();
    },

@ -25,7 +27,7 @@ AppFavorites.prototype = {
    },

    _reload: function() {
-        let ids = Shell.GConf.get_default().get_string_list('favorite_apps');
+        let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
        let appSys = Shell.AppSystem.get_default();
        let apps = ids.map(function (id) {
                return appSys.get_app(id);
@ -61,23 +63,51 @@ AppFavorites.prototype = {
        return appId in this._favorites;
    },

-    addFavorite: function(appId) {
+    _addFavorite: function(appId) {
        if (appId in this._favorites)
-            return;
+            return false;
+
        let app = Shell.AppSystem.get_default().get_app(appId);
+
        if (!app)
-            return;
+            return false;
+
        let ids = this._getIds();
        ids.push(appId);
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
+        global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
        this._favorites[appId] = app;
+        return true;
+    },
+
+    addFavorite: function(appId) {
+        if (!this._addFavorite(appId))
+            return;
+
+        let app = Shell.AppSystem.get_default().get_app(appId);
+
+        Main.overview.infoBar.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
+            this._removeFavorite(appId);
+        }));
+    },
+
+    _removeFavorite: function(appId) {
+        if (!appId in this._favorites)
+            return false;
+
+        let ids = this._getIds().filter(function (id) { return id != appId; });
+        global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
+        return true;
    },

    removeFavorite: function(appId) {
-        if (!appId in this._favorites)
+        let app = this._favorites[appId];
+        if (!this._removeFavorite(appId))
            return;
-        let ids = this._getIds().filter(function (id) { return id != appId; });
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
+
+        Main.overview.infoBar.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
+                                         Lang.bind(this, function () {
+            this._addFavorite(appId);
+        }));
    }
 };
 Signals.addSignalMethods(AppFavorites.prototype);
--- a/js/ui/appIcon.js
+++ b/js/ui/appIcon.js
@ -1,591 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Pango = imports.gi.Pango;
-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 GenericDisplay = imports.ui.genericDisplay;
-const AppFavorites = imports.ui.appFavorites;
-const Main = imports.ui.main;
-const Workspaces = imports.ui.workspaces;
-
-const GLOW_COLOR = new Clutter.Color();
-GLOW_COLOR.from_pixel(0x4f6ba4ff);
-const GLOW_PADDING_HORIZONTAL = 3;
-const GLOW_PADDING_VERTICAL = 3;
-
-const APPICON_DEFAULT_ICON_SIZE = 48;
-
-const APPICON_PADDING = 1;
-const APPICON_BORDER_WIDTH = 1;
-const APPICON_CORNER_RADIUS = 4;
-
-const APPICON_MENU_POPUP_TIMEOUT_MS = 600;
-
-const APPICON_DEFAULT_BORDER_COLOR = new Clutter.Color();
-APPICON_DEFAULT_BORDER_COLOR.from_pixel(0x787878ff);
-const APPICON_MENU_BACKGROUND_COLOR = new Clutter.Color();
-APPICON_MENU_BACKGROUND_COLOR.from_pixel(0x292929ff);
-const APPICON_MENU_FONT = 'Sans 14px';
-const APPICON_MENU_COLOR = new Clutter.Color();
-APPICON_MENU_COLOR.from_pixel(0xffffffff);
-const APPICON_MENU_SELECTED_COLOR = new Clutter.Color();
-APPICON_MENU_SELECTED_COLOR.from_pixel(0x005b97ff);
-const APPICON_MENU_SEPARATOR_COLOR = new Clutter.Color();
-APPICON_MENU_SEPARATOR_COLOR.from_pixel(0x787878ff);
-const APPICON_MENU_BORDER_WIDTH = 1;
-const APPICON_MENU_ARROW_SIZE = 12;
-const APPICON_MENU_CORNER_RADIUS = 4;
-const APPICON_MENU_PADDING = 4;
-
-const TRANSPARENT_COLOR = new Clutter.Color();
-TRANSPARENT_COLOR.from_pixel(0x00000000);
-
-const MenuType = { NONE: 0, ON_RIGHT: 1, BELOW: 2 };
-
-function AppIcon(params) {
-    this._init(params);
-}
-
-AppIcon.prototype = {
-    _init : function(params) {
-        this.app = params.app;
-        if (!this.app)
-            throw new Error('AppIcon constructor requires "app" param');
-
-        this._menuType = ('menuType' in params) ? params.menuType : MenuType.NONE;
-        this._iconSize = ('size' in params) ? params.size : APPICON_DEFAULT_ICON_SIZE;
-        this._showGlow = ('glow' in params) ? params.glow : false;
-
-        this.actor = new Shell.ButtonBox({ orientation: Big.BoxOrientation.VERTICAL,
-                                           border: APPICON_BORDER_WIDTH,
-                                           corner_radius: APPICON_CORNER_RADIUS,
-                                           padding: APPICON_PADDING,
-                                           reactive: true });
-        this.actor._delegate = this;
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this.highlight_border_color = APPICON_DEFAULT_BORDER_COLOR;
-
-        if (this._menuType != MenuType.NONE) {
-            this.actor.connect('button-press-event', Lang.bind(this, this._updateMenuOnButtonPress));
-            this.actor.connect('notify::hover', Lang.bind(this, this._updateMenuOnHoverChanged));
-            this.actor.connect('activate', Lang.bind(this, this._updateMenuOnActivate));
-
-            this._menuTimeoutId = 0;
-            this._menu = null;
-        }
-
-        let iconBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                    x_align: Big.BoxAlignment.CENTER,
-                                    y_align: Big.BoxAlignment.CENTER,
-                                    width: this._iconSize,
-                                    height: this._iconSize });
-        this.icon = this.app.create_icon_texture(this._iconSize);
-        iconBox.append(this.icon, Big.BoxPackFlags.NONE);
-
-        this.actor.append(iconBox, Big.BoxPackFlags.EXPAND);
-
-        let nameBox = new Shell.GenericContainer();
-        nameBox.connect('get-preferred-width', Lang.bind(this, this._nameBoxGetPreferredWidth));
-        nameBox.connect('get-preferred-height', Lang.bind(this, this._nameBoxGetPreferredHeight));
-        nameBox.connect('allocate', Lang.bind(this, this._nameBoxAllocate));
-        this._nameBox = nameBox;
-
-        this._name = new St.Label({ style_class: "app-icon-label",
-                                     text: this.app.get_name() });
-        this._name.clutter_text.line_alignment = Pango.Alignment.CENTER;
-        nameBox.add_actor(this._name);
-        if (this._showGlow) {
-            this._glowBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
-            this._nameBox.add_actor(this._glowBox);
-            this._glowBox.lower(this._name);
-            this._appWindowChangedId = this.app.connect('windows-changed', Lang.bind(this, this._rerenderGlow));
-            this._rerenderGlow();
-        } else {
-            this._glowBox = null;
-            this._appWindowChangedId = 0;
-        }
-
-        this.actor.append(nameBox, Big.BoxPackFlags.NONE);
-    },
-
-    _nameBoxGetPreferredWidth: function (nameBox, forHeight, alloc) {
-        let [min, natural] = this._name.get_preferred_width(forHeight);
-        alloc.min_size = min + GLOW_PADDING_HORIZONTAL * 2;
-        alloc.natural_size = natural + GLOW_PADDING_HORIZONTAL * 2;
-    },
-
-    _nameBoxGetPreferredHeight: function (nameBox, forWidth, alloc) {
-        let [min, natural] = this._name.get_preferred_height(forWidth);
-        alloc.min_size = min + GLOW_PADDING_VERTICAL * 2;
-        alloc.natural_size = natural + GLOW_PADDING_VERTICAL * 2;
-    },
-
-    _nameBoxAllocate: function (nameBox, box, flags) {
-        let childBox = new Clutter.ActorBox();
-        let [minWidth, naturalWidth] = this._name.get_preferred_width(-1);
-        let [minHeight, naturalHeight] = this._name.get_preferred_height(-1);
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-        let targetWidth = availWidth;
-        let xPadding = 0;
-        if (naturalWidth < availWidth) {
-            xPadding = Math.floor((availWidth - naturalWidth) / 2);
-        }
-        childBox.x1 = xPadding;
-        childBox.x2 = availWidth - xPadding;
-        childBox.y1 = GLOW_PADDING_VERTICAL;
-        childBox.y2 = availHeight - GLOW_PADDING_VERTICAL;
-        this._name.allocate(childBox, flags);
-
-        // Now the glow
-        if (this._glowBox != null) {
-            let glowPaddingHoriz = Math.max(0, xPadding - GLOW_PADDING_HORIZONTAL);
-            glowPaddingHoriz = Math.max(GLOW_PADDING_HORIZONTAL, glowPaddingHoriz);
-            childBox.x1 = glowPaddingHoriz;
-            childBox.x2 = availWidth - glowPaddingHoriz;
-            childBox.y1 = 0;
-            childBox.y2 = availHeight;
-            this._glowBox.allocate(childBox, flags);
-        }
-    },
-
-    _onDestroy: function() {
-        if (this._appWindowChangedId > 0)
-            this.app.disconnect(this._appWindowChangedId);
-    },
-
-    _rerenderGlow: function() {
-        if (!this._showGlow)
-            return;
-        this._glowBox.get_children().forEach(function (a) { a.destroy(); });
-        let glowPath = GLib.filename_to_uri(global.imagedir + 'app-well-glow.png', '');
-        let windows = this.app.get_windows();
-        for (let i = 0; i < windows.length && i < 3; i++) {
-            let glow = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
-                                                                      glowPath, -1, -1);
-            glow.keep_aspect_ratio = false;
-            this._glowBox.append(glow, Big.BoxPackFlags.EXPAND);
-        }
-    },
-
-    // AppIcon itself is not a draggable, but if you want to make
-    // a subclass of it draggable, you can use this method to create
-    // a drag actor
-    createDragActor: function() {
-        return this.app.create_icon_texture(this._iconSize);
-    },
-
-    setHighlight: function(highlight) {
-        if (highlight) {
-            this.actor.border_color = this.highlight_border_color;
-        } else {
-            this.actor.border_color = TRANSPARENT_COLOR;
-        }
-    },
-
-    _updateMenuOnActivate: function(actor, event) {
-        if (this._menuTimeoutId != 0) {
-            Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = 0;
-        }
-        this.emit('activate');
-        return false;
-    },
-
-    _updateMenuOnHoverChanged: function() {
-        if (!this.actor.hover && this._menuTimeoutId != 0) {
-            Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = 0;
-        }
-        return false;
-    },
-
-    _updateMenuOnButtonPress: function(actor, event) {
-        let button = event.get_button();
-        if (button == 1) {
-            if (this._menuTimeoutId != 0)
-                Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = Mainloop.timeout_add(APPICON_MENU_POPUP_TIMEOUT_MS,
-                                                       Lang.bind(this, function () { this.popupMenu(button); }));
-        } else if (button == 3) {
-            this.popupMenu(button);
-        }
-        return false;
-    },
-
-    popupMenu: function(activatingButton) {
-        if (this._menuTimeoutId != 0) {
-            Mainloop.source_remove(this._menuTimeoutId);
-            this._menuTimeoutId = 0;
-        }
-
-        this.actor.fake_release();
-
-        if (!this._menu) {
-            this._menu = new AppIconMenu(this, this._menuType);
-            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)
-                    this.menuPoppedUp();
-                else
-                    this.menuPoppedDown();
-            }));
-        }
-
-        this._menu.popup(activatingButton);
-
-        return false;
-    },
-
-    // Default implementations; AppDisplay.RunningWellItem overrides these
-    highlightWindow: function(window) {
-        this.emit('highlight-window', window);
-    },
-
-    activateWindow: function(window) {
-        this.emit('activate-window', window);
-    },
-
-    menuPoppedUp: function() {
-        this.emit('menu-popped-up', this._menu);
-    },
-
-    menuPoppedDown: function() {
-        this.emit('menu-popped-down', this._menu);
-    }
-};
-
-Signals.addSignalMethods(AppIcon.prototype);
-
-function AppIconMenu(source, type) {
-    this._init(source, type);
-}
-
-AppIconMenu.prototype = {
-    _init: function(source, type) {
-        this._source = source;
-        this._type = type;
-
-        this.actor = new Shell.GenericContainer({ 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));
-
-        this._windowContainer = new Shell.Menu({ orientation: Big.BoxOrientation.VERTICAL,
-                                                 border_color: source.highlight_border_color,
-                                                 border: APPICON_MENU_BORDER_WIDTH,
-                                                 background_color: APPICON_MENU_BACKGROUND_COLOR,
-                                                 padding: 4,
-                                                 corner_radius: APPICON_MENU_CORNER_RADIUS,
-                                                 width: Main.overview._dash.actor.width * 0.75 });
-        this._windowContainer.connect('unselected', Lang.bind(this, this._onItemUnselected));
-        this._windowContainer.connect('selected', Lang.bind(this, this._onItemSelected));
-        this._windowContainer.connect('cancelled', Lang.bind(this, this._onWindowSelectionCancelled));
-        this._windowContainer.connect('activate', Lang.bind(this, this._onItemActivate));
-        this.actor.add_actor(this._windowContainer);
-
-        // Stay popped up on release over application icon
-        this._windowContainer.set_persistent_source(this._source.actor);
-
-        // Intercept events while the menu has the pointer grab to do window-related effects
-        this._windowContainer.connect('enter-event', Lang.bind(this, this._onMenuEnter));
-        this._windowContainer.connect('leave-event', Lang.bind(this, this._onMenuLeave));
-        this._windowContainer.connect('button-release-event', Lang.bind(this, this._onMenuButtonRelease));
-
-        this._arrow = new St.DrawingArea();
-        this._arrow.connect('redraw', Lang.bind(this, function (area, texture) {
-            Shell.draw_box_pointer(texture,
-                                   this._type == MenuType.ON_RIGHT ? Shell.PointerDirection.LEFT : Shell.PointerDirection.UP,
-                                   source.highlight_border_color,
-                                   APPICON_MENU_BACKGROUND_COLOR);
-        }));
-        this.actor.add_actor(this._arrow);
-
-        // Chain our visibility and lifecycle to that of the source
-        source.actor.connect('notify::mapped', Lang.bind(this, function () {
-            if (!source.actor.mapped)
-                this._windowContainer.popdown();
-        }));
-        source.actor.connect('destroy', Lang.bind(this, function () { this.actor.destroy(); }));
-
-        global.stage.add_actor(this.actor);
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let [min, natural] = this._windowContainer.get_preferred_width(forHeight);
-        if (this._type == MenuType.ON_RIGHT) {
-            min += APPICON_MENU_ARROW_SIZE;
-            natural += APPICON_MENU_ARROW_SIZE;
-        }
-        alloc.min_size = min;
-        alloc.natural_size = natural;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let [min, natural] = this._windowContainer.get_preferred_height(forWidth);
-        if (this._type == MenuType.BELOW) {
-            min += APPICON_MENU_ARROW_SIZE;
-            natural += APPICON_MENU_ARROW_SIZE;
-        }
-        alloc.min_size = min;
-        alloc.natural_size = natural;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-
-        let width = box.x2 - box.x1;
-        let height = box.y2 - box.y1;
-
-        if (this._type == MenuType.ON_RIGHT) {
-            childBox.x1 = 0;
-            childBox.x2 = APPICON_MENU_ARROW_SIZE;
-            childBox.y1 = Math.floor((height / 2) - (APPICON_MENU_ARROW_SIZE / 2));
-            childBox.y2 = childBox.y1 + APPICON_MENU_ARROW_SIZE;
-            this._arrow.allocate(childBox, flags);
-
-            childBox.x1 = APPICON_MENU_ARROW_SIZE - APPICON_MENU_BORDER_WIDTH;
-            childBox.x2 = width;
-            childBox.y1 = 0;
-            childBox.y2 = height;
-            this._windowContainer.allocate(childBox, flags);
-        } else /* MenuType.BELOW */ {
-            childBox.x1 = Math.floor((width / 2) - (APPICON_MENU_ARROW_SIZE / 2));
-            childBox.x2 = childBox.x1 + APPICON_MENU_ARROW_SIZE;
-            childBox.y1 = 0;
-            childBox.y2 = APPICON_MENU_ARROW_SIZE;
-            this._arrow.allocate(childBox, flags);
-
-            childBox.x1 = 0;
-            childBox.x2 = width;
-            childBox.y1 = APPICON_MENU_ARROW_SIZE - APPICON_MENU_BORDER_WIDTH;
-            childBox.y2 = height;
-            this._windowContainer.allocate(childBox, flags);
-        }
-    },
-
-    _redisplay: function() {
-        this._windowContainer.remove_all();
-
-        let windows = this._source.app.get_windows();
-
-        this._windowContainer.show();
-
-        let iconsDiffer = false;
-        let texCache = Shell.TextureCache.get_default();
-        if (windows.length > 0) {
-            let firstIcon = windows[0].mini_icon;
-            for (let i = 1; i < windows.length; i++) {
-                if (!texCache.pixbuf_equal(windows[i].mini_icon, firstIcon)) {
-                    iconsDiffer = true;
-                    break;
-                }
-            }
-        }
-
-        // Display the app windows menu items and the separator between windows
-        // of the current desktop and other windows.
-        let activeWorkspace = global.screen.get_active_workspace();
-        let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;
-
-        for (let i = 0; i < windows.length; i++) {
-            if (!separatorShown && windows[i].get_workspace() != activeWorkspace) {
-                this._appendSeparator();
-                separatorShown = true;
-            }
-
-            let icon = null;
-            if (iconsDiffer)
-                icon = Shell.TextureCache.get_default().bind_pixbuf_property(windows[i], "mini-icon");
-
-            let box = this._appendMenuItem(icon, windows[i].title);
-            box._window = windows[i];
-        }
-
-        if (windows.length > 0)
-            this._appendSeparator();
-
-        let isFavorite = AppFavorites.getAppFavorites().isFavorite(this._source.app.get_id());
-
-        this._newWindowMenuItem = windows.length > 0 ? this._appendMenuItem(null, _("New Window")) : null;
-
-        if (windows.length > 0)
-            this._appendSeparator();
-        this._toggleFavoriteMenuItem = this._appendMenuItem(null, isFavorite ? _("Remove from Favorites")
-                                                                    : _("Add to Favorites"));
-
-        this._highlightedItem = null;
-    },
-
-    _appendSeparator: function () {
-        let box = new Big.Box({ padding_top: 2, padding_bottom: 2 });
-        box.append(new Clutter.Rectangle({ height: 1,
-                                           color: APPICON_MENU_SEPARATOR_COLOR }),
-                   Big.BoxPackFlags.EXPAND);
-        this._windowContainer.append_separator(box, Big.BoxPackFlags.NONE);
-    },
-
-    _appendMenuItem: function(iconTexture, labelText) {
-        /* Use padding here rather than spacing in the box above so that
-         * we have a larger reactive area.
-         */
-        let box = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                padding_top: 4,
-                                padding_bottom: 4,
-                                spacing: 4,
-                                reactive: true });
-        let vCenter;
-        if (iconTexture != null) {
-            vCenter = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
-            vCenter.append(iconTexture, Big.BoxPackFlags.NONE);
-            box.append(vCenter, Big.BoxPackFlags.NONE);
-        }
-        vCenter = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
-        let label = new Clutter.Text({ text: labelText,
-                                       font_name: APPICON_MENU_FONT,
-                                       ellipsize: Pango.EllipsizeMode.END,
-                                       color: APPICON_MENU_COLOR });
-        vCenter.append(label, Big.BoxPackFlags.NONE);
-        box.append(vCenter, Big.BoxPackFlags.NONE);
-        this._windowContainer.append(box, Big.BoxPackFlags.NONE);
-        return box;
-    },
-
-    popup: function(activatingButton) {
-        let [stageX, stageY] = this._source.actor.get_transformed_position();
-        let [stageWidth, stageHeight] = this._source.actor.get_transformed_size();
-
-        this._redisplay();
-
-        this._windowContainer.popup(activatingButton, global.get_current_time());
-
-        this.emit('popup', true);
-
-        let x, y;
-        if (this._type == MenuType.ON_RIGHT) {
-            x = Math.floor(stageX + stageWidth);
-            y = Math.floor(stageY + (stageHeight / 2) - (this.actor.height / 2));
-        } else {
-            x = Math.floor(stageX + (stageWidth / 2) - (this.actor.width / 2));
-            y = Math.floor(stageY + stageHeight);
-        }
-
-        this.actor.set_position(x, y);
-        this.actor.show();
-    },
-
-    popdown: function() {
-        this._windowContainer.popdown();
-        this.emit('popup', false);
-        this.actor.hide();
-    },
-
-    selectWindow: function(metaWindow) {
-        this._selectMenuItemForWindow(metaWindow);
-    },
-
-    _findMetaWindowForActor: function (actor) {
-        if (actor._delegate instanceof Workspaces.WindowClone)
-            return actor._delegate.metaWindow;
-        else if (actor.get_meta_window)
-            return actor.get_meta_window();
-        return null;
-    },
-
-    // This function is called while the menu has a pointer grab; what we want
-    // to do is see if the mouse was released over a window representation
-    _onMenuButtonRelease: function (actor, event) {
-        let metaWindow = this._findMetaWindowForActor(event.get_source());
-        if (metaWindow) {
-            this.emit('activate-window', metaWindow);
-        }
-    },
-
-    _updateHighlight: function (item) {
-        if (this._highlightedItem) {
-            this._highlightedItem.background_color = TRANSPARENT_COLOR;
-            this.emit('highlight-window', null);
-        }
-        this._highlightedItem = item;
-        if (this._highlightedItem) {
-            this._highlightedItem.background_color = APPICON_MENU_SELECTED_COLOR;
-            let window = this._highlightedItem._window;
-            if (window)
-                this.emit('highlight-window', window);
-        }
-    },
-
-    _selectMenuItemForWindow: function (metaWindow) {
-        let children = this._windowContainer.get_children();
-        for (let i = 0; i < children.length; i++) {
-            let child = children[i];
-            let menuMetaWindow = child._window;
-            if (menuMetaWindow == metaWindow)
-                this._updateHighlight(child);
-        }
-    },
-
-    // Called while menu has a pointer grab
-    _onMenuEnter: function (actor, event) {
-        let metaWindow = this._findMetaWindowForActor(event.get_source());
-        if (metaWindow) {
-            this._selectMenuItemForWindow(metaWindow);
-        }
-    },
-
-    // Called while menu has a pointer grab
-    _onMenuLeave: function (actor, event) {
-        let metaWindow = this._findMetaWindowForActor(event.get_source());
-        if (metaWindow) {
-            this._updateHighlight(null);
-        }
-    },
-
-    _onItemUnselected: function (actor, child) {
-        this._updateHighlight(null);
-    },
-
-    _onItemSelected: function (actor, child) {
-        this._updateHighlight(child);
-    },
-
-    _onItemActivate: function (actor, child) {
-        if (child._window) {
-            let metaWindow = child._window;
-            this.emit('activate-window', metaWindow);
-        } else if (child == this._newWindowMenuItem) {
-            this._source.app.launch();
-            this.emit('activate-window', null);
-        } else if (child == this._toggleFavoriteMenuItem) {
-            let favs = AppFavorites.getAppFavorites();
-            let isFavorite = favs.isFavorite(this._source.app.get_id());
-            if (isFavorite)
-                favs.removeFavorite(this._source.app.get_id());
-            else
-                favs.addFavorite(this._source.app.get_id());
-        }
-        this.popdown();
-    },
-
-    _onWindowSelectionCancelled: function () {
-        this.emit('highlight-window', null);
-        this.popdown();
-    }
-};
-
-Signals.addSignalMethods(AppIconMenu.prototype);
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@ -0,0 +1,359 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Tweener = imports.ui.tweener;
+
+const POPUP_ANIMATION_TIME = 0.15;
+
+/**
+ * BoxPointer:
+ * @side: A St.Side type; currently only St.Side.TOP is implemented
+ * @binProperties: Properties to set on contained bin
+ *
+ * An actor which displays a triangle "arrow" pointing to a given
+ * side.  The .bin property is a container in which content can be
+ * placed.  The arrow position may be controlled via setArrowOrigin().
+ *
+ */
+function BoxPointer(side, binProperties) {
+    this._init(side, binProperties);
+}
+
+BoxPointer.prototype = {
+    _init: function(arrowSide, binProperties) {
+        this._arrowSide = arrowSide;
+        this._arrowOrigin = 0;
+        this.actor = new St.Bin({ x_fill: true,
+                                  y_fill: true });
+        this._container = new Shell.GenericContainer();
+        this.actor.set_child(this._container);
+        this._container.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this._container.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this._container.connect('allocate', Lang.bind(this, this._allocate));
+        this.bin = new St.Bin(binProperties);
+        this._container.add_actor(this.bin);
+        this._border = new St.DrawingArea();
+        this._border.connect('repaint', Lang.bind(this, this._drawBorder));
+        this._container.add_actor(this._border);
+        this.bin.raise(this._border);
+    },
+
+    animateAppear: function(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.actor.opacity = 0;
+        this.actor.show();
+
+        switch (this._arrowSide) {
+            case St.Side.TOP:
+                this.actor.y -= rise;
+                break;
+            case St.Side.BOTTOM:
+                this.actor.y += rise;
+                break;
+            case St.Side.LEFT:
+                this.actor.x -= rise;
+                break;
+            case St.Side.RIGHT:
+                this.actor.x += rise;
+                break;
+        }
+
+        Tweener.addTween(this.actor, { opacity: 255,
+                                       x: x,
+                                       y: y,
+                                       transition: "linear",
+                                       onComplete: onComplete,
+                                       time: POPUP_ANIMATION_TIME });
+    },
+
+    animateDisappear: function(onComplete) {
+        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');
+
+        switch (this._arrowSide) {
+            case St.Side.TOP:
+                y += rise;
+                break;
+            case St.Side.BOTTOM:
+                y -= rise;
+                break;
+            case St.Side.LEFT:
+                x += rise;
+                break;
+            case St.Side.RIGHT:
+                x -= rise;
+                break;
+        }
+
+        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) {
+        let themeNode = this.actor.get_theme_node();
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        alloc.min_size += borderWidth * 2;
+        alloc.natural_size += borderWidth * 2;
+        if ((!isWidth && (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM))
+            || (isWidth && (this._arrowSide == St.Side.LEFT || this._arrowSide == St.Side.RIGHT))) {
+            let rise = themeNode.get_length('-arrow-rise');
+            alloc.min_size += rise;
+            alloc.natural_size += rise;
+        }
+    },
+
+    _getPreferredWidth: function(actor, forHeight, alloc) {
+        let [minInternalSize, natInternalSize] = this.bin.get_preferred_width(forHeight);
+        alloc.min_size = minInternalSize;
+        alloc.natural_size = natInternalSize;
+        this._adjustAllocationForArrow(true, alloc);
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let [minSize, naturalSize] = this.bin.get_preferred_height(forWidth);
+        alloc.min_size = minSize;
+        alloc.natural_size = naturalSize;
+        this._adjustAllocationForArrow(false, alloc);
+    },
+
+    _allocate: function(actor, box, flags) {
+        let themeNode = this.actor.get_theme_node();
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        let rise = themeNode.get_length('-arrow-rise');
+        let childBox = new Clutter.ActorBox();
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        childBox.x1 = 0;
+        childBox.y1 = 0;
+        childBox.x2 = availWidth;
+        childBox.y2 = availHeight;
+        this._border.allocate(childBox, flags);
+
+        childBox.x1 = borderWidth;
+        childBox.y1 = borderWidth;
+        childBox.x2 = availWidth - borderWidth;
+        childBox.y2 = availHeight - borderWidth;
+        switch (this._arrowSide) {
+            case St.Side.TOP:
+                childBox.y1 += rise;
+                break;
+            case St.Side.BOTTOM:
+                childBox.y2 -= rise;
+                break;
+            case St.Side.LEFT:
+                childBox.x1 += rise;
+                break;
+            case St.Side.RIGHT:
+                childBox.x2 -= rise;
+                break;
+        }
+        this.bin.allocate(childBox, flags);
+    },
+
+    _drawBorder: function(area) {
+        let themeNode = this.actor.get_theme_node();
+
+        let borderWidth = themeNode.get_length('-arrow-border-width');
+        let base = themeNode.get_length('-arrow-base');
+        let rise = themeNode.get_length('-arrow-rise');
+        let borderRadius = themeNode.get_length('-arrow-border-radius');
+
+        let halfBorder = borderWidth / 2;
+        let halfBase = Math.floor(base/2);
+
+        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];
+        if (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM) {
+            boxHeight -= rise;
+        } else {
+            boxWidth -= rise;
+        }
+        let cr = area.get_context();
+        Clutter.cairo_set_source_color(cr, borderColor);
+
+        // Translate so that box goes from 0,0 to boxWidth,boxHeight,
+        // with the arrow poking out of that
+        if (this._arrowSide == St.Side.TOP) {
+            cr.translate(0, rise);
+        } else if (this._arrowSide == St.Side.LEFT) {
+            cr.translate(rise, 0);
+        }
+
+        cr.moveTo(borderRadius, halfBorder);
+
+        if (this._arrowSide == St.Side.TOP) {
+            cr.lineTo(this._arrowOrigin - halfBase, halfBorder);
+            cr.lineTo(this._arrowOrigin, halfBorder - rise);
+            cr.lineTo(this._arrowOrigin + halfBase, halfBorder);
+        }
+        cr.lineTo(boxWidth - borderRadius, halfBorder);
+
+        cr.arc(boxWidth - borderRadius - halfBorder, borderRadius + halfBorder, borderRadius,
+               3*Math.PI/2, Math.PI*2);
+
+        if (this._arrowSide == St.Side.RIGHT) {
+            cr.lineTo(boxWidth - halfBorder, this._arrowOrigin - halfBase);
+            cr.lineTo(boxWidth - halfBorder + rise, this._arrowOrigin);
+            cr.lineTo(boxWidth - halfBorder, this._arrowOrigin + halfBase);
+        }
+        cr.lineTo(boxWidth - halfBorder, boxHeight - borderRadius);
+
+        cr.arc(boxWidth - borderRadius - halfBorder, boxHeight - borderRadius - halfBorder, borderRadius,
+               0, Math.PI/2);
+
+        if (this._arrowSide == St.Side.BOTTOM) {
+            cr.lineTo(this._arrowOrigin + halfBase, boxHeight - halfBorder);
+            cr.lineTo(this._arrowOrigin, boxHeight - halfBorder + rise);
+            cr.lineTo(this._arrowOrigin - halfBase, boxHeight - halfBorder);
+        }
+        cr.lineTo(borderRadius, boxHeight - halfBorder);
+
+        cr.arc(borderRadius + halfBorder, boxHeight - borderRadius - halfBorder, borderRadius,
+               Math.PI/2, Math.PI);
+
+        if (this._arrowSide == St.Side.LEFT) {
+            cr.lineTo(halfBorder, this._arrowOrigin + halfBase);
+            cr.lineTo(halfBorder - rise, this._arrowOrigin);
+            cr.lineTo(halfBorder, this._arrowOrigin - halfBase);
+        }
+        cr.lineTo(halfBorder, borderRadius);
+
+        cr.arc(borderRadius + halfBorder, borderRadius + halfBorder, borderRadius,
+               Math.PI, 3*Math.PI/2);
+
+        Clutter.cairo_set_source_color(cr, backgroundColor);
+        cr.fillPreserve();
+        Clutter.cairo_set_source_color(cr, borderColor);
+        cr.setLineWidth(borderWidth);
+        cr.stroke();
+    },
+
+    setPosition: function(sourceActor, gap, alignment) {
+        // We need to show it now to force an allocation,
+        // so that we can query the correct size.
+        this.actor.show();
+
+        // Position correctly relative to the sourceActor
+        let [sourceX, sourceY] = sourceActor.get_transformed_position();
+        let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
+
+        let [minWidth, minHeight, natWidth, natHeight] = this.actor.get_preferred_size();
+
+        // We also want to keep it onscreen, and separated from the
+        // edge by the same distance as the main part of the box is
+        // separated from its sourceActor
+        let primary = global.get_primary_monitor();
+        let arrowRise = this.actor.get_theme_node().get_length('-arrow-rise');
+
+        let resX, resY;
+
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+            resY = sourceY + sourceHeight + gap;
+            break;
+        case St.Side.BOTTOM:
+            resY = sourceY - natHeight - gap;
+            break;
+        case St.Side.LEFT:
+            resX = sourceX + sourceWidth + gap;
+            break;
+        case St.Side.RIGHT:
+            resX = sourceX - natWidth - gap;
+            break;
+        }
+
+        // Now align and position the pointing axis, making sure
+        // it fits on screen
+        switch (this._arrowSide) {
+        case St.Side.TOP:
+        case St.Side.BOTTOM:
+            switch (alignment) {
+            case St.Align.START:
+                resX = sourceX;
+                break;
+            case St.Align.MIDDLE:
+                resX = sourceX - Math.floor((natWidth - sourceWidth) / 2);
+                break;
+            case St.Align.END:
+                resX = sourceX - (natWidth - sourceWidth);
+                break;
+            }
+
+            resX = Math.min(resX, primary.x + primary.width - natWidth - arrowRise - gap);
+            resX = Math.max(resX, primary.x);
+
+            this.setArrowOrigin((sourceX - resX) + Math.floor(sourceWidth / 2));
+            break;
+
+        case St.Side.LEFT:
+        case St.Side.RIGHT:
+            switch (alignment) {
+            case St.Align.START:
+                resY = sourceY;
+                break;
+            case St.Align.MIDDLE:
+                resY = sourceY - Math.floor((natHeight - sourceHeight) / 2);
+                break;
+            case St.Align.END:
+                resY = sourceY - (natHeight - sourceHeight);
+                break;
+            }
+
+            resY = Math.min(resY, primary.y + primary.height - natHeight - arrowRise - gap);
+            resY = Math.max(resY, primary.y);
+
+            this.setArrowOrigin((sourceY - resY) + Math.floor(sourceHeight / 2));
+            break;
+        }
+
+        let parent = this.actor.get_parent();
+        let success, x, y;
+        while (!success) {
+            [success, x, y] = parent.transform_stage_point(resX, resY);
+            parent = parent.get_parent();
+        }
+
+        // Actually set the position
+        this.actor.x = Math.floor(x);
+        this.actor.y = Math.floor(y);
+    },
+
+    // @origin: Coordinate specifying middle of the arrow, along
+    // the Y axis for St.Side.LEFT, St.Side.RIGHT from the top and X axis from
+    // the left for St.Side.TOP and St.Side.BOTTOM.
+    setArrowOrigin: function(origin) {
+        if (this._arrowOrigin != origin) {
+            this._arrowOrigin = origin;
+            this._border.queue_repaint();
+        }
+    }
+};
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -1,12 +1,15 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
-
+const Pango = imports.gi.Pango;
 const Gettext_gtk20 = imports.gettext.domain('gtk20');

 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
+const WEEKDATE_HEADER_WIDTH_DIGITS = 3;
+const SHOW_WEEKDATE_KEY = 'show-weekdate';

 function _sameDay(dateA, dateB) {
    return (dateA.getDate() == dateB.getDate() &&
@ -14,9 +17,35 @@ function _sameDay(dateA, dateB) {
            dateA.getYear() == dateB.getYear());
 }

+function _getCalendarWeekForDate(date) {
+    // Based on the algorithms found here:
+    // http://en.wikipedia.org/wiki/Talk:ISO_week_date
+    let midnightDate = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+    // Need to get Monday to be 1 ... Sunday to be 7
+    let dayOfWeek = 1 + ((midnightDate.getDay() + 6) % 7);
+    let nearestThursday = new Date(midnightDate.getFullYear(), midnightDate.getMonth(),
+                                   midnightDate.getDate() + (4 - dayOfWeek));
+
+    let jan1st = new Date(nearestThursday.getFullYear(), 0, 1);
+    let diffDate = nearestThursday - jan1st;
+    let dayNumber = Math.floor(Math.abs(diffDate) / MSECS_IN_DAY);
+    let weekNumber = Math.floor(dayNumber / 7) + 1;
+
+    return weekNumber;
+}
+
+function _getDigitWidth(actor){
+    let context = actor.get_pango_context();
+    let themeNode = actor.get_theme_node();
+    let font = themeNode.get_font();
+    let metrics = context.get_metrics(font, context.get_language());
+    let width = metrics.get_approximate_digit_width();
+    return width;
+}
+
 function Calendar() {
    this._init();
-};
+}

 Calendar.prototype = {
    _init: function() {
@ -24,27 +53,34 @@ Calendar.prototype = {
        // GTK+ by preference uses nl_langinfo (NL_TIME_FIRST_WEEKDAY). We probably
        // should add a C function so we can do the full handling.
        this._weekStart = NaN;
-        let weekStartString = Gettext_gtk20.gettext("calendar:week_start:0");
-        if (weekStartString.indexOf("calendar:week_start:") == 0) {
+        this._weekdate = NaN;
+        this._digitWidth = NaN;
+        this._settings = new Gio.Settings({ schema: 'org.gnome.shell.calendar' });
+
+        this._settings.connect('changed::' + SHOW_WEEKDATE_KEY, Lang.bind(this, this._onSettingsChange));
+        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
+
+        let weekStartString = Gettext_gtk20.gettext('calendar:week_start:0');
+        if (weekStartString.indexOf('calendar:week_start:') == 0) {
            this._weekStart = parseInt(weekStartString.substring(20));
        }

        if (isNaN(this._weekStart) || this._weekStart < 0 || this._weekStart > 6) {
-            log("Translation of 'calendar:week_start:0' in GTK+ is not correct");
-            this.weekStart = 0;
+            log('Translation of "calendar:week_start:0" in GTK+ is not correct');
+            this._weekStart = 0;
        }

        // Find the ordering for month/year in the calendar heading
-        switch (Gettext_gtk20.gettext("calendar:MY")) {
-        case "calendar:MY":
-            this._headerFormat = "%B %Y";
+        switch (Gettext_gtk20.gettext('calendar:MY')) {
+        case 'calendar:MY':
+            this._headerFormat = '%B %Y';
            break;
-        case "calendar:YM":
-            this._headerFormat = "%Y %B";
+        case 'calendar:YM':
+            this._headerFormat = '%Y %B';
            break;
        default:
-            log("Translation of 'calendar:MY' in GTK+ is not correct");
-            this._headerFormat = "%B %Y";
+            log('Translation of "calendar:MY" in GTK+ is not correct');
+            this._headerFormat = '%B %Y';
            break;
        }

@ -52,45 +88,13 @@ Calendar.prototype = {
        this.date = new Date();

        this.actor = new St.Table({ homogeneous: false,
-                                    style_class: "calendar",
+                                    style_class: 'calendar',
                                    reactive: true });

        this.actor.connect('scroll-event',
                           Lang.bind(this, this._onScroll));

-        // Top line of the calendar '<| September 2009 |>'
-        this._topBox = new St.BoxLayout();
-        this.actor.add(this._topBox,
-                       { row: 0, col: 0, col_span: 7 });
-
-        let back = new St.Button({ label: "&lt;", style_class: 'calendar-change-month'  });
-        this._topBox.add(back);
-        back.connect("clicked", Lang.bind(this, this._prevMonth));
-
-        this._dateLabel = new St.Label();
-        this._topBox.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
-
-        let forward = new St.Button({ label: "&gt;", style_class: 'calendar-change-month' });
-        this._topBox.add(forward);
-        forward.connect("clicked", Lang.bind(this, this._nextMonth));
-
-        // We need to figure out the abbreviated localized names for the days of the week;
-        // we do this by just getting the next 7 days starting from right now and then putting
-        // them in the right cell in the table. It doesn't matter if we add them in order
-        let iter = new Date(this.date);
-        iter.setSeconds(0); // Leap second protection. Hah!
-        iter.setHours(12);
-        for (let i = 0; i < 7; i++) {
-            this.actor.add(new St.Label({ text: iter.toLocaleFormat("%a") }),
-                           { row: 1,
-                             col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: 1.0 });
-            iter.setTime(iter.getTime() + MSECS_IN_DAY);
-        }
-
-        // All the children after this are days, and get removed when we update the calendar
-        this._firstDayIndex = this.actor.get_children().length;
-
+        this._buildHeader ();
        this._update();
    },

@ -102,6 +106,74 @@ Calendar.prototype = {
        }
    },

+    _buildHeader: function() {
+        let offsetCols = this._useWeekdate ? 1 : 0;
+        this.actor.destroy_children();
+
+        // Top line of the calendar '<| September 2009 |>'
+        this._topBox = new St.BoxLayout();
+        this.actor.add(this._topBox,
+                       { row: 0, col: 0, col_span: offsetCols + 7 });
+
+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChange));
+        let [backlabel, forwardlabel] = ['&lt;', '&gt;'];
+        if (St.Widget.get_default_direction () == St.TextDirection.RTL) {
+            [backlabel, forwardlabel] = [forwardlabel, backlabel];
+        }
+
+        let back = new St.Button({ label: backlabel, style_class: 'calendar-change-month'  });
+        this._topBox.add(back);
+        back.connect('clicked', Lang.bind(this, this._prevMonth));
+
+        this._dateLabel = new St.Label();
+        this._topBox.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
+
+        let forward = new St.Button({ label: forwardlabel, style_class: 'calendar-change-month' });
+        this._topBox.add(forward);
+        forward.connect('clicked', Lang.bind(this, this._nextMonth));
+
+        // We need to figure out the abbreviated localized names for the days of the week;
+        // we do this by just getting the next 7 days starting from right now and then putting
+        // them in the right cell in the table. It doesn't matter if we add them in order
+        let iter = new Date(this.date);
+        iter.setSeconds(0); // Leap second protection. Hah!
+        iter.setHours(12);
+
+        if (this._useWeekdate) {
+            this._weekdateHeader = new St.Label();
+            this.actor.add(this._weekdateHeader,
+                              { row: 1,
+                                col: 0,
+                                x_fill: false, x_align: St.Align.MIDDLE });
+            this._setWeekdateHeaderWidth();
+        } else {
+            this._weekdateHeader = null;
+        }
+
+        for (let i = 0; i < 7; i++) {
+            this.actor.add(new St.Label({ text: iter.toLocaleFormat('%a') }),
+                           { row: 1,
+                             col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7,
+                             x_fill: false, x_align: St.Align.END });
+            iter.setTime(iter.getTime() + MSECS_IN_DAY);
+        }
+
+        // All the children after this are days, and get removed when we update the calendar
+        this._firstDayIndex = this.actor.get_children().length;
+    },
+
+    _onStyleChange: function(actor, event) {
+        // width of a digit in pango units
+        this._digitWidth = _getDigitWidth(this.actor) / Pango.SCALE;
+        this._setWeekdateHeaderWidth();
+    },
+
+    _setWeekdateHeaderWidth: function() {
+        if (this.digitWidth != NaN && this._useWeekdate && this._weekdateHeader) {
+            this._weekdateHeader.set_width (this._digitWidth * WEEKDATE_HEADER_WIDTH_DIGITS);
+        }
+    },
+
    _onScroll : function(actor, event) {
        switch (event.get_scroll_direction()) {
        case Clutter.ScrollDirection.UP:
@ -135,6 +207,12 @@ Calendar.prototype = {
        this._update();
    },

+    _onSettingsChange: function() {
+        this._useWeekdate = this._settings.get_boolean(SHOW_WEEKDATE_KEY);
+        this._buildHeader();
+        this._update();
+    },
+
    _update: function() {
        this._dateLabel.text = this.date.toLocaleFormat(this._headerFormat);

@ -148,7 +226,8 @@ Calendar.prototype = {
        iter.setDate(1);
        iter.setSeconds(0);
        iter.setHours(12);
-        iter.setTime(iter.getTime() - (iter.getDay() - this._weekStart) * MSECS_IN_DAY);
+        let daysToWeekStart = (7 + iter.getDay() - this._weekStart) % 7;
+        iter.setTime(iter.getTime() - daysToWeekStart * MSECS_IN_DAY);

        let now = new Date();

@ -156,14 +235,24 @@ Calendar.prototype = {
        while (true) {
            let label = new St.Label({ text: iter.getDate().toString() });
            if (_sameDay(now, iter))
-                label.style_class = "calendar-day calendar-today";
+                label.style_class = 'calendar-day calendar-today';
            else if (iter.getMonth() != this.date.getMonth())
-                label.style_class = "calendar-day calendar-other-month-day";
+                label.style_class = 'calendar-day calendar-other-month-day';
            else
-                label.style_class = "calendar-day";
+                label.style_class = 'calendar-day';
+
+            let offsetCols = this._useWeekdate ? 1 : 0;
            this.actor.add(label,
-                           { row: row, col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: 1.0 });
+                           { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7,
+                             x_fill: false, x_align: St.Align.END });
+
+            if (this._useWeekdate && iter.getDay() == 4) {
+                let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
+                                           style_class: 'calendar-day calendar-calendarweek'});
+                this.actor.add(label,
+                              { row: row, col: 0,
+		                        x_fill: false, x_align: St.Align.MIDDLE });
+            }

            iter.setTime(iter.getTime() + MSECS_IN_DAY);
            if (iter.getDay() == this._weekStart) {
--- a/js/ui/chrome.js
+++ b/js/ui/chrome.js
@ -1,10 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-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 Main = imports.ui.main;
 const Params = imports.misc.params;
@ -13,6 +13,19 @@ 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,
+    affectsStruts: true,
+    affectsInputRegion: true
+};
+
 function Chrome() {
    this._init();
 }
@ -20,12 +33,13 @@ function Chrome() {
 Chrome.prototype = {
    _init: function() {
        // The group itself has zero size so it doesn't interfere with DND
-        this.actor = new Clutter.Group({ width: 0, height: 0 });
-        global.stage.add_actor(this.actor);
-        this.nonOverviewActor = new Clutter.Group();
-        this.actor.add_actor(this.nonOverviewActor);
+        this.actor = new Shell.GenericContainer({ width: 0, height: 0 });
+        Main.uiGroup.add_actor(this.actor);
+        this.actor.connect('allocate', Lang.bind(this, this._allocated));

-        this._obscuredByFullscreen = false;
+        this._inFullscreen = false;
+        this._inOverview = false;
+        this.visibility = Visibility.FULL;

        this._trackedActors = [];

@ -44,13 +58,10 @@ Chrome.prototype = {
        this._queueUpdateRegions();
    },

-    _verifyAncestry: function(actor, ancestor) {
-        while (actor) {
-            if (actor == ancestor)
-                return true;
-            actor = actor.get_parent();
-        }
-        return false;
+    _allocated: function(actor, box, flags) {
+        let children = this.actor.get_children();
+        for (let i = 0; i < children.length; i++)
+            children[i].allocate_preferred_size(flags);
    },

    // addActor:
@ -67,19 +78,15 @@ Chrome.prototype = {
    //
    // If %visibleInOverview is %true in @params, @actor will remain
    // visible when the overview is brought up. Otherwise it will
-    // automatically be hidden. If %affectsStruts or %affectsInputRegion
-    // is %false, the actor will not have the indicated effect.
+    // automatically be hidden. Likewise, if %visibleInFullscreen is
+    // %true, the actor will be visible even when a fullscreen window
+    // should be covering it.
+    //
+    // If %affectsStruts or %affectsInputRegion is %false, the actor
+    // will not have the indicated effect.
    addActor: function(actor, params) {
-        params = Params.parse(params, { visibleInOverview: false,
-                                        affectsStruts: true,
-                                        affectsInputRegion: true });
-
-        if (params.visibleInOverview)
-            this.actor.add_actor(actor);
-        else
-            this.nonOverviewActor.add_actor(actor);
-
-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        this.actor.add_actor(actor);
+        this._trackActor(actor, params);
    },

    // trackActor:
@ -89,13 +96,32 @@ Chrome.prototype = {
    // Tells the chrome to track @actor, which must be a descendant
    // of an actor added via addActor(). This can be used to extend the
    // struts or input region to cover specific children.
+    //
+    // @params can have any of the same values as in addActor(), though
+    // some possibilities don't make sense (eg, trying to have a
+    // %visibleInOverview child of a non-%visibleInOverview parent).
+    // By default, @actor has the same params as its chrome ancestor.
    trackActor: function(actor, params) {
-        if (!this._verifyAncestry(actor, this.actor))
+        let ancestor = actor.get_parent();
+        let index = this._findActor(ancestor);
+        while (ancestor && index == -1) {
+            ancestor = ancestor.get_parent();
+            index = this._findActor(ancestor);
+        }
+        if (!ancestor)
            throw new Error('actor is not a descendent of the chrome layer');

-        params = Params.parse(params, { affectsStruts: true,
-                                        affectsInputRegion: true });
-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        let ancestorData = this._trackedActors[index];
+        if (!params)
+            params = {};
+        // We can't use Params.parse here because we want to drop
+        // the extra values like ancestorData.actor
+        for (let prop in defaultParams) {
+            if (!params[prop])
+                params[prop] = ancestorData[prop];
+        }
+
+        this._trackActor(actor, params);
    },

    // untrackActor:
@ -111,10 +137,7 @@ Chrome.prototype = {
    //
    // Removes @actor from the chrome layer
    removeActor: function(actor) {
-        if (actor.get_parent() == this.nonOverviewActor)
-            this.nonOverviewActor.remove_actor(actor);
-        else
-            this.actor.remove_actor(actor);
+        this.actor.remove_actor(actor);
        this._untrackActor(actor);
    },

@ -127,16 +150,12 @@ Chrome.prototype = {
        return -1;
    },

-    _trackActor: function(actor, inputRegion, strut) {
-        let actorData;
-
+    _trackActor: function(actor, params) {
        if (this._findActor(actor) != -1)
            throw new Error('trying to re-track existing chrome actor');

-        actorData = { actor: actor,
-                      inputRegion: inputRegion,
-                      strut: strut };
-
+        let actorData = Params.parse(params, defaultParams);
+        actorData.actor = actor;
        actorData.visibleId = actor.connect('notify::visible',
                                            Lang.bind(this, this._queueUpdateRegions));
        actorData.allocationId = actor.connect('notify::allocation',
@ -166,20 +185,44 @@ Chrome.prototype = {
    },

    _actorReparented: function(actor, oldParent) {
-        if (!this._verifyAncestry(actor, this.actor))
+        if (!this.actor.contains(actor))
            this._untrackActor(actor);
    },

+    _updateVisibility: function() {
+        for (let i = 0; i < this._trackedActors.length; i++) {
+            let actorData = this._trackedActors[i];
+            if (this._inOverview && !actorData.visibleInOverview)
+                this.actor.set_skip_paint(actorData.actor, true);
+            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() {
-        this.actor.show();
-        this.nonOverviewActor.hide();
+        this._inOverview = true;
+        this._updateVisibility();
        this._queueUpdateRegions();
    },

    _overviewHidden: function() {
-        if (this._obscuredByFullscreen)
-            this.actor.hide();
-        this.nonOverviewActor.show();
+        this._inOverview = false;
+        this._updateVisibility();
        this._queueUpdateRegions();
    },

@ -190,13 +233,13 @@ Chrome.prototype = {
    },

    _windowsRestacked: function() {
-        let windows = global.get_windows();
+        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
        // OVERRIDE_REDIRECT that covers the whole screen.
-        // ("override_redirect" is not actually a layer above all
+        // ('override_redirect' is not actually a layer above all
        // other windows, but this seems to be how mutter treats it
        // currently...) If we wanted to be extra clever, we could
        // figure out when an OVERRIDE_REDIRECT window was trying to
@ -205,26 +248,40 @@ Chrome.prototype = {

        // @windows is sorted bottom to top.

-        this._obscuredByFullscreen = false;
+        let wasInFullscreen = this._inFullscreen;
+        this._inFullscreen = false;
        for (let i = windows.length - 1; i > -1; i--) {
            let layer = windows[i].get_meta_window().get_layer();

-            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT ||
-                layer == Meta.StackLayer.FULLSCREEN) {
+            // 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) {
+                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) {
                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._obscuredByFullscreen = true;
+                    this._inFullscreen = true;
                    break;
                }
            } else
                break;
        }

-        let shouldBeVisible = !this._obscuredByFullscreen || Main.overview.visible;
-        if (this.actor.visible != shouldBeVisible) {
-            this.actor.visible = shouldBeVisible;
+        if (this._inFullscreen != wasInFullscreen) {
+            this._updateVisibility();
            this._queueUpdateRegions();
        }
    },
@ -236,7 +293,7 @@ Chrome.prototype = {

        for (i = 0; i < this._trackedActors.length; i++) {
            let actorData = this._trackedActors[i];
-            if (!actorData.inputRegion && !actorData.strut)
+            if (!actorData.affectsInputRegion && !actorData.affectsStruts)
                continue;

            let [x, y] = actorData.actor.get_transformed_position();
@ -247,10 +304,12 @@ Chrome.prototype = {
            h = Math.round(h);
            let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h});

-            if (actorData.inputRegion && actorData.actor.get_paint_visibility())
+            if (actorData.affectsInputRegion &&
+                actorData.actor.get_paint_visibility() &&
+                !this.actor.get_skip_paint(actorData.actor))
                rects.push(rect);

-            if (!actorData.strut)
+            if (!actorData.affectsStruts)
                continue;

            // Metacity wants to know what side of the screen the
@ -302,3 +361,4 @@ Chrome.prototype = {
        return false;
    }
 };
+Signals.addSignalMethods(Chrome.prototype);
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -1,22 +1,52 @@
-/* -*- mode: js2; js2-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil -*- */
+/* -*- 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 Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Tweener = imports.ui.tweener;
+const Main = imports.ui.main;

+const Params = imports.misc.params;
+
+// Time to scale down to maxDragActorSize
+const SCALE_ANIMATION_TIME = 0.25;
+// Time to animate to original position on cancel
 const SNAP_BACK_ANIMATION_TIME = 0.25;
+// Time to animate to original position on success
+const REVERT_ANIMATION_TIME = 0.75;
+
+const DragMotionResult = {
+    NO_DROP:   0,
+    COPY_DROP: 1,
+    MOVE_DROP: 2,
+    CONTINUE:  3
+};
+
+const DRAG_CURSOR_MAP = {
+    0: Shell.Cursor.UNSUPPORTED_TARGET,
+    1: Shell.Cursor.COPY,
+    2: Shell.Cursor.MOVE
+};
+
+const DragDropResult = {
+    FAILURE:  0,
+    SUCCESS:  1,
+    CONTINUE: 2
+};

 let eventHandlerActor = null;
 let currentDraggable = null;
+let dragMonitors = [];

 function _getEventHandlerActor() {
    if (!eventHandlerActor) {
        eventHandlerActor = new Clutter.Rectangle();
        eventHandlerActor.width = 0;
        eventHandlerActor.height = 0;
-        global.stage.add_actor(eventHandlerActor);
+        Main.uiGroup.add_actor(eventHandlerActor);
        // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
        // when you've grabbed the pointer.
        eventHandlerActor.connect('event',
@ -27,31 +57,66 @@ function _getEventHandlerActor() {
    return eventHandlerActor;
 }

-function _Draggable(actor, manualMode) {
-    this._init(actor, manualMode);
+function addDragMonitor(monitor) {
+    dragMonitors.push(monitor);
+}
+
+function removeMonitor(monitor) {
+    for (let i = 0; i < dragMonitors.length; i++)
+        if (dragMonitors[i] == monitor) {
+            dragMonitors.splice(i, 1);
+            return;
+        }
+}
+
+function _Draggable(actor, params) {
+    this._init(actor, params);
 }

 _Draggable.prototype = {
-    _init : function(actor, manualMode) {
+    _init : function(actor, params) {
+        params = Params.parse(params, { manualMode: false,
+                                        restoreOnSuccess: false,
+                                        dragActorMaxSize: undefined,
+                                        dragActorOpacity: undefined });
+
        this.actor = actor;
-        if (!manualMode)
+        if (!params.manualMode)
            this.actor.connect('button-press-event',
                               Lang.bind(this, this._onButtonPress));
+
+        this.actor.connect('destroy', Lang.bind(this, function() {
+            this._actorDestroyed = true;
+            if (this._dragInProgress)
+                this._cancelDrag(global.get_current_time());
+            this.disconnectAll();
+        }));
        this._onEventId = null;

+        this._restoreOnSuccess = params.restoreOnSuccess;
+        this._dragActorMaxSize = params.dragActorMaxSize;
+        this._dragActorOpacity = params.dragActorOpacity;
+
        this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
        this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
-        this._snapBackInProgress = false; // The drag has been cancelled and the item is in the process of snapping back.
+        this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
    },

    _onButtonPress : function (actor, event) {
-        // FIXME: we should make sure it's button 1, but we can't currently
-        // check that from JavaScript
+        if (event.get_button() != 1)
+            return false;
+
        if (Tweener.getTweenCount(actor))
            return false;

        this._buttonDown = true;
-        this._grabActor();
+        // 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.Clickable)
+            this.actor.connect('notify::hover',
+                               Lang.bind(this, this._onClickableHoverChanged));
+        else
+            this._grabActor();

        let [stageX, stageY] = event.get_coords();
        this._dragStartX = stageX;
@ -59,7 +124,16 @@ _Draggable.prototype = {

        return false;
    },
-    
+
+    _onClickableHoverChanged: function(button) {
+        if (button.hover || !button.held)
+            return;
+
+        button.fake_release();
+        this.startDrag(this._dragStartX, this._dragStartY,
+                       global.get_current_time());
+    },
+
    _grabActor: function() {
        Clutter.grab_pointer(this.actor);
        this._onEventId = this.actor.connect('event',
@ -91,7 +165,7 @@ _Draggable.prototype = {
            this._buttonDown = false;
            if (this._dragInProgress) {
                return this._dragActorDropped(event);
-            } else if (this._dragActor != null && !this._snapBackInProgress) {
+            } else if (this._dragActor != null && !this._animationInProgress) {
                // Drag must have been cancelled with Esc.
                this._dragComplete();
                return true;
@ -139,9 +213,10 @@ _Draggable.prototype = {
        if (this._onEventId)
            this._ungrabActor();
        this._grabEvents();
+        global.set_cursor(Shell.Cursor.IN_DRAG);

-        this._dragStartX = stageX;
-        this._dragStartY = stageY;
+        this._dragX = this._dragStartX = stageX;
+        this._dragY = this._dragStartY = stageY;

        if (this.actor._delegate && this.actor._delegate.getDragActor) {
            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
@ -154,10 +229,9 @@ _Draggable.prototype = {
                // the dragActor over it. Otherwise, center it
                // around the pointer
                let [sourceX, sourceY] = this._dragActorSource.get_transformed_position();
-                let [sourceWidth, sourceHeight] = this._dragActorSource.get_transformed_size();
                let x, y;
-                if (stageX > sourceX && stageX <= sourceX + sourceWidth &&
-                    stageY > sourceY && stageY <= sourceY + sourceHeight) {
+                if (stageX > sourceX && stageX <= sourceX + this._dragActor.width &&
+                    stageY > sourceY && stageY <= sourceY + this._dragActor.height) {
                    x = sourceX;
                    y = sourceY;
                } else {
@ -193,6 +267,45 @@ _Draggable.prototype = {

        this._dragActor.reparent(this.actor.get_stage());
        this._dragActor.raise_top();
+
+        this._dragOrigOpacity = this._dragActor.opacity;
+        if (this._dragActorOpacity != undefined)
+            this._dragActor.opacity = this._dragActorOpacity;
+
+        this._snapBackX = this._dragStartX + this._dragOffsetX;
+        this._snapBackY = this._dragStartY + this._dragOffsetY;
+        this._snapBackScale = this._dragActor.scale_x;
+
+        if (this._dragActorMaxSize != undefined) {
+            let [scaledWidth, scaledHeight] = this._dragActor.get_transformed_size();
+            let currentSize = Math.max(scaledWidth, scaledHeight);
+            if (currentSize > this._dragActorMaxSize) {
+                let scale = this._dragActorMaxSize / currentSize;
+                let origScale =  this._dragActor.scale_x;
+                let origDragOffsetX = this._dragOffsetX;
+                let origDragOffsetY = this._dragOffsetY;
+
+                // The position of the actor changes as we scale
+                // around the drag position, but we can't just tween
+                // to the final position because that tween would
+                // fight with updates as the user continues dragging
+                // the mouse; instead we do the position computations in
+                // an onUpdate() function.
+                Tweener.addTween(this._dragActor,
+                                 { scale_x: scale * origScale,
+                                   scale_y: scale * origScale,
+                                   time: SCALE_ANIMATION_TIME,
+                                   transition: 'easeOutQuad',
+                                   onUpdate: function() {
+                                       let currentScale = this._dragActor.scale_x / origScale;
+                                       this._dragOffsetX = currentScale * origDragOffsetX;
+                                       this._dragOffsetY = currentScale * origDragOffsetY;
+                                       this._dragActor.set_position(this._dragX + this._dragOffsetX,
+                                                                    this._dragY + this._dragOffsetY);
+                                   },
+                                   onUpdateScope: this });
+            }
+        }
    },

    _maybeStartDrag:  function(event) {
@ -211,31 +324,60 @@ _Draggable.prototype = {

    _updateDragPosition : function (event) {
        let [stageX, stageY] = event.get_coords();
+        this._dragX = stageX;
+        this._dragY = stageY;

        // If we are dragging, update the position
        if (this._dragActor) {
            this._dragActor.set_position(stageX + this._dragOffsetX,
                                         stageY + this._dragOffsetY);
+
            // Because we want to find out what other actor is located at the current position of this._dragActor,
            // we have to temporarily hide this._dragActor.
            this._dragActor.hide();
            let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                      stageX + this._dragOffsetX,
-                                                                      stageY + this._dragOffsetY);
+                                                                      stageX, stageY);
            this._dragActor.show();
+
+            // We call observers only once per motion with the innermost
+            // target actor. If necessary, the observer can walk the
+            // parent itself.
+            let dragEvent = {
+                x: stageX,
+                y: stageY,
+                dragActor: this._dragActor,
+                source: this.actor._delegate,
+                targetActor: target
+            };
+            for (let i = 0; i < dragMonitors.length; i++) {
+                let motionFunc = dragMonitors[i].dragMotion;
+                if (motionFunc) {
+                    let result = motionFunc(dragEvent);
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
+                }
+            }
            while (target) {
                if (target._delegate && target._delegate.handleDragOver) {
-                    let [targX, targY] = target.get_transformed_position();
+                    let [r, targX, targY] = target.transform_stage_point(stageX, stageY);
                    // We currently loop through all parents on drag-over even if one of the children has handled it.
                    // We can check the return value of the function and break the loop if it's true if we don't want
                    // to continue checking the parents.
-                    target._delegate.handleDragOver(this.actor._delegate, this._dragActor,
-                                                    (stageX + this._dragOffsetX - targX) / target.scale_x,
-                                                    (stageY + this._dragOffsetY - targY) / target.scale_y,
-                                                    event.get_time());
+                    let result = target._delegate.handleDragOver(this.actor._delegate,
+                                                                 this._dragActor,
+                                                                 targX,
+                                                                 targY,
+                                                                 event.get_time());
+                    if (result != DragMotionResult.CONTINUE) {
+                        global.set_cursor(DRAG_CURSOR_MAP[result]);
+                        return true;
+                    }
                }
                target = target.get_parent();
            }
+            global.set_cursor(Shell.Cursor.IN_DRAG);
        }

        return true;
@ -249,19 +391,49 @@ _Draggable.prototype = {
        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
                                                                  dropX, dropY);
        this._dragActor.show();
+
+        // We call observers only once per motion with the innermost
+        // target actor. If necessary, the observer can walk the
+        // parent itself.
+        let dropEvent = {
+            dropActor: this._dragActor,
+            targetActor: target,
+            clutterEvent: event
+        };
+        for (let i = 0; i < dragMonitors.length; i++) {
+            let dropFunc = dragMonitors[i].dragDrop;
+            if (dropFunc)
+                switch (dropFunc(dropEvent)) {
+                    case DragDropResult.FAILURE:
+                    case DragDropResult.SUCCESS:
+                        return true;
+                    case DragDropResult.CONTINUE:
+                        continue;
+                }
+        }
+
        while (target) {
            if (target._delegate && target._delegate.acceptDrop) {
-                let [targX, targY] = target.get_transformed_position();
-                if (target._delegate.acceptDrop(this.actor._delegate, this._dragActor,
-                                                (dropX - targX) / target.scale_x,
-                                                (dropY - targY) / target.scale_y,
+                let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
+                if (target._delegate.acceptDrop(this.actor._delegate,
+                                                this._dragActor,
+                                                targX,
+                                                targY,
                                                event.get_time())) {
+                    if (this._actorDestroyed)
+                        return true;
                    // If it accepted the drop without taking the actor,
-                    // destroy it.
-                    if (this._dragActor.get_parent() == this._dragActor.get_stage())
-                        this._dragActor.destroy();
+                    // handle it ourselves.
+                    if (this._dragActor.get_parent() == this._dragActor.get_stage()) {
+                        if (this._restoreOnSuccess) {
+                            this._restoreDragActor(event.get_time());
+                            return true;
+                        } else
+                            this._dragActor.destroy();
+                    }

                    this._dragInProgress = false;
+                    global.unset_cursor();
                    this.emit('drag-end', event.get_time(), true);
                    this._dragComplete();
                    return true;
@ -275,31 +447,65 @@ _Draggable.prototype = {
        return true;
    },

+    // Get position of the drag actor's source if the source is still around,
+    // or return the original location if the actor itself was being dragged
+    // or the source is no longer around.
+    _getRestoreLocation: function() {
+        let locX = this._snapBackX;
+        let locY = this._snapBackY;
+
+        if (this._dragActorSource && this._dragActorSource.visible)
+            [locX, locY] = this._dragActorSource.get_transformed_position();
+        return [locX, locY];
+    },
+
    _cancelDrag: function(eventTime) {
        this._dragInProgress = false;
-        // Snap back to the actor source if the source is still around, snap back 
-        // to the original location if the actor itself was being dragged or the
-        // source is no longer around.
-        let snapBackX = this._dragStartX + this._dragOffsetX;
-        let snapBackY = this._dragStartY + this._dragOffsetY;
-        if (this._dragActorSource && this._dragActorSource.visible) {
-            [snapBackX, snapBackY] = this._dragActorSource.get_transformed_position();
+        let [snapBackX, snapBackY] = this._getRestoreLocation();
+
+        if (this._actorDestroyed) {
+            global.unset_cursor();
+            this.emit('drag-end', eventTime, false);
+            return;
        }

-        this._snapBackInProgress = true;
+        this._animationInProgress = true;
        // No target, so snap back
        Tweener.addTween(this._dragActor,
                         { x: snapBackX,
                           y: snapBackY,
+                           scale_x: this._snapBackScale,
+                           scale_y: this._snapBackScale,
+                           opacity: this._dragOrigOpacity,
                           time: SNAP_BACK_ANIMATION_TIME,
-                           transition: "easeOutQuad",
-                           onComplete: this._onSnapBackComplete,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
                           onCompleteScope: this,
                           onCompleteParams: [this._dragActor, eventTime]
                         });
    },

-    _onSnapBackComplete : function (dragActor, eventTime) {
+    _restoreDragActor: function(eventTime) {
+        this._dragInProgress = false;
+        [restoreX, restoreY] = this._getRestoreLocation();
+
+        // fade the actor back in at its original location
+        this._dragActor.set_position(restoreX, restoreY);
+        this._dragActor.set_scale(this._snapBackScale, this._snapBackScale);
+        this._dragActor.opacity = 0;
+
+        this._animationInProgress = true;
+        Tweener.addTween(this._dragActor,
+                         { opacity: this._dragOrigOpacity,
+                           time: REVERT_ANIMATION_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: this._onAnimationComplete,
+                           onCompleteScope: this,
+                           onCompleteParams: [this._dragActor, eventTime]
+                         });
+    },
+
+    _onAnimationComplete : function (dragActor, eventTime) {
        if (this._dragOrigParent) {
            dragActor.reparent(this._dragOrigParent);
            dragActor.set_scale(this._dragOrigScale, this._dragOrigScale);
@ -307,9 +513,10 @@ _Draggable.prototype = {
        } else {
            dragActor.destroy();
        }
+        global.unset_cursor();
        this.emit('drag-end', eventTime, false);

-        this._snapBackInProgress = false;
+        this._animationInProgress = false;
        if (!this._buttonDown)
            this._dragComplete();
    },
@ -326,10 +533,24 @@ Signals.addSignalMethods(_Draggable.prototype);
 /**
 * makeDraggable:
 * @actor: Source actor
- * @manualMode: If given, do not automatically start drag and drop on click
+ * @params: (optional) Additional parameters
 *
 * Create an object which controls drag and drop for the given actor.
+ *
+ * If %manualMode is %true in @params, do not automatically start
+ * drag and drop on click
+ *
+ * If %dragActorMaxSize is present in @params, the drag actor will
+ * be scaled down to be no larger than that size in pixels.
+ *
+ * If %dragActorOpacity is present in @params, the drag actor will
+ * will be set to have that opacity during the drag.
+ *
+ * Note that when the drag actor is the source actor and the drop
+ * succeeds, the actor scale and opacity aren't reset; if the drop
+ * target wants to reuse the actor, it's up to the drop target to
+ * reset these values.
 */
-function makeDraggable(actor, manualMode) {
-    return new _Draggable(actor, manualMode);
+function makeDraggable(actor, params) {
+    return new _Draggable(actor, params);
 }
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -1,11 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -42,7 +38,7 @@ DocDisplayItem.prototype = {
        GenericDisplay.GenericDisplayItem.prototype._init.call(this);
        this._docInfo = docInfo;

-        this._setItemInfo(docInfo.name, "");
+        this._setItemInfo(docInfo.name, '');

        this._timeoutTime = -1;
        this._resetTimeDisplay(currentSecs);
@ -81,12 +77,12 @@ DocDisplayItem.prototype = {
    // Creates and returns a large preview icon, but only if this._docInfo is an image file
    // and we were able to generate a pixbuf from it successfully.
    _createLargePreviewIcon : function() {
-        if (this._docInfo.mimeType == null || this._docInfo.mimeType.indexOf("image/") != 0)
+        if (this._docInfo.mimeType == null || this._docInfo.mimeType.indexOf('image/') != 0)
            return null;

        try {
-            return Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.NONE,
-                                                                  this._docInfo.uri, -1, -1);
+            return St.TextureCache.get_default().load_uri_sync(St.TextureCachePolicy.NONE,
+                                                               this._docInfo.uri, -1, -1);
        } catch (e) {
            // An exception will be raised when the image format isn't know
            /* FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=591480: should
@ -116,15 +112,15 @@ DocDisplayItem.prototype = {
 /* This class represents a display containing a collection of document items.
 * The documents are sorted by how recently they were last visited.
 */
-function DocDisplay(flags) {
-    this._init(flags);
+function DocDisplay() {
+    this._init();
 }

 DocDisplay.prototype = {
    __proto__:  GenericDisplay.GenericDisplay.prototype,

-    _init : function(flags) {
-        GenericDisplay.GenericDisplay.prototype._init.call(this, flags);
+    _init : function() {
+        GenericDisplay.GenericDisplay.prototype._init.call(this);
        // We keep a single timeout callback for updating last visited times
        // for all the items in the display. This avoids creating individual
        // callbacks for each item in the display. So proper time updates
@ -267,25 +263,35 @@ function DashDocDisplayItem(docInfo) {
 DashDocDisplayItem.prototype = {
    _init: function(docInfo) {
        this._info = docInfo;
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: DEFAULT_SPACING,
-                                   reactive: true });
-        this.actor.connect('button-release-event', Lang.bind(this, function () {
+        this._icon = docInfo.createIcon(DASH_DOCS_ICON_SIZE);
+
+        this.actor = new St.Clickable({ style_class: 'recent-docs-item',
+                                        reactive: true,
+                                        x_align: St.Align.START });
+
+        let box = new St.BoxLayout({ style_class: 'recent-docs-item-box' });
+        this.actor.set_child(box);
+
+        box.add(this._icon);
+
+        let text = new St.Label({ text: docInfo.name });
+        box.add(text);
+
+        this.actor.connect('clicked', Lang.bind(this, function () {
            docInfo.launch();
            Main.overview.hide();
        }));

        this.actor._delegate = this;
-
-        this._icon = docInfo.createIcon(DASH_DOCS_ICON_SIZE);
-        let iconBox = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
-        iconBox.append(this._icon, Big.BoxPackFlags.NONE);
-        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
-        let name = new St.Label({ style_class: 'dash-recent-docs-item',
-                                   text: docInfo.name });
-        this.actor.append(name, Big.BoxPackFlags.EXPAND);
-
        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));
    },

    getUri: function() {
@ -357,34 +363,37 @@ DashDocDisplay.prototype = {
    _getPreferredHeight: function(actor, forWidth, alloc) {
        let children = actor.get_children();

-        // Two columns, where we go vertically down first.  So just take
-        // the height of half of the children as our preferred height.
+        // The width of an item is our allocated width, minus spacing, divided in half.
+        this._itemWidth = Math.floor((forWidth - DEFAULT_SPACING) / 2);
+
+        let maxNatural = 0;
+        for (let i = 0; i < children.length; i++) {
+            let child = children[i];
+            let [minSize, naturalSize] = child.get_preferred_height(this._itemWidth);
+            maxNatural = Math.max(maxNatural, naturalSize);
+        }
+
+        this._itemHeight = maxNatural;

        let firstColumnChildren = Math.ceil(children.length / 2);
-
-        let natural = 0;
-        for (let i = 0; i < firstColumnChildren; i++) {
-            let child = children[i];
-            let [minSize, naturalSize] = child.get_preferred_height(-1);
-            natural += naturalSize;
-
-            if (i > 0 && i < children.length - 1) {
-                natural += DEFAULT_SPACING;
-            }
-        }
-        alloc.natural_size = natural;
+        alloc.natural_size = (firstColumnChildren * maxNatural +
+                              (firstColumnChildren - 1) * DEFAULT_SPACING);
    },

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

+        // Make sure this._itemWidth/Height have been computed, even
+        // if the parent actor didn't check our size before allocating.
+        // (Not clear if that is required or not as a Clutter
+        // invariant; this is safe and cheap because of caching.)
+        actor.get_preferred_height(width);
+
        let children = actor.get_children();

-        // The width of an item is our allocated width, minus spacing, divided in half.
-        let itemWidth = Math.floor((width - DEFAULT_SPACING) / 2);
-        let x = box.x1;
-        let y = box.y1;
+        let x = 0;
+        let y = 0;
        let columnIndex = 0;
        let i = 0;
        // Loop over the children, going vertically down first.  When we run
@ -393,9 +402,7 @@ DashDocDisplay.prototype = {
        while (i < children.length) {
            let child = children[i];

-            let [minSize, naturalSize] = child.get_preferred_height(-1);
-
-            if (y + naturalSize > box.y2) {
+            if (y + this._itemHeight > box.y2) {
                // Is this the second column, or we're in
                // the first column and can't even fit one
                // item?  In that case, break.
@ -404,9 +411,9 @@ DashDocDisplay.prototype = {
                }
                // Set x to the halfway point.
                columnIndex += 1;
-                x = x + itemWidth + DEFAULT_SPACING;
+                x = x + this._itemWidth + DEFAULT_SPACING;
                // And y is back to the top.
-                y = box.y1;
+                y = 0;
                // Retry this same item, now that we're in the second column.
                // By looping back to the top here, we re-test the size
                // again for the second column.
@ -416,13 +423,13 @@ DashDocDisplay.prototype = {
            let childBox = new Clutter.ActorBox();
            childBox.x1 = x;
            childBox.y1 = y;
-            childBox.x2 = childBox.x1 + itemWidth;
-            childBox.y2 = y + naturalSize;
+            childBox.x2 = childBox.x1 + this._itemWidth;
+            childBox.y2 = y + this._itemHeight;

            y = childBox.y2 + DEFAULT_SPACING;

-            child.show();
            child.allocate(childBox, flags);
+            this.actor.set_skip_paint(child, false);

            i++;
        }
@ -438,7 +445,6 @@ DashDocDisplay.prototype = {
            this._checkDocExistence = false;
        }

-        let skipPaint = [];
        for (; i < children.length; i++)
            this.actor.set_skip_paint(children[i], true);
    },
@ -485,7 +491,7 @@ DocSearchProvider.prototype = {
    __proto__: Search.SearchProvider.prototype,

    _init: function(name) {
-        Search.SearchProvider.prototype._init.call(this, _("DOCUMENTS"));
+        Search.SearchProvider.prototype._init.call(this, _("RECENT ITEMS"));
        this._docManager = DocInfo.getDocManager();
    },

@ -512,6 +518,6 @@ DocSearchProvider.prototype = {
    },

    expandSearch: function(terms) {
-        log("TODO expand docs search");
+        log('TODO expand docs search');
    }
 };
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -1,5 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

+const Clutter = imports.gi.Clutter;;
+const GLib = imports.gi.GLib;
+const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Gettext_gtk20 = imports.gettext.domain('gtk20');

@ -28,15 +31,71 @@ function _patchContainerClass(containerClass) {
    };
 }

-_patchContainerClass(St.BoxLayout);
-_patchContainerClass(St.Table);
+// Replace @method with something that throws an error instead
+function _blockMethod(method, replacement, reason) {
+    let match = method.match(/^(.+)\.([^.]+)$/);
+    if (!match)
+        throw new Error('Bad method name "' + method + '"');
+    let proto = 'imports.gi.' + match[1] + '.prototype';
+    let property = match[2];
+
+    if (!global.set_property_mutable(proto, property, true))
+        throw new Error('Bad method name "' + method + '"');
+
+    // eval() is evil in general, but we know it's safe here since
+    // set_property_mutable() would have failed if proto was
+    // malformed.
+    let node = eval(proto);
+
+    let msg = 'Do not use "' + method + '".';
+    if (replacement)
+        msg += ' Use "' + replacement + '" instead.';
+    if (reason)
+        msg += ' (' + reason + ')';
+
+    node[property] = function() {
+        throw new Error(msg);
+    };
+
+    global.set_property_mutable(proto, property, false);
+}

 function init() {
    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 (Gettext_gtk20.gettext("default:LTR") == "default:RTL") {
+    if (Gettext_gtk20.gettext('default:LTR') == 'default:RTL') {
        St.Widget.set_default_direction(St.TextDirection.RTL);
    }
+
+    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);
+
+    Clutter.Actor.prototype.toString = function() {
+        return St.describe_actor(this);
+    };
+
+    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.');
+    _blockMethod('Gdk.Display.get_device_state', 'global.get_pointer',
+                 'gjs\'s handling of Gdk.ModifierType is broken. See bug 597292.');
+    _blockMethod('Gdk.Window.get_device_position', 'global.get_pointer',
+                 'gjs\'s handling of Gdk.ModifierType is broken. See bug 597292.');
+
+    // Now close the back door to prevent extensions from trying to
+    // abuse it. We can't actually delete it since
+    // 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;
 }
--- 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 ExtensionState = {
    ENABLED: 1,
@ -52,6 +51,12 @@ function loadExtension(dir, enabled, type) {
            return;
        }
    }
+
+    if (extensions[meta.uuid] != undefined) {
+        global.logError(baseErrorString + "extension already loaded");
+        return;
+    }
+
    // Encourage people to add this
    if (!meta['url']) {
        global.log(baseErrorString + 'Warning: Missing "url" property in metadata.json');
@ -119,16 +124,15 @@ function loadExtension(dir, enabled, type) {
 }

 function init() {
-    let userConfigPath = GLib.get_user_config_dir();
-    let userExtensionsPath = GLib.build_filenamev([userConfigPath, 'gnome-shell', 'extensions']);
+    let userExtensionsPath = GLib.build_filenamev([global.userdatadir, 'extensions']);
    userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
    try {
        userExtensionsDir.make_directory_with_parents(null);
    } catch (e) {
-        global.logError(""+e);
+        global.logError('' + e);
    }

-    disabledExtensions = Shell.GConf.get_default().get_string_list('disabled_extensions');
+    disabledExtensions = global.settings.get_strv('disabled-extensions', -1);
 }

 function _loadExtensionsIn(dir, type) {
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@ -1,16 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gdk = imports.gi.Gdk;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;

 const DND = imports.ui.dnd;
@ -21,25 +13,9 @@ const RedisplayFlags = { NONE: 0,
                         SUBSEARCH: 1 << 2,
                         IMMEDIATE: 1 << 3 };

-const ITEM_DISPLAY_DESCRIPTION_COLOR = new Clutter.Color();
-ITEM_DISPLAY_DESCRIPTION_COLOR.from_pixel(0xffffffbb);
-const DISPLAY_CONTROL_SELECTED_COLOR = new Clutter.Color();
-DISPLAY_CONTROL_SELECTED_COLOR.from_pixel(0x112288ff);
-const PREVIEW_BOX_BACKGROUND_COLOR = new Clutter.Color();
-PREVIEW_BOX_BACKGROUND_COLOR.from_pixel(0xADADADf0);
-
-const DEFAULT_PADDING = 4;
-
+// Used by subclasses
 const ITEM_DISPLAY_ICON_SIZE = 48;
-const DEFAULT_COLUMN_GAP = 6;
-
 const PREVIEW_ICON_SIZE = 96;
-const PREVIEW_BOX_PADDING = 6;
-const PREVIEW_BOX_SPACING = DEFAULT_PADDING;
-const PREVIEW_BOX_CORNER_RADIUS = 10;
-// how far relative to the full item width the preview box should be placed
-const PREVIEW_PLACING = 3/4;
-const PREVIEW_DETAILS_MIN_WIDTH = PREVIEW_ICON_SIZE * 2;

 /* This is a virtual class that represents a single display item containing
 * a name, a description, and an icon. It allows selecting an item and represents
@ -51,7 +27,7 @@ function GenericDisplayItem() {

 GenericDisplayItem.prototype = {
    _init: function() {
-        this.actor = new St.BoxLayout({ style_class: "generic-display-item",
+        this.actor = new St.BoxLayout({ style_class: 'generic-display-item',
                                         reactive: true });

        this.actor._delegate = this;
@ -64,6 +40,14 @@ GenericDisplayItem.prototype = {
                                     }));

        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin',
+                          Lang.bind(this, function() {
+                              Main.overview.beginItemDrag(this);
+                          }));
+        draggable.connect('drag-end',
+                          Lang.bind(this, function() {
+                              Main.overview.endItemDrag(this);
+                          }));

        this._iconBin = new St.Bin();
        this.actor.add(this._iconBin);
@ -105,7 +89,10 @@ GenericDisplayItem.prototype = {
    // Highlights the item by setting a different background color than the default 
    // if isSelected is true, removes the highlighting otherwise.
    markSelected: function(isSelected) {
-        this.actor.set_style_pseudo_class(isSelected ? "selected" : null);
+        if (isSelected)
+            this.actor.add_style_pseudo_class('selected');
+        else
+            this.actor.remove_style_pseudo_class('selected');
    },

    /*
@ -114,11 +101,10 @@ GenericDisplayItem.prototype = {
     */
    createDetailsActor: function() {

-        let details = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                    spacing: PREVIEW_BOX_SPACING });
+        let details = new St.BoxLayout({ style_class: 'generic-display-container',
+                                         vertical: true });

-        let mainDetails = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                        spacing: PREVIEW_BOX_SPACING });
+        let mainDetails = new St.BoxLayout({ style_class: 'generic-display-container' });

        // Inner box with name and description
        let textDetails = new St.BoxLayout({ style_class: 'generic-display-details',
@ -132,21 +118,19 @@ GenericDisplayItem.prototype = {

        this._detailsDescriptions.push(detailsDescription);

-        mainDetails.append(textDetails, Big.BoxPackFlags.EXPAND);
+        mainDetails.add(textDetails, { expand: true });

        let previewIcon = this._createPreviewIcon();
        let largePreviewIcon = this._createLargePreviewIcon();

        if (previewIcon != null && largePreviewIcon == null) {
-            mainDetails.prepend(previewIcon, Big.BoxPackFlags.NONE);
+            mainDetails.insert_actor(previewIcon, 0);
        }

-        details.append(mainDetails, Big.BoxPackFlags.NONE);
+        details.add(mainDetails);

        if (largePreviewIcon != null) {
-            let largePreview = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
-            largePreview.append(largePreviewIcon, Big.BoxPackFlags.NONE);
-            details.append(largePreview, Big.BoxPackFlags.NONE);
+            details.add(largePreviewIcon);
        }
   
        return details;
@ -161,7 +145,7 @@ GenericDisplayItem.prototype = {

    // Performes an action associated with launching this item, such as opening a file or an application.
    launch: function() {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

    //// Protected methods ////
@ -193,12 +177,12 @@ GenericDisplayItem.prototype = {
        this._icon = this._createIcon();
        this._iconBin.set_child(this._icon);

-        this._name = new St.Label({ style_class: "generic-display-item-name",
+        this._name = new St.Label({ style_class: 'generic-display-item-name',
                                     text: nameText });
        this._infoText.add(this._name);

-        this._description = new St.Label({ style_class: "generic-display-item-description",
-                                            text: descriptionText ? descriptionText : "" });
+        this._description = new St.Label({ style_class: 'generic-display-item-description',
+                                            text: descriptionText ? descriptionText : '' });
        this._infoText.add(this._description);
    },

@ -225,12 +209,12 @@ GenericDisplayItem.prototype = {

    // Returns an icon for the item.
    _createIcon: function() {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

    // Returns a preview icon for the item.
    _createPreviewIcon: function() {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    }

    //// Private methods ////
@ -238,33 +222,25 @@ GenericDisplayItem.prototype = {

 Signals.addSignalMethods(GenericDisplayItem.prototype);

-const GenericDisplayFlags = {
-    DISABLE_VSCROLLING: 1 << 0
-}
-
 /* This is a virtual class that represents a display containing a collection of items
 * that can be filtered with a search string.
 */
-function GenericDisplay(flags) {
-    this._init(flags);
+function GenericDisplay() {
+    this._init();
 }

 GenericDisplay.prototype = {
-    _init : function(flags) {
-        let disableVScrolling = (flags & GenericDisplayFlags.DISABLE_VSCROLLING) != 0;
+    _init : function() {
        this._search = '';
        this._expanded = false;

-        if (disableVScrolling) {
-            this.actor = this._list = new Shell.OverflowList({ spacing: 6,
-                                                                 item_height: 50 });
-        } else {
-            this.actor = new St.ScrollView({ x_fill: true, y_fill: true });
-            this.actor.get_hscroll_bar().hide();
-            this._list = new St.BoxLayout({ style_class: 'generic-display-container',
-                                             vertical: true });
-            this.actor.add_actor(this._list);
-        }
+        this.actor = new St.ScrollView({ x_fill: true,
+                                         y_fill: false,
+                                         vshadows: true });
+        this._list = new St.BoxLayout({ style_class: 'generic-display-container',
+                                         vertical: true });
+        this.actor.add_actor(this._list);
+        this.actor.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);

        this._pendingRedisplay = RedisplayFlags.NONE;
        this.actor.connect('notify::mapped', Lang.bind(this, this._onMappedNotify));
@ -371,7 +347,7 @@ GenericDisplay.prototype = {
        // TODO: figure out why this._list.displayedCount is returning a
        // positive number when this._mathedItems.length is 0
        // This can be triggered if a search string is entered for which there are no matches.
-        // log("this._mathedItems.length: " + this._matchedItems.length + " this._list.displayedCount " + this._list.displayedCount);
+        // log('this._mathedItems.length: ' + this._matchedItems.length + ' this._list.displayedCount ' + this._list.displayedCount);
        return this._matchedItemKeys.length > 0;
    },

@ -388,8 +364,7 @@ GenericDisplay.prototype = {
    resetState: function() {
        this._filterReset();
        this._openDetailIndex = -1;
-        if (!(this.actor instanceof Shell.OverflowList))
-            this.actor.get_vscroll_bar().get_adjustment().value = 0;
+        this.actor.get_vscroll_bar().get_adjustment().value = 0;
    },

    // Returns an actor which acts as a sidebar; this is used for
@ -417,7 +392,7 @@ GenericDisplay.prototype = {
    // and adds it to the list of displayed items, but does not yet display it.
    _addDisplayItem : function(itemId) {
        if (this._displayedItems.hasOwnProperty(itemId)) {
-            log("Tried adding a display item for " + itemId + ", but an item with this item id is already among displayed items.");
+            log('Tried adding a display item for ' + itemId + ', but an item with this item id is already among displayed items.');
            return;
        }

@ -476,7 +451,7 @@ GenericDisplay.prototype = {
    // Return true if there's an active search or other constraint
    // on the list
    _filterActive: function() {
-        return this._search != "";
+        return this._search != '';
    },

    // Called when we are resetting state
@ -599,32 +574,32 @@ GenericDisplay.prototype = {
    // Implementation should return %true if we are up to date, and %false
    // if a full reload occurred.
    _refreshCache: function() {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

    // Sets the list of the displayed items based on the default sorting order.
    // The default sorting order is specific to each implementing class.
    _setDefaultList: function() {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

-	// Compares items associated with the item ids based on the order in which the
-	// items should be displayed.
-	// Intended to be used as a compareFunction for array.sort().
-	// Returns an integer value indicating the result of the comparison.
+    // Compares items associated with the item ids based on the order in which the
+    // items should be displayed.
+    // Intended to be used as a compareFunction for array.sort().
+    // Returns an integer value indicating the result of the comparison.
    _compareItems: function(itemIdA, itemIdB) {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

    // Checks if the item info can be a match for the search string. 
    // Returns a boolean flag indicating if that's the case.
    _isInfoMatching: function(itemInfo, search) {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

    // Creates a display item based on itemInfo.
    _createDisplayItem: function(itemInfo) {
-        throw new Error("Not implemented");
+        throw new Error('Not implemented');
    },

    //// Private methods ////
@ -668,11 +643,7 @@ GenericDisplay.prototype = {
    // Returns a display item based on its index in the ordering of the
    // display children.
    _findDisplayedByIndex: function(index) {
-        let actor;
-        if (this.actor instanceof Shell.OverflowList)
-            actor = this.actor.get_displayed_actor(index);
-        else
-            actor = this._list.get_children()[index];
+        let actor = this._list.get_children()[index];
        return this._findDisplayedByActor(actor);
    },

@ -698,7 +669,7 @@ GenericDisplay.prototype = {

        this._selectedIndex = index;
        if (index < 0)
-            return
+            return;

        // Mark the new item as selected and create its details pane
        let item = this._findDisplayedByIndex(index);
@ -707,8 +678,6 @@ GenericDisplay.prototype = {
    },

    _getVisibleCount: function() {
-        if (this.actor instanceof Shell.OverflowList)
-            return this._list.displayed_count;
        return this._list.get_n_children();
    },

--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@ -0,0 +1,290 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+
+const Lang = imports.lang;
+const Params = imports.misc.params;
+
+const ICON_SIZE = 48;
+
+
+function BaseIcon(label, createIcon) {
+    this._init(label, createIcon);
+}
+
+BaseIcon.prototype = {
+    _init : function(label, params) {
+        params = Params.parse(params, { createIcon: null,
+                                        setSizeManually: false });
+        this.actor = new St.Bin({ style_class: 'overview-icon',
+                                  x_fill: true,
+                                  y_fill: true });
+        this.actor._delegate = this;
+        this.actor.connect('style-changed',
+                           Lang.bind(this, this._onStyleChanged));
+
+        this._spacing = 0;
+
+        let box = new Shell.GenericContainer();
+        box.connect('allocate', Lang.bind(this, this._allocate));
+        box.connect('get-preferred-width',
+                    Lang.bind(this, this._getPreferredWidth));
+        box.connect('get-preferred-height',
+                    Lang.bind(this, this._getPreferredHeight));
+        this.actor.set_child(box);
+
+        this.iconSize = ICON_SIZE;
+        this._iconBin = new St.Bin();
+
+        box.add_actor(this._iconBin);
+
+        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 = 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 [labelMinHeight, labelNatHeight] = this._name.get_preferred_height(-1);
+        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(-1);
+        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();
+
+        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) {
+        this._getPreferredHeight(actor, -1, alloc);
+    },
+
+    _getPreferredHeight: function(actor, forWidth, alloc) {
+        let [iconMinHeight, iconNatHeight] = this._iconBin.get_preferred_height(forWidth);
+        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
+    // parameter to _init()
+    createIcon: function(size) {
+        throw new Error('no implementation of createIcon in ' + this);
+    },
+
+    setIconSize: function(size) {
+        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.icon.destroy();
+        this.iconSize = size;
+        this.icon = this.createIcon(this.iconSize);
+        this._iconBin.child = this.icon;
+    },
+
+    _onStyleChanged: function() {
+        let node = this.actor.get_theme_node();
+        this._spacing = node.get_length('spacing');
+
+        if (this._setSizeManually)
+            return;
+
+        let len = node.get_length('icon-size');
+        if (len > 0)
+            this._setIconSize(len);
+    }
+};
+
+function IconGrid(params) {
+    this._init(params);
+}
+
+IconGrid.prototype = {
+    _init: function(params) {
+        params = Params.parse(params, { rowLimit: null,
+                                        columnLimit: null,
+                                        xAlign: St.Align.MIDDLE });
+        this._rowLimit = params.rowLimit;
+        this._colLimit = params.columnLimit;
+        this._xAlign = params.xAlign;
+
+        this.actor = new St.BoxLayout({ style_class: 'icon-grid',
+                                        vertical: true });
+        // Pulled from CSS, but hardcode some defaults here
+        this._spacing = 0;
+        this._item_size = ICON_SIZE;
+        this._grid = new Shell.GenericContainer();
+        this.actor.add(this._grid, { expand: true, y_align: St.Align.START });
+        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
+
+        this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this._grid.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this._grid.connect('allocate', Lang.bind(this, this._allocate));
+    },
+
+    _getPreferredWidth: function (grid, forHeight, alloc) {
+        let children = this._grid.get_children();
+        let nColumns = this._colLimit ? Math.min(this._colLimit,
+                                                 children.length)
+                                      : children.length;
+        let totalSpacing = Math.max(0, nColumns - 1) * this._spacing;
+        // Kind of a lie, but not really an issue right now.  If
+        // we wanted to support some sort of hidden/overflow that would
+        // need higher level design
+        alloc.min_size = this._item_size;
+        alloc.natural_size = nColumns * this._item_size + totalSpacing;
+    },
+
+    _getPreferredHeight: function (grid, forWidth, alloc) {
+        let children = this._grid.get_children();
+        let [nColumns, usedWidth] = this._computeLayout(forWidth);
+        let nRows;
+        if (nColumns > 0)
+            nRows = Math.ceil(children.length / nColumns);
+        else
+            nRows = 0;
+        if (this._rowLimit)
+            nRows = Math.min(nRows, this._rowLimit);
+        let totalSpacing = Math.max(0, nRows - 1) * this._spacing;
+        let height = nRows * this._item_size + totalSpacing;
+        alloc.min_size = height;
+        alloc.natural_size = height;
+    },
+
+    _allocate: function (grid, box, flags) {
+        let children = this._grid.get_children();
+        let availWidth = box.x2 - box.x1;
+        let availHeight = box.y2 - box.y1;
+
+        let [nColumns, usedWidth] = this._computeLayout(availWidth);
+
+        let leftPadding;
+        switch(this._xAlign) {
+            case St.Align.START:
+                leftPadding = 0;
+                break;
+            case St.Align.MIDDLE:
+                leftPadding = Math.floor((availWidth - usedWidth) / 2);
+                break;
+            case St.Align.END:
+                leftPadding = availWidth - usedWidth;
+        }
+
+        let x = box.x1 + leftPadding;
+        let y = box.y1;
+        let columnIndex = 0;
+        let rowIndex = 0;
+        for (let i = 0; i < children.length; i++) {
+            let [childMinWidth, childMinHeight, childNaturalWidth, childNaturalHeight]
+                = children[i].get_preferred_size();
+
+            /* Center the item in its allocation horizontally */
+            let width = Math.min(this._item_size, childNaturalWidth);
+            let childXSpacing = Math.max(0, width - childNaturalWidth) / 2;
+            let height = Math.min(this._item_size, childNaturalHeight);
+            let childYSpacing = Math.max(0, height - childNaturalHeight) / 2;
+
+            let childBox = new Clutter.ActorBox();
+            if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
+                let _x = box.x2 - (x + width);
+                childBox.x1 = Math.floor(_x - childXSpacing);
+            } else {
+                childBox.x1 = Math.floor(x + childXSpacing);
+            }
+            childBox.y1 = Math.floor(y + childYSpacing);
+            childBox.x2 = childBox.x1 + width;
+            childBox.y2 = childBox.y1 + height;
+
+            if (this._rowLimit && rowIndex >= this._rowLimit) {
+                this._grid.set_skip_paint(children[i], true);
+            } else {
+                children[i].allocate(childBox, flags);
+                this._grid.set_skip_paint(children[i], false);
+            }
+
+            columnIndex++;
+            if (columnIndex == nColumns) {
+                columnIndex = 0;
+                rowIndex++;
+            }
+
+            if (columnIndex == 0) {
+                y += this._item_size + this._spacing;
+                x = box.x1 + leftPadding;
+            } else {
+                x += this._item_size + this._spacing;
+            }
+        }
+    },
+
+    _computeLayout: function (forWidth) {
+        let children = this._grid.get_children();
+        let nColumns = 0;
+        let usedWidth = 0;
+        while ((this._colLimit == null || nColumns < this._colLimit) &&
+               (usedWidth + this._item_size <= forWidth)) {
+            usedWidth += this._item_size + this._spacing;
+            nColumns += 1;
+        }
+
+        if (nColumns > 0)
+            usedWidth -= this._spacing;
+
+        return [nColumns, usedWidth];
+    },
+
+    _onStyleChanged: function() {
+        let themeNode = this.actor.get_theme_node();
+        this._spacing = themeNode.get_length('spacing');
+        this._item_size = themeNode.get_length('-shell-grid-item-size');
+        this._grid.queue_relayout();
+    },
+
+    removeAll: function () {
+        this._grid.get_children().forEach(Lang.bind(this, function (child) {
+            child.destroy();
+        }));
+    },
+
+    addItem: function(actor) {
+        this._grid.add_actor(actor);
+    },
+
+    getItemAtIndex: function(index) {
+        return this._grid.get_children()[index];
+    },
+
+    visibleItemsCount: function() {
+        return this._grid.get_children().length - this._grid.get_n_skip_paint();
+    }
+};
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -1,19 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

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

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

-const SHADE_COLOR = new Clutter.Color();
-SHADE_COLOR.from_pixel(0x00000044);
-
 /**
 * Lightbox:
 * @container: parent Clutter.Container
- * @width: (optional) shade actor width
- * @height: (optional) shade actor height
+ * @params: (optional) additional parameters:
+ *           - inhibitEvents: whether to inhibit events for @container
+ *           - width: shade actor width
+ *           - height: shade actor height
+ *           - fadeTime: seconds used to fade in/out
 *
 * Lightbox creates a dark translucent "shade" actor to hide the
 * contents of @container, and allows you to specify particular actors
@ -27,30 +28,37 @@ SHADE_COLOR.from_pixel(0x00000044);
 *
 * By default, the shade window will have the height and width of
 * @container and will track any changes in its size. You can override
- * this by passing an explicit width and height
+ * this by passing an explicit width and height in @params.
 */
-function Lightbox(container, width, height) {
-    this._init(container, width, height);
+function Lightbox(container, params) {
+    this._init(container, params);
 }

 Lightbox.prototype = {
-    _init : function(container, width, height) {
+    _init : function(container, params) {
+        params = Params.parse(params, { inhibitEvents: false,
+                                        width: null,
+                                        height: null,
+                                        fadeTime: null
+                                      });
+
        this._container = container;
        this._children = container.get_children();
-        this.actor = new Clutter.Rectangle({ color: SHADE_COLOR,
-                                             x: 0,
-                                             y: 0,
-                                             border_width: 0,
-                                             reactive: true });
+        this._fadeTime = params.fadeTime;
+        this.actor = new St.Bin({ x: 0,
+                                  y: 0,
+                                  style_class: 'lightbox',
+                                  reactive: params.inhibitEvents });

        container.add_actor(this.actor);
        this.actor.raise_top();
+        this.actor.hide();

-        this._destroySignalId = this.actor.connect('destroy', Lang.bind(this, this.destroy));
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

-        if (width && height) {
-            this.actor.width = width;
-            this.actor.height = height;
+        if (params.width && params.height) {
+            this.actor.width = params.width;
+            this.actor.height = params.height;
            this._allocationChangedSignalId = 0;
        } else {
            this.actor.width = container.width;
@ -65,8 +73,13 @@ Lightbox.prototype = {
    },

    _allocationChanged : function(container, box, flags) {
-        this.actor.width = this._container.width;
-        this.actor.height = this._container.height;
+        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
+            this.actor.width = this.width;
+            this.actor.height = this.height;
+            return false;
+        }));
+        this.width = this._container.width;
+        this.height = this._container.height;
    },

    _actorAdded : function(container, newChild) {
@ -91,6 +104,35 @@ Lightbox.prototype = {
        }
    },

+    show: function() {
+        if (this._fadeTime) {
+            this.actor.opacity = 0;
+            Tweener.addTween(this.actor,
+                             { opacity: 255,
+                               time: this._fadeTime,
+                               transition: 'easeOutQuad'
+                             });
+        } else {
+            this.actor.opacity = 255;
+        }
+        this.actor.show();
+    },
+
+    hide: function() {
+        if (this._fadeTime) {
+            Tweener.addTween(this.actor,
+                             { opacity: 0,
+                               time: this._fadeTime,
+                               transition: 'easeOutQuad',
+                               onComplete: Lang.bind(this, function() {
+                                   this.actor.hide();
+                               })
+                             });
+        } else {
+            this.actor.hide();
+        }
+    },
+
    _actorRemoved : function(container, child) {
        let index = this._children.indexOf(child);
        if (index != -1) // paranoia
@ -134,18 +176,24 @@ Lightbox.prototype = {
    /**
     * destroy:
     *
-     * Destroys the lightbox. This is called automatically if the
-     * lightbox's container is destroyed.
+     * Destroys the lightbox.
     */
    destroy : function() {
+        this.actor.destroy();
+    },
+
+    /**
+     * _onDestroy:
+     *
+     * This is called when the lightbox' actor is destroyed, either
+     * by destroying its container or by explicitly calling this.destroy().
+     */
+    _onDestroy: function() {
        if (this._allocationChangedSignalId != 0)
            this._container.disconnect(this._allocationChangedSignalId);
        this._container.disconnect(this._actorAddedSignalId);
        this._container.disconnect(this._actorRemovedSignalId);

-        this.actor.disconnect(this._destroySignalId);
-
        this.highlight(null);
-        this.actor.destroy();
    }
 };
--- a/js/ui/link.js
+++ b/js/ui/link.js
@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;
@ -12,6 +11,7 @@ function Link(props) {
 Link.prototype = {
    _init : function(props) {
        let realProps = { reactive: true,
+                          track_hover: true,
                          style_class: 'shell-link' };
        // The user can pass in reactive: false to override the above and get
        // a non-reactive link (a link to the current page, perhaps)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -1,7 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
+const GConf = imports.gi.GConf;
+const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Pango = imports.gi.Pango;
 const St = imports.gi.St;
@ -18,22 +19,22 @@ const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;

 /* Imports...feel free to add here as needed */
-var commandHeader = "const Clutter = imports.gi.Clutter; " +
-                    "const GLib = imports.gi.GLib; " +
-                    "const Gtk = imports.gi.Gtk; " +
-                    "const Mainloop = imports.mainloop; " +
-                    "const Meta = imports.gi.Meta; " +
-                    "const Shell = imports.gi.Shell; " +
-                    "const Main = imports.ui.main; " +
-                    "const Lang = imports.lang; " +
-                    "const Tweener = imports.ui.tweener; " +
+var commandHeader = 'const Clutter = imports.gi.Clutter; ' +
+                    'const GLib = imports.gi.GLib; ' +
+                    'const Gtk = imports.gi.Gtk; ' +
+                    'const Mainloop = imports.mainloop; ' +
+                    'const Meta = imports.gi.Meta; ' +
+                    'const Shell = imports.gi.Shell; ' +
+                    'const Main = imports.ui.main; ' +
+                    'const Lang = imports.lang; ' +
+                    'const Tweener = imports.ui.tweener; ' +
                    /* Utility functions...we should probably be able to use these
                     * in the shell core code too. */
-                    "const stage = global.stage; " +
-                    "const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; " +
+                    'const stage = global.stage; ' +
+                    'const color = function(pixel) { let c= new Clutter.Color(); c.from_pixel(pixel); return c; }; ' +
                    /* Special lookingGlass functions */
-                       "const it = Main.lookingGlass.getIt(); " +
-                    "const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ";
+                       'const it = Main.lookingGlass.getIt(); ' +
+                    'const r = Lang.bind(Main.lookingGlass, Main.lookingGlass.getResult); ';

 function Notebook() {
    this._init();
@ -43,14 +44,16 @@ Notebook.prototype = {
    _init: function() {
        this.actor = new St.BoxLayout({ vertical: true });

-        this.tabControls = new St.BoxLayout({ style_class: "labels" });
+        this.tabControls = new St.BoxLayout({ style_class: 'labels' });

        this._selectedIndex = -1;
        this._tabs = [];
    },

    appendPage: function(name, child) {
-        let labelBox = new St.BoxLayout({ style_class: "notebook-tab" });
+        let labelBox = new St.BoxLayout({ style_class: 'notebook-tab',
+                                          reactive: true,
+                                          track_hover: true });
        let label = new St.Button({ label: name });
        label.connect('clicked', Lang.bind(this, function () {
            this.selectChild(child);
@ -84,7 +87,7 @@ Notebook.prototype = {
        if (this._selectedIndex < 0)
            return;
        let tabData = this._tabs[this._selectedIndex];
-        tabData.labelBox.set_style_pseudo_class(null);
+        tabData.labelBox.remove_style_pseudo_class('selected');
        tabData.scrollView.hide();
        this._selectedIndex = -1;
    },
@ -98,7 +101,7 @@ Notebook.prototype = {
            return;
        }
        let tabData = this._tabs[index];
-        tabData.labelBox.set_style_pseudo_class('selected');
+        tabData.labelBox.add_style_pseudo_class('selected');
        tabData.scrollView.show();
        this._selectedIndex = index;
        this.emit('selection', tabData.child);
@ -136,9 +139,43 @@ Notebook.prototype = {
        let vAdjust = tabData.scrollView.vscroll.adjustment;
        vAdjust.value = vAdjust.upper - vAdjust.page_size;
    }
-}
+};
 Signals.addSignalMethods(Notebook.prototype);

+function objectToString(o) {
+    if (typeof(o) == typeof(objectToString)) {
+        // special case this since the default is way, way too verbose
+        return "<js function>";
+    } else {
+        return "" + o;
+    }
+}
+
+function ObjLink(o, title) {
+    this._init(o, title);
+}
+
+ObjLink.prototype = {
+    __proto__: Link.Link,
+
+    _init: function(o, title) {
+        let text;
+        if (title)
+            text = title;
+        else
+            text = objectToString(o);
+        text = GLib.markup_escape_text(text, -1);
+        this._obj = o;
+        Link.Link.prototype._init.call(this, { label: text });
+        this.actor.get_child().single_line_mode = true;
+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+    },
+
+    _onClicked: function (link) {
+        Main.lookingGlass.inspectObject(this._obj, this.actor);
+    }
+};
+
 function Result(command, o, index) {
    this._init(command, o, index);
 }
@ -148,163 +185,317 @@ Result.prototype = {
        this.index = index;
        this.o = o;

-        this.actor = new Big.Box();
+        this.actor = new St.BoxLayout({ vertical: true });

        let cmdTxt = new St.Label({ text: command });
-        cmdTxt.ellipsize = Pango.EllipsizeMode.END;
-
-        this.actor.append(cmdTxt, Big.BoxPackFlags.NONE);
-        let resultTxt = new St.Label({ text: "r(" + index + ") = " + o });
-        resultTxt.ellipsize = Pango.EllipsizeMode.END;
-
-        this.actor.append(resultTxt, Big.BoxPackFlags.NONE);
-        let line = new Clutter.Rectangle({ name: "Separator",
-                                           height: 1 });
-        let padBin = new St.Bin({ name: "Separator", x_fill: true, y_fill: true });
+        cmdTxt.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+        this.actor.add(cmdTxt);
+        let box = new St.BoxLayout({});
+        this.actor.add(box);
+        let resultTxt = new St.Label({ text: 'r(' + index + ') = ' });
+        resultTxt.clutter_text.ellipsize = Pango.EllipsizeMode.END;
+        box.add(resultTxt);
+        let objLink = new ObjLink(o);
+        box.add(objLink.actor);
+        let line = new Clutter.Rectangle({ name: 'Separator' });
+        let padBin = new St.Bin({ name: 'Separator', x_fill: true, y_fill: true });
        padBin.add_actor(line);
-        this.actor.append(padBin, Big.BoxPackFlags.NONE);
+        this.actor.add(padBin);
    }
-}
+};

-function ActorHierarchy() {
+function WindowList() {
    this._init();
 }

-ActorHierarchy.prototype = {
+WindowList.prototype = {
    _init : function () {
-        this._previousTarget = null;
-        this._target = null;
-
-        this._parentList = [];
-
-        this.actor = new St.BoxLayout({ name: "ActorHierarchy", vertical: true });
+        this.actor = new St.BoxLayout({ name: 'Windows', vertical: true, style: 'spacing: 8px' });
+        let display = global.screen.get_display();
+        let tracker = Shell.WindowTracker.get_default();
+        this._updateId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._updateWindowList));
+        display.connect('window-created', Lang.bind(this, this._updateWindowList));
+        tracker.connect('tracked-windows-changed', Lang.bind(this, this._updateWindowList));
    },

-    setTarget: function(actor) {
-        this._previousTarget = this._target;
-        this.target = actor;
-
-        this.actor.get_children().forEach(function (child) { child.destroy(); });
-
-        if (!(actor instanceof Clutter.Actor))
-            return;
-
-        if (this.target == null)
-            return;
-
-        this._parentList = [];
-        let parent = actor;
-        while ((parent = parent.get_parent()) != null) {
-            this._parentList.push(parent);
-
-            let link = new St.Label({ reactive: true,
-                                      text: "" + parent });
-            this.actor.add_actor(link);
-            let parentTarget = parent;
-            link.connect('button-press-event', Lang.bind(this, function () {
-                this._selectByActor(parentTarget);
-                return true;
-            }));
-        }
-        this.emit('selection', actor);
-    },
-
-    _selectByActor: function(actor) {
-        let idx = this._parentList.indexOf(actor);
-        let children = this.actor.get_children();
-        let link = children[idx];
-        this.emit('selection', actor);
-    }
-}
-Signals.addSignalMethods(ActorHierarchy.prototype);
-
-function PropertyInspector() {
-    this._init();
-}
-
-PropertyInspector.prototype = {
-    _init : function () {
-        this._target = null;
-
-        this._parentList = [];
-
-        this.actor = new St.BoxLayout({ name: "PropertyInspector", vertical: true });
-    },
-
-    setTarget: function(actor) {
-        this.target = actor;
-
-        this.actor.get_children().forEach(function (child) { child.destroy(); });
-
-        for (let propName in actor) {
-            let valueStr;
-            try {
-                valueStr = "" + actor[propName];
-            } catch (e) {
-                valueStr = '<error>';
+    _updateWindowList: function() {
+        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
+        let windows = global.get_window_actors();
+        let tracker = Shell.WindowTracker.get_default();
+        for (let i = 0; i < windows.length; i++) {
+            let metaWindow = windows[i].metaWindow;
+            // Avoid multiple connections
+            if (!metaWindow._lookingGlassManaged) {
+                metaWindow.connect('unmanaged', Lang.bind(this, this._updateWindowList));
+                metaWindow._lookingGlassManaged = true;
+            }
+            let box = new St.BoxLayout({ vertical: true });
+            this.actor.add(box);
+            let windowLink = new ObjLink(metaWindow, metaWindow.title);
+            box.add(windowLink.actor, { x_align: St.Align.START, x_fill: false });
+            let propsBox = new St.BoxLayout({ vertical: true, style: 'padding-left: 6px;' });
+            box.add(propsBox);
+            propsBox.add(new St.Label({ text: 'wmclass: ' + metaWindow.get_wm_class() }));
+            let app = tracker.get_window_app(metaWindow);
+            if (app != null && !app.is_transient()) {
+                let icon = app.create_icon_texture(22);
+                let propBox = new St.BoxLayout({ style: 'spacing: 6px; ' });
+                propsBox.add(propBox);
+                propBox.add(new St.Label({ text: 'app: ' }), { y_fill: false });
+                let appLink = new ObjLink(app, app.get_id());
+                propBox.add(appLink.actor, { y_fill: false });
+                propBox.add(icon, { y_fill: false });
+            } else {
+                propsBox.add(new St.Label({ text: '<untracked>' }));
            }
-            let propText = propName + ": " + valueStr;
-            let propDisplay = new St.Label({ reactive: true,
-                                             text: propText });
-            this.actor.add_actor(propDisplay);
        }
    }
+};
+Signals.addSignalMethods(WindowList.prototype);
+
+function ObjInspector() {
+    this._init();
 }

+ObjInspector.prototype = {
+    _init : function () {
+        this._obj = null;
+        this._previousObj = null;
+
+        this._parentList = [];
+
+        this.actor = new St.ScrollView({ x_fill: true, y_fill: true });
+        this.actor.get_hscroll_bar().hide();
+        this._container = new St.BoxLayout({ name: 'LookingGlassPropertyInspector',
+                                             style_class: 'lg-dialog',
+                                             vertical: true });
+        this.actor.add_actor(this._container);
+    },
+
+    selectObject: function(obj, skipPrevious) {
+        if (!skipPrevious)
+            this._previousObj = this._obj;
+        else
+            this._previousObj = null;
+        this._obj = obj;
+
+        this._container.get_children().forEach(function (child) { child.destroy(); });
+
+        let hbox = new St.BoxLayout({ style_class: 'lg-obj-inspector-title' });
+        this._container.add_actor(hbox);
+        let label = new St.Label({ text: 'Inspecting: %s: %s'.format(typeof(obj),
+                                                                     objectToString(obj)) });
+        label.single_line_mode = true;
+        hbox.add(label, { expand: true, y_fill: false });
+        let button = new St.Button({ label: 'Insert', style_class: 'lg-obj-inspector-button' });
+        button.connect('clicked', Lang.bind(this, this._onInsert));
+        hbox.add(button);
+
+        if (this._previousObj != null) {
+            button = new St.Button({ label: 'Back', style_class: 'lg-obj-inspector-button' });
+            button.connect('clicked', Lang.bind(this, this._onBack));
+            hbox.add(button);
+        }
+
+        button = new St.Button({ style_class: 'window-close' });
+        button.connect('clicked', Lang.bind(this, this.close));
+        hbox.add(button);
+        if (typeof(obj) == typeof({})) {
+            for (let propName in obj) {
+                let valueStr;
+                let link;
+                try {
+                    let prop = obj[propName];
+                    link = new ObjLink(prop).actor;
+                } catch (e) {
+                    link = new St.Label({ text: '<error>' });
+                }
+                let hbox = new St.BoxLayout();
+                let propText = propName + ": " + valueStr;
+                hbox.add(new St.Label({ text: propName + ': ' }));
+                hbox.add(link);
+                this._container.add_actor(hbox);
+            }
+        }
+    },
+
+    open: function(sourceActor) {
+        if (this._open)
+            return;
+        this._previousObj = null;
+        this._open = true;
+        this.actor.show();
+        if (sourceActor) {
+            this.actor.set_scale(0, 0);
+            let [sourceX, sourceY] = sourceActor.get_transformed_position();
+            let [sourceWidth, sourceHeight] = sourceActor.get_transformed_size();
+            this.actor.move_anchor_point(Math.floor(sourceX + sourceWidth / 2),
+                                         Math.floor(sourceY + sourceHeight / 2));
+            Tweener.addTween(this.actor, { scale_x: 1, scale_y: 1,
+                                           transition: "easeOutQuad",
+                                           time: 0.2 });
+        } else {
+            this.actor.set_scale(1, 1);
+        }
+    },
+
+    close: function() {
+        if (!this._open)
+            return;
+        this._open = false;
+        this.actor.hide();
+        this._previousObj = null;
+        this._obj = null;
+    },
+
+    _onInsert: function() {
+        let obj = this._obj;
+        this.close();
+        Main.lookingGlass.insertObject(obj);
+    },
+
+    _onBack: function() {
+        this.selectObject(this._previousObj, true);
+    }
+};
+
 function Inspector() {
    this._init();
 }

 Inspector.prototype = {
    _init: function() {
-        let width = 150;
-        let primary = global.get_primary_monitor();
-        let eventHandler = new St.BoxLayout({ name: "LookingGlassDialog",
+        let container = new Shell.GenericContainer({ width: 0,
+                                                     height: 0 });
+        container.connect('allocate', Lang.bind(this, this._allocate));
+        Main.uiGroup.add_actor(container);
+
+        let eventHandler = new St.BoxLayout({ name: 'LookingGlassDialog',
                                              vertical: false,
-                                              y: primary.y + Math.floor(primary.height / 2),
                                              reactive: true });
-        eventHandler.connect('notify::allocation', Lang.bind(this, function () {
-            eventHandler.x = primary.x + Math.floor((primary.width - eventHandler.width) / 2);
-        }));
-        global.stage.add_actor(eventHandler);
-        let displayText = new St.Label();
-        eventHandler.add(displayText, { expand: true });
+        this._eventHandler = eventHandler;
+        container.add_actor(eventHandler);
+        this._displayText = new St.Label();
+        eventHandler.add(this._displayText, { expand: true });

-        let borderPaintTarget = null;
-        let borderPaintId = null;
-        eventHandler.connect('destroy', Lang.bind(this, function() {
-            if (borderPaintTarget != null)
-                borderPaintTarget.disconnect(borderPaintId);
-        }));
-
-        eventHandler.connect('button-press-event', Lang.bind(this, function (actor, event) {
-            Clutter.ungrab_pointer(eventHandler);
-
-            let [stageX, stageY] = event.get_coords();
-            let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
-                                                       stageX,
-                                                       stageY);
-            this.emit('target', target, stageX, stageY);
-            eventHandler.destroy();
-            this.emit('closed');
-            return true;
-        }));
-
-        eventHandler.connect('motion-event', Lang.bind(this, function (actor, event) {
-            let [stageX, stageY] = event.get_coords();
-            let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
-                                                       stageX,
-                                                       stageY);
-            displayText.text = '<inspect x: ' + stageX + ' y: ' + stageY + '> ' + target;
-            if (borderPaintTarget != null)
-                borderPaintTarget.disconnect(borderPaintId);
-            borderPaintTarget = target;
-            borderPaintId = Shell.add_hook_paint_red_border(target);
-            return true;
-        }));
+        this._borderPaintTarget = null;
+        this._borderPaintId = null;
+        eventHandler.connect('destroy', Lang.bind(this, this._onDestroy));
+        eventHandler.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
+        eventHandler.connect('button-press-event', Lang.bind(this, this._onButtonPressEvent));
+        eventHandler.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        eventHandler.connect('motion-event', Lang.bind(this, this._onMotionEvent));
        Clutter.grab_pointer(eventHandler);
+        Clutter.grab_keyboard(eventHandler);
+
+        // this._target is the actor currently shown by the inspector.
+        // this._pointerTarget is the actor directly under the pointer.
+        // Normally these are the same, but if you use the scroll wheel
+        // to drill down, they'll diverge until you either scroll back
+        // out, or move the pointer outside of _pointerTarget.
+        this._target = null;
+        this._pointerTarget = null;
+    },
+
+    _allocate: function(actor, box, flags) {
+        let primary = global.get_primary_monitor();
+
+        let [minWidth, minHeight, natWidth, natHeight] =
+            this._eventHandler.get_preferred_size();
+
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = primary.x + Math.floor((primary.width - natWidth) / 2);
+        childBox.x2 = childBox.x1 + natWidth;
+        childBox.y1 = primary.y + Math.floor((primary.height - natHeight) / 2);
+        childBox.y2 = childBox.y1 + natHeight;
+        this._eventHandler.allocate(childBox, flags);
+    },
+
+    _close: function() {
+        Clutter.ungrab_pointer(this._eventHandler);
+        Clutter.ungrab_keyboard(this._eventHandler);
+        this._eventHandler.destroy();
+        this.emit('closed');
+    },
+
+    _onDestroy: function() {
+        if (this._borderPaintTarget != null)
+            this._borderPaintTarget.disconnect(this._borderPaintId);
+    },
+
+    _onKeyPressEvent: function (actor, event) {
+        if (event.get_key_symbol() == Clutter.Escape)
+            this._close();
+        return true;
+    },
+
+    _onButtonPressEvent: function (actor, event) {
+        if (this._target) {
+            let [stageX, stageY] = event.get_coords();
+            this.emit('target', this._target, stageX, stageY);
+        }
+        this._close();
+        return true;
+    },
+
+    _onScrollEvent: function (actor, event) {
+        switch (event.get_scroll_direction()) {
+        case Clutter.ScrollDirection.UP:
+            // select parent
+            let parent = this._target.get_parent();
+            if (parent != null) {
+                this._target = parent;
+                this._update(event);
+            }
+            break;
+
+        case Clutter.ScrollDirection.DOWN:
+            // select child
+            if (this._target != this._pointerTarget) {
+                let child = this._pointerTarget;
+                while (child) {
+                    let parent = child.get_parent();
+                    if (parent == this._target)
+                        break;
+                    child = parent;
+                }
+                if (child) {
+                    this._target = child;
+                    this._update(event);
+                }
+            }
+            break;
+
+        default:
+            break;
+        }
+        return true;
+    },
+
+    _onMotionEvent: function (actor, event) {
+        this._update(event);
+        return true;
+    },
+
+    _update: function(event) {
+        let [stageX, stageY] = event.get_coords();
+        let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
+                                                   stageX,
+                                                   stageY);
+
+        if (target != this._pointerTarget)
+            this._target = target;
+        this._pointerTarget = target;
+
+        let position = '[inspect x: ' + stageX + ' y: ' + stageY + ']';
+        this._displayText.text = '';
+        this._displayText.text = position + ' ' + 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);
    }
-}
+};

 Signals.addSignalMethods(Inspector.prototype);

@ -317,18 +508,23 @@ ErrorLog.prototype = {
        this.actor = new St.BoxLayout();
        this.text = new St.Label();
        this.actor.add(this.text);
+        // We need to override StLabel's default ellipsization when
+        // using line_wrap; otherwise ClutterText's layout is going
+        // to constrain both the width and height, which prevents
+        // scrolling.
+        this.text.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
        this.text.clutter_text.line_wrap = true;
        this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
    },

    _formatTime: function(d){
-        function pad(n) { return n < 10 ? '0' + n : n };
+        function pad(n) { return n < 10 ? '0' + n : n; }
        return d.getUTCFullYear()+'-'
            + pad(d.getUTCMonth()+1)+'-'
            + pad(d.getUTCDate())+'T'
            + pad(d.getUTCHours())+':'
            + pad(d.getUTCMinutes())+':'
-            + pad(d.getUTCSeconds())+'Z'
+            + pad(d.getUTCSeconds())+'Z';
    },

    _renderText: function() {
@ -338,11 +534,11 @@ ErrorLog.prototype = {
        let stack = Main._getAndClearErrorStack();
        for (let i = 0; i < stack.length; i++) {
            let logItem = stack[i];
-            text += logItem.category + " t=" + this._formatTime(new Date(logItem.timestamp)) + " " + logItem.message + "\n";
+            text += logItem.category + ' t=' + this._formatTime(new Date(logItem.timestamp)) + ' ' + logItem.message + '\n';
        }
        this.text.text = text;
    }
-}
+};

 function Extensions() {
    this._init();
@ -398,7 +594,7 @@ Extensions.prototype = {
            case ExtensionSystem.ExtensionState.OUT_OF_DATE:
                return _("Out of date");
        }
-        return "Unknown"; // Not translated, shouldn't appear
+        return 'Unknown'; // Not translated, shouldn't appear
    },

    _createExtensionDisplay: function(meta) {
@ -444,7 +640,7 @@ function LookingGlass() {
 LookingGlass.prototype = {
    _init : function() {
        this._idleHistorySaveId = 0;
-        let historyPath = global.configdir + "/lookingglass-history.txt";
+        let historyPath = global.userdatadir + '/lookingglass-history.txt';
        this._historyFile = Gio.file_new_for_path(historyPath);
        this._savedText = null;
        this._historyNavIndex = -1;
@ -463,22 +659,28 @@ LookingGlass.prototype = {
        // Sort of magic, but...eh.
        this._maxItems = 150;

-        this.actor = new St.BoxLayout({ name: "LookingGlassDialog",
+        this.actor = new St.BoxLayout({ name: 'LookingGlassDialog',
+                                        style_class: 'lg-dialog',
                                        vertical: true,
                                        visible: false });

-        let gconf = Shell.GConf.get_default();
-        gconf.watch_directory("/desktop/gnome/interface");
-        gconf.connect("changed::/desktop/gnome/interface/monospace_font_name",
-                      Lang.bind(this, this._updateFont));
+        let gconf = GConf.Client.get_default();
+        gconf.add_dir('/desktop/gnome/interface', GConf.ClientPreloadType.PRELOAD_NONE);
+        gconf.notify_add('/desktop/gnome/interface/monospace_font_name',
+                         Lang.bind(this, this._updateFont));
        this._updateFont();

-        global.stage.add_actor(this.actor);
+        Main.uiGroup.add_actor(this.actor);

-        let toolbar = new St.BoxLayout({ name: "Toolbar" });
+        this._objInspector = new ObjInspector();
+        Main.uiGroup.add_actor(this._objInspector.actor);
+        this._objInspector.actor.hide();
+
+        let toolbar = new St.BoxLayout({ name: 'Toolbar' });
        this.actor.add_actor(toolbar);
-        let inspectIcon = Shell.TextureCache.get_default().load_gicon(new Gio.ThemedIcon({ name: 'gtk-color-picker' }),
-                                                                      24);
+        let inspectIcon = St.TextureCache.get_default().load_icon_name('gtk-color-picker',
+                                                                       St.IconType.SYMBOLIC,
+                                                                       24);
        toolbar.add_actor(inspectIcon);
        inspectIcon.reactive = true;
        inspectIcon.connect('button-press-event', Lang.bind(this, function () {
@ -486,7 +688,6 @@ LookingGlass.prototype = {
            inspector.connect('target', Lang.bind(this, function(i, target, stageX, stageY) {
                this._pushResult('<inspect x:' + stageX + ' y:' + stageY + '>',
                                 target);
-                this._hierarchy.setTarget(target);
            }));
            inspector.connect('closed', Lang.bind(this, function() {
                this.actor.show();
@ -504,18 +705,17 @@ LookingGlass.prototype = {
        toolbar.add(emptyBox, { expand: true });
        toolbar.add_actor(notebook.tabControls);

-        this._evalBox = new St.BoxLayout({ name: "EvalBox", vertical: true });
+        this._evalBox = new St.BoxLayout({ name: 'EvalBox', vertical: true });
        notebook.appendPage('Evaluator', this._evalBox);

-        this._resultsArea = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                          spacing: 4 });
+        this._resultsArea = new St.BoxLayout({ name: 'ResultsArea', vertical: true });
        this._evalBox.add(this._resultsArea, { expand: true });

-        let entryArea = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
+        let entryArea = new St.BoxLayout({ name: 'EntryArea' });
        this._evalBox.add_actor(entryArea);

        let label = new St.Label({ text: 'js>>> ' });
-        entryArea.append(label, Big.BoxPackFlags.NONE);
+        entryArea.add(label);

        this._entry = new St.Entry();
        /* unmapping the edit box will un-focus it, undo that */
@ -523,17 +723,14 @@ LookingGlass.prototype = {
            if (child == this._evalBox)
                global.stage.set_key_focus(this._entry);
        }));
-        entryArea.append(this._entry, Big.BoxPackFlags.EXPAND);
+        entryArea.add(this._entry, { expand: true });

-        this._hierarchy = new ActorHierarchy();
-        notebook.appendPage('Hierarchy', this._hierarchy.actor);
-
-        this._propInspector = new PropertyInspector();
-        notebook.appendPage('Properties', this._propInspector.actor);
-        this._hierarchy.connect('selection', Lang.bind(this, function (h, actor) {
-            this._pushResult('<parent selection>', actor);
+        this._windowList = new WindowList();
+        this._windowList.connect('selected', Lang.bind(this, function(list, window) {
            notebook.selectIndex(0);
+            this._pushResult('<window selection>', window);
        }));
+        notebook.appendPage('Windows', this._windowList.actor);

        this._errorLog = new ErrorLog();
        notebook.appendPage('Errors', this._errorLog.actor);
@ -547,7 +744,7 @@ LookingGlass.prototype = {
            // newline-separated.
            text.replace('\n', ' ');
            // Strip leading and trailing whitespace
-            text = text.replace(/^\s+/g, "").replace(/\s+$/g, "");
+            text = text.replace(/^\s+/g, '').replace(/\s+$/g, '');
            if (text == '')
                return true;
            this._evaluate(text);
@ -582,11 +779,11 @@ LookingGlass.prototype = {
    },

    _updateFont: function() {
-        let gconf = Shell.GConf.get_default();
-        let fontName = gconf.get_string("/desktop/gnome/interface/monospace_font_name");
+        let gconf = GConf.Client.get_default();
+        let fontName = gconf.get_string('/desktop/gnome/interface/monospace_font_name');
        // This is mishandled by the scanner - should by Pango.FontDescription_from_string(fontName);
        // https://bugzilla.gnome.org/show_bug.cgi?id=595889
-        let fontDesc = Pango.Font.description_from_string(fontName);
+        let fontDesc = Pango.font_description_from_string(fontName);
        // We ignore everything but size and style; you'd be crazy to set your system-wide
        // monospace font to be bold/oblique/etc. Could easily be added here.
        this.actor.style =
@ -621,8 +818,7 @@ LookingGlass.prototype = {
        let index = this._results.length + this._offset;
        let result = new Result('>>> ' + command, obj, index);
        this._results.push(result);
-        this._resultsArea.append(result.actor, Big.BoxPackFlags.NONE);
-        this._propInspector.setTarget(obj);
+        this._resultsArea.add(result.actor);
        if (this._borderPaintTarget != null) {
            this._borderPaintTarget.disconnect(this._borderPaintId);
            this._borderPaintTarget = null;
@ -657,11 +853,10 @@ LookingGlass.prototype = {
        try {
            resultObj = eval(fullCmd);
        } catch (e) {
-            resultObj = "<exception " + e + ">";
+            resultObj = '<exception ' + e + '>';
        }

        this._pushResult(command, resultObj);
-        this._hierarchy.setTarget(null);
        this._entry.text = '';
    },

@ -691,6 +886,9 @@ LookingGlass.prototype = {
        this.actor.y = this._hiddenY;
        this.actor.width = myWidth;
        this.actor.height = myHeight;
+        this._objInspector.actor.set_size(Math.floor(myWidth * 0.8), Math.floor(myHeight * 0.8));
+        this._objInspector.actor.set_position(this.actor.x + Math.floor(myWidth * 0.1),
+                                              this._targetY + Math.floor(myHeight * 0.1));
    },

    slaveTo: function(actor) {
@ -701,11 +899,24 @@ LookingGlass.prototype = {
        this._resizeTo(actor);
    },

+    insertObject: function(obj) {
+        this._pushResult('<insert>', obj);
+    },
+
+    inspectObject: function(obj, sourceActor) {
+        this._objInspector.open(sourceActor);
+        this._objInspector.selectObject(obj);
+    },
+
    // Handle key events which are relevant for all tabs of the LookingGlass
    _globalKeyPressEvent : function(actor, event) {
        let symbol = event.get_key_symbol();
        if (symbol == Clutter.Escape) {
-            this.close();
+            if (this._objInspector.actor.visible) {
+                this._objInspector.close();
+            } else {
+                this.close();
+            }
            return true;
        }
        return false;
@ -730,7 +941,7 @@ LookingGlass.prototype = {
        global.stage.set_key_focus(this._entry);

        Tweener.addTween(this.actor, { time: 0.5,
-                                       transition: "easeOutQuad",
+                                       transition: 'easeOutQuad',
                                       y: this._targetY
                                     });
    },
@ -742,6 +953,8 @@ LookingGlass.prototype = {
        if (this._keyPressEventId)
            global.stage.disconnect(this._keyPressEventId);

+        this._objInspector.actor.hide();
+
        this._historyNavIndex = -1;
        this._open = false;
        Tweener.removeTweens(this.actor);
@ -755,7 +968,7 @@ LookingGlass.prototype = {
        Main.popModal(this.actor);

        Tweener.addTween(this.actor, { time: 0.5,
-                                       transition: "easeOutQuad",
+                                       transition: 'easeOutQuad',
                                       y: this._hiddenY,
                                       onComplete: Lang.bind(this, function () {
                                           this.actor.hide();
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
--- a/js/ui/magnifierDBus.js
+++ b/js/ui/magnifierDBus.js
@ -0,0 +1,378 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const Main = imports.ui.main;
+
+const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
+const MAG_SERVICE_PATH = '/org/gnome/Magnifier';
+const ZOOM_SERVICE_NAME = 'org.gnome.Magnifier.ZoomRegion';
+const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
+
+// Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
+// http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
+const MagnifierIface = {
+    name: MAG_SERVICE_NAME,
+    methods: [
+                { name: 'setActive', inSignature: 'b', outSignature: '' },
+                { name: 'isActive', inSignature: '', outSignature: 'b' },
+                { name: 'showCursor', inSignature: '', outSignature: '' },
+                { name: 'hideCursor', inSignature: '', outSignature: ''  },
+                { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' },
+                { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' },
+                { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' },
+                { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' },
+                { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' },
+
+                { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' },
+                { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' },
+                { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' },
+                { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' },
+                { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' },
+                { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' },
+                { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' },
+                { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' }
+             ],
+    signals: [],
+    properties: []
+};
+
+// Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
+// http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
+const ZoomRegionIface = {
+    name: ZOOM_SERVICE_NAME,
+    methods: [
+                { name: 'setMagFactor', inSignature: 'dd', outSignature: ''},
+                { name: 'getMagFactor', inSignature: '', outSignature: 'dd' },
+                { name: 'setRoi', inSignature: 'ai', outSignature: '' },
+                { name: 'getRoi', inSignature: '', outSignature: 'ai' },
+                { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' },
+                { name: 'moveResize', inSignature: 'ai', outSignature: '' }
+             ],
+    signals: [],
+    properties: []
+};
+
+// For making unique ZoomRegion DBus proxy object paths of the form:
+// '/org/gnome/Magnifier/ZoomRegion/zoomer0',
+// '/org/gnome/Magnifier/ZoomRegion/zoomer1', etc.
+let _zoomRegionInstanceCount = 0;
+
+function ShellMagnifier() {
+    this._init();
+}
+
+ShellMagnifier.prototype = {
+    _init: function() {
+        this._zoomers = {};
+        DBus.session.exportObject(MAG_SERVICE_PATH, this);
+    },
+
+    /**
+     * setActive:
+     * @activate:   Boolean to activate or de-activate the magnifier.
+     */
+    setActive: function(activate) {
+        Main.magnifier.setActive(activate);
+    },
+
+    /**
+     * isActive:
+     * @return  Whether the magnifier is active (boolean).
+     */
+    isActive: function() {
+        return Main.magnifier.isActive();
+    },
+
+    /**
+     * showCursor:
+     * Show the system mouse pointer.
+     */
+    showCursor: function() {
+        Main.magnifier.showSystemCursor();
+    },
+
+    /**
+     * hideCursor:
+     * Hide the system mouse pointer.
+     */
+    hideCursor: function() {
+        Main.magnifier.hideSystemCursor();
+    },
+
+    /**
+     * createZoomRegion:
+     * Create a new ZoomRegion and return its object path.
+     * @xMagFactor:     The power to set horizontal magnification of the
+     *                  ZoomRegion.  A value of 1.0 means no magnification.  A
+     *                  value of 2.0 doubles the size.
+     * @yMagFactor:     The power to set the vertical magnification of the
+     *                  ZoomRegion.
+     * @roi             Array of integers defining the region of the
+     *                  screen/desktop to magnify.  The array has the form
+     *                  [left, top, right, bottom].
+     * @viewPort        Array of integers, [left, top, right, bottom] that defines
+     *                  the position of the ZoomRegion on screen.
+     * @return          The newly created ZoomRegion.
+     */
+    createZoomRegion: function(xMagFactor, yMagFactor, roi, viewPort) {
+        let ROI = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
+        let viewBox = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
+        let realZoomRegion = Main.magnifier.createZoomRegion(xMagFactor, yMagFactor, ROI, viewBox);
+        let objectPath = ZOOM_SERVICE_PATH + '/zoomer' + _zoomRegionInstanceCount;
+        _zoomRegionInstanceCount++;
+
+        let zoomRegionProxy = new ShellMagnifierZoomRegion(objectPath, realZoomRegion);
+        let proxyAndZoomRegion = {};
+        proxyAndZoomRegion.proxy = zoomRegionProxy;
+        proxyAndZoomRegion.zoomRegion = realZoomRegion;
+        this._zoomers[objectPath] = proxyAndZoomRegion;
+        return objectPath;
+    },
+
+    /**
+     * addZoomRegion:
+     * Append the given ZoomRegion to the magnifier's list of ZoomRegions.
+     * @zoomerObjectPath:   The object path for the zoom region proxy.
+     */
+    addZoomRegion: function(zoomerObjectPath) {
+        let proxyAndZoomRegion = this._zoomers[zoomerObjectPath];
+        if (proxyAndZoomRegion && proxyAndZoomRegion.zoomRegion) {
+            Main.magnifier.addZoomRegion(proxyAndZoomRegion.zoomRegion);
+            return true;
+        }
+        else
+            return false;
+    },
+
+    /**
+     * getZoomRegions:
+     * Return a list of ZoomRegion object paths for this Magnifier.
+     * @return:     The Magnifier's zoom region list as an array of DBus object
+     *              paths.
+     */
+    getZoomRegions: function() {
+        // There may be more ZoomRegions in the magnifier itself than have
+        // been added through dbus.  Make sure all of them are associated with
+        // an object path and proxy.
+        let zoomRegions = Main.magnifier.getZoomRegions();
+        let objectPaths = [];
+        let thoseZoomers = this._zoomers;
+        zoomRegions.forEach (function(aZoomRegion, index, array) {
+            let found = false;
+            for (let objectPath in thoseZoomers) {
+                let proxyAndZoomRegion = thoseZoomers[objectPath];
+                if (proxyAndZoomRegion.zoomRegion === aZoomRegion) {
+                    objectPaths.push(objectPath);
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                // Got a ZoomRegion with no DBus proxy, make one.
+                let newPath =  ZOOM_SERVICE_PATH + '/zoomer' + _zoomRegionInstanceCount;
+                _zoomRegionInstanceCount++;
+                let zoomRegionProxy = new ShellMagnifierZoomRegion(newPath, aZoomRegion);
+                let proxyAndZoomer = {};
+                proxyAndZoomer.proxy = zoomRegionProxy;
+                proxyAndZoomer.zoomRegion = aZoomRegion;
+                thoseZoomers[newPath] = proxyAndZoomer;
+                objectPaths.push(newPath);
+            }
+        });
+        return objectPaths;
+    },
+
+    /**
+     * clearAllZoomRegions:
+     * Remove all the zoom regions from this Magnfier's ZoomRegion list.
+     */
+    clearAllZoomRegions: function() {
+        Main.magnifier.clearAllZoomRegions();
+        for (let objectPath in this._zoomers) {
+            let proxyAndZoomer = this._zoomers[objectPath];
+            proxyAndZoomer.proxy = null;
+            proxyAndZoomer.zoomRegion = null;
+            delete this._zoomers[objectPath];
+            DBus.session.unexportObject(proxyAndZoomer);
+        }
+        this._zoomers = {};
+    },
+
+    /**
+     * fullScreenCapable:
+     * Consult if the Magnifier can magnify in full-screen mode.
+     * @return  Always return true.
+     */
+    fullScreenCapable: function() {
+        return true;
+    },
+
+    /**
+     * setCrosswireSize:
+     * Set the crosswire size of all ZoomRegions.
+     * @size:   The thickness of each line in the cross wire.
+     */
+     setCrosswireSize: function(size) {
+        Main.magnifier.setCrosshairsThickness(size);
+     },
+
+    /**
+     * getCrosswireSize:
+     * Get the crosswire size of all ZoomRegions.
+     * @return:   The thickness of each line in the cross wire.
+     */
+     getCrosswireSize: function() {
+        return Main.magnifier.getCrosshairsThickness();
+     },
+
+    /**
+     * setCrosswireLength:
+     * Set the crosswire length of all zoom-regions..
+     * @size:   The length of each line in the cross wire.
+     */
+     setCrosswireLength: function(length) {
+        Main.magnifier.setCrosshairsLength(length);
+     },
+
+    /**
+     * setCrosswireSize:
+     * Set the crosswire size of all zoom-regions.
+     * @size:   The thickness of each line in the cross wire.
+     */
+     getCrosswireLength: function() {
+        return Main.magnifier.getCrosshairsLength();
+     },
+
+    /**
+     * setCrosswireClip:
+     * Set if the crosswire will be clipped by the cursor image..
+     * @clip:   Flag to indicate whether to clip the crosswire.
+     */
+     setCrosswireClip: function(clip) {
+        Main.magnifier.setCrosshairsClip(clip);
+     },
+
+    /**
+     * getCrosswireClip:
+     * Get the crosswire clip value.
+     * @return:   Whether the crosswire is clipped by the cursor image.
+     */
+     getCrosswireClip: function() {
+        return Main.magnifier.getCrosshairsClip();
+     },
+
+    /**
+     * setCrosswireColor:
+     * Set the crosswire color of all ZoomRegions.
+     * @color:   Unsigned int of the form rrggbbaa.
+     */
+     setCrosswireColor: function(color) {
+        Main.magnifier.setCrosshairsColor('#%08x'.format(color));
+     },
+
+    /**
+     * getCrosswireClip:
+     * Get the crosswire color of all ZoomRegions.
+     * @return:   The crosswire color as an unsigned int in the form rrggbbaa.
+     */
+     getCrosswireColor: function() {
+        let colorString = Main.magnifier.getCrosshairsColor();
+        // Drop the leading '#'.
+        return parseInt(colorString.slice(1), 16);
+     }
+};
+
+/**
+ * ShellMagnifierZoomRegion:
+ * Object that implements the DBus ZoomRegion interface.
+ * @zoomerObjectPath:   String that is the path to a DBus ZoomRegion.
+ * @zoomRegion:         The actual zoom region associated with the object path.
+ */
+function ShellMagnifierZoomRegion(zoomerObjectPath, zoomRegion) {
+    this._init(zoomerObjectPath, zoomRegion);
+}
+
+ShellMagnifierZoomRegion.prototype = {
+    _init: function(zoomerObjectPath, zoomRegion) {
+        this._zoomRegion = zoomRegion;
+        DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath);
+        DBus.session.exportObject(zoomerObjectPath, this);
+    },
+
+    /**
+     * setMagFactor:
+     * @xMagFactor:     The power to set the horizontal magnification factor to
+     *                  of the magnified view.  A value of 1.0 means no
+     *                  magnification.  A value of 2.0 doubles the size.
+     * @yMagFactor:     The power to set the vertical magnification factor to
+     *                  of the magnified view.
+     */
+    setMagFactor: function(xMagFactor, yMagFactor) {
+        this._zoomRegion.setMagFactor(xMagFactor, yMagFactor);
+    },
+
+    /**
+     * getMagFactor:
+     * @return  an array, [xMagFactor, yMagFactor], containing the horizontal
+     *          and vertical magnification powers.  A value of 1.0 means no
+     *          magnification.  A value of 2.0 means the contents are doubled
+     *          in size, and so on.
+     */
+    getMagFactor: function() {
+        return this._zoomRegion.getMagFactor();
+    },
+
+    /**
+     * setRoi:
+     * Sets the "region of interest" that the ZoomRegion is magnifying.
+     * @roi     Array, [left, top, right, bottom], defining the region of the
+     *          screen to magnify. The values are in screen (unmagnified)
+     *          coordinate space.
+     */
+    setRoi: function(roi) {
+        let roiObject = { x: roi[0], y: roi[1], width: roi[2] - roi[0], height: roi[3] - roi[1] };
+        this._zoomRegion.setROI(roiObject);
+    },
+
+    /**
+     * getRoi:
+     * Retrieves the "region of interest" -- the rectangular bounds of that part
+     * of the desktop that the magnified view is showing (x, y, width, height).
+     * The bounds are given in non-magnified coordinates.
+     * @return  an array, [left, top, right, bottom], representing the bounding
+     *          rectangle of what is shown in the magnified view.
+     */
+    getRoi: function() {
+        let roi = this._zoomRegion.getROI();
+        roi[2] += roi[0];
+        roi[3] += roi[1];
+        return roi;
+    },
+
+    /**
+     * Set the "region of interest" by centering the given screen coordinate
+     * within the zoom region.
+     * @x       The x-coord of the point to place at the center of the zoom region.
+     * @y       The y-coord.
+     * @return  Whether the shift was successful (for GS-mag, this is always
+     *          true).
+     */
+    shiftContentsTo: function(x, y) {
+        this._zoomRegion.scrollContentsTo(x, y);
+        return true;
+    },
+
+    /**
+     * moveResize
+     * Sets the position and size of the ZoomRegion on screen.
+     * @viewPort    Array, [left, top, right, bottom], defining the position and
+     *              size on screen to place the zoom region.
+     */
+    moveResize: function(viewPort) {
+        let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] };
+        this._zoomRegion.setViewPort(viewRect);
+    }
+};
+
+DBus.conformExport(ShellMagnifier.prototype, MagnifierIface);
+DBus.conformExport(ShellMagnifierZoomRegion.prototype, ZoomRegionIface);
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -1,51 +1,71 @@
 /* -*- 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;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const GConf = imports.gi.GConf;
 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 Chrome = imports.ui.chrome;
 const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
+const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
 const PlaceDisplay = imports.ui.placeDisplay;
 const RunDialog = imports.ui.runDialog;
 const LookingGlass = imports.ui.lookingGlass;
+const NotificationDaemon = imports.ui.notificationDaemon;
+const WindowAttentionHandler = imports.ui.windowAttentionHandler;
+const Scripting = imports.ui.scripting;
 const ShellDBus = imports.ui.shellDBus;
-const Sidebar = imports.ui.sidebar;
+const TelepathyClient = imports.ui.telepathyClient;
 const WindowManager = imports.ui.windowManager;
+const Magnifier = imports.ui.magnifier;
+const StatusIconDispatcher = imports.ui.statusIconDispatcher;

 const DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
 DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);

 let chrome = null;
 let panel = null;
-let sidebar = null;
 let placesManager = null;
 let overview = null;
 let runDialog = null;
 let lookingGlass = null;
 let wm = null;
+let messageTray = null;
+let notificationDaemon = null;
+let windowAttentionHandler = null;
+let telepathyClient = null;
 let recorder = null;
 let shellDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
+let uiGroup = null;
+let magnifier = null;
+let statusIconDispatcher = null;
 let _errorLogStack = [];
 let _startDate;

+let background = null;
+
 function start() {
-    // Add a binding for "global" in the global JS namespace; (gjs
+    // Add a binding for 'global' in the global JS namespace; (gjs
    // keeps the web browser convention of having that namespace be
-    // called "window".)
+    // called 'window'.)
    window.global = Shell.Global.get();

    // Now monkey patch utility functions into the global proxy;
@ -54,7 +74,7 @@ function start() {
    global.logError = _logError;
    global.log = _logDebug;

-    Gio.DesktopAppInfo.set_desktop_env("GNOME");
+    Gio.DesktopAppInfo.set_desktop_env('GNOME');

    global.grab_dbus_service();
    shellDBusService = new ShellDBus.GnomeShell();
@ -82,40 +102,43 @@ function start() {
    // when we are running inside Xephyr.
    global.stage.color = DEFAULT_BACKGROUND_COLOR;

-    // Mutter currently hardcodes putting "Yessir. The compositor is running""
-    // in the Overview. Clear that out.
-    let children = global.overlay_group.get_children();
-    for (let i = 0; i < children.length; i++)
-        children[i].destroy();
-
    let themeContext = St.ThemeContext.get_for_stage (global.stage);
-    let stylesheetPath = global.datadir + "/theme/gnome-shell.css";
+    let stylesheetPath = global.datadir + '/theme/gnome-shell.css';
    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
    themeContext.set_theme (theme);

-    global.connect('panel-run-dialog', function(panel) {
-        // Make sure not more than one run dialog is shown.
-        getRunDialog().open();
-    });
    let shellwm = global.window_manager;
-    shellwm.takeover_keybinding("panel_main_menu");
-    shellwm.connect("keybinding::panel_main_menu", function () {
+    shellwm.takeover_keybinding('panel_main_menu');
+    shellwm.connect('keybinding::panel_main_menu', function () {
        overview.toggle();
    });
-    shellwm.takeover_keybinding("panel_run_dialog");
-    shellwm.connect("keybinding::panel_run_dialog", function () {
+    shellwm.takeover_keybinding('panel_run_dialog');
+    shellwm.connect('keybinding::panel_run_dialog', function () {
       getRunDialog().open();
    });

+    // Set up stage hierarchy to group all UI actors under one container.
+    uiGroup = new Clutter.Group();
+    global.window_group.reparent(uiGroup);
+    global.overlay_group.reparent(uiGroup);
+    global.stage.add_actor(uiGroup);
+
    placesManager = new PlaceDisplay.PlacesManager();
    overview = new Overview.Overview();
    chrome = new Chrome.Chrome();
+    magnifier = new Magnifier.Magnifier();
+    statusIconDispatcher = new StatusIconDispatcher.StatusIconDispatcher();
    panel = new Panel.Panel();
-    sidebar = new Sidebar.Sidebar();
    wm = new WindowManager.WindowManager();
+    messageTray = new MessageTray.MessageTray();
+    notificationDaemon = new NotificationDaemon.NotificationDaemon();
+    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
+    telepathyClient = new TelepathyClient.Client();

    _startDate = new Date();

+    let recorderSettings = new Gio.Settings({ schema: 'org.gnome.shell.recorder' });
+
    global.screen.connect('toggle-recording', function() {
        if (recorder == null) {
            recorder = new Shell.Recorder({ stage: global.stage });
@ -124,11 +147,25 @@ function start() {
        if (recorder.is_recording()) {
            recorder.pause();
        } else {
+            // read the parameters from GSettings always in case they have changed
+            recorder.set_framerate(recorderSettings.get_int('framerate'));
+            recorder.set_filename('shell-%d%u-%c.' + recorderSettings.get_string('file-extension'));
+            let pipeline = recorderSettings.get_string('pipeline');
+
+            if (!pipeline.match(/^\s*$/))
+                recorder.set_pipeline(pipeline);
+            else
+                recorder.set_pipeline(null);
+
            recorder.record();
        }
    });

-    _relayout();
+    background = global.create_root_pixmap_actor();
+    global.stage.add_actor(background);
+    background.lower_bottom();
+
+    global.gdk_screen.connect('monitors-changed', _relayout);

    ExtensionSystem.init();
    ExtensionSystem.loadExtensions();
@ -137,13 +174,23 @@ function start() {

    let display = global.screen.get_display();
    display.connect('overlay-key', Lang.bind(overview, overview.toggle));
-    global.connect('panel-main-menu', Lang.bind(overview, overview.toggle));

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

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

    Mainloop.idle_add(_removeUnusedWorkspaces);
+
+    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
+    if (perfModuleName) {
+        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
+        let module = eval('imports.perf.' + perfModuleName + ';');
+        Scripting.runPerfScript(module, perfOutput);
+    }
 }

 /**
@ -164,7 +211,7 @@ function _log(category, msg) {
        for (let i = 2; i < arguments.length; i++) {
            text += JSON.stringify(arguments[i]);
            if (i < arguments.length - 1)
-                text += " ";
+                text += ' ';
        }
    }
    _errorLogStack.push({timestamp: new Date().getTime(),
@ -192,16 +239,25 @@ function _relayout() {
    panel.actor.set_position(primary.x, primary.y);
    panel.actor.set_size(primary.width, Panel.PANEL_HEIGHT);
    overview.relayout();
+
+    background.set_size(global.screen_width, global.screen_height);
+
+    // To avoid updating the position and size of the workspaces
+    // in the overview, we just hide the overview. The positions
+    // will be updated when it is next shown. We do the same for
+    // the calendar popdown.
+    overview.hide();
+    panel.hideCalendar();
 }

 // metacity-clutter currently uses the same prefs as plain metacity,
 // which probably means we'll be starting out with multiple workspaces;
 // remove any unused ones. (We do this from an idle handler, because
-// global.get_windows() still returns NULL at the point when start()
+// global.get_window_actors() still returns NULL at the point when start()
 // is called.)
 function _removeUnusedWorkspaces() {

-    let windows = global.get_windows();
+    let windows = global.get_window_actors();
    let maxWorkspace = 0;
    for (let i = 0; i < windows.length; i++) {
        let win = windows[i];
@ -236,35 +292,48 @@ function _removeUnusedWorkspaces() {
 function _globalKeyPressHandler(actor, event) {
    if (modalCount == 0)
        return false;
+    if (event.type() != Clutter.EventType.KEY_RELEASE)
+        return false;

-    let type = event.type();
+    let symbol = event.get_key_symbol();
+    let keyCode = event.get_key_code();
+    let modifierState = Shell.get_event_state(event);
+    // Check the overview key first, this isn't a Meta.KeyBindingAction yet
+    if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
+        // The super key is the default for triggering the overview, and should
+        // get us out of the overview when we are already in it.
+        if (overview.visible)
+            overview.hide();

-    if (type == Clutter.EventType.KEY_PRESS) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.Print) {
-            // We want to be able to take screenshots of the shell at all times
-            let gconf = Shell.GConf.get_default();
-            let command = gconf.get_string("/apps/metacity/keybinding_commands/command_screenshot");
-            if (command != null && command != "") {
+        return true;
+    }
+
+    // Whitelist some of the Metacity actions
+    let display = global.screen.get_display();
+    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+
+    // This relies on the fact that Clutter.ModifierType is the same as Gdk.ModifierType
+    let action = display.get_keybinding_action(keyCode, modifierState);
+    switch (action) {
+        case Meta.KeyBindingAction.COMMAND_SCREENSHOT:
+            let gconf = GConf.Client.get_default();
+            let command = gconf.get_string('/apps/metacity/keybinding_commands/command_screenshot');
+            if (command != null && command != '') {
                let [ok, len, args] = GLib.shell_parse_argv(command);
                let p = new Shell.Process({'args' : args});
                p.run();
            }
-
            return true;
-        }
-    } else if (type == Clutter.EventType.KEY_RELEASE) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
-            // The super key is the default for triggering the overview, and should
-            // get us out of the overview when we are already in it.
-            if (overview.visible)
-                overview.hide();
-
+        case Meta.KeyBindingAction.WORKSPACE_LEFT:
+            wm.actionMoveWorkspaceLeft();
            return true;
-        } else if (symbol == Clutter.F2 && (Shell.get_event_state(event) & Clutter.ModifierType.MOD1_MASK)) {
+        case Meta.KeyBindingAction.WORKSPACE_RIGHT:
+            wm.actionMoveWorkspaceRight();
+            return true;
+        case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
+        case Meta.KeyBindingAction.COMMAND_2:
            getRunDialog().open();
-        }
+            return true;
    }

    return false;
@ -298,7 +367,7 @@ function _findModal(actor) {
 function pushModal(actor) {
    if (modalCount == 0) {
        if (!global.begin_modal(global.get_current_time())) {
-            log("pushModal: invocation of begin_modal failed");
+            log('pushModal: invocation of begin_modal failed');
            return false;
        }
    }
@ -321,6 +390,7 @@ function pushModal(actor) {
    }
    modalActorFocusStack.push([actor, curFocus]);

+    global.stage.set_key_focus(null);
    return true;
 }

@ -373,12 +443,14 @@ function getRunDialog() {
 * activateWindow:
 * @window: the Meta.Window to activate
 * @time: (optional) current event time
+ * @workspaceNum: (optional) window's workspace number
 *
- * Activates @window, switching to its workspace first if necessary
+ * Activates @window, switching to its workspace first if necessary,
+ * and switching out of the overview if it's currently active
 */
-function activateWindow(window, time) {
+function activateWindow(window, time, workspaceNum) {
    let activeWorkspaceNum = global.screen.get_active_workspace_index();
-    let windowWorkspaceNum = window.get_workspace().index();
+    let windowWorkspaceNum = (workspaceNum !== undefined) ? workspaceNum : window.get_workspace().index();

    if (!time)
        time = global.get_current_time();
@ -389,6 +461,8 @@ function activateWindow(window, time) {
    } else {
        window.activate(time);
    }
+
+    overview.hide();
 }

 // TODO - replace this timeout with some system to guess when the user might
@ -437,7 +511,7 @@ function _queueBeforeRedraw(workId) {
        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, function () {
            _runBeforeRedrawQueue();
            return false;
-        }, null);
+        });
    }
 }

@ -461,7 +535,7 @@ function _queueBeforeRedraw(workId) {
 */
 function initializeDeferredWork(actor, callback, props) {
    // Turn into a string so we can use as an object property
-    let workId = "" + (++_deferredWorkSequence);
+    let workId = '' + (++_deferredWorkSequence);
    _deferredWorkData[workId] = { 'actor': actor,
                                  'callback': callback };
    actor.connect('notify::mapped', function () {
@ -491,7 +565,7 @@ function initializeDeferredWork(actor, callback, props) {
 function queueDeferredWork(workId) {
    let data = _deferredWorkData[workId];
    if (!data) {
-        global.logError("invalid work id ", workId);
+        global.logError('invalid work id ', workId);
        return;
    }
    if (_deferredWorkQueue.indexOf(workId) < 0)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -0,0 +1,458 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+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 Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+const Params = imports.misc.params;
+
+let nextNotificationId = 1;
+
+// Should really be defined in dbus.js
+const BusIface = {
+    name: 'org.freedesktop.DBus',
+    methods: [{ name: 'GetConnectionUnixProcessID',
+                inSignature: 's',
+                outSignature: 'i' }]
+};
+
+const Bus = function () {
+    this._init();
+};
+
+Bus.prototype = {
+     _init: function() {
+         DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
+     }
+};
+
+DBus.proxifyPrototype(Bus.prototype, BusIface);
+
+const NotificationDaemonIface = {
+    name: 'org.freedesktop.Notifications',
+    methods: [{ name: 'Notify',
+                inSignature: 'susssasa{sv}i',
+                outSignature: 'u'
+              },
+              { name: 'CloseNotification',
+                inSignature: 'u',
+                outSignature: ''
+              },
+              { name: 'GetCapabilities',
+                inSignature: '',
+                outSignature: 'as'
+              },
+              { name: 'GetServerInformation',
+                inSignature: '',
+                outSignature: 'ssss'
+              }],
+    signals: [{ name: 'NotificationClosed',
+                inSignature: 'uu' },
+              { name: 'ActionInvoked',
+                inSignature: 'us' }]
+};
+
+const NotificationClosedReason = {
+    EXPIRED: 1,
+    DISMISSED: 2,
+    APP_CLOSED: 3,
+    UNDEFINED: 4
+};
+
+const Urgency = {
+    LOW: 0,
+    NORMAL: 1,
+    CRITICAL: 2
+};
+
+const rewriteRules = {
+    'XChat': [
+        { pattern:     /^XChat: Private message from: (\S*) \(.*\)$/,
+          replacement: '&lt;$1&gt;' },
+        { pattern:     /^XChat: New public message from: (\S*) \((.*)\)$/,
+          replacement: '$2 &lt;$1&gt;' },
+        { pattern:     /^XChat: Highlighted message from: (\S*) \((.*)\)$/,
+          replacement: '$2 &lt;$1&gt;' }
+    ]
+};
+
+function NotificationDaemon() {
+    this._init();
+}
+
+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 = {};
+        this._busProxy = new Bus();
+
+        Main.statusIconDispatcher.connect('message-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        Main.statusIconDispatcher.connect('message-icon-removed', Lang.bind(this, this._onTrayIconRemoved));
+
+        Shell.WindowTracker.get_default().connect('notify::focus-app',
+            Lang.bind(this, this._onFocusAppChanged));
+        Main.overview.connect('hidden',
+            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');
+
+            // kill the notification-daemon. pkill is more portable
+            // than killall, but on Linux at least it won't match if
+            // you pass more than 15 characters of the process name...
+            // However, if you use the '-f' flag to match the entire
+            // command line, it will work, but we have to be careful
+            // in that case that we don't match 'gedit
+            // notification-daemon.c' or whatever...
+            let p = new Shell.Process({ args: ['pkill', '-f',
+                                               '^([^ ]*/)?(notification-daemon|notify-osd)$']});
+            p.run();
+        }
+    },
+
+    _iconForNotificationData: function(icon, hints, size) {
+        let textureCache = St.TextureCache.get_default();
+
+        if (icon) {
+            if (icon.substr(0, 7) == 'file://')
+                return textureCache.load_uri_async(icon, size, size);
+            else if (icon[0] == '/') {
+                let uri = GLib.filename_to_uri(icon, null);
+                return textureCache.load_uri_async(uri, size, size);
+            } else
+                return textureCache.load_icon_name(icon, St.IconType.FULLCOLOR, size);
+        } else if (hints.icon_data) {
+            let [width, height, rowStride, hasAlpha,
+                 bitsPerSample, nChannels, data] = hints.icon_data;
+            return textureCache.load_from_raw(data, data.length, hasAlpha,
+                                              width, height, rowStride, size);
+        } else {
+            let stockIcon;
+            switch (hints.urgency) {
+                case Urgency.LOW:
+                case Urgency.NORMAL:
+                    stockIcon = 'gtk-dialog-info';
+                    break;
+                case Urgency.CRITICAL:
+                    stockIcon = 'gtk-dialog-error';
+                    break;
+            }
+            return textureCache.load_icon_name(stockIcon, St.IconType.FULLCOLOR, size);
+        }
+    },
+
+    _newSource: function(title, pid) {
+        let source = new Source(title, pid);
+        this._sources[pid] = source;
+
+        source.connect('destroy', Lang.bind(this,
+            function() {
+                delete this._sources[pid];
+            }));
+
+        Main.messageTray.add(source);
+        return source;
+    },
+
+    Notify: function(appName, replacesId, icon, summary, body,
+                     actions, hints, timeout) {
+        let id;
+
+        // Filter out notifications from Empathy, since we
+        // handle that information from telepathyClient.js
+        if (appName == 'Empathy') {
+            // Ignore replacesId since we already sent back a
+            // NotificationClosed for that id.
+            id = nextNotificationId++;
+            Mainloop.idle_add(Lang.bind(this,
+                                        function () {
+                                            this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                                        }));
+            return id;
+        }
+
+        summary = GLib.markup_escape_text(summary, -1);
+
+        let rewrites = rewriteRules[appName];
+        if (rewrites) {
+            for (let i = 0; i < rewrites.length; i++) {
+                let rule = rewrites[i];
+                if (summary.search(rule.pattern) != -1)
+                    summary = summary.replace(rule.pattern, rule.replacement);
+            }
+        }
+
+        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
+
+        let ndata = { appName: appName,
+                      icon: icon,
+                      summary: summary,
+                      body: body,
+                      actions: actions,
+                      hints: hints,
+                      timeout: timeout };
+        if (replacesId != 0 && this._notifications[replacesId]) {
+            ndata.id = id = replacesId;
+            ndata.notification = this._notifications[replacesId].notification;
+        } else {
+            replacesId = 0;
+            ndata.id = id = nextNotificationId++;
+        }
+        this._notifications[id] = ndata;
+
+        let sender = DBus.getCurrentMessageContext().sender;
+        let pid = this._senderToPid[sender];
+        let source = pid ? this._sources[pid] : null;
+
+        if (source) {
+            this._notifyForSource(source, ndata);
+            return id;
+        }
+
+        if (replacesId) {
+            // There's already a pending call to GetConnectionUnixProcessID,
+            // which will see the new notification data when it finishes,
+            // so we don't have to do anything.
+            return id;
+        }
+
+        this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this,
+            function (pid, ex) {
+                // The app may have updated or removed the notification
+                ndata = this._notifications[id];
+                if (!ndata)
+                    return;
+
+                this._senderToPid[sender] = pid;
+                source = this._sources[pid];
+
+                if (!source)
+                    source = this._newSource(appName, pid);
+                source.connect('destroy', Lang.bind(this,
+                    function() {
+                        delete this._senderToPid[sender];
+                    }));
+
+                this._notifyForSource(source, ndata);
+            }));
+
+        return id;
+    },
+
+    _notifyForSource: function(source, ndata) {
+        let [id, icon, summary, body, actions, hints, notification] =
+            [ndata.id, ndata.icon, ndata.summary, ndata.body,
+             ndata.actions, ndata.hints, ndata.notification];
+
+        let iconActor = this._iconForNotificationData(icon, hints, source.ICON_SIZE);
+
+        if (notification == null) {
+            notification = new MessageTray.Notification(source, summary, body, { icon: iconActor });
+            ndata.notification = notification;
+            notification.connect('clicked', Lang.bind(this,
+                function(n) {
+                    this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
+                }));
+            notification.connect('destroy', Lang.bind(this,
+                function(n) {
+                    delete this._notifications[id];
+                }));
+            notification.connect('action-invoked', Lang.bind(this, this._actionInvoked, source, id));
+        } else {
+            notification.update(summary, body, { icon: iconActor,
+                                                 clear: true });
+        }
+
+        if (actions.length) {
+            notification.setUseActionIcons(hints['action-icons'] == true);
+            for (let i = 0; i < actions.length - 1; i += 2)
+                notification.addButton(actions[i], actions[i + 1]);
+        }
+
+        notification.setUrgent(hints.urgency == Urgency.CRITICAL);
+
+        let sourceIconActor = source.useNotificationIcon ? this._iconForNotificationData(icon, hints, source.ICON_SIZE) : null;
+        source.notify(notification, sourceIconActor);
+    },
+
+    CloseNotification: function(id) {
+        let ndata = this._notifications[id];
+        if (ndata) {
+            if (ndata.notification)
+                ndata.notification.destroy();
+            delete this._notifications[id];
+        }
+        this._emitNotificationClosed(id, NotificationClosedReason.APP_CLOSED);
+    },
+
+    GetCapabilities: function() {
+        return [
+            'actions',
+            'action-icons',
+            'body',
+            // 'body-hyperlinks',
+            // 'body-images',
+            'body-markup',
+            // 'icon-multi',
+            'icon-static',
+            'persistence',
+            // 'sound',
+        ];
+    },
+
+    GetServerInformation: function() {
+        return [
+            'GNOME Shell',
+            'GNOME',
+            '0.1', // FIXME, get this from somewhere
+            '1.0'
+        ];
+    },
+
+    _onFocusAppChanged: function() {
+        let tracker = Shell.WindowTracker.get_default();
+        if (!tracker.focus_app)
+            return;
+
+        for (let id in this._sources) {
+            let source = this._sources[id];
+            if (source.app == tracker.focus_app) {
+                source.activated();
+                return;
+            }
+        }
+    },
+
+    _actionInvoked: function(notification, action, source, id) {
+        source.activated();
+        this._emitActionInvoked(id, action);
+    },
+
+    _emitNotificationClosed: function(id, reason) {
+        DBus.session.emit_signal('/org/freedesktop/Notifications',
+                                 'org.freedesktop.Notifications',
+                                 'NotificationClosed', 'uu',
+                                 [id, reason]);
+    },
+
+    _emitActionInvoked: function(id, action) {
+        DBus.session.emit_signal('/org/freedesktop/Notifications',
+                                 'org.freedesktop.Notifications',
+                                 'ActionInvoked', 'us',
+                                 [id, action]);
+    },
+
+    _onTrayIconAdded: function(o, icon) {
+        let source = this._sources[icon.pid];
+        if (!source)
+            source = this._newSource(icon.title || icon.wm_class || _("Unknown"), icon.pid);
+        source.setTrayIcon(icon);
+    },
+
+    _onTrayIconRemoved: function(o, icon) {
+        let source = this._sources[icon.pid];
+        if (source)
+            source.destroy();
+    }
+};
+
+DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
+
+function Source(title, pid) {
+    this._init(title, pid);
+}
+
+Source.prototype = {
+    __proto__:  MessageTray.Source.prototype,
+
+    _init: function(title, pid) {
+        MessageTray.Source.prototype._init.call(this, title);
+
+        this._pid = pid;
+        this._setApp();
+        if (this.app)
+            this.title = this.app.get_name();
+        else
+            this.useNotificationIcon = true;
+        this._isTrayIcon = false;
+    },
+
+    notify: function(notification, icon) {
+        if (!this.app)
+            this._setApp();
+        if (!this.app && icon)
+            this._setSummaryIcon(icon);
+        MessageTray.Source.prototype.notify.call(this, notification);
+    },
+
+    _setApp: function() {
+        this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid);
+        if (!this.app)
+            return;
+
+        // Only override the icon if we were previously using
+        // notification-based icons (ie, not a trayicon)
+        if (this.useNotificationIcon) {
+            this.useNotificationIcon = false;
+            this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE));
+        }
+    },
+
+    setTrayIcon: function(icon) {
+        this._setSummaryIcon(icon);
+        this.useNotificationIcon = false;
+        this._isTrayIcon = true;
+    },
+
+    _notificationClicked: function(notification) {
+        notification.destroy();
+        this.openApp();
+        this.activated();
+    },
+
+    activated: function() {
+        if (!this._isTrayIcon)
+            this.destroy();
+    },
+
+    openApp: function() {
+        if (this.app == null)
+            return;
+
+        let windows = this.app.get_windows();
+        if (windows.length > 0) {
+            let mostRecentWindow = windows[0];
+            Main.activateWindow(mostRecentWindow);
+        }
+    }
+};
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -1,29 +1,27 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

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

-const AppDisplay = imports.ui.appDisplay;
-const DocDisplay = imports.ui.docDisplay;
 const GenericDisplay = imports.ui.genericDisplay;
+const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Panel = imports.ui.panel;
 const Dash = imports.ui.dash;
 const Tweener = imports.ui.tweener;
-const Workspaces = imports.ui.workspaces;
-
-const ROOT_OVERVIEW_COLOR = new Clutter.Color();
-ROOT_OVERVIEW_COLOR.from_pixel(0x000000ff);
+const WorkspacesView = imports.ui.workspacesView;

 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;

+// Time for pane menus to fade in/out
+const PANE_FADE_TIME = 0.1;
+
 // We divide the screen into a grid of rows and columns, which we use
 // to help us position the Overview components, such as the side panel
 // that lists applications and documents, the workspaces display, and 
@ -73,10 +71,101 @@ const SHADOW_WIDTH = 6;

 const NUMBER_OF_SECTIONS_IN_SEARCH = 2;

+const INFO_BAR_HIDE_TIMEOUT = 10;
+
 let wideScreen = false;
 let displayGridColumnWidth = null;
 let displayGridRowHeight = null;
-let addRemoveButtonSize = null;
+
+function InfoBar() {
+    this._init();
+}
+
+InfoBar.prototype = {
+    _init: function() {
+        this.actor = new St.Bin({ style_class: 'info-bar-panel',
+                                  x_fill: true,
+                                  y_fill: false });
+        this._label = new St.Label();
+        this._undo = new St.Button({ style_class: 'info-bar-link-button' });
+
+        let bin = new St.Bin({ x_fill: false,
+                               y_fill: false,
+                               x_align: St.Align.MIDDLE,
+                               y_align: St.Align.MIDDLE });
+        this.actor.set_child(bin);
+
+        let box = new St.BoxLayout({ style_class: 'info-bar' });
+        bin.set_child(box);
+        this._timeoutId = 0;
+
+        box.add(this._label, {'y-fill' : false, 'y-align' : St.Align.MIDDLE});
+        box.add(this._undo);
+
+        this.actor.set_opacity(0);
+
+        this._undoCallback = null;
+        this._undo.connect('clicked', Lang.bind(this, this._onUndoClicked));
+    },
+
+    _onUndoClicked: function() {
+        Mainloop.source_remove(this._timeoutId);
+        this._timeoutId = 0;
+
+        if (this._undoCallback)
+            this._undoCallback();
+        this.actor.set_opacity(0);
+        this._undoCallback = null;
+    },
+
+    _hideDone: function() {
+        this._undoCallback = null;
+    },
+
+    _hide: function() {
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           transition: 'easeOutQuad',
+                           time: ANIMATION_TIME,
+                           onComplete: this._hideDone,
+                           onCompleteScope: this
+                         });
+    },
+
+    _onTimeout: function() {
+        this._timeoutId = 0;
+        this._hide();
+        return false;
+    },
+
+    setMessage: function(text, undoCallback, undoLabel) {
+        if (this._timeoutId)
+            Mainloop.source_remove(this._timeoutId);
+
+        this._timeout = false;
+
+        this._label.text = text;
+
+        Tweener.addTween(this.actor,
+                         { opacity: 255,
+                           transition: 'easeOutQuad',
+                           time: ANIMATION_TIME
+                         });
+
+        this._timeoutId = Mainloop.timeout_add_seconds(INFO_BAR_HIDE_TIMEOUT, Lang.bind(this, this._onTimeout));
+
+        if (undoLabel)
+            this._undo.label = undoLabel;
+        else
+            this._undo.label = _("Undo");
+
+        this._undoCallback = undoCallback;
+        if (undoCallback)
+            this._undo.show();
+        else
+            this._undo.hide();
+    }
+};

 function Overview() {
    this._init();
@ -84,8 +173,21 @@ function Overview() {

 Overview.prototype = {
    _init : function() {
-        this._group = new Clutter.Group();
+        this._group = new St.Group({ style_class: 'overview' });
        this._group._delegate = this;
+        this._group.connect('destroy', Lang.bind(this,
+            function() {
+                if (this._lightbox) {
+                    this._lightbox.destroy();
+                    this._lightbox = null;
+                }
+            }));
+
+        this.infoBar = new InfoBar();
+        this._group.add_actor(this.infoBar.actor);
+
+        this._workspacesManager = null;
+        this._lightbox = null;

        this.visible = false;
        this.animationInProgress = false;
@ -110,7 +212,7 @@ Overview.prototype = {
        this._group.add_actor(this._transparentBackground);

        // Background color for the Overview
-        this._backOver = new Clutter.Rectangle({ color: ROOT_OVERVIEW_COLOR });
+        this._backOver = new St.Label();
        this._group.add_actor(this._backOver);

        this._group.hide();
@ -121,8 +223,7 @@ Overview.prototype = {
        this._group.add_actor(this._dash.actor);

        // Container to hold popup pane chrome.
-        this._paneContainer = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                             spacing: 6 });
+        this._paneContainer = new St.BoxLayout({ style_class: 'overview-pane' });
        // Note here we explicitly don't set the paneContainer to be reactive yet; that's done
        // inside the notify::visible handler on panes.
        this._paneContainer.connect('button-release-event', Lang.bind(this, function(background) {
@ -132,11 +233,23 @@ Overview.prototype = {
        this._group.add_actor(this._paneContainer);

        this._transparentBackground.lower_bottom();
-        this._paneContainer.lower_bottom();
+        this._paneContainer.hide();

        this._coverPane.lower_bottom();

-        this._workspaces = null;
+        this.workspaces = null;
+    },
+
+    _onViewChanged: function() {
+        if (!this.visible)
+            return;
+
+        this.workspaces = this._workspacesManager.workspacesView;
+
+        // Show new workspacesView
+        this._group.add_actor(this.workspaces.actor);
+        this._workspacesBar.raise(this.workspaces.actor);
+        this._dash.actor.raise(this.workspaces.actor);
    },

    _recalculateGridSizes: function () {
@ -157,8 +270,12 @@ Overview.prototype = {

    relayout: function () {
        let primary = global.get_primary_monitor();
+        let rtl = (St.Widget.get_default_direction () == St.TextDirection.RTL);
+
+        this._recalculateGridSizes();

        this._group.set_position(primary.x, primary.y);
+        this._group.set_size(primary.width, primary.height);

        let contentY = Panel.PANEL_HEIGHT;
        let contentHeight = primary.height - contentY;
@ -176,19 +293,32 @@ Overview.prototype = {
        this._workspacesHeight = Math.floor(displayGridRowHeight * workspaceRowsUsed
                                   - WORKSPACE_GRID_PADDING * (primary.height / primary.width) * 2);

-        this._workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
+        if (rtl) {
+            this._workspacesX = WORKSPACE_GRID_PADDING;
+        } else {
+            this._workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
+        }
        this._workspacesY = Math.floor(displayGridRowHeight + WORKSPACE_GRID_PADDING * (primary.height / primary.width));

-        this._dash.actor.set_position(0, contentY);
+        if (rtl) {
+            this._dash.actor.set_position(primary.width - displayGridColumnWidth, contentY);
+        } else {
+            this._dash.actor.set_position(0, contentY);
+        }
+
        this._dash.actor.set_size(displayGridColumnWidth, contentHeight);
        this._dash.searchArea.height = this._workspacesY - contentY;
        this._dash.sectionArea.height = this._workspacesHeight;
        this._dash.searchResults.actor.height = this._workspacesHeight;

+        this.infoBar.actor.set_position(displayGridColumnWidth, Panel.PANEL_HEIGHT);
+        this.infoBar.actor.set_size(primary.width - displayGridColumnWidth, this._workspacesY - Panel.PANEL_HEIGHT);
+        this.infoBar.actor.raise_top();
+
        // place the 'Add Workspace' button in the bottom row of the grid
-        addRemoveButtonSize = Math.floor(displayGridRowHeight * 3/5);
-        this._addButtonX = this._workspacesX + this._workspacesWidth - addRemoveButtonSize;
-        this._addButtonY = primary.height - Math.floor(displayGridRowHeight * 4/5);
+        this._workspacesBarX = this._workspacesX;
+        this._workspacesBarWidth = this._workspacesWidth;
+        this._workspacesBarY = primary.height - displayGridRowHeight;

        // The parent (this._group) is positioned at the top left of the primary monitor
        // while this._backOver occupies the entire screen.
@ -199,17 +329,22 @@ Overview.prototype = {
                                         this._workspacesY);
        // Dynamic width
        this._paneContainer.height = this._workspacesHeight;
+        if (rtl) {
+            this._paneContainer.connect('notify::width', Lang.bind(this, function (paneContainer) {
+                paneContainer.x = this._dash.actor.x - (DEFAULT_PADDING + paneContainer.width);
+            }));
+        }

-        this._transparentBackground.set_position(this._paneContainer.x, this._paneContainer.y);
-        this._transparentBackground.set_size(primary.width - this._paneContainer.x,
-                                             this._paneContainer.height);
+        this._transparentBackground.set_position(primary.x, primary.y);
+        this._transparentBackground.set_size(primary.width, primary.height);

-        if (this._activeDisplayPane != null)
-            this._activeDisplayPane.actor.width = displayGridColumnWidth * 2;
    },

-    addPane: function (pane) {
-        this._paneContainer.append(pane.actor, Big.BoxPackFlags.NONE);
+    addPane: function (pane, align) {
+        pane.actor.height = .9 * this._workspacesHeight;
+        this._paneContainer.add(pane.actor, { expand: true,
+                                              y_fill: false,
+                                              y_align: align });
        // When a pane is displayed, we raise the transparent background to the top
        // and connect to button-release-event on it, then raise the pane above that.
        // The idea here is that clicking anywhere outside the pane should close it.
@ -217,17 +352,28 @@ Overview.prototype = {
        let backgroundEventId = null;
        pane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
            if (isOpen) {
-                pane.actor.width = displayGridColumnWidth * 2;
                this._activeDisplayPane = pane;
                this._transparentBackground.raise_top();
                this._paneContainer.raise_top();
+                this._paneContainer.show();
+                this._paneReady = false;
                if (backgroundEventId != null)
                    this._transparentBackground.disconnect(backgroundEventId);
-                backgroundEventId = this._transparentBackground.connect('button-release-event', Lang.bind(this, function () {
-                    this._activeDisplayPane.close();
+                backgroundEventId = this._transparentBackground.connect('captured-event', Lang.bind(this, function (actor, event) {
+                    if (event.get_source() != this._transparentBackground)
+                        return false;
+                    if (event.type() == Clutter.EventType.BUTTON_PRESS)
+                        this._paneReady = true;
+                    if (event.type() == Clutter.EventType.BUTTON_RELEASE
+                        && this._paneReady)
+                        this._activeDisplayPane.close();
                    return true;
                }));
-                this._workspaces.actor.opacity = 64;
+                if (!this._lightbox)
+                    this._lightbox = new Lightbox.Lightbox(this._group,
+                                                           { fadeTime: PANE_FADE_TIME });
+                this._lightbox.show();
+                this._lightbox.highlight(this._paneContainer);
            } else if (pane == this._activeDisplayPane) {
                this._activeDisplayPane = null;
                if (backgroundEventId != null) {
@ -235,40 +381,37 @@ Overview.prototype = {
                    backgroundEventId = null;
                }
                this._transparentBackground.lower_bottom();
-                this._paneContainer.lower_bottom();
-                this._workspaces.actor.opacity = 255;
+                this._paneContainer.hide();
+                this._lightbox.hide();
            }
        }));
    },

-    //// Draggable target interface ////
+    //// Public methods ////

-    // Closes any active panes if a GenericDisplayItem is being
-    // dragged over the Overview, i.e. as soon as it starts being dragged.
-    // This allows the user to place the item on any workspace.
-    handleDragOver : function(source, actor, x, y, time) {
-        if (source instanceof GenericDisplay.GenericDisplayItem
-            || source instanceof AppDisplay.AppIcon) {
+    beginItemDrag: function(source) {
+        // Close any active panes if @source is a GenericDisplayItem.
+        // This allows the user to place the item on any workspace.
+        if (source instanceof GenericDisplay.GenericDisplayItem)
            if (this._activeDisplayPane != null)
                this._activeDisplayPane.close();
-            return true;
-        }
-
-        return false;
+        this.emit('item-drag-begin');
    },

-    //// Public methods ////
+    endItemDrag: function(source) {
+        this.emit('item-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();
+        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 [posX, posY] = this.workspaces.getActiveWorkspacePosition();
        let scale = this.getZoomedInScale();

        return [- posX * scale, - posY * scale];
@ -296,20 +439,28 @@ Overview.prototype = {
        this._dash.show();

        /* TODO: make this stuff dynamic */
-        this._workspaces = new Workspaces.Workspaces(this._workspacesWidth, this._workspacesHeight,
-                                                     this._workspacesX, this._workspacesY);
-        this._group.add_actor(this._workspaces.actor);
+        this._workspacesManager =
+            new WorkspacesView.WorkspacesManager(this._workspacesWidth,
+                                                 this._workspacesHeight,
+                                                 this._workspacesX,
+                                                 this._workspacesY);
+        this._workspacesManager.connect('view-changed',
+                                        Lang.bind(this, this._onViewChanged));
+        this.workspaces = this._workspacesManager.workspacesView;
+        this._group.add_actor(this.workspaces.actor);

        // The workspaces actor is as big as the screen, so we have to raise the dash above it
        // for drag and drop to work.  In the future we should fix the workspaces to not
        // be as big as the screen.
-        this._dash.actor.raise(this._workspaces.actor);
+        this._dash.actor.raise(this.workspaces.actor);

-        // Create (+) button
-        this._addButton = new AddWorkspaceButton(addRemoveButtonSize, this._addButtonX, this._addButtonY, Lang.bind(this, this._acceptNewWorkspaceDrop));
-        this._addButton.actor.connect('button-release-event', Lang.bind(this, this._addNewWorkspace));
-        this._group.add_actor(this._addButton.actor);
-        this._addButton.actor.raise(this._workspaces.actor);
+        this._workspacesBar = this._workspacesManager.controlsBar.actor;
+        this._workspacesBar.set_position(this._workspacesBarX,
+                                         this._workspacesBarY);
+        this._workspacesBar.width = this._workspacesBarWidth;
+
+        this._group.add_actor(this._workspacesBar);
+        this._workspacesBar.raise(this.workspaces.actor);

        // All the the actors in the window group are completely obscured,
        // hiding the group holding them while the Overview is displayed greatly
@ -339,7 +490,7 @@ Overview.prototype = {
                           onCompleteScope: this
                          });

-        // Make Dash fade in so that it doesn't appear to big.
+        // Make Dash fade in so that it doesn't appear too big.
        this._dash.actor.opacity = 0;
        Tweener.addTween(this._dash.actor,
                         { opacity: 255,
@ -359,11 +510,7 @@ Overview.prototype = {
        this._hideInProgress = true;
        if (this._activeDisplayPane != null)
            this._activeDisplayPane.close();
-        this._workspaces.hide();
-
-        this._addButton.actor.destroy();
-        this._addButton.actor = null;
-        this._addButton = null;
+        this.workspaces.hide();

        // Create a zoom in effect by transforming the Overview group so that
        // the active workspace fills up the whole screen. The opposite
@ -408,21 +555,7 @@ Overview.prototype = {
     * and will return %null.
     */
    getWorkspacesForWindow: function(metaWindow) {
-        return this._workspaces;
-    },
-
-    /**
-     * activateWindow:
-     * @metaWindow: A #MetaWindow
-     * @time: Event timestamp integer
-     *
-     * Make the given MetaWindow be the focus window, switching
-     * to the workspace it's on if necessary.  This function
-     * should only be used when the Overview is currently active;
-     * outside of that, use the relevant methods on MetaDisplay.
-     */
-    activateWindow: function (metaWindow, time) {
-         this._workspaces.activateWindowFromOverview(metaWindow, time);
+        return this.workspaces;
    },

    //// Private methods ////
@ -440,13 +573,18 @@ Overview.prototype = {
    _hideDone: function() {
        global.window_group.show();

-        this._workspaces.destroy();
-        this._workspaces = null;
+        this.workspaces.destroy();
+        this.workspaces = null;
+
+        this._workspacesBar.destroy();
+        this._workspacesBar = null;
+
+        this._workspacesManager = null;

        this._dash.hide();
        this._group.hide();

-        this.visible = false; 
+        this.visible = false;
        this.animationInProgress = false;
        this._hideInProgress = false;

@ -454,43 +592,6 @@ Overview.prototype = {

        Main.popModal(this._dash.actor);
        this.emit('hidden');
-    },
-
-    _addNewWorkspace: function() {
-        global.screen.append_new_workspace(false, global.get_current_time());
-    },
-
-    _acceptNewWorkspaceDrop: function(source, dropActor, x, y, time) {
-        this._addNewWorkspace();
-        return this._workspaces.acceptNewWorkspaceDrop(source, dropActor, x, y, time);
    }
 };
 Signals.addSignalMethods(Overview.prototype);
-
-function AddWorkspaceButton(buttonSize, buttonX, buttonY, acceptDropCallback) {
-    this._init(buttonSize, buttonX, buttonY, acceptDropCallback);
-}
-
-AddWorkspaceButton.prototype = {
-    _init: function(buttonSize, buttonX, buttonY, acceptDropCallback) {
-        this.actor = new Clutter.Group({ x: buttonX,
-                                         y: buttonY,
-                                         width: global.screen_width - buttonX,
-                                         height: global.screen_height - buttonY,
-                                         reactive: true });
-        this.actor._delegate = this;
-        this._acceptDropCallback = acceptDropCallback;
-
-        let plus = new Clutter.Texture({ x: 0,
-                                         y: 0,
-                                         width: buttonSize,
-                                         height: buttonSize });
-        plus.set_from_file(global.imagedir + 'add-workspace.svg');
-        this.actor.add_actor(plus);
-    },
-
-    // Draggable target interface
-    acceptDrop: function(source, actor, x, y, time) {
-        return this._acceptDropCallback(source, actor, x, y, time);
-    }
-};
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@ -0,0 +1,98 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+const Lang = imports.lang;
+const PopupMenu = imports.ui.popupMenu;
+const Main = imports.ui.main;
+
+function Button(menuAlignment) {
+    this._init(menuAlignment);
+}
+
+Button.prototype = {
+    _init: function(menuAlignment) {
+        this.actor = new St.Bin({ style_class: 'panel-button',
+                                  reactive: true,
+                                  can_focus: true,
+                                  x_fill: true,
+                                  y_fill: false,
+                                  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._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));
+        Main.chrome.addActor(this.menu.actor, { visibleInOverview: true,
+                                                affectsStruts: false });
+        this.menu.actor.hide();
+    },
+
+    _onButtonPress: function(actor, event) {
+        this.menu.toggle();
+    },
+
+    _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_Down) {
+            if (!this.menu.isOpen)
+                this.menu.toggle();
+            this.menu.activateFirst();
+            return true;
+        } else
+            return false;
+    },
+
+    _onOpenStateChanged: function(menu, open) {
+        if (open) {
+            this.actor.add_style_pseudo_class('pressed');
+            let focus = global.stage.get_key_focus();
+            if (!focus || (focus != this.actor && !menu.contains(focus)))
+                this.actor.grab_key_focus();
+        } else
+            this.actor.remove_style_pseudo_class('pressed');
+    }
+};
+
+/* SystemStatusButton:
+ *
+ * This class manages one System Status indicator (network, keyboard,
+ * volume, bluetooth...), which is just a PanelMenuButton with an
+ * icon and a tooltip
+ */
+function SystemStatusButton() {
+    this._init.apply(this, arguments);
+}
+
+SystemStatusButton.prototype = {
+    __proto__: Button.prototype,
+
+    _init: function(iconName,tooltipText) {
+        Button.prototype._init.call(this, St.Align.START);
+        this._iconActor = null;
+        this.setIcon(iconName);
+        this.setTooltip(tooltipText);
+    },
+
+    setIcon: function(iconName) {
+        this._iconName = iconName;
+        if (this._iconActor)
+            this._iconActor.destroy();
+        this._iconActor = St.TextureCache.get_default().load_icon_name(this._iconName, St.IconType.SYMBOLIC, 24);
+        this.actor.set_child(this._iconActor);
+    },
+
+    setTooltip: function(text) {
+        if (text != null) {
+            this.tooltip = text;
+            this.actor.has_tooltip = true;
+            this.actor.tooltip_text = text;
+        } else {
+            this.actor.has_tooltip = false;
+            this.tooltip = null;
+        }
+    }
+};
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -1,8 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
+const GConf = imports.gi.GConf;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Shell = imports.gi.Shell;
@ -48,10 +46,14 @@ PlaceInfo.prototype = {
        for (let i = 0; i < terms.length; i++) {
            let term = terms[i];
            let idx = this._lowerName.indexOf(term);
-            if (idx == 0)
-                return Search.MatchType.PREFIX;
-            else if (idx > 0)
-                mtype = Search.MatchType.SUBSTRING;
+            if (idx == 0) {
+                mtype = Search.MatchType.PREFIX;
+            } else if (idx > 0) {
+                if (mtype == Search.MatchType.NONE)
+                    mtype = Search.MatchType.SUBSTRING;
+            } else {
+                return Search.MatchType.NONE;
+            }
        }
        return mtype;
    },
@ -59,7 +61,7 @@ PlaceInfo.prototype = {
    isRemovable: function() {
        return false;
    }
-}
+};

 function PlaceDeviceInfo(mount) {
    this._init(mount);
@ -72,12 +74,12 @@ PlaceDeviceInfo.prototype = {
        this._mount = mount;
        this.name = mount.get_name();
        this._lowerName = this.name.toLowerCase();
-        this.id = "mount:" + mount.get_root().get_uri();
+        this.id = 'mount:' + mount.get_root().get_uri();
    },

    iconFactory: function(size) {
        let icon = this._mount.get_icon();
-        return Shell.TextureCache.get_default().load_gicon(icon, size);
+        return St.TextureCache.get_default().load_gicon(icon, size);
    },

    launch: function() {
@ -93,13 +95,26 @@ PlaceDeviceInfo.prototype = {
        if (!this.isRemovable())
            return;

-        this._mount.unmount(0, null, Lang.bind(this, this._removeFinish), null);
+        if (this._mount.can_eject())
+            this._mount.eject(0, null, Lang.bind(this, this._removeFinish));
+        else
+            this._mount.unmount(0, null, Lang.bind(this, this._removeFinish));
    },

    _removeFinish: function(o, res, data) {
-        this._mount.unmount_finish(res);
+        try {
+            if (this._mount.can_eject())
+                this._mount.eject_finish(res);
+            else
+                this._mount.unmount_finish(res);
+        } catch (e) {
+            let message = _("Failed to unmount '%s'").format(o.get_name());
+            Main.overview.infoBar.setMessage(message,
+                                             Lang.bind(this, this.remove),
+                                             _("Retry"));
+        }
    }
-}
+};


 function PlacesManager() {
@ -108,13 +123,13 @@ function PlacesManager() {

 PlacesManager.prototype = {
    _init: function() {
-        let gconf = Shell.GConf.get_default();
-        gconf.watch_directory(NAUTILUS_PREFS_DIR);
+        let gconf = GConf.Client.get_default();
+        gconf.add_dir(NAUTILUS_PREFS_DIR, GConf.ClientPreloadType.PRELOAD_NONE);

        this._defaultPlaces = [];
        this._mounts = [];
        this._bookmarks = [];
-        this._isDesktopHome = false;
+        this._isDesktopHome = gconf.get_bool(DESKTOP_IS_HOME_KEY);

        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
        let homeUri = homeFile.get_uri();
@ -122,7 +137,7 @@ PlacesManager.prototype = {
        let homeIcon = Shell.util_get_icon_for_uri (homeUri);
        this._home = new PlaceInfo('special:home', homeLabel,
            function(size) {
-                return Shell.TextureCache.get_default().load_gicon(homeIcon, size);
+                return St.TextureCache.get_default().load_gicon(homeIcon, size);
            },
            function() {
                Gio.app_info_launch_default_for_uri(homeUri, global.create_app_launch_context());
@ -135,7 +150,7 @@ PlacesManager.prototype = {
        let desktopIcon = Shell.util_get_icon_for_uri (desktopUri);
        this._desktopMenu = new PlaceInfo('special:desktop', desktopLabel,
            function(size) {
-                return Shell.TextureCache.get_default().load_gicon(desktopIcon, size);
+                return St.TextureCache.get_default().load_gicon(desktopIcon, size);
            },
            function() {
                Gio.app_info_launch_default_for_uri(desktopUri, global.create_app_launch_context());
@ -143,7 +158,7 @@ PlacesManager.prototype = {

        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
            function (size) {
-                return Shell.TextureCache.get_default().load_icon_name("applications-internet", size);
+                return St.TextureCache.get_default().load_icon_name('applications-internet', St.IconType.FULLCOLOR, size);
            },
            function () {
                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
@ -156,7 +171,7 @@ PlacesManager.prototype = {
            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.");
+                log('Cannot create "Network" item, .desktop file not found or corrupt.');
            }
        }

@ -172,6 +187,7 @@ PlacesManager.prototype = {

        this._defaultPlaces.push(this._home);

+        this._desktopMenuIndex = this._defaultPlaces.length;
        if (!this._isDesktopHome)
            this._defaultPlaces.push(this._desktopMenu);

@ -195,7 +211,7 @@ PlacesManager.prototype = {
        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
        this._updateDevices();

-        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), ".gtk-bookmarks"]);
+        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), '.gtk-bookmarks']);
        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
        let monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
        this._bookmarkTimeoutId = 0;
@ -211,9 +227,8 @@ PlacesManager.prototype = {
        }));

        this._reloadBookmarks();
-        this._updateDesktopMenuVisibility();

-        gconf.connect('changed::' + DESKTOP_IS_HOME_KEY, Lang.bind(this, this._updateDesktopMenuVisibility));
+        gconf.notify_add(DESKTOP_IS_HOME_KEY, Lang.bind(this, this._updateDesktopMenuVisibility));

    },

@ -310,7 +325,7 @@ PlacesManager.prototype = {

            let item = new PlaceInfo('bookmark:' + bookmark, label,
                function(size) {
-                    return Shell.TextureCache.get_default().load_gicon(icon, size);
+                    return St.TextureCache.get_default().load_gicon(icon, size);
                },
                function() {
                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
@ -324,9 +339,15 @@ PlacesManager.prototype = {
    },

    _updateDesktopMenuVisibility: function() {
-        let gconf = Shell.GConf.get_default();
+        let gconf = GConf.Client.get_default();
        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);

+        if (this._isDesktopHome)
+            this._removeById(this._defaultPlaces, 'special:desktop');
+        else
+            this._defaultPlaces.splice(this._desktopMenuIndex, 0,
+                                       this._desktopMenu);
+
        /* See comment in _updateDevices for explanation why there are two signals. */
        this.emit('defaults-updated');
        this.emit('places-updated');
@ -353,13 +374,13 @@ PlacesManager.prototype = {
        return this._mounts;
    },

-    _lookupById: function(sourceArray, id) {
+    _lookupIndexById: function(sourceArray, id) {
        for (let i = 0; i < sourceArray.length; i++) {
            let place = sourceArray[i];
            if (place.id == id)
-                return place;
+                return i;
        }
-        return null;
+        return -1;
    },

    lookupPlaceById: function(id) {
@ -372,7 +393,11 @@ PlacesManager.prototype = {
            sourceArray = this._mounts;
        else if (type == 'bookmark')
            sourceArray = this._bookmarks;
-        return this._lookupById(sourceArray, id);
+        return sourceArray[this._lookupIndexById(sourceArray, id)];
+    },
+
+    _removeById: function(sourceArray, id) {
+        sourceArray.splice(this._lookupIndexById(sourceArray, id), 1);
    }
 };

@ -391,31 +416,44 @@ DashPlaceDisplayItem.prototype = {
        this.name = info.name;
        this._info = info;
        this._icon = info.iconFactory(PLACES_ICON_SIZE);
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: 4 });
-        let text = new St.Button({ style_class: 'places-item',
-                                   label: info.name,
-                                   x_align: St.Align.START });
-        text.connect('clicked', Lang.bind(this, this._onClicked));
-        let iconBox = new St.Bin({ child: this._icon, reactive: true });
-        iconBox.connect('button-release-event',
-                        Lang.bind(this, this._onClicked));
-        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
-        this.actor.append(text, Big.BoxPackFlags.EXPAND);
+
+        this.actor = new St.Clickable({ style_class: 'places-item',
+                                        reactive: true,
+                                        x_align: St.Align.START,
+                                        x_fill: true });
+
+        let box = new St.BoxLayout({ style_class: 'places-item-box' });
+        this.actor.set_child(box);
+
+        let bin = new St.Bin({ child: this._icon });
+        box.add(bin);
+
+        let text = new St.Label({ text: info.name });
+        box.add(text, { expand: true, x_fill: true });

        if (info.isRemovable()) {
-            let removeIcon = Shell.TextureCache.get_default().load_icon_name ('media-eject', PLACES_ICON_SIZE);
-            let removeIconBox = new St.Button({ child: removeIcon,
-                                                reactive: true });
-            this.actor.append(removeIconBox, Big.BoxPackFlags.NONE);
+            let removeIcon = St.TextureCache.get_default().load_icon_name ('media-eject', St.IconType.FULLCOLOR, PLACES_ICON_SIZE);
+            let removeIconBox = new St.Clickable({ child: removeIcon,
+                                                   reactive: true });
+            box.add(removeIconBox);
            removeIconBox.connect('clicked',
                                  Lang.bind(this, function() {
                                                  this._info.remove();
                                            }));
        }

+        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+
        this.actor._delegate = this;
-        let draggable = DND.makeDraggable(this.actor);
+        this._draggable = DND.makeDraggable(this.actor);
+        this._draggable.connect('drag-begin',
+                                Lang.bind(this, function() {
+                                    Main.overview.beginItemDrag(this);
+                                }));
+        this._draggable.connect('drag-end',
+                                Lang.bind(this, function() {
+                                    Main.overview.endItemDrag(this);
+                                }));
    },

    _onClicked: function(b) {
@ -449,28 +487,12 @@ DashPlaceDisplay.prototype = {
        // look better in that there would be an even number of items left+right,
        // but it seems like we want some sort of differentiation between actions
        // like "Connect to server..." and regular folders
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: 4 });
-        this._leftBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.actor.append(this._leftBox, Big.BoxPackFlags.EXPAND);
-        this._rightBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.actor.append(this._rightBox, Big.BoxPackFlags.EXPAND);
+        this.actor = new St.Table({ style_class: 'places-section',
+                                    homogeneous: true });

-        // Subdivide left into actions and devices
-        this._actionsBox = new St.BoxLayout({ style_class: 'places-actions',
-                                               vertical: true });
-
-        this._devBox = new St.BoxLayout({ style_class: 'places-actions',
-                                           name: 'placesDevices',
-                                           vertical: true });
-
-        this._dirsBox = new St.BoxLayout({ style_class: 'places-actions',
-                                            vertical: true });
-
-        this._leftBox.append(this._actionsBox, Big.BoxPackFlags.NONE);
-        this._leftBox.append(this._devBox, Big.BoxPackFlags.NONE);
-
-        this._rightBox.append(this._dirsBox, Big.BoxPackFlags.NONE);
+        this._defaultsList = [];
+        this._bookmarksList = [];
+        this._mountsList = [];

        Main.placesManager.connect('defaults-updated', Lang.bind(this, this._updateDefaults));
        Main.placesManager.connect('bookmarks-updated', Lang.bind(this, this._updateBookmarks));
@ -482,27 +504,40 @@ DashPlaceDisplay.prototype = {
    },

    _updateDefaults: function() {
-        this._actionsBox.destroy_children();
+        for (let i = 0; i < this._defaultsList.length; i++)
+            this._defaultsList[i].destroy();

+        this._defaultsList = [];
        let places = Main.placesManager.getDefaultPlaces();
-        for (let i = 0; i < places.length; i++)
-            this._actionsBox.add(new DashPlaceDisplayItem(places[i]).actor);
+        for (let i = 0; i < places.length; i++) {
+            this._defaultsList[i] = new DashPlaceDisplayItem(places[i]).actor;
+            this.actor.add(this._defaultsList[i], {row: i, col: 0});
+        }
+        this._updateMounts();
    },

    _updateMounts: function() {
-        this._devBox.destroy_children();
+        for (let i = 0; i < this._mountsList.length; i++)
+            this._mountsList[i].destroy();

+        this._mountsList = [];
        let places = Main.placesManager.getMounts();
-        for (let i = 0; i < places.length; i++)
-            this._devBox.add(new DashPlaceDisplayItem(places[i]).actor);
+        for (let i = 0; i < places.length; i++) {
+             this._mountsList[i] = new DashPlaceDisplayItem(places[i]).actor;
+             this.actor.add(this._mountsList[i], {row: this._defaultsList.length + i, col: 0});
+        }
    },

    _updateBookmarks: function() {
-        this._dirsBox.destroy_children();
+        for (let i = 0; i < this._bookmarksList.length; i++)
+            this._bookmarksList[i].destroy();

+        this._bookmarksList = [];
        let places = Main.placesManager.getBookmarks();
-        for (let i = 0; i < places.length; i ++)
-            this._dirsBox.add(new DashPlaceDisplayItem(places[i]).actor);
+        for (let i = 0; i < places.length; i ++) {
+            this._bookmarksList[i] = new DashPlaceDisplayItem(places[i]).actor;
+            this.actor.add(this._bookmarksList[i], {row: i, col: 1});
+        }
    }
 };

@ -516,7 +551,7 @@ PlaceSearchProvider.prototype = {
    __proto__: Search.SearchProvider.prototype,

    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("PLACES"));
+        Search.SearchProvider.prototype._init.call(this, _("PLACES & DEVICES"));
    },

    getResultMeta: function(resultId) {
@ -540,8 +575,9 @@ PlaceSearchProvider.prototype = {
    },

    _searchPlaces: function(places, terms) {
-        let multipleResults = [];
+        let multiplePrefixResults = [];
        let prefixResults = [];
+        let multipleSubstringResults = [];
        let substringResults = [];

        terms = terms.map(String.toLowerCase);
@ -549,17 +585,20 @@ PlaceSearchProvider.prototype = {
        for (let i = 0; i < places.length; i++) {
            let place = places[i];
            let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleResults.push(place.id);
+            if (mtype == Search.MatchType.MULTIPLE_PREFIX)
+                multiplePrefixResults.push(place.id);
            else if (mtype == Search.MatchType.PREFIX)
                prefixResults.push(place.id);
+            else if (mtype == Search.MatchType.MULTIPLE_SUBSTRING)
+                multipleSubstringResults.push(place.id);
            else if (mtype == Search.MatchType.SUBSTRING)
                substringResults.push(place.id);
        }
-        multipleResults.sort(this._compareResultMeta);
+        multiplePrefixResults.sort(this._compareResultMeta);
        prefixResults.sort(this._compareResultMeta);
+        multipleSubstringResults.sort(this._compareResultMeta);
        substringResults.sort(this._compareResultMeta);
-        return multipleResults.concat(prefixResults.concat(substringResults));
+        return multiplePrefixResults.concat(prefixResults.concat(multipleSubstringResults.concat(substringResults)));
    },

    getInitialResultSet: function(terms) {
@ -571,4 +610,4 @@ PlaceSearchProvider.prototype = {
        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
        return this._searchPlaces(places, terms);
    }
-}
+};
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -1,12 +1,11 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 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');
@ -14,19 +13,15 @@ const _ = Gettext.gettext;

 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;

-const BOX_BACKGROUND_COLOR = new Clutter.Color();
-BOX_BACKGROUND_COLOR.from_pixel(0x000000cc);
-
-const BOX_TEXT_COLOR = new Clutter.Color();
-BOX_TEXT_COLOR.from_pixel(0xffffffff);
-
-const DIALOG_WIDTH = 320;
-const DIALOG_PADDING = 6;
-const ICON_SIZE = 24;
-const ICON_BOX_SIZE = 36;
 const MAX_FILE_DELETED_BEFORE_INVALID = 10;

+const HISTORY_KEY = 'command-history';
+const HISTORY_LIMIT = 512;
+
+const DIALOG_FADE_TIME = 0.1;
+
 function CommandCompleter() {
    this._init();
 }
@ -35,6 +30,7 @@ CommandCompleter.prototype = {
    _init : function() {
        this._changedCount = 0;
        this._paths = GLib.getenv('PATH').split(':');
+        this._paths.push(GLib.get_home_dir());
        this._valid = false;
        this._updateInProgress = false;
        this._childs = new Array(this._paths.length);
@ -42,7 +38,14 @@ CommandCompleter.prototype = {
        for (let i = 0; i < this._paths.length; i++) {
            this._childs[i] = [];
            let file = Gio.file_new_for_path(this._paths[i]);
-            let info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
+            let info;
+            try {
+                info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
+            } catch (e) {
+                // FIXME catchall
+                this._paths[i] = null;
+                continue;
+            }

            if (info.get_attribute_uint32(Gio.FILE_ATTRIBUTE_STANDARD_TYPE) != Gio.FileType.DIRECTORY)
                continue;
@ -50,15 +53,18 @@ CommandCompleter.prototype = {
            this._paths[i] = file.get_path();
            this._monitors[i] = file.monitor_directory(Gio.FileMonitorFlags.NONE, null);
            if (this._monitors[i] != null) {
-                this._monitors[i].connect("changed", Lang.bind(this, this._onChanged));
+                this._monitors[i].connect('changed', Lang.bind(this, this._onChanged));
            }
        }
+        this._paths = this._paths.filter(function(a) {
+            return a != null;
+        });
        this._update(0);
    },

    _onGetEnumerateComplete : function(obj, res) {
        this._enumerator = obj.enumerate_children_finish(res);
-        this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete), null);
+        this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete));
    },

    _onNextFileComplete : function(obj, res) {
@ -67,7 +73,7 @@ CommandCompleter.prototype = {
            this._childs[this._i].push(files[i].get_name());
        }
        if (files.length) {
-            this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete), null);
+            this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete));
        } else {
            this._enumerator.close(null);
            this._enumerator = null;
@ -94,7 +100,7 @@ CommandCompleter.prototype = {
        }
        let file = Gio.file_new_for_path(this._paths[i]);
        this._childs[this._i] = [];
-        file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onGetEnumerateComplete), null);
+        file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onGetEnumerateComplete));
    },

    _onChanged : function(m, f, of, type) {
@ -128,7 +134,7 @@ CommandCompleter.prototype = {
    },

    getCompletion: function(text) {
-        let common = "";
+        let common = '';
        let notInit = true;
        if (!this._valid) {
            this._update(0);
@ -141,7 +147,7 @@ CommandCompleter.prototype = {
                    break;
            }
            if (k == 0)
-                return "";
+                return '';
            return s1.substr(0, k);
        }
        function _hasPrefix(s1, prefix) {
@ -166,17 +172,24 @@ CommandCompleter.prototype = {

 function RunDialog() {
    this._init();
-};
+}

 RunDialog.prototype = {
    _init : function() {
        this._isOpen = false;

-        let gconf = Shell.GConf.get_default();
-        gconf.connect('changed::development_tools', Lang.bind(this, function () {
-            this._enableInternalCommands = gconf.get_boolean('development_tools');
+        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._enableInternalCommands = gconf.get_boolean('development_tools');

        this._internalCommands = { 'lg':
                                   Lang.bind(this, function() {
@ -200,87 +213,70 @@ RunDialog.prototype = {
        // All actors are inside _group. We create it initially
        // hidden then show it in show()
        this._group = new Clutter.Group({ visible: false,
-                                          x: 0,
-                                          y: 0,
-                                          width: global.screen_width,
-                                          height: global.screen_height });
-        global.stage.add_actor(this._group);
+                                          x: 0, y: 0 });
+        Main.uiGroup.add_actor(this._group);

-        let lightbox = new Lightbox.Lightbox(this._group);
+        this._lightbox = new Lightbox.Lightbox(this._group,
+                                               { inhibitEvents: true });

-        this._boxH = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   x_align: Big.BoxAlignment.CENTER,
-                                   y_align: Big.BoxAlignment.CENTER });
+        this._box = new St.Bin({ x_align: St.Align.MIDDLE,
+                                 y_align: St.Align.MIDDLE });

-        this._group.add_actor(this._boxH);
-        lightbox.highlight(this._boxH);
+        this._group.add_actor(this._box);
+        this._lightbox.highlight(this._box);

-        let boxV = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                 y_align: Big.BoxAlignment.CENTER });
+        let dialogBox = new St.BoxLayout({ style_class: 'run-dialog', vertical: true });

-        this._boxH.append(boxV, Big.BoxPackFlags.NONE);
+        this._box.set_child(dialogBox);

+        let label = new St.Label({ style_class: 'run-dialog-label',
+                                   text: _("Please enter a command:") });

-        let dialogBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                      background_color: BOX_BACKGROUND_COLOR,
-                                      corner_radius: 4,
-                                      reactive: false,
-                                      padding: DIALOG_PADDING,
-                                      width: DIALOG_WIDTH });
+        dialogBox.add(label, { expand: true, y_fill: false });

-        this._boxH.append(dialogBox, Big.BoxPackFlags.NONE);
+        let entry = new St.Entry({ style_class: 'run-dialog-entry' });

-        let label = new Clutter.Text({ color: BOX_TEXT_COLOR,
-                                       font_name: '18px Sans',
-                                       text: _("Please enter a command:") });
+        this._entryText = entry.clutter_text;
+        dialogBox.add(entry, { expand: true });

-        dialogBox.append(label, Big.BoxPackFlags.EXPAND);
+        this._errorBox = new St.BoxLayout();

-        this._entry = new Clutter.Text({ color: BOX_TEXT_COLOR,
-                                         font_name: '20px Sans Bold',
-                                         editable: true,
-                                         activatable: true,
-                                         singleLineMode: true });
+        dialogBox.add(this._errorBox, { expand: true });

-        dialogBox.append(this._entry, Big.BoxPackFlags.EXPAND);
+        let errorIcon = new St.Button({ style_class: 'run-dialog-error-icon' });

-        this._errorBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                       padding_top: DIALOG_PADDING });
-
-        dialogBox.append(this._errorBox, Big.BoxPackFlags.EXPAND);
-
-        let iconBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                    y_align: Big.BoxAlignment.CENTER,
-                                    x_align: Big.BoxAlignment.CENTER,
-                                    width: ICON_BOX_SIZE,
-                                    height: ICON_BOX_SIZE });
-
-        this._errorBox.append(iconBox, Big.BoxPackFlags.NONE);
+        this._errorBox.add(errorIcon);

        this._commandError = false;

-        let errorIcon = Shell.TextureCache.get_default().load_icon_name("gtk-dialog-error", ICON_SIZE);
-        iconBox.append(errorIcon, Big.BoxPackFlags.EXPAND);
+        this._errorMessage = new St.Label({ style_class: 'run-dialog-error-label' });
+        this._errorMessage.clutter_text.line_wrap = true;

-        this._errorMessage = new Clutter.Text({ color: BOX_TEXT_COLOR,
-                                                font_name: '18px Sans Bold',
-                                                line_wrap: true });
-
-        this._errorBox.append(this._errorMessage, Big.BoxPackFlags.EXPAND);
+        this._errorBox.add(this._errorMessage, { expand: true });

        this._errorBox.hide();

-        this._entry.connect('activate', Lang.bind(this, function (o, e) {
-            this._run(o.get_text());
-            if (!this._commandError)
-                this.close();
-        }));
-
        this._pathCompleter = new Gio.FilenameCompleter();
        this._commandCompleter = new CommandCompleter();
        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
-        this._entry.connect('key-press-event', Lang.bind(this, function(o, e) {
+        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) {
+                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();
+            }
            if (symbol == Clutter.Escape) {
                this.close();
                return true;
@ -325,36 +321,85 @@ RunDialog.prototype = {
        }
    },

-    _run : function(command) {
+    _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;
+
+        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)
-            f = this._internalCommands[command];
+            f = this._internalCommands[input];
        else
            f = null;
        if (f) {
            f();
-        } else if (command) {
+        } else if (input) {
            try {
+                if (inTerminal)
+                    command = 'gnome-terminal -x ' + input;
                let [ok, len, args] = GLib.shell_parse_argv(command);
-                let p = new Shell.Process({'args' : args});
+                let p = new Shell.Process({ 'args' : args });
                p.run();
            } catch (e) {
-                this._commandError = true;
-                /*
-                 * The exception contains an error string like:
-                 * Error invoking Shell.run: Failed to execute child process "foo"
-                 * (No such file or directory)
-                 * We are only interested in the actual error, so parse that out.
-                 */
-                let m = /.+\((.+)\)/.exec(e);
-                let errorStr = _("Execution of '%s' failed:").format(command) + "\n" + m[1];
-                this._errorMessage.set_text(errorStr);
-                this._errorBox.show();
+                // Mmmh, that failed - see if @input matches an existing file
+                let path = null;
+                if (input.charAt(0) == '/') {
+                    path = input;
+                } else {
+                    if (input.charAt(0) == '~')
+                        input = input.slice(1);
+                    path = GLib.get_home_dir() + '/' + input;
+                }
+
+                if (GLib.file_test(path, GLib.FileTest.EXISTS)) {
+                    let file = Gio.file_new_for_path(path);
+                    Gio.app_info_launch_default_for_uri(file.get_uri(),
+                                                        global.create_app_launch_context());
+                } else {
+                    this._commandError = true;
+                    // The exception contains an error string like:
+                    // Error invoking Shell.run: Failed to execute child
+                    // process "foo" (No such file or directory)
+                    // We are only interested in the actual error, so parse
+                    //that out.
+                    let m = /.+\((.+)\)/.exec(e);
+                    let errorStr = _("Execution of '%s' failed:").format(command) + '\n' + m[1];
+                    this._errorMessage.set_text(errorStr);
+
+                    this._errorBox.show();
+                }
            }
        }
    },

+    _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() {
        if (this._isOpen) // Already shown
            return;
@ -365,13 +410,22 @@ RunDialog.prototype = {
        // Position the dialog on the current monitor
        let monitor = global.get_focus_monitor();

-        this._boxH.set_position(monitor.x, monitor.y);
-        this._boxH.set_size(monitor.width, monitor.height);
+        this._historyIndex = this._history.length;
+
+        this._box.set_position(monitor.x, monitor.y);
+        this._box.set_size(monitor.width, monitor.height);

        this._isOpen = true;
+        this._lightbox.show();
+        this._group.opacity = 0;
        this._group.show();
+        Tweener.addTween(this._group,
+                         { opacity: 255,
+                           time: DIALOG_FADE_TIME,
+                           transition: 'easeOutQuad'
+                         });

-        global.stage.set_key_focus(this._entry);
+        global.stage.set_key_focus(this._entryText);
    },

    close : function() {
@ -379,14 +433,20 @@ RunDialog.prototype = {
            return;

        this._isOpen = false;
-        
-        this._errorBox.hide();
        this._commandError = false;

-        this._group.hide();
-        this._entry.set_text('');
-
        Main.popModal(this._group);
+
+        Tweener.addTween(this._group,
+                         { opacity: 0,
+                           time: DIALOG_FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                               this._errorBox.hide();
+                               this._group.hide();
+                               this._entryText.set_text('');
+                           })
+                         });
    }
 };
 Signals.addSignalMethods(RunDialog.prototype);
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@ -0,0 +1,260 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Gio = imports.gi.Gio;
+const Mainloop = imports.mainloop;
+
+const Meta = imports.gi.Meta;
+const Shell = imports.gi.Shell;
+
+// This module provides functionality for driving the shell user interface
+// in an automated fashion. The primary current use case for this is
+// automated performance testing (see runPerfScript()), but it could
+// be applied to other forms of automation, such as testing for
+// correctness as well.
+//
+// When scripting an automated test we want to make a series of calls
+// in a linear fashion, but we also want to be able to let the main
+// loop run so actions can finish. For this reason we write the script
+// as a generator function that yields when it want to let the main
+// loop run.
+//
+//    yield Scripting.sleep(1000);
+//    main.overview.show();
+//    yield Scripting.waitLeisure();
+//
+// While it isn't important to the person writing the script, the actual
+// yielded result is a function that the caller uses to provide the
+// callback for resuming the script.
+
+/**
+ * sleep:
+ * @milliseconds: number of milliseconds to wait
+ *
+ * Used within an automation script to pause the the execution of the
+ * current script for the specified amount of time. Use as
+ * 'yield Scripting.sleep(500);'
+ */
+function sleep(milliseconds) {
+    let cb;
+
+    Mainloop.timeout_add(milliseconds, function() {
+                             if (cb)
+                                 cb();
+                             return false;
+                         });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+/**
+ * waitLeisure:
+ *
+ * Used within an automation script to pause the the execution of the
+ * current script until the shell is completely idle. Use as
+ * 'yield Scripting.waitLeisure();'
+ */
+function waitLeisure() {
+    let cb;
+
+    global.run_at_leisure(function() {
+                             if (cb)
+                                 cb();
+                          });
+
+    return function(callback) {
+        cb = callback;
+    };
+}
+
+/**
+ * defineScriptEvent
+ * @name: The event will be called script.<name>
+ * @description: Short human-readable description of the event
+ *
+ * Convenience function to define a zero-argument performance event
+ * within the 'script' namespace that is reserved for events defined locally
+ * within a performance automation script
+ */
+function defineScriptEvent(name, description) {
+    Shell.PerfLog.get_default().define_event("script." + name,
+                                             description,
+                                             "");
+}
+
+/**
+ * scriptEvent
+ * @name: Name registered with defineScriptEvent()
+ *
+ * Convenience function to record a script-local performance event
+ * previously defined with defineScriptEvent
+ */
+function scriptEvent(name) {
+    Shell.PerfLog.get_default().event("script." + name);
+}
+
+/**
+ * collectStatistics
+ *
+ * Convenience function to trigger statistics collection
+ */
+function collectStatistics() {
+    Shell.PerfLog.get_default().collect_statistics();
+}
+
+function _step(g, finish, onError) {
+    try {
+        let waitFunction = g.next();
+        waitFunction(function() {
+                         _step(g, finish, onError);
+                     });
+    } catch (err if err instanceof StopIteration) {
+        if (finish)
+            finish();
+    } catch (err) {
+        if (onError)
+            onError(err);
+    }
+}
+
+function _collect(scriptModule, outputFile) {
+    let eventHandlers = {};
+
+    for (let f in scriptModule) {
+        let m = /([A-Za-z]+)_([A-Za-z]+)/.exec(f);
+        if (m)
+            eventHandlers[m[1] + "." + m[2]] = scriptModule[f];
+    }
+
+    Shell.PerfLog.get_default().replay(
+        function(time, eventName, signature, arg) {
+            if (eventName in eventHandlers)
+                eventHandlers[eventName](time, arg);
+        });
+
+    if ('finish' in scriptModule)
+        scriptModule.finish();
+
+    if (outputFile) {
+        let f = Gio.file_new_for_path(outputFile);
+        let raw = f.replace(null, false,
+                            Gio.FileCreateFlags.NONE,
+                            null);
+        let out = Gio.BufferedOutputStream.new_sized (raw, 4096);
+        Shell.write_string_to_stream (out, "{\n");
+
+        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()
+        Shell.write_string_to_stream(out, ',\n"monitors":\n[');
+        for (let i = 0; i < monitors.length; i++) {
+            let monitor = monitors[i];
+            let is_primary = (monitor.x == primary.x &&
+                              monitor.y == primary.y &&
+                              monitor.width == primary.width &&
+                              monitor.height == primary.height);
+            if (i != 0)
+                Shell.write_string_to_stream(out, ', ');
+            Shell.write_string_to_stream(out, '"%s%dx%d+%d+%d"'.format(is_primary ? "*" : "",
+                                                                       monitor.width, monitor.height,
+                                                                       monitor.x, monitor.y));
+        }
+        Shell.write_string_to_stream(out, ' ]');
+
+        Shell.write_string_to_stream(out, ',\n"metrics":\n[ ');
+        let first = true;
+        for (let name in scriptModule.METRICS) {
+            let metric = scriptModule.METRICS[name]; 
+
+            if (!first)
+                Shell.write_string_to_stream(out, ',\n  ');
+            first = false;
+
+            Shell.write_string_to_stream(out,
+                                         '{ "name": ' + JSON.stringify(name) + ',\n' +
+                                         '    "description": ' + JSON.stringify(metric.description) + ',\n' +
+                                         '    "units": ' + JSON.stringify(metric.units) + ',\n' +
+                                         '    "value": ' + JSON.stringify(metric.value) + ' }');
+        }
+        Shell.write_string_to_stream(out, ' ]');
+
+        Shell.write_string_to_stream (out, ',\n"log":\n');
+        Shell.PerfLog.get_default().dump_log(out);
+
+        Shell.write_string_to_stream (out, '\n}\n');
+        out.close(null);
+    } else {
+        let metrics = [];
+        for (let metric in scriptModule.METRICS)
+            metrics.push(metric);
+
+        metrics.sort();
+
+        print ('------------------------------------------------------------');
+        for (let i = 0; i < metrics.length; i++) {
+            let metric = metrics[i];
+            print ('# ' + scriptModule.METRIC_DESCRIPTIONS[metric]);
+            print (metric + ': ' +  scriptModule.METRICS[metric]);
+        }
+        print ('------------------------------------------------------------');
+    }
+}
+
+/**
+ * runPerfScript
+ * @scriptModule: module object with run and finish functions
+ *    and event handlers
+ *
+ * Runs a script for automated collection of performance data. The
+ * script is defined as a Javascript module with specified contents.
+ *
+ * First the run() function within the module will be called as a
+ * generator to automate a series of actions. These actions will
+ * trigger performance events and the script can also record its
+ * own performance events.
+ *
+ * Then the recorded event log is replayed using handler functions
+ * within the module. The handler for the event 'foo.bar' is called
+ * foo_bar().
+ *
+ * Finally if the module has a function called finish(), that will
+ * be called.
+ *
+ * The event handler and finish functions are expected to fill in
+ * metrics to an object within the module called METRICS. Each
+ * property of this object represents an individual metric. The
+ * name of the property is the name of the metric, the value
+ * of the property is an object with the following properties:
+ *
+ *  description: human readable description of the metric
+ *  units: a string representing the units of the metric. It has
+ *   the form '<unit> <unit> ... / <unit> / <unit> ...'. Certain
+ *   unit values are recognized: s, ms, us, B, KiB, MiB. Other
+ *   values can appear but are uninterpreted. Examples 's',
+ *   '/ s', 'frames', 'frames / s', 'MiB / s / frame'
+ *  value: computed value of the metric
+ *
+ * The resulting metrics will be written to @outputFile as JSON, or,
+ * if @outputFile is not provided, logged.
+ *
+ * After running the script and collecting statistics from the
+ * event log, GNOME Shell will exit.
+ **/
+function runPerfScript(scriptModule, outputFile) {
+    Shell.PerfLog.get_default().set_enabled(true);
+
+    let g = scriptModule.run();
+
+    _step(g,
+          function() {
+              _collect(scriptModule, outputFile);
+              Meta.exit(Meta.ExitCode.SUCCESS);
+          },
+         function(err) {
+             log("Script failed: " + err + "\n" + err.stack);
+             Meta.exit(Meta.ExitCode.ERROR);
+         });
+}
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Signals = imports.signals;
-const St = imports.gi.St;

 const RESULT_ICON_SIZE = 24;

@ -10,9 +9,10 @@ const RESULT_ICON_SIZE = 24;
 // implementations.
 const MatchType = {
    NONE: 0,
-    MULTIPLE: 1,
-    PREFIX: 2,
-    SUBSTRING: 3
+    SUBSTRING: 1,
+    MULTIPLE_SUBSTRING: 2,
+    PREFIX: 3,
+    MULTIPLE_PREFIX: 4
 };

 function SearchResultDisplay(provider) {
@ -40,7 +40,7 @@ SearchResultDisplay.prototype = {
     * The terms are useful for search match highlighting.
     */
    renderResults: function(results, terms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    },

    /**
@ -67,7 +67,7 @@ SearchResultDisplay.prototype = {
     * Returns: The number of actors visible.
     */
    getVisibleResultCount: function() {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    },

    /**
@ -79,7 +79,14 @@ SearchResultDisplay.prototype = {
     * available.
     */
    selectIndex: function() {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
+    },
+
+    /**
+     * Activate the currently selected search result.
+     */
+    activateSelected: function() {
+        throw new Error('Not implemented');
    }
 };

@ -101,7 +108,7 @@ SearchProvider.prototype = {

    /**
     * getInitialResultSet:
-     * @terms: Array of search terms, treated as logical OR
+     * @terms: Array of search terms, treated as logical AND
     *
     * Called when the user first begins a search (most likely
     * therefore a single term of length one or two), or when
@ -113,14 +120,15 @@ SearchProvider.prototype = {
     * item.  Ordering of returned results is up to the discretion of the provider,
     * but you should follow these heruistics:
     *
-     *  * Put items which match multiple search terms before single matches
+     *  * Put items where the term matches multiple criteria (e.g. name and
+     *    description) before single matches
     *  * Put items which match on a prefix before non-prefix substring matches
     *
     * This function should be fast; do not perform unindexed full-text searches
     * or network queries.
     */
    getInitialResultSet: function(terms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    },

    /**
@ -137,7 +145,7 @@ SearchProvider.prototype = {
     * result set, rather than possibly performing a full re-query.
     */
    getSubsearchResultSet: function(previousResults, newTerms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    },

    /**
@ -148,7 +156,7 @@ SearchProvider.prototype = {
     * properties which describe the given search result.
     */
    getResultMeta: function(id) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    },

    /**
@ -187,7 +195,7 @@ SearchProvider.prototype = {
     * Called when the user chooses a given result.
     */
    activateResult: function(id) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    },

    /**
@ -198,9 +206,9 @@ SearchProvider.prototype = {
     * displaying search results for that item type.
     */
    expandSearch: function(terms) {
-        throw new Error("not implemented");
+        throw new Error('Not implemented');
    }
-}
+};
 Signals.addSignalMethods(SearchProvider.prototype);

 function SearchSystem() {
@ -231,7 +239,7 @@ SearchSystem.prototype = {
    },

    updateSearch: function(searchString) {
-        searchString = searchString.replace(/^\s+/g, "").replace(/\s+$/g, "");
+        searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
        if (searchString == '')
            return null;

@ -250,16 +258,24 @@ SearchSystem.prototype = {
        if (isSubSearch) {
            for (let i = 0; i < this._previousResults.length; i++) {
                let [provider, previousResults] = this._previousResults[i];
-                let providerResults = provider.getSubsearchResultSet(previousResults, terms);
-                if (providerResults.length > 0)
-                    results.push([provider, providerResults]);
+                try {
+                    let providerResults = provider.getSubsearchResultSet(previousResults, terms);
+                    if (providerResults.length > 0)
+                        results.push([provider, providerResults]);
+                } catch (error) {
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                }
            }
        } else {
            for (let i = 0; i < this._providers.length; i++) {
                let provider = this._providers[i];
-                let providerResults = provider.getInitialResultSet(terms);
-                if (providerResults.length > 0)
-                    results.push([provider, providerResults]);
+                try {
+                    let providerResults = provider.getInitialResultSet(terms);
+                    if (providerResults.length > 0)
+                        results.push([provider, providerResults]);
+                } catch (error) {
+                    global.log ('A ' + error.name + ' has occured in ' + provider.title + ': ' + error.message);
+                }
            }
        }

@ -268,5 +284,5 @@ SearchSystem.prototype = {

        return results;
    }
-}
+};
 Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -1,23 +1,20 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const DBus = imports.dbus;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;

 const Main = imports.ui.main;

 const GnomeShellIface = {
-    name: "org.gnome.Shell",
-    methods: [{ name: "Eval",
-                inSignature: "s",
-                outSignature: "bs"
+    name: 'org.gnome.Shell',
+    methods: [{ name: 'Eval',
+                inSignature: 's',
+                outSignature: 'bs'
              }
             ],
    signals: [],
-    properties: [{ name: "OverviewActive",
-                   signature: "b",
-                   access: "readwrite" }]
+    properties: [{ name: 'OverviewActive',
+                   signature: 'b',
+                   access: 'readwrite' }]
 };

 function GnomeShell() {
@ -50,7 +47,7 @@ GnomeShell.prototype = {
            returnValue = JSON.stringify(eval(code));
            // A hack; DBus doesn't have null/undefined
            if (returnValue == undefined)
-                returnValue = "";
+                returnValue = '';
            success = true;
        } catch (e) {
            returnValue = JSON.stringify(e);
--- a/js/ui/sidebar.js
+++ b/js/ui/sidebar.js
@ -1,186 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-
-const Main = imports.ui.main;
-const Panel = imports.ui.panel;
-const Tweener = imports.ui.tweener;
-const Widget = imports.ui.widget;
-const WidgetBox = imports.ui.widgetBox;
-
-const SIDEBAR_SPACING = 4;
-const SIDEBAR_PADDING = 4;
-
-// The total sidebar width is the widget width plus the widget padding
-// (counted twice for the widget box, and once again for the
-// out-of-screen padding), plus the empty space between the border of
-// the bar and of the windows
-const SIDEBAR_COLLAPSED_WIDTH = Widget.COLLAPSED_WIDTH + 3 * WidgetBox.WIDGETBOX_PADDING + SIDEBAR_PADDING;
-const SIDEBAR_EXPANDED_WIDTH = Widget.EXPANDED_WIDTH + 3 * WidgetBox.WIDGETBOX_PADDING + SIDEBAR_PADDING;
-
-function Sidebar() {
-    this._init();
-}
-
-Sidebar.prototype = {
-    _init : function() {
-        // The top-left corner of the sidebar is fixed at:
-        // x = -WidgetBox.WIDGETBOX_PADDING, y = Panel.PANEL_HEIGHT.
-        // (The negative X is so that we don't see the rounded
-        // WidgetBox corners on the screen edge side.)
-        this.actor = new Clutter.Group({ x: -WidgetBox.WIDGETBOX_PADDING,
-                                         y: Panel.PANEL_HEIGHT,
-                                         width: SIDEBAR_EXPANDED_WIDTH });
-
-        // The actual widgets go into a Big.Box inside this.actor. The
-        // box's width will vary during the expand/collapse animations,
-        // but this.actor's width will remain constant until we adjust
-        // it at the end of the animation, because we don't want the
-        // wm strut to move and cause windows to move multiple times
-        // during the animation.
-        this.box = new Big.Box ({ padding_top: SIDEBAR_PADDING,
-                                  padding_bottom: SIDEBAR_PADDING,
-                                  padding_right: 0,
-                                  padding_left: 0,
-                                  spacing: SIDEBAR_SPACING });
-        this.actor.add_actor(this.box);
-
-        this._gconf = Shell.GConf.get_default();
-
-        this._expanded = this._gconf.get_boolean ("sidebar/expanded");
-        if (!this._expanded)
-            this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
-
-        this._visible = this._gconf.get_boolean ("sidebar/visible");
-        if (this._visible)
-            Main.chrome.addActor(this.actor);
-
-        this._widgets = [];
-        this.addWidget(new ToggleWidget());
-
-        let default_widgets = this._gconf.get_string_list("sidebar/widgets");
-        for (let i = 0; i < default_widgets.length; i++)
-            this.addWidget(default_widgets[i]);
-
-        this._gconf.connect('changed::sidebar/expanded',
-                            Lang.bind(this, this._expandedChanged));
-        this._gconf.connect('changed::sidebar/visible',
-                            Lang.bind(this, this._visibleChanged));
-
-        this._adjustPosition();
-    },
-
-    addWidget: function(widget) {
-        let widgetBox;
-        try {
-            widgetBox = new WidgetBox.WidgetBox(widget, this._expanded);
-        } catch(e) {
-            logError(e, "Failed to add widget '" + widget + "'");
-            return;
-        }
-
-        this.box.append(widgetBox.actor, Big.BoxPackFlags.NONE);
-        this._widgets.push(widgetBox);
-        this._adjustPosition();
-    },
-
-    _adjustPosition: function() {
-        let primary=global.get_primary_monitor();
-
-        this.actor.y = Math.max(primary.y + Panel.PANEL_HEIGHT,primary.height/2 - this.actor.height/2);
-        this.actor.x = primary.x;
-    },
-
-    _visibleChanged: function() {
-        let visible = this._gconf.get_boolean("sidebar/visible");
-        if (visible == this._visible)
-            return;
-
-        this._visible = visible;
-        if (visible)
-            Main.chrome.addActor(this.actor);
-        else
-            Main.chrome.removeActor(this.actor);
-    },
-
-    _expandedChanged: function() {
-        let expanded = this._gconf.get_boolean("sidebar/expanded");
-        if (expanded == this._expanded)
-            return;
-
-        this._expanded = expanded;
-        if (expanded)
-            this._expand();
-        else
-            this._collapse();
-    },
-
-    _expand: function() {
-        this._expanded = true;
-        for (let i = 0; i < this._widgets.length; i++)
-            this._widgets[i].expand();
-
-        // Updated the strut/stage area after the animation completes
-        Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME,
-                                 onComplete: function () {
-                                     this.actor.width = SIDEBAR_EXPANDED_WIDTH;
-                                 } });
-    },
-
-    _collapse: function() {
-        this._expanded = false;
-        for (let i = 0; i < this._widgets.length; i++)
-            this._widgets[i].collapse();
-
-        // Updated the strut/stage area after the animation completes
-        Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME,
-                                 onComplete: function () {
-                                     this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
-                                 } });
-    },
-
-    destroy: function() {
-        this.hide();
-
-        for (let i = 0; i < this._widgets.length; i++)
-            this._widgets[i].destroy();
-        this.actor.destroy();
-    }
-};
-
-const LEFT_DOUBLE_ARROW = "\u00AB";
-const RIGHT_DOUBLE_ARROW = "\u00BB";
-
-function ToggleWidget() {
-    this._init();
-}
-
-ToggleWidget.prototype = {
-    __proto__ : Widget.Widget.prototype,
-
-    _init : function() {
-        this._gconf = Shell.GConf.get_default();
-
-        this.actor = new Clutter.Text({ font_name: "Sans Bold 16px",
-                                        text: LEFT_DOUBLE_ARROW,
-                                        reactive: true });
-        this.actor.connect('button-release-event',
-                           Lang.bind(this, this._collapse));
-        this.collapsedActor = new Clutter.Text({ font_name: "Sans Bold 16px",
-                                                 text: RIGHT_DOUBLE_ARROW,
-                                                 reactive: true });
-        this.collapsedActor.connect('button-release-event',
-                                    Lang.bind(this, this._expand));
-    },
-
-    _collapse : function () {
-        this._gconf.set_boolean ("sidebar/expanded", false);
-    },
-
-    _expand : function () {
-        this._gconf.set_boolean ("sidebar/expanded", true);
-    }
-};
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@ -0,0 +1,237 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const GConf = imports.gi.GConf;
+const Gio = imports.gi.Gio;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const KEY_A11Y_DIR            = "/desktop/gnome/accessibility";
+const KEY_STICKY_KEYS_ENABLED = KEY_A11Y_DIR + "/keyboard/stickykeys_enable";
+const KEY_BOUNCE_KEYS_ENABLED = KEY_A11Y_DIR + "/keyboard/bouncekeys_enable";
+const KEY_SLOW_KEYS_ENABLED   = KEY_A11Y_DIR + "/keyboard/slowkeys_enable";
+const KEY_MOUSE_KEYS_ENABLED  = KEY_A11Y_DIR + "/keyboard/mousekeys_enable";
+
+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 KEY_FONT_DPI    = "/desktop/gnome/font_rendering/dpi";
+const DPI_LOW_REASONABLE_VALUE  = 50;
+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";
+
+const DESKTOP_INTERFACE_SCHEMA = "org.gnome.desktop.interface";
+const KEY_GTK_THEME      = "gtk-theme";
+const KEY_ICON_THEME     = "icon-theme";
+
+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);
+}
+
+ATIndicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'preferences-desktop-accessibility', null);
+
+        let client = GConf.Client.get_default();
+        client.add_dir(KEY_A11Y_DIR, GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
+        client.notify_add(KEY_A11Y_DIR, Lang.bind(this, this._keyChanged), null, null);
+        client.add_dir(KEY_META_DIR, GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
+        client.notify_add(KEY_META_DIR, Lang.bind(this, this._keyChanged), null, null);
+
+        let highContrast = this._buildHCItem();
+        this.menu.addMenuItem(highContrast);
+
+        let magnifier = this._buildMagItem();
+        this.menu.addMenuItem(magnifier);
+
+        let textZoom = this._buildFontItem(client);
+        this.menu.addMenuItem(textZoom);
+
+        let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
+        this.menu.addMenuItem(screenReader);
+
+        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);
+
+        let stickyKeys = this._buildItemGConf(_("Sticky Keys"), client, KEY_STICKY_KEYS_ENABLED);
+        this.menu.addMenuItem(stickyKeys);
+
+        let slowKeys = this._buildItemGConf(_("Slow Keys"), client, KEY_SLOW_KEYS_ENABLED);
+        this.menu.addMenuItem(slowKeys);
+
+        let bounceKeys = this._buildItemGConf(_("Bounce Keys"), client, KEY_BOUNCE_KEYS_ENABLED);
+        this.menu.addMenuItem(bounceKeys);
+
+        let mouseKeys = this._buildItemGConf(_("Mouse Keys"), client, KEY_MOUSE_KEYS_ENABLED);
+        this.menu.addMenuItem(mouseKeys);
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addAction(_("Universal Access Settings"), function() {
+            let p = new Shell.Process({ args: ['gnome-control-center','universal-access'] });
+            p.run();
+        });
+    },
+
+    _buildItemExtended: function(string, initial_value, writable, on_set) {
+        let widget = new PopupMenu.PopupSwitchMenuItem(string, initial_value);
+        if (!writable)
+            widget.actor.reactive = false;
+        else
+            widget.connect('toggled', function(item) {
+                on_set(item.state);
+            });
+        return widget;
+    },
+
+    _buildItemGConf: function(string, client, key) {
+        function on_get() {
+            return client.get_bool(key);
+        }
+        let widget = this._buildItemExtended(string,
+            client.get_bool(key),
+            client.key_is_writable(key),
+            function(enabled) {
+                client.set_bool(key, enabled);
+            });
+        this.connect('gconf-changed', function() {
+            widget.setToggleState(client.get_bool(key));
+        });
+        return widget;
+    },
+
+    _buildItem: function(string, schema, key) {
+        let settings = new Gio.Settings({ schema: schema });
+        let widget = this._buildItemExtended(string,
+            settings.get_boolean(key),
+            settings.is_writable(key),
+            function(enabled) {
+                return settings.set_boolean(key, enabled);
+            });
+        settings.connect('changed::'+key, function() {
+            widget.setToggleState(settings.get_boolean(key));
+        });
+        return widget;
+    },
+
+    _buildHCItem: function() {
+        let settings = new Gio.Settings({ schema: DESKTOP_INTERFACE_SCHEMA });
+        let gtkTheme = settings.get_string(KEY_GTK_THEME);
+        let iconTheme = settings.get_string(KEY_ICON_THEME);
+        let hasHC = (gtkTheme == HIGH_CONTRAST_THEME);
+        let highContrast = this._buildItemExtended(
+            _("High Contrast"),
+            hasHC,
+            settings.is_writable(KEY_GTK_THEME) && settings.is_writable(KEY_ICON_THEME),
+            function (enabled) {
+                if (enabled) {
+                    settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
+                    settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
+                } else {
+                    settings.set_string(KEY_GTK_THEME, gtkTheme);
+                    settings.set_string(KEY_ICON_THEME, iconTheme);
+                }
+            });
+        settings.connect('changed::' + KEY_GTK_THEME, function() {
+            let value = settings.get_string(KEY_GTK_THEME);
+            if (value == HIGH_CONTRAST_THEME) {
+                highContrast.setToggleState(true);
+            } else {
+                highContrast.setToggleState(false);
+                gtkTheme = value;
+            }
+        });
+        settings.connect('changed::' + KEY_ICON_THEME, function() {
+            let value = settings.get_string(KEY_ICON_THEME);
+            if (value != HIGH_CONTRAST_THEME)
+                iconTheme = value;
+        });
+        return highContrast;
+    },
+
+    _buildFontItem: function(client) {
+        let first_gconf_value = client.get_without_default(KEY_FONT_DPI);
+        let default_value = getDPIFromX();
+        let first_value = first_gconf_value ? first_gconf_value.get_float() : default_value;
+        function on_get() {
+            let u_dpi = client.get_float(KEY_FONT_DPI);
+            let x_dpi = getDPIFromX();
+            return (u_dpi - (DPI_FACTOR_LARGE * x_dpi) > -1);
+        }
+        let initial_setting = on_get();
+        let widget = this._buildItemExtended(_("Large Text"),
+            initial_setting,
+            client.key_is_writable(KEY_FONT_DPI),
+            function (enabled) {
+                if (enabled)
+                    client.set_float(KEY_FONT_DPI, DPI_FACTOR_LARGE * getDPIFromX());
+                else
+                    client.set_float(KEY_FONT_DPI, (first_value && !initial_setting) ? first_value : default_value);
+            });
+        this.connect('gconf-changed', function() {
+            let active = on_get();
+            if (!active)
+                // setting was modified manually, update it
+                first_value = client.get_float(KEY_FONT_DPI);
+            widget.setToggleState(on_get());
+        });
+        return widget;
+    },
+
+    _buildMagItem: function() {
+        let mag = Main.magnifier;
+        let widget = this._buildItemExtended(_("Zoom"),
+            mag.isActive(),
+            true,
+            Lang.bind(mag, mag.setActive));
+        mag.connect('active-changed', function(magnifier, active) {
+            widget.setToggleState(active);
+        });
+        return widget;
+    },
+
+    _keyChanged: function() {
+        this.emit('gconf-changed');
+    }
+};
+Signals.addSignalMethods(ATIndicator.prototype);
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@ -0,0 +1,222 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const DBus = imports.dbus;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Gvc = imports.gi.Gvc;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+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);
+}
+
+Indicator.prototype = {
+    __proto__: PanelMenu.SystemStatusButton.prototype,
+
+    _init: function() {
+        PanelMenu.SystemStatusButton.prototype._init.call(this, 'audio-volume-muted', null);
+
+        this._control = new Gvc.MixerControl({ name: 'GNOME Shell Volume Control' });
+        this._control.connect('ready', Lang.bind(this, this._onControlReady));
+        this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
+        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._output = null;
+        this._outputVolumeId = 0;
+        this._outputMutedId = 0;
+        this._outputSwitch = new PopupMenu.PopupSwitchMenuItem(_("Output: Muted"), false);
+        this._outputSwitch.connect('toggled', Lang.bind(this, this._switchToggled, '_output'));
+        this._outputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._outputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_output'));
+        this._outputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.menu.addMenuItem(this._outputSwitch);
+        this.menu.addMenuItem(this._outputSlider);
+
+        this._separator = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(this._separator);
+
+        this._input = null;
+        this._inputVolumeId = 0;
+        this._inputMutedId = 0;
+        this._inputSwitch = new PopupMenu.PopupSwitchMenuItem(_("Input: Muted"), false);
+        this._inputSwitch.connect('toggled', Lang.bind(this, this._switchToggled, '_input'));
+        this._inputSlider = new PopupMenu.PopupSliderMenuItem(0);
+        this._inputSlider.connect('value-changed', Lang.bind(this, this._sliderChanged, '_input'));
+        this._inputSlider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
+        this.menu.addMenuItem(this._inputSwitch);
+        this.menu.addMenuItem(this._inputSlider);
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addAction(_("Sound Preferences"), function() {
+            let p = new Shell.Process({ args: ['gnome-control-center', 'sound'] });
+            p.run();
+        });
+
+        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this._control.open();
+    },
+
+    _onScrollEvent: function(actor, event) {
+        let direction = event.get_scroll_direction();
+        let currentVolume = this._output.volume;
+
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            this._output.volume = Math.max(0, currentVolume - VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
+            this._output.push_volume();
+        }
+        else if (direction == Clutter.ScrollDirection.UP) {
+            this._output.volume = Math.min(VOLUME_MAX, currentVolume + VOLUME_MAX * VOLUME_ADJUSTMENT_STEP);
+            this._output.push_volume();
+        }
+    },
+
+    _onControlReady: function() {
+        this._readOutput();
+        this._readInput();
+    },
+
+    _readOutput: function() {
+        if (this._outputVolumeId) {
+            this._output.disconnect(this._outputVolumeId);
+            this._output.disconnect(this._outputMutedId);
+            this._outputVolumeId = 0;
+            this._outputMutedId = 0;
+        }
+        this._output = this._control.get_default_sink();
+        if (this._output) {
+            this._outputMutedId = this._output.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_output'));
+            this._outputVolumeId = this._output.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_output'));
+            this._mutedChanged (null, null, '_output');
+            this._volumeChanged (null, null, '_output');
+        } else {
+            this._outputSwitch.label.text = _("Output: Muted");
+            this._outputSwitch.setToggleState(false);
+            this.setIcon('audio-volume-muted-symbolic');
+        }
+    },
+
+    _readInput: function() {
+        if (this._inputVolumeId) {
+            this._input.disconnect(this._inputVolumeId);
+            this._input.disconnect(this._inputMutedId);
+            this._inputVolumeId = 0;
+            this._inputMutedId = 0;
+        }
+        this._input = this._control.get_default_source();
+        if (this._input) {
+            this._inputMutedId = this._input.connect('notify::is-muted', Lang.bind(this, this._mutedChanged, '_input'));
+            this._inputVolumeId = this._input.connect('notify::volume', Lang.bind(this, this._volumeChanged, '_input'));
+            this._mutedChanged (null, null, '_input');
+            this._volumeChanged (null, null, '_input');
+        } else {
+            this._separator.actor.hide();
+            this._inputSwitch.actor.hide();
+            this._inputSlider.actor.hide();
+        }
+    },
+
+    _maybeShowInput: function() {
+        // only show input widgets if any application is recording audio
+        let showInput = false;
+        let recordingApps = this._control.get_source_outputs();
+        if (this._input && recordingApps) {
+            for (let i = 0; i < recordingApps.length; i++) {
+                let outputStream = recordingApps[i];
+                let id = outputStream.get_application_id();
+                // but skip gnome-volume-control and pavucontrol
+                // (that appear as recording because they show the input level)
+                if (!id || (id != 'org.gnome.VolumeControl' && id != 'org.PulseAudio.pavucontrol')) {
+                    showInput = true;
+                    break;
+                }
+            }
+        }
+        if (showInput) {
+            this._separator.actor.show();
+            this._inputSwitch.actor.show();
+            this._inputSlider.actor.show();
+        } else {
+            this._separator.actor.hide();
+            this._inputSwitch.actor.hide();
+            this._inputSlider.actor.hide();
+        }
+    },
+
+    _volumeToIcon: function(volume) {
+        if (volume <= 0) {
+            return 'audio-volume-muted';
+        } else {
+            let v = volume / VOLUME_MAX;
+            if (v < 0.33)
+                return 'audio-volume-low';
+            if (v > 0.8)
+                return 'audio-volume-high';
+            return 'audio-volume-medium';
+        }
+    },
+
+    _sliderChanged: function(slider, value, property) {
+        if (this[property] == null) {
+            log ('Volume slider changed for %s, but %s does not exist'.format(property, property));
+            return;
+        }
+        this[property].volume = value * VOLUME_MAX;
+        this[property].push_volume();
+    },
+
+    _notifyVolumeChange: function() {
+        global.play_theme_sound('audio-volume-change');
+    },
+
+    _switchToggled: function(switchItem, state, property) {
+        if (this[property] == null) {
+            log ('Volume mute switch toggled for %s, but %s does not exist'.format(property, property));
+            return;
+        }
+        this[property].change_is_muted(!state);
+        this._notifyVolumeChange();
+    },
+
+    _mutedChanged: function(object, param_spec, property) {
+        let muted = this[property].is_muted;
+        let toggleSwitch = this[property+'Switch'];
+        toggleSwitch.setToggleState(!muted);
+        this._updateLabel(property);
+        if (property == '_output') {
+            if (muted)
+                this.setIcon('audio-volume-muted');
+            else
+                this.setIcon(this._volumeToIcon(this._output.volume));
+        }
+    },
+
+    _volumeChanged: function(object, param_spec, property) {
+        this[property+'Slider'].setValue(this[property].volume / VOLUME_MAX);
+        this._updateLabel(property);
+        if (property == '_output' && !this._output.is_muted)
+            this.setIcon(this._volumeToIcon(this._output.volume));
+    },
+
+    _updateLabel: function(property) {
+        let label;
+        if (this[property].is_muted)
+            label = (property == '_output' ? _("Output: Muted") : _("Input: Muted"));
+        else
+            label = (property == '_output' ? _("Output: %3.0f%%") : _("Input: %3.0f%%")).format(this[property].volume / VOLUME_MAX * 100);
+        this[property+'Switch'].label.text = label;
+    }
+};
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@ -0,0 +1,56 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+
+const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
+
+const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
+    'bluetooth-applet': 'bluetooth',
+    'gnome-volume-control-applet': 'volume',
+    'nm-applet': 'network',
+    'gnome-power-manager': 'battery',
+    'keyboard': 'keyboard',
+    'gnome-settings-daemon': 'display'
+};
+
+function StatusIconDispatcher() {
+    this._init();
+}
+
+StatusIconDispatcher.prototype = {
+    _init: function() {
+        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
+        // status icons
+        // http://bugzilla.gnome.org/show_bug.cgi=id=621382
+        let p = new Shell.Process({ args: ['pkill', '-f', '^([^ ]*/)?indicator-application-service$']});
+        p.run();
+    },
+
+    _onTrayIconAdded: function(o, icon) {
+        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
+        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
+        if (role)
+            this.emit('status-icon-added', icon, role);
+        else
+            this.emit('message-icon-added', icon);
+    },
+
+    _onTrayIconRemoved: function(o, icon) {
+        let wmClass = (icon.wm_class || 'unknown').toLowerCase();
+        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
+        if (role)
+            this.emit('status-icon-removed', icon);
+        else
+            this.emit('message-icon-removed', icon);
+    }
+};
+Signals.addSignalMethods(StatusIconDispatcher.prototype);
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@ -1,201 +1,193 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const DBus = imports.dbus;
 const Gdm = imports.gi.Gdm;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 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 Panel = imports.ui.panel;
+const GnomeSession = imports.misc.gnomeSession;
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;

 // Adapted from gdm/gui/user-switch-applet/applet.c
 //
 // Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
 // Copyright (C) 2008,2009 Red Hat, Inc.

-const SIDEBAR_VISIBLE_KEY = 'sidebar/visible';
-
-function StatusMenu() {
+function StatusMenuButton() {
    this._init();
 }

-StatusMenu.prototype = {
-    _init: function() {
-        this._gdm = Gdm.UserManager.ref_default();
-        this._user = this._gdm.get_user(GLib.get_user_name());
-        this._presence = new GnomeSessionPresence();
+StatusMenuButton.prototype = {
+    __proto__: PanelMenu.Button.prototype,
+
+    _init: function() {
+        PanelMenu.Button.prototype._init.call(this, St.Align.START);
+        let box = new St.BoxLayout({ name: 'panelStatusMenu' });
+        this.actor.set_child(box);
+
+        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.actor = new St.BoxLayout({ name: 'StatusMenu' });
        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this._iconBox = new St.Bin();
-        this.actor.add(this._iconBox, { y_align: St.Align.MIDDLE });
+        box.add(this._iconBox, { y_align: St.Align.MIDDLE, y_fill: false });

-        let textureCache = Shell.TextureCache.get_default();
-        // FIXME: these icons are all wrong (likewise in createSubMenu)
-        this._availableIcon = textureCache.load_icon_name('gtk-yes', 16);
-        this._busyIcon = textureCache.load_icon_name('gtk-no', 16);
-        this._invisibleIcon = textureCache.load_icon_name('gtk-close', 16);
-        this._idleIcon = textureCache.load_icon_name('gtk-media-pause', 16);
+        let textureCache = St.TextureCache.get_default();
+        this._availableIcon = textureCache.load_icon_name('user-available', St.IconType.SYMBOLIC, 16);
+        this._busyIcon = textureCache.load_icon_name('user-busy', St.IconType.SYMBOLIC, 16);
+        this._invisibleIcon = textureCache.load_icon_name('user-invisible', St.IconType.SYMBOLIC, 16);
+        this._idleIcon = textureCache.load_icon_name('user-idle', St.IconType.SYMBOLIC, 16);

        this._presence.connect('StatusChanged', Lang.bind(this, this._updatePresenceIcon));
        this._presence.getStatus(Lang.bind(this, this._updatePresenceIcon));

-        this._name = new St.Label({ text: this._user.get_real_name() });
-        this.actor.add(this._name, { expand: true, y_align: St.Align.MIDDLE });
-        this._userNameChangedId = this._user.connect('notify::display-name', Lang.bind(this, this._updateUserName));
+        this._name = new St.Label();
+        box.add(this._name, { y_align: St.Align.MIDDLE, y_fill: false });
+        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUserName));
+        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUserName));

        this._createSubMenu();
-        this._gdm.connect('users-loaded', Lang.bind(this, this._updateSwitchUser));
+        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));
    },

    _onDestroy: function() {
-        this._user.disconnect(this._userNameChangedId);
+        this._user.disconnect(this._userLoadedId);
+        this._user.disconnect(this._userChangedId);
    },

    _updateUserName: function() {
-        this._name.set_text(this._user.get_real_name());
+        if (this._user.is_loaded)
+          this._name.set_text(this._user.get_real_name());
+        else
+          this._name.set_text("");
    },

    _updateSwitchUser: function() {
-        let users = this._gdm.list_users();
-        if (users.length > 1)
-            this._loginScreenItem.show();
+        if (this._gdm.can_switch ())
+            this._loginScreenItem.actor.show();
        else
-            this._loginScreenItem.hide();
+            this._loginScreenItem.actor.hide();
    },

    _updatePresenceIcon: function(presence, status) {
-        if (status == GnomeSessionPresenceStatus.AVAILABLE)
+        if (status == GnomeSession.PresenceStatus.AVAILABLE)
            this._iconBox.child = this._availableIcon;
-        else if (status == GnomeSessionPresenceStatus.BUSY)
+        else if (status == GnomeSession.PresenceStatus.BUSY)
            this._iconBox.child = this._busyIcon;
-        else if (status == GnomeSessionPresenceStatus.INVISIBLE)
+        else if (status == GnomeSession.PresenceStatus.INVISIBLE)
            this._iconBox.child = this._invisibleIcon;
        else
            this._iconBox.child = this._idleIcon;
-    },

-    // The menu
-
-    _createImageMenuItem: function(label, iconName, forceIcon) {
-        let image = new Gtk.Image();
-        let item = new Gtk.ImageMenuItem({ label: label,
-                                           image: image,
-                                           always_show_image: forceIcon == true });
-        item.connect('style-set', Lang.bind(this,
-            function() {
-                image.set_from_icon_name(iconName, Gtk.IconSize.MENU);
-            }));
-
-        return item;
+        for (let itemStatus in this._presenceItems)
+            this._presenceItems[itemStatus].setShowDot(itemStatus == status);
    },

    _createSubMenu: function() {
-        this._menu = new Gtk.Menu();
-        this._menu.connect('deactivate', Lang.bind(this, function() { this.emit('deactivated'); }));
-
        let item;

-        item = this._createImageMenuItem(_('Available'), 'gtk-yes', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.AVAILABLE));
-        this._menu.append(item);
-        item.show();
+        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 = this._createImageMenuItem(_('Busy'), 'gtk-no', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.BUSY));
-        this._menu.append(item);
-        item.show();
+        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;

-        item = this._createImageMenuItem(_('Invisible'), 'gtk-close', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.INVISIBLE));
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupImageMenuItem(_("Invisible"), 'user-invisible', true);
+        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSession.PresenceStatus.INVISIBLE));
+        this.menu.addMenuItem(item);
+        this._presenceItems[GnomeSession.PresenceStatus.INVISIBLE] = item;

-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);

-        item = this._createImageMenuItem(_('Account Information...'), 'user-info');
-        item.connect('activate', Lang.bind(this, this._onAccountInformationActivate));
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupMenuItem(_("My Account..."));
+        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
+        this.menu.addMenuItem(item);

-        let gconf = Shell.GConf.get_default();
-        item = new Gtk.CheckMenuItem({ label: _('Sidebar'),
-                                       active: gconf.get_boolean(SIDEBAR_VISIBLE_KEY) });
-        item.connect('activate', Lang.bind(this,
-            function() {
-                gconf.set_boolean(SIDEBAR_VISIBLE_KEY, this._sidebarItem.active);
-            }));
-        this._menu.append(item);
-        item.show();
-        this._sidebarItem = item;
-
-        item = this._createImageMenuItem(_('System Preferences...'), 'preferences-desktop');
+        item = new PopupMenu.PopupMenuItem(_("System Settings..."));
        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);

-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);

-        item = this._createImageMenuItem(_('Lock Screen'), 'system-lock-screen');
+        item = new PopupMenu.PopupMenuItem(_("Lock Screen"));
        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);

-        item = this._createImageMenuItem(_('Switch User'), 'system-users');
+        item = new PopupMenu.PopupMenuItem(_("Switch User"));
        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);
        this._loginScreenItem = item;

-        item = this._createImageMenuItem(_('Log Out...'), 'system-log-out');
+        item = new PopupMenu.PopupMenuItem(_("Log Out..."));
        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);

-        item = this._createImageMenuItem(_('Shut Down...'), 'system-shutdown');
+        item = new PopupMenu.PopupSeparatorMenuItem();
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Suspend"));
        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-        this._menu.append(item);
-        item.show();
+        this.menu.addMenuItem(item);
+
+        item = new PopupMenu.PopupMenuItem(_("Restart..."));
+        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);
    },

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

-    _onAccountInformationActivate: function() {
+    _onMyAccountActivate: function() {
+        Main.overview.hide();
        this._spawn(['gnome-about-me']);
    },

    _onPreferencesActivate: function() {
+        Main.overview.hide();
        this._spawn(['gnome-control-center']);
    },

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

    _onLoginScreenActivate: function() {
+        Main.overview.hide();
        this._gdm.goto_login_session();
        this._onLockScreenActivate();
    },

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

    _onShutDownActivate: function() {
+        Main.overview.hide();
        this._spawn(['gnome-session-save', '--shutdown-dialog']);
    },

@ -205,93 +197,5 @@ StatusMenu.prototype = {
        // on failure
        let p = new Shell.Process({'args' : args});
        p.run();
-    },
-
-    // shell_status_menu_toggle:
-    // @event: event causing the toggle
-    //
-    // If the menu is not currently up, pops it up. Otherwise, hides it.
-    // Popping up may fail if another grab is already active; check with
-    // isActive().
-    toggle: function(event) {
-        if (this._menu.visible)
-            this._menu.popdown();
-        else {
-            // We don't want to overgrab a Mutter grab with the grab
-            // that GTK+ uses on menus.
-            if (global.display_is_grabbed())
-                return;
-
-            let [menuWidth, menuHeight] = this._menu.get_size_request ();
-
-            let panel;
-            for (panel = this.actor; panel; panel = panel.get_parent()) {
-                if (panel._delegate instanceof Panel.Panel)
-                    break;
-            }
-
-            let [panelX, panelY] = panel.get_transformed_position();
-            let [panelWidth, panelHeight] = panel.get_transformed_size();
-
-            let menuX = Math.round(panelX + panelWidth - menuWidth);
-            let menuY = Math.round(panelY + panelHeight);
-
-            Shell.popup_menu(this._menu, event.get_button(), event.get_time(),
-                             menuX, menuY);
-        }
-    },
-    
-    //  isActive:
-    //  
-    //  Gets whether the menu is currently popped up
-    //  
-    //  Return value: %true if the menu is currently popped up
-    isActive: function() {
-        return this._menu.visible;
    }
 };
-Signals.addSignalMethods(StatusMenu.prototype);
-
-
-const GnomeSessionPresenceIface = {
-    name: 'org.gnome.SessionManager.Presence',
-    methods: [{ name: 'SetStatus',
-                inSignature: 'u' }],
-    properties: [{ name: 'status',
-                   signature: 'u',
-                   access: 'readwrite' }],
-    signals: [{ name: 'StatusChanged',
-                inSignature: 'u' }]
-};
-
-const GnomeSessionPresenceStatus = {
-    AVAILABLE: 0,
-    INVISIBLE: 1,
-    BUSY: 2,
-    IDLE: 3
-};
-
-function GnomeSessionPresence() {
-    this._init();
-}
-
-GnomeSessionPresence.prototype = {
-    _init: function() {
-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
-        this.connect('StatusChanged', Lang.bind(this, function (proxy, status) { this.status = status; }));
-    },
-
-    getStatus: function(callback) {
-        this.GetRemote('status', Lang.bind(this,
-            function(status, ex) {
-                if (!ex)
-                    callback(this, status);
-            }));
-    },
-
-    setStatus: function(status) {
-        this.SetStatusRemote(status);
-    }
-};
-DBus.proxifyPrototype(GnomeSessionPresence.prototype, GnomeSessionPresenceIface);
-
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@ -0,0 +1,639 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const DBus = imports.dbus;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const St = imports.gi.St;
+const Gettext = imports.gettext.domain('gnome-shell');
+const _ = Gettext.gettext;
+
+const Main = imports.ui.main;
+const MessageTray = imports.ui.messageTray;
+const Telepathy = imports.misc.telepathy;
+
+let contactManager;
+let channelDispatcher;
+
+// See Notification.appendMessage
+const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
+const SCROLLBACK_RECENT_LENGTH = 20;
+const SCROLLBACK_IDLE_LENGTH = 5;
+
+// 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';
+
+
+// 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 Client() {
+    this._init();
+};
+
+Client.prototype = {
+    _init : function() {
+        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 = {};
+
+        contactManager = new ContactManager();
+        contactManager.connect('presence-changed', Lang.bind(this, this._presenceChanged));
+
+        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));
+    },
+
+    _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);
+    },
+
+    _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;
+
+                let connReq = new Telepathy.ConnectionRequests(DBus.session,
+                                                               Telepathy.pathToName(connPath),
+                                                               connPath);
+                connReq.GetRemote('Channels', Lang.bind(this,
+                    function(channels, err) {
+                        if (!channels)
+                            return;
+
+                        this._addChannels(accountPath, connPath, channels);
+                    }));
+
+                contactManager.addConnection(connPath);
+            }));
+    },
+
+    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;
+
+        source.setPresence(type, message);
+    }
+};
+DBus.conformExport(Client.prototype, Telepathy.ClientIface);
+DBus.conformExport(Client.prototype, Telepathy.ClientObserverIface);
+
+
+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 = textureCache.load_icon_name('stock_person', St.IconType.FULLCOLOR, 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(accountPath, connPath, channelPath, targetHandle, targetHandleType, targetId) {
+        MessageTray.Source.prototype._init.call(this, targetId);
+
+        this._accountPath = accountPath;
+
+        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];
+                }));
+        }
+
+        // Since we only create sources when receiving a message, this
+        // is a plausible default
+        this._presence = Telepathy.ConnectionPresenceType.AVAILABLE;
+
+        this._channelText = new Telepathy.ChannelText(DBus.session, connName, channelPath);
+        this._receivedId = this._channelText.connect('Received', Lang.bind(this, this._messageReceived));
+
+        this._channelText.ListPendingMessagesRemote(false, Lang.bind(this, this._gotPendingMessages));
+
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon: function() {
+        return contactManager.createAvatar(this._conn, this._targetHandle,
+                                           this.ICON_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));
+    },
+
+    _gotChannelRequest: function (chanReqPath, ex) {
+        if (ex) {
+            log ('EnsureChannelRemote failed? ' + ex);
+            return;
+        }
+
+        let chanReq = new Telepathy.ChannelRequest(DBus.session, Telepathy.CHANNEL_DISPATCHER_NAME, chanReqPath);
+        chanReq.ProceedRemote();
+    },
+
+    _gotPendingMessages: function(msgs, err) {
+        if (!msgs)
+            return;
+
+        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._channelText.disconnect(this._receivedId);
+        this.destroy();
+    },
+
+    _ensureNotification: function() {
+        if (!Main.messageTray.contains(this))
+            Main.messageTray.add(this);
+
+        if (!this._notification)
+            this._notification = new Notification(this);
+    },
+
+    _messageReceived: function(channel, id, timestamp, sender,
+                               type, flags, text) {
+        this._ensureNotification();
+        this._notification.appendMessage(text);
+        this.notify(this._notification);
+    },
+
+    respond: function(text) {
+        this._channelText.SendRemote(Telepathy.ChannelTextMessageType.NORMAL, text);
+    },
+
+    setPresence: function(presence, message) {
+        let msg, notify;
+
+        if (presence == Telepathy.ConnectionPresenceType.AVAILABLE) {
+            msg = _("%s is online.").format(this.title);
+            notify = (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);
+            notify = (this._presence != Telepathy.ConnectionPresenceType.OFFLINE);
+        } else if (presence == Telepathy.ConnectionPresenceType.AWAY) {
+            msg = _("%s is away.").format(this.title);
+            notify = false;
+        } else if (presence == Telepathy.ConnectionPresenceType.BUSY) {
+            msg = _("%s is busy.").format(this.title);
+            notify = false;
+        } else
+            return;
+
+        this._presence = presence;
+
+        if (message)
+            msg += ' <i>(' + GLib.markup_escape_text(message, -1) + ')</i>';
+
+        this._ensureNotification();
+        this._notification.appendMessage(msg, true);
+        if (notify)
+            this.notify(this._notification);
+    }
+};
+
+function Notification(source) {
+    this._init(source);
+}
+
+Notification.prototype = {
+    __proto__:  MessageTray.Notification.prototype,
+
+    _init: function(source) {
+        MessageTray.Notification.prototype._init.call(this, source, source.title, null, { customContent: 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._history = [];
+    },
+
+    appendMessage: function(text, asTitle) {
+        if (asTitle)
+            this.update(text, null, { customContent: true });
+        else
+            this.update(this.source.title, text, { customContent: true });
+        this._append(text, 'chat-received');
+    },
+
+    _append: function(text, style) {
+        let body = this.addBody(text);
+        body.add_style_class_name(style);
+        this.scrollTo(St.Side.BOTTOM);
+
+        let now = new Date().getTime() / 1000;
+        this._history.unshift({ actor: body, time: now });
+
+        if (this._history.length > 1) {
+            // Keep the scrollback from growing too long. If the most
+            // recent message (before the one we just added) is within
+            // SCROLLBACK_RECENT_TIME, we will keep
+            // SCROLLBACK_RECENT_LENGTH previous messages. Otherwise
+            // we'll keep SCROLLBACK_IDLE_LENGTH messages.
+
+            let lastMessageTime = this._history[1].time;
+            let maxLength = (lastMessageTime < now - SCROLLBACK_RECENT_TIME) ?
+                SCROLLBACK_IDLE_LENGTH : SCROLLBACK_RECENT_LENGTH;
+            if (this._history.length > maxLength) {
+                let expired = this._history.splice(maxLength);
+                for (let i = 0; i < expired.length; i++)
+                    expired[i].actor.destroy();
+            }
+        }
+    },
+
+    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() {
+        let text = this._responseEntry.get_text();
+        if (text == '')
+            return;
+
+        this._responseEntry.set_text('');
+        this._append(text, 'chat-sent');
+        this.source.respond(text);
+    }
+};
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@ -1,9 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
 const Signals = imports.signals;
 const Tweener = imports.tweener.tweener;

@ -42,17 +43,8 @@ const Tweener = imports.tweener.tweener;
 // calls any of these is almost certainly wrong anyway, because they
 // affect the entire application.)

-let slowDownFactor = 1.0;
-
 // Called from Main.start
 function init() {
-    let slowdownEnv = GLib.getenv("GNOME_SHELL_SLOWDOWN_FACTOR");
-    if (slowdownEnv) {
-        let factor = parseFloat(slowdownEnv);
-        if (!isNaN(factor) && factor > 0.0)
-            slowDownFactor = factor;
-    }
-
    Tweener.setFrameTicker(new ClutterFrameTicker());
 }

@ -178,7 +170,7 @@ function resumeTweens() {
 function registerSpecialProperty(name, getFunction, setFunction,
                                 parameters, preProcessFunction) {
    Tweener.registerSpecialProperty(name, getFunction, setFunction,
-				    parameters, preProcessFunction);
+                                    parameters, preProcessFunction);
 }

 function registerSpecialPropertyModifier(name, modifyFunction, getFunction) {
@ -190,7 +182,7 @@ function registerSpecialPropertySplitter(name, splitFunction, parameters) {
 }


-// The "FrameTicker" object is an object used to feed new frames to
+// The 'FrameTicker' object is an object used to feed new frames to
 // Tweener so it can update values and redraw. The default frame
 // ticker for Tweener just uses a simple timeout at a fixed frame rate
 // and has no idea of "catching up" by dropping frames.
@ -215,12 +207,19 @@ ClutterFrameTicker.prototype = {
        // when we need to stop, so use 1000 seconds as "infinity"
        this._timeline = new Clutter.Timeline({ duration: 1000*1000 });
        this._startTime = -1;
-        this._currentTime = -1;

        this._timeline.connect('new-frame', Lang.bind(this,
            function(timeline, frame) {
                this._onNewFrame(frame);
            }));
+
+        let perf_log = Shell.PerfLog.get_default();
+        perf_log.define_event("tweener.framePrepareStart",
+                              "Start of a new animation frame",
+                              "");
+        perf_log.define_event("tweener.framePrepareDone",
+                              "Finished preparing frame",
+                              "");
    },

    _onNewFrame : function(frame) {
@ -233,22 +232,27 @@ ClutterFrameTicker.prototype = {
            this._startTime = this._timeline.get_elapsed_time();

        // currentTime is in milliseconds
-        this._currentTime = (this._timeline.get_elapsed_time() - this._startTime) / slowDownFactor;
+        let perf_log = Shell.PerfLog.get_default();
+        perf_log.event("tweener.framePrepareStart");
        this.emit('prepare-frame');
+        perf_log.event("tweener.framePrepareDone");
    },

    getTime : function() {
-        return this._currentTime;
+        return this._timeline.get_elapsed_time();
    },

    start : function() {
+        if (St.get_slow_down_factor() > 0)
+            Tweener.setTimeScale(1 / St.get_slow_down_factor());
        this._timeline.start();
+        global.begin_work();
    },

    stop : function() {
        this._timeline.stop();
        this._startTime = -1;
-        this._currentTime = -1;
+        global.end_work();
    }
 };

--- a/js/ui/widget.js
+++ b/js/ui/widget.js
@ -1,364 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-const Mainloop = imports.mainloop;
-const Lang = imports.lang;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const AppFavorites = imports.ui.appFavorites;
-const DocInfo = imports.misc.docInfo;
-
-const COLLAPSED_WIDTH = 24;
-const EXPANDED_WIDTH = 200;
-
-const STATE_EXPANDED    = 0;
-const STATE_COLLAPSING  = 1;
-const STATE_COLLAPSED   = 2;
-const STATE_EXPANDING   = 3;
-const STATE_POPPING_OUT = 4;
-const STATE_POPPED_OUT  = 5;
-const STATE_POPPING_IN  = 6;
-
-function Widget() {
-}
-
-Widget.prototype = {
-    // _init():
-    //
-    // Your widget constructor. Your constructor function should look
-    // like:
-    //
-    //     function MyWidgetType() {
-    //         this._init.apply(this, arguments);
-    //     }
-    //
-    // and your _init method should start by doing:
-    //
-    //     Widget.Widget.prototype._init.apply(this, arguments);
-    //
-    // The _init method must define a field named "actor" containing
-    // the Clutter.Actor to show in expanded mode. This actor will be
-    // clipped to Widget.EXPANDED_WIDTH. Most widgets will also define
-    // a field named "title" containing the title string to show above
-    // the widget in the sidebar.
-    //
-    // If you want to have a separate collapsed view, you can define a
-    // field "collapsedActor" containing the Clutter.Actor to show in
-    // that mode. (It may be the same actor.) This actor will be
-    // clipped to Widget.COLLAPSED_WIDTH, and will normally end up
-    // having the same height as the main actor.
-    //
-    // If you do not set a collapsedActor, then you must set a title,
-    // since that is what will be displayed in collapsed mode, and
-    // in this case (and only in this case), the widget will support
-    // pop-out, meaning that if the user hovers over its title while
-    // the sidebar is collapsed, the widget's expanded view will pop
-    // out of the sidebar until either the cursor moves out of it,
-    // or else the widget calls this.activated() on itself.
-    _init: function (initialState) {
-        this.state = initialState;
-    },
-
-    // destroy():
-    //
-    // Optional. Will be called when the widget is removed from the
-    // sidebar. (Note that you don't need to destroy the actors,
-    // since they will be destroyed for you.)
-
-    // collapse():
-    //
-    // Optional. Called during the sidebar collapse process, at the
-    // point when the expanded sidebar has slid offscreen, but the
-    // collapsed sidebar has not yet slid onscreen.
-
-    // expand():
-    //
-    // Optional. Called during the sidebar expand process, at the
-    // point when the collapsed sidebar has slid offscreen, but the
-    // expanded sidebar has not yet slid onscreen.
-
-    // activated():
-    //
-    // Emits the "activated" signal for you, which will cause pop-out
-    // to end.
-    activated: function() {
-        this.emit('activated');
-    }
-
-    // state:
-    //
-    // A field set on your widget by the sidebar. Will contain one of
-    // the Widget.STATE_* values. (Eg, Widget.STATE_EXPANDED).
-};
-
-Signals.addSignalMethods(Widget.prototype);
-
-
-function ClockWidget() {
-    this._init.apply(this, arguments);
-}
-
-ClockWidget.prototype = {
-    __proto__ : Widget.prototype,
-
-    _init: function() {
-        Widget.prototype._init.apply(this, arguments);
-
-        this.actor = new Clutter.Text({ font_name: "Sans Bold 16px",
-                                        text: "",
-                                        // Give an explicit height to ensure
-                                        // it's the same in both modes
-                                        height: COLLAPSED_WIDTH });
-
-        this.collapsedActor = new Clutter.CairoTexture({ width: COLLAPSED_WIDTH,
-                                                         height: COLLAPSED_WIDTH,
-                                                         surface_width: COLLAPSED_WIDTH,
-                                                         surface_height: COLLAPSED_WIDTH });
-
-        this._update();
-    },
-
-    destroy: function() {
-        if (this.timer)
-            Mainloop.source_remove(this.timer);
-    },
-
-    expand: function() {
-        this._update();
-    },
-
-    collapse: function() {
-        this._update();
-    },
-
-    _update: function() {
-        let time = new Date();
-        let msec_remaining = 60000 - (1000 * time.getSeconds() +
-                                      time.getMilliseconds());
-        if (msec_remaining < 500) {
-            time.setMinutes(time.getMinutes() + 1);
-            msec_remaining += 60000;
-        }
-
-        if (this.state == STATE_COLLAPSED || this.state == STATE_COLLAPSING)
-            this._updateCairo(time);
-        else
-            this._updateText(time);
-
-        if (this.timer)
-            Mainloop.source_remove(this.timer);
-        this.timer = Mainloop.timeout_add(msec_remaining, Lang.bind(this, this._update));
-        return false;
-    },
-
-    _updateText: function(time) {
-        // Translators: This is a time format.
-        this.actor.set_text(time.toLocaleFormat(_("%H:%M")));
-    },
-
-    _updateCairo: function(time) {
-        Shell.draw_clock(this.collapsedActor,
-                         time.getHours() % 12,
-                         time.getMinutes());
-    }
-};
-
-
-const ITEM_ICON_SIZE = 48;
-const ITEM_PADDING = 1;
-const ITEM_SPACING = 4;
-
-const ITEM_BG_COLOR = new Clutter.Color();
-ITEM_BG_COLOR.from_pixel(0x00000000);
-const ITEM_NAME_COLOR = new Clutter.Color();
-ITEM_NAME_COLOR.from_pixel(0x000000ff);
-
-function LauncherWidget() {
-    this._init.apply(this, arguments);
-}
-
-LauncherWidget.prototype = {
-    __proto__ : Widget.prototype,
-
-    addItem : function(info) {
-        let item = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                 width: EXPANDED_WIDTH,
-                                 height: ITEM_ICON_SIZE,
-                                 padding: ITEM_PADDING,
-                                 spacing: ITEM_SPACING,
-                                 reactive: true });
-        item._info = info;
-        item.append(info.createIcon(ITEM_ICON_SIZE), Big.BoxPackFlags.NONE);
-        item.append(new Clutter.Text({ color: ITEM_NAME_COLOR,
-                                       font_name: "Sans 14px",
-                                       ellipsize: Pango.EllipsizeMode.END,
-                                       text: info.name }),
-                    Big.BoxPackFlags.NONE);
-
-        this.actor.append(item, Big.BoxPackFlags.NONE);
-        item.connect('button-press-event', Lang.bind(this, this._buttonPress));
-        item.connect('button-release-event', Lang.bind(this, this._buttonRelease));
-        item.connect('leave-event', Lang.bind(this, this._leave));
-        item.connect('enter-event', Lang.bind(this, this._enter));
-
-        if (!this.collapsedActor)
-            return;
-
-        item = new Big.Box({ width: COLLAPSED_WIDTH,
-                             height: COLLAPSED_WIDTH,
-                             padding: ITEM_PADDING,
-                             reactive: true });
-        item._info = info;
-        item.append(info.createIcon(COLLAPSED_WIDTH - 2 * ITEM_PADDING),
-                    Big.BoxPackFlags.NONE);
-
-        this.collapsedActor.append(item, Big.BoxPackFlags.NONE);
-        item.connect('button-press-event', Lang.bind(this, this._buttonPress));
-        item.connect('button-release-event', Lang.bind(this, this._buttonRelease));
-        item.connect('leave-event', Lang.bind(this, this._leave));
-        item.connect('enter-event', Lang.bind(this, this._enter));
-    },
-
-    clear : function() {
-        let children, i;
-
-        children = this.actor.get_children();
-        for (i = 0; i < children.length; i++)
-            children[i].destroy();
-
-        if (this.collapsedActor) {
-            children = this.collapsedActor.get_children();
-            for (i = 0; i < children.length; i++)
-                children[i].destroy();
-        }
-    },
-
-    _buttonPress : function(item) {
-        Clutter.grab_pointer(item);
-        item._buttonDown = true;
-        item._inItem = true;
-        this._updateItemState(item);
-        return true;
-    },
-
-    _leave : function(item, evt) {
-        if (evt.get_source() == item && item._buttonDown) {
-            item._inItem = false;
-            this._updateItemState(item);
-        }
-        return false;
-    },
-
-    _enter : function(item, evt) {
-        if (evt.get_source() == item && item._buttonDown) {
-            item._inItem = true;
-            this._updateItemState(item);
-        }
-        return false;
-    },
-
-    _buttonRelease : function(item) {
-        Clutter.ungrab_pointer(item);
-        item._buttonDown = false;
-        this._updateItemState(item);
-
-        if (item._inItem) {
-            item._info.launch();
-            this.activated();
-        }
-        return true;
-    },
-
-    _updateItemState : function(item) {
-        if (item._buttonDown && item._inItem) {
-            item.padding_top = item.padding_left = 2 * ITEM_PADDING;
-            item.padding_bottom = item.padding_right = 0;
-        } else
-            item.padding = ITEM_PADDING;
-    }
-};
-
-function AppsWidgetInfo(appInfo) {
-    this._init(appInfo);
-}
-
-AppsWidgetInfo.prototype = {
-    _init : function(appInfo) {
-        this._info = appInfo;
-        this.name = appInfo.get_name();
-    },
-
-    createIcon : function(size) {
-        return this._info.create_icon_texture(size);
-    },
-
-    launch : function() {
-        this._info.launch();
-    }
-}
-
-function AppsWidget() {
-    this._init.apply(this, arguments);
-}
-
-AppsWidget.prototype = {
-    __proto__ : LauncherWidget.prototype,
-
-    _init : function() {
-        Widget.prototype._init.apply(this, arguments);
-
-        this.title = _("Applications");
-        this.actor = new Big.Box({ spacing: 2 });
-        this.collapsedActor = new Big.Box({ spacing: 2});
-
-        let appSystem = Shell.AppSystem.get_default();
-        let apps = AppFavorites.getAppFavorites().getFavorites();
-        for (let i = 0; i < apps.length; i++) {
-            this.addItem(new AppsWidgetInfo(apps[i]));
-        }
-    }
-};
-
-function RecentDocsWidget() {
-    this._init.apply(this, arguments);
-}
-
-RecentDocsWidget.prototype = {
-    __proto__ : LauncherWidget.prototype,
-
-    _init : function() {
-        Widget.prototype._init.apply(this, arguments);
-
-        this.title = _("Recent Documents");
-        this.actor = new Big.Box({ spacing: 2 });
-
-        this._recentManager = Gtk.RecentManager.get_default();
-        this._recentManager.connect('changed', Lang.bind(this, this._recentChanged));
-        this._recentChanged();
-    },
-
-    _recentChanged: function() {
-        let i;
-
-        this.clear();
-
-        let items = [];
-        let docs = this._recentManager.get_items();
-        for (i = 0; i < docs.length; i++) {
-            let docInfo = new DocInfo.DocInfo (docs[i]);
-
-            items.push(docInfo);
-        }
-
-        items.sort(function (a,b) { return b.timestamp - a.timestamp; });
-        for (i = 0; i < Math.min(items.length, 5); i++)
-            this.addItem(items[i]);
-    }
-};
--- a/js/ui/widgetBox.js
+++ b/js/ui/widgetBox.js
@ -1,381 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-
-const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
-const Widget = imports.ui.widget;
-
-const WIDGETBOX_BG_COLOR = new Clutter.Color();
-WIDGETBOX_BG_COLOR.from_pixel(0xf0f0f0ff);
-const BLACK = new Clutter.Color();
-BLACK.from_pixel(0x000000ff);
-
-const WIDGETBOX_PADDING = 2;
-const ANIMATION_TIME = 0.5;
-const POP_IN_LAG = 250; /* milliseconds */
-
-function WidgetBox(widget, expanded) {
-    this._init(widget, expanded);
-}
-
-WidgetBox.prototype = {
-    _init: function(widget, expanded) {
-        this.state = expanded ? Widget.STATE_EXPANDED : Widget.STATE_COLLAPSED;
-
-	if (widget instanceof Widget.Widget) {
-	    this._widget = widget;
-            this._widget.state = this.state;
-	} else {
-	    let ctor = this._ctorFromName(widget);
-            this._widget = new ctor(this.state);
-	}
-
-        if (!this._widget.actor)
-            throw new Error("widget has no actor");
-        else if (!this._widget.title && !this._widget.collapsedActor)
-            throw new Error("widget has neither title nor collapsedActor");
-
-        this.state = expanded ? Widget.STATE_EXPANDED : Widget.STATE_COLLAPSED;
-
-        // The structure of a WidgetBox:
-        //
-        // The top level is a Clutter.Group, which exists to make
-        // pop-out work correctly; when another widget pops out, its
-        // width will increase, which will in turn cause the sidebar's
-        // width to increase, which will cause the sidebar to increase
-        // the width of each of its children (the WidgetBoxes). But we
-        // don't want the non-popped-out widgets to expand, so we make
-        // the top-level actor be a Clutter.Group, which will accept
-        // the new width from the Sidebar, but not impose it on its
-        // own child.
-        //
-        // Inside the toplevel group is a horizontal Big.Box
-        // containing 2 Clutter.Groups; one for the collapsed state
-        // (cgroup) and one for the expanded state (egroup). Each
-        // group contains a single vertical Big.Box (cbox and ebox
-        // respectively), which have the appropriate fixed width. The
-        // cbox contains either the collapsed widget actor or else the
-        // rotated title. The ebox contains the horizontal title (if
-        // any), separator line, and the expanded widget actor. (If
-        // the widget doesn't have a collapsed actor, and therefore
-        // supports pop-out, then it will also have a vertical line
-        // between the two groups, which will only be shown during
-        // pop-out.)
-        //
-        // In the expanded view, cgroup is hidden and egroup is shown.
-        // When animating to the collapsed view, first the ebox is
-        // slid offscreen by giving it increasingly negative x
-        // coordinates within egroup. Then once it's fully offscreen,
-        // we hide egroup, show cgroup, and slide cbox back in in the
-        // same way.
-        //
-        // The pop-out view works similarly to the second half of the
-        // collapsed-to-expanded transition, except that the
-        // horizontal title gets hidden to avoid duplication.
-
-        this.actor = new Clutter.Group();
-        this._hbox = new Big.Box({ background_color: WIDGETBOX_BG_COLOR,
-                                   padding_top: WIDGETBOX_PADDING,
-                                   padding_bottom: WIDGETBOX_PADDING,
-                                   padding_right: WIDGETBOX_PADDING,
-                                   // Left padding is here to make up for
-                                   // the X offset used for the sidebar
-                                   // to hide its rounded corners
-                                   padding_left: 2 * WIDGETBOX_PADDING,
-                                   spacing: WIDGETBOX_PADDING,
-                                   corner_radius: WIDGETBOX_PADDING,
-                                   orientation: Big.BoxOrientation.HORIZONTAL,
-                                   reactive: true });
-        this.actor.add_actor(this._hbox);
-
-        this._cgroup = new Clutter.Group({ clip_to_allocation: true });
-        this._hbox.append(this._cgroup, Big.BoxPackFlags.NONE);
-
-        this._cbox = new Big.Box({ width: Widget.COLLAPSED_WIDTH,
-                                   clip_to_allocation: true });
-        this._cgroup.add_actor(this._cbox);
-
-        if (this._widget.collapsedActor) {
-            if (this._widget.collapsedActor == this._widget.actor)
-                this._singleActor = true;
-            else {
-                this._cbox.append(this._widget.collapsedActor,
-                                  Big.BoxPackFlags.NONE);
-            }
-        } else {
-            let vtitle = new Clutter.Text({ font_name: "Sans 16px",
-                                            text: this._widget.title,
-                                            rotation_angle_z: -90.0 });
-            let signalId = vtitle.connect('notify::allocation',
-                                          function () {
-                                              vtitle.disconnect(signalId);
-                                              vtitle.set_anchor_point(vtitle.natural_width, 0);
-                                              vtitle.set_size(vtitle.natural_height,
-                                                              vtitle.natural_width);
-                                          });
-            this._vtitle = vtitle;
-            this._cbox.append(this._vtitle, Big.BoxPackFlags.NONE);
-
-            this._vline = new Clutter.Rectangle({ color: BLACK, width: 1 });
-            this._hbox.append(this._vline, Big.BoxPackFlags.NONE);
-            this._vline.hide();
-
-            // Set up pop-out
-            this._eventHandler = this._hbox.connect('captured-event',
-                                                    Lang.bind(this, this._popEventHandler));
-            this._activationHandler = this._widget.connect('activated',
-                                                           Lang.bind(this, this._activationHandler));
-        }
-
-        this._egroup = new Clutter.Group({ clip_to_allocation: true });
-        this._hbox.append(this._egroup, Big.BoxPackFlags.NONE);
-
-        this._ebox = new Big.Box({ spacing: WIDGETBOX_PADDING,
-                                   width: Widget.EXPANDED_WIDTH,
-                                   clip_to_allocation: true });
-        this._egroup.add_actor(this._ebox);
-
-        if (this._widget.title) {
-            this._htitle = new Clutter.Text({ font_name: "Sans 16px",
-                                              text: this._widget.title });
-            this._ebox.append(this._htitle, Big.BoxPackFlags.NONE);
-
-            this._hline = new Clutter.Rectangle({ color: BLACK, height: 1 });
-            this._ebox.append(this._hline, Big.BoxPackFlags.NONE);
-        }
-
-        this._ebox.append(this._widget.actor, Big.BoxPackFlags.NONE);
-
-        if (expanded)
-            this._setWidgetExpanded();
-        else
-            this._setWidgetCollapsed();
-    },
-
-    // Given a name like "imports.ui.widget.ClockWidget", turn that
-    // into a constructor function
-    _ctorFromName: function(name) {
-        // Make sure it's a valid import
-        if (!name.match(/^imports(\.[a-zA-Z0-9_]+)+$/))
-            throw new Error("widget name must start with 'imports.'");
-        if (name.match(/^imports\.gi\./))
-            throw new Error("cannot import widget from GIR");
-
-        let ctor = eval(name);
-
-        // Make sure it's really a constructor
-        if (!ctor || typeof(ctor) != "function")
-            throw new Error("widget name is not a constructor");
-
-        // Make sure it's a widget
-        let proto = ctor.prototype;
-        while (proto && proto != Widget.Widget.prototype)
-            proto = proto.__proto__;
-        if (!proto)
-            throw new Error("widget does not inherit from Widget prototype");
-
-        return ctor;
-    },
-
-    expand: function() {
-        Tweener.addTween(this._cbox, { x: -Widget.COLLAPSED_WIDTH,
-                                       time: ANIMATION_TIME / 2,
-                                       transition: "easeOutQuad",
-                                       onComplete: this._expandPart1Complete,
-                                       onCompleteScope: this });
-        this.state = this._widget.state = Widget.STATE_EXPANDING;
-    },
-
-    _setWidgetExpanded: function() {
-        this._cgroup.hide();
-        this._egroup.show();
-
-        if (this._singleActor) {
-            this._widget.actor.unparent();
-            this._ebox.append(this._widget.actor, Big.BoxPackFlags.NONE);
-        }
-
-        if (this._htitle) {
-            this._htitle.show();
-            this._hline.show();
-        }
-    },
-
-    _expandPart1Complete: function() {
-        this._cbox.x = 0;
-        this._setWidgetExpanded();
-
-        if (this._widget.expand) {
-            try {
-                this._widget.expand();
-            } catch (e) {
-                logError(e, 'Widget failed to expand');
-            }
-        }
-
-        this._ebox.x = -Widget.EXPANDED_WIDTH;
-        Tweener.addTween(this._ebox, { x: 0,
-                                       time: ANIMATION_TIME / 2,
-                                       transition: "easeOutQuad",
-                                       onComplete: this._expandComplete,
-                                       onCompleteScope: this });
-    },
-
-    _expandComplete: function() {
-        this.state = this._widget.state = Widget.STATE_EXPANDED;
-    },
-
-    collapse: function() {
-        Tweener.addTween(this._ebox, { x: -Widget.EXPANDED_WIDTH,
-                                       time: ANIMATION_TIME / 2,
-                                       transition: "easeOutQuad",
-                                       onComplete: this._collapsePart1Complete,
-                                       onCompleteScope: this });
-        this.state = this._widget.state = Widget.STATE_COLLAPSING;
-    },
-
-    _setWidgetCollapsed: function() {
-        this._egroup.hide();
-        this._cgroup.show();
-
-        if (this._singleActor) {
-            this._widget.actor.unparent();
-            this._cbox.append(this._widget.actor, Big.BoxPackFlags.NONE);
-        }
-
-        if (this._htitle) {
-            this._htitle.hide();
-            this._hline.hide();
-        }
-
-        if (this._vtitle)
-            this._cbox.height = this._ebox.height;
-    },
-
-    _collapsePart1Complete: function() {
-        this._ebox.x = 0;
-        this._setWidgetCollapsed();
-
-        if (this._widget.collapse) {
-            try {
-                this._widget.collapse();
-            } catch (e) {
-                logError(e, 'Widget failed to collapse');
-            }
-        }
-
-        this._cbox.x = -Widget.COLLAPSED_WIDTH;
-        Tweener.addTween(this._cbox, { x: 0,
-                                       time: ANIMATION_TIME / 2,
-                                       transition: "easeOutQuad",
-                                       onComplete: this._collapseComplete,
-                                       onCompleteScope: this });
-    },
-
-    _collapseComplete: function() {
-        this.state = this._widget.state = Widget.STATE_COLLAPSED;
-    },
-
-    _popEventHandler: function(actor, event) {
-        let type = event.type();
-
-        if (type == Clutter.EventType.ENTER) {
-            this._clearPopInTimeout();
-            if (this.state == Widget.STATE_COLLAPSED ||
-                this.state == Widget.STATE_COLLAPSING) {
-                this._popOut();
-                return false;
-            }
-        } else if (type == Clutter.EventType.LEAVE &&
-                   (this.state == Widget.STATE_POPPED_OUT ||
-                    this.state == Widget.STATE_POPPING_OUT)) {
-            // If moving into another actor within this._hbox, let the
-            // event be propagated
-            let into = event.get_related();
-            while (into) {
-                if (into == this._hbox)
-                    return false;
-                into = into.get_parent();
-            }
-
-            // Else, moving out of this._hbox
-            this._setPopInTimeout();
-            return false;
-        }
-
-        return false;
-    },
-
-    _activationHandler: function() {
-        if (this.state == Widget.STATE_POPPED_OUT)
-            this._popIn();
-    },
-
-    _popOut: function() {
-        if (this.state != Widget.STATE_COLLAPSED &&
-            this.state != Widget.STATE_COLLAPSING)
-            return;
-
-        this._vline.show();
-        this._egroup.show();
-        this._ebox.x = -Widget.EXPANDED_WIDTH;
-        Tweener.addTween(this._ebox, { x: 0,
-                                       time: ANIMATION_TIME / 2,
-                                       transition: "easeOutQuad",
-                                       onComplete: this._popOutComplete,
-                                       onCompleteScope: this });
-        this.state = this._widget.state = Widget.STATE_POPPING_OUT;
-
-        Main.chrome.trackActor(this._hbox, { affectsStruts: false });
-    },
-
-    _popOutComplete: function() {
-        this.state = this._widget.state = Widget.STATE_POPPED_OUT;
-    },
-
-    _setPopInTimeout: function() {
-        this._clearPopInTimeout();
-        this._popInTimeout = Mainloop.timeout_add(POP_IN_LAG, Lang.bind(this, function () { this._popIn(); return false; }));
-    },
-
-    _clearPopInTimeout: function() {
-        if (this._popInTimeout) {
-            Mainloop.source_remove(this._popInTimeout);
-            delete this._popInTimeout;
-        }
-    },
-
-    _popIn: function() {
-        this._clearPopInTimeout();
-
-        if (this.state != Widget.STATE_POPPED_OUT &&
-            this.state != Widget.STATE_POPPING_OUT)
-            return;
-
-        Tweener.addTween(this._ebox, { x: -Widget.EXPANDED_WIDTH,
-                                       time: ANIMATION_TIME / 2,
-                                       transition: "easeOutQuad",
-                                       onComplete: this._popInComplete,
-                                       onCompleteScope: this });
-    },
-
-    _popInComplete: function() {
-        this.state = this._widget.state = Widget.STATE_COLLAPSED;
-        this._vline.hide();
-        this._egroup.hide();
-        this._ebox.x = 0;
-
-        Main.chrome.untrackActor(this._hbox);
-    },
-
-    destroy: function() {
-        if (this._widget.destroy)
-            this._widget.destroy();
-    }
-};
-
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@ -0,0 +1,107 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+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;
+
+function WindowAttentionHandler() {
+    this._init();
+}
+
+WindowAttentionHandler.prototype = {
+    _init : function() {
+        this._startupIds = {};
+        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) {
+        let sequences = tracker.get_startup_sequences();
+        this._startupIds = {};
+        for(let i = 0; i < sequences.length; i++) {
+            this._startupIds[sequences[i].get_id()] = true;
+        }
+    },
+
+    _getTitle : function(app, window) {
+        if (this._startupIds[window.get_startup_id()])
+            return app.get_name();
+        else
+            return window.title;
+    },
+
+    _getBanner : function(app, window) {
+        if (this._startupIds[window.get_startup_id()])
+            return _("%s has finished starting").format(app.get_name());
+        else
+            return _("'%s' is ready").format(window.title);
+    },
+
+    _onWindowDemandsAttention : function(display, window) {
+        // We don't want to show the notification when the window is already focused,
+        // because this is rather pointless.
+        // Some apps (like GIMP) do things like setting the urgency hint on the
+        // toolbar windows which would result into a notification even though GIMP itself is
+        // focused.
+        // We are just ignoring the hint on skip_taskbar windows for now.
+        // (Which is the same behaviour as with metacity + panel)
+
+        if (!window || window.has_focus() || window.is_skip_taskbar())
+            return;
+
+        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);
+
+        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(); }));
+
+    }
+};
+
+function Source(app, window) {
+    this._init(app, window);
+}
+
+Source.prototype = {
+    __proto__ : MessageTray.Source.prototype,
+
+    _init: function(app, window) {
+        MessageTray.Source.prototype._init.call(this, app.get_name());
+        this._window = window;
+        this._app = app;
+        this._setSummaryIcon(this.createNotificationIcon());
+    },
+
+    createNotificationIcon : function() {
+        return this._app.create_icon_texture(this.ICON_SIZE);
+    },
+
+    _notificationClicked : function(notification) {
+        Main.activateWindow(this._window);
+        this.destroy();
+    }
+};
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -1,16 +1,80 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

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

 const AltTab = imports.ui.altTab;
+const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;

 const WINDOW_ANIMATION_TIME = 0.25;
+const DIM_TIME = 0.500;
+const UNDIM_TIME = 0.250;
+
+var dimShader = undefined;
+
+function getDimShader() {
+    if (dimShader === null)
+        return null;
+    if (!dimShader) {
+        let [success, source, length] = GLib.file_get_contents(global.datadir +
+                                                               '/shaders/dim-window.glsl');
+        try {
+            let shader = new Clutter.Shader();
+            shader.set_fragment_source(source, -1);
+            shader.compile();
+
+            dimShader = shader;
+        } catch (e) {
+            log(e.message);
+            dimShader = null;
+        }
+    }
+    return dimShader;
+}
+
+function WindowDimmer(actor) {
+    this._init(actor);
+}
+
+WindowDimmer.prototype = {
+    _init: function(actor) {
+        this.actor = actor;
+    },
+
+    set dimFraction(fraction) {
+        this._dimFraction = fraction;
+        let shader = getDimShader();
+        if (!Meta.prefs_get_attach_modal_dialogs() || !shader) {
+            this.actor.set_shader(null);
+            return;
+        }
+        if (fraction > 0.01) {
+            this.actor.set_shader(shader);
+            this.actor.set_shader_param_float('height', this.actor.get_height());
+            this.actor.set_shader_param_float('fraction', fraction);
+        } else
+            this.actor.set_shader(null);
+    },
+
+    get dimFraction() {
+        return this._dimFraction;
+    },
+
+    _dimFraction: 0.0
+};
+
+function getWindowDimmer(texture) {
+    if (!texture._windowDimmer)
+        texture._windowDimmer = new WindowDimmer(texture);
+
+    return texture._windowDimmer;
+}

 function WindowManager() {
    this._init();
@ -18,36 +82,65 @@ function WindowManager() {

 WindowManager.prototype = {
    _init : function() {
-        let shellwm = global.window_manager;
+        this._shellwm =  global.window_manager;

+        this._keyBindingHandlers = [];
        this._minimizing = [];
        this._maximizing = [];
        this._unmaximizing = [];
        this._mapping = [];
        this._destroying = [];

-        this._switchData = null;
-        shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
-        shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
-        shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
-        shellwm.connect('kill-minimize', Lang.bind(this, this._minimizeWindowDone));
-        shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
-        shellwm.connect('kill-maximize', Lang.bind(this, this._maximizeWindowDone));
-        shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
-        shellwm.connect('kill-unmaximize', Lang.bind(this, this._unmaximizeWindowDone));
-        shellwm.connect('map', Lang.bind(this, this._mapWindow));
-        shellwm.connect('kill-map', Lang.bind(this, this._mapWindowDone));
-        shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
-        shellwm.connect('kill-destroy', Lang.bind(this, this._destroyWindowDone));
+        this._dimmedWindows = [];

-        shellwm.takeover_keybinding('switch_windows');
-        shellwm.connect('keybinding::switch_windows', Lang.bind(this, this._startAppSwitcher));
+        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) {
+            this._minimizeWindowDone(shellwm, actor);
+            this._maximizeWindowDone(shellwm, actor);
+            this._unmaximizeWindowDone(shellwm, actor);
+            this._mapWindowDone(shellwm, actor);
+            this._destroyWindowDone(shellwm, actor);
+        }));
+
+        this._shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
+        this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
+        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
+        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
+        this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
+        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
+
+        this._workspaceSwitcherPopup = null;
+        this.setKeybindingHandler('switch_to_workspace_left', Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setKeybindingHandler('switch_to_workspace_right', Lang.bind(this, this._showWorkspaceSwitcher));
+        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));
+
+        Main.overview.connect('showing', Lang.bind(this, function() {
+            for (let i = 0; i < this._dimmedWindows.length; i++)
+                this._undimParentWindow(this._dimmedWindows[i], true);
+        }));
+        Main.overview.connect('hiding', Lang.bind(this, function() {
+            for (let i = 0; i < this._dimmedWindows.length; i++)
+                this._dimParentWindow(this._dimmedWindows[i], true);
+        }));
+    },
+
+    setKeybindingHandler: function(keybinding, handler){
+        if (this._keyBindingHandlers[keybinding])
+            this._shellwm.disconnect(this._keyBindingHandlers[keybinding]);
+        else
+            this._shellwm.takeover_keybinding(keybinding);
+
+        this._keyBindingHandlers[keybinding] =
+            this._shellwm.connect('keybinding::' + keybinding, handler);
    },

    _shouldAnimate : function(actor) {
        if (Main.overview.visible)
            return false;
-        if (actor && (actor.get_window_type() != Meta.CompWindowType.NORMAL))
+        if (actor && (actor.meta_window.get_window_type() != Meta.WindowType.NORMAL))
            return false;
        return true;
    },
@ -74,11 +167,19 @@ WindowManager.prototype = {
         * maybe TODO: get icon geometry passed through and move the window towards it?
         */
        this._minimizing.push(actor);
+
+        let primary = global.get_primary_monitor();
+        let xDest = primary.x;
+        if (St.Widget.get_default_direction() == St.TextDirection.RTL)
+            xDest += primary.width;
+
        Tweener.addTween(actor,
                         { scale_x: 0.0,
                           scale_y: 0.0,
+                           x: xDest,
+                           y: 0,
                           time: WINDOW_ANIMATION_TIME,
-                           transition: "easeOutQuad",
+                           transition: 'easeOutQuad',
                           onComplete: this._minimizeWindowDone,
                           onCompleteScope: this,
                           onCompleteParams: [shellwm, actor],
@ -121,23 +222,122 @@ WindowManager.prototype = {
    _unmaximizeWindowDone : function(shellwm, actor) {
    },

+    _parentHasOtherAttachedDialog: function(parent, self) {
+        var count = 0;
+        parent.foreach_transient(function(win) {
+            if (win.get_window_type() == Meta.WindowType.MODAL_DIALOG && win != self)
+                count++;
+            return false;
+        });
+        return count != 0;
+    },
+
+    _markParentWindowAsDimmable: function(actor, animate) {
+        if (Meta.prefs_get_attach_modal_dialogs()) {
+            this._dimmedWindows.push(actor);
+            if (this._shouldAnimate())
+                this._dimParentWindow(actor, animate);
+        }
+    },
+
+    _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 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,
+                               time: DIM_TIME,
+                               transition: 'linear'
+                             });
+        else
+            getWindowDimmer(texture).dimFraction = 1.0;
+    },
+
+    _undimParentWindow: function(actor, animate) {
+        let meta = actor.get_meta_window();
+        let parent = meta.get_transient_for();
+        if (!parent)
+            return;
+        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,
+                               time: UNDIM_TIME,
+                               transition: 'linear'
+                             });
+        else
+            getWindowDimmer(texture).dimFraction = 0.0;
+    },
+
    _mapWindow : function(shellwm, actor) {
+        actor._windowType = actor.meta_window.get_window_type();
+        actor._notifyWindowTypeSignalId = actor.meta_window.connect('notify::window-type', Lang.bind(this, function () {
+            let type = actor.meta_window.get_window_type();
+            if (type == actor._windowType)
+                return;
+            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._markParentWindowAsDimmable(actor, true);
+            if (this._shouldAnimate()) {
+                actor.set_scale(1.0, 0.0);
+                actor.show();
+                this._mapping.push(actor);
+
+                Tweener.addTween(actor,
+                                 { scale_y: 1,
+                                   time: WINDOW_ANIMATION_TIME,
+                                   transition: "easeOutQuad",
+                                   onComplete: this._mapWindowDone,
+                                   onCompleteScope: this,
+                                   onCompleteParams: [shellwm, actor],
+                                   onOverwrite: this._mapWindowOverwrite,
+                                   onOverwriteScope: this,
+                                   onOverwriteParams: [shellwm, actor]
+                                 });
+                return;
+            }
+            shellwm.completed_map(actor);
+            return;
+        }
        if (!this._shouldAnimate(actor)) {
            shellwm.completed_map(actor);
            return;
        }

-        actor.move_anchor_point_from_gravity(Clutter.Gravity.CENTER);
-        actor.set_scale(0.0, 0.0);
+        actor.opacity = 0;
        actor.show();
-        
-        /* scale window up from 0x0 to normal size */
+
+        /* Fade window in */
        this._mapping.push(actor);
        Tweener.addTween(actor,
-                         { scale_x: 1.0,
-                           scale_y: 1.0,
+                         { opacity: 255,
                           time: WINDOW_ANIMATION_TIME,
-                           transition: "easeOutQuad",
+                           transition: 'easeOutQuad',
                           onComplete: this._mapWindowDone,
                           onCompleteScope: this,
                           onCompleteParams: [shellwm, actor],
@ -150,8 +350,7 @@ WindowManager.prototype = {
    _mapWindowDone : function(shellwm, actor) {
        if (this._removeEffect(this._mapping, actor)) {
            Tweener.removeTweens(actor);
-            actor.set_scale(1.0, 1.0);
-            actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);
+            actor.opacity = 255;
            shellwm.completed_map(actor);
        }
    },
@ -163,10 +362,51 @@ WindowManager.prototype = {
    },

    _destroyWindow : function(shellwm, actor) {
+        let parent = actor.meta_window.get_transient_for();
+        if (actor._notifyWindowTypeSignalId) {
+            actor.meta_window.disconnect(actor._notifyWindowTypeSignalId);
+            actor._notifyWindowTypeSignalId = 0;
+        }
+        while (actor.meta_window.get_window_type() == Meta.WindowType.MODAL_DIALOG
+               && parent) {
+            this._unmarkParentWindowAsDimmable(actor, true);
+            if (!Meta.prefs_get_attach_modal_dialogs()
+                || !this._shouldAnimate())
+                break;
+            actor.set_scale(1.0, 1.0);
+            actor.show();
+            this._destroying.push(actor);
+
+            actor._parentDestroyId = parent.connect('unmanaged', Lang.bind(this, function () {
+                Tweener.removeTweens(actor);
+                this._destroyWindowDone(shellwm, actor);
+            }));
+
+            Tweener.addTween(actor,
+                             { scale_y: 0,
+                               time: WINDOW_ANIMATION_TIME,
+                               transition: "easeOutQuad",
+                               onComplete: this._destroyWindowDone,
+                               onCompleteScope: this,
+                               onCompleteParams: [shellwm, actor],
+                               onOverwrite: this._destroyWindowDone,
+                               onOverwriteScope: this,
+                               onOverwriteParams: [shellwm, actor]
+                             });
+            return;
+        }
        shellwm.completed_destroy(actor);
    },
-    
+
    _destroyWindowDone : function(shellwm, actor) {
+        if (this._removeEffect(this._destroying, actor)) {
+            let parent = actor.get_meta_window().get_transient_for();
+            if (parent && actor._parentDestroyId) {
+                parent.disconnect(actor._parentDestroyId);
+                actor._parentDestroyId = 0;
+            }
+            shellwm.completed_destroy(actor);
+        }
    },

    _switchWorkspace : function(shellwm, from, to, direction) {
@ -175,7 +415,7 @@ WindowManager.prototype = {
            return;
        }

-        let windows = shellwm.get_switch_workspace_actors();
+        let windows = global.get_window_actors();

        /* @direction is the direction that the "camera" moves, so the
         * screen contents have to move one screen's worth in the
@ -236,7 +476,7 @@ WindowManager.prototype = {
                         { x: xDest,
                           y: yDest,
                           time: WINDOW_ANIMATION_TIME,
-                           transition: "easeOutQuad",
+                           transition: 'easeOutQuad',
                           onComplete: this._switchWorkspaceDone,
                           onCompleteScope: this,
                           onCompleteParams: [shellwm]
@ -245,7 +485,7 @@ WindowManager.prototype = {
                         { x: 0,
                           y: 0,
                           time: WINDOW_ANIMATION_TIME,
-                           transition: "easeOutQuad"
+                           transition: 'easeOutQuad'
                         });
    },

@ -272,9 +512,55 @@ WindowManager.prototype = {
    },

    _startAppSwitcher : function(shellwm, binding, window, backwards) {
+        /* prevent a corner case where both popups show up at once */
+        if (this._workspaceSwitcherPopup != null)
+            this._workspaceSwitcherPopup.actor.hide();
+
        let tabPopup = new AltTab.AltTabPopup();

        if (!tabPopup.show(backwards))
            tabPopup.destroy();
+    },
+
+    _showWorkspaceSwitcher : function(shellwm, binding, window, backwards) {
+        /* We don't support this kind of layout */
+        if (binding == 'switch_to_workspace_up' || binding == 'switch_to_workspace_down')
+            return;
+
+        if (global.screen.n_workspaces == 1)
+            return;
+
+        if (this._workspaceSwitcherPopup == null)
+            this._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup();
+
+        if (binding == 'switch_to_workspace_left') {
+            this.actionMoveWorkspaceLeft();
+        }
+
+        if (binding == 'switch_to_workspace_right') {
+            this.actionMoveWorkspaceRight();
+        }
+    },
+
+    actionMoveWorkspaceLeft: function() {
+        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        if (activeWorkspaceIndex > 0) {
+            global.screen.get_workspace_by_index(activeWorkspaceIndex - 1).activate(global.get_current_time());
+            if (!Main.overview.visible)
+                this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex - 1);
+        } else if (!Main.overview.visible) {
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.LEFT, activeWorkspaceIndex);
+        }
+    },
+
+    actionMoveWorkspaceRight: function() {
+        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        if (activeWorkspaceIndex <  global.screen.n_workspaces - 1) {
+            global.screen.get_workspace_by_index(activeWorkspaceIndex + 1).activate(global.get_current_time());
+            if (!Main.overview.visible)
+                this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex + 1);
+        } else if (!Main.overview.visible) {
+            this._workspaceSwitcherPopup.display(WorkspaceSwitcherPopup.RIGHT, activeWorkspaceIndex);
+        }
    }
 };
--- a/js/ui/workspaces.js
+++ b/js/ui/workspaces.js
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -0,0 +1,156 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Main = imports.ui.main;
+
+const Tweener = imports.ui.tweener;
+
+const ANIMATION_TIME = 0.1;
+const DISPLAY_TIMEOUT = 600;
+
+const LEFT = -1;
+const RIGHT = 1;
+
+function WorkspaceSwitcherPopup() {
+    this._init();
+}
+
+WorkspaceSwitcherPopup.prototype = {
+    _init : function() {
+        this.actor = new St.Group({ reactive: true,
+                                         x: 0,
+                                         y: 0,
+                                         width: global.screen_width,
+                                         height: global.screen_height,
+                                         style_class: 'workspace-switcher-group' });
+        Main.uiGroup.add_actor(this.actor);
+
+        this._container = new St.BoxLayout({ style_class: 'workspace-switcher-container' });
+        this._list = new Shell.GenericContainer({ style_class: 'workspace-switcher' });
+        this._itemSpacing = 0;
+        this._list.connect('style-changed', Lang.bind(this, function() {
+                                                        this._itemSpacing = this._list.get_theme_node().get_length('spacing');
+                                                     }));
+
+        this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
+        this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
+        this._list.connect('allocate', Lang.bind(this, this._allocate));
+        this._container.add(this._list);
+
+        this.actor.add_actor(this._container);
+
+        this._redraw();
+
+        this._position();
+
+        this.actor.show();
+        this._timeoutId = Mainloop.timeout_add(DISPLAY_TIMEOUT, Lang.bind(this, this._onTimeout));
+    },
+
+    _getPreferredWidth : function (actor, forHeight, alloc) {
+        let children = this._list.get_children();
+        let primary = global.get_primary_monitor();
+
+        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 width = 0;
+        for (let i = 0; i < children.length; i++) {
+            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);
+        width += spacing;
+        width = Math.min(width, availwidth);
+
+        this._childWidth = (width - spacing) / global.screen.n_workspaces;
+
+        alloc.min_size = width;
+        alloc.natural_size = width;
+    },
+
+    _getPreferredHeight : function (actor, forWidth, alloc) {
+        let primary = global.get_primary_monitor();
+        this._childHeight = Math.round(this._childWidth * primary.height / primary.width);
+
+        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 x = box.x1;
+        let prevChildBoxX2 = box.x1 - this._itemSpacing;
+        for (let i = 0; i < children.length; i++) {
+            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;
+            children[i].allocate(childBox, flags);
+        }
+    },
+
+    _redraw : function(direction, activeWorkspaceIndex) {
+        this._list.destroy_children();
+
+        for (let i = 0; i < global.screen.n_workspaces; i++) {
+            let indicator = null;
+
+           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' });
+
+           this._list.add_actor(indicator);
+
+        }
+    },
+
+    _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 + Math.floor((primary.height - this._container.height) / 2);
+    },
+
+    _show : function() {
+        Tweener.addTween(this._container, { opacity: 255,
+                                            time: ANIMATION_TIME,
+                                            transition: 'easeOutQuad'
+                                           });
+        this._position();
+        this.actor.show();
+    },
+
+    display : function(direction, activeWorkspaceIndex) {
+        this._redraw(direction, activeWorkspaceIndex);
+        if (this._timeoutId != 0)
+            Mainloop.source_remove(this._timeoutId);
+        this._timeoutId = Mainloop.timeout_add(DISPLAY_TIMEOUT, Lang.bind(this, this._onTimeout));
+        this._show();
+    },
+
+    _onTimeout : function() {
+        Mainloop.source_remove(this._timeoutId);
+        this._timeoutId = 0;
+        Tweener.addTween(this._container, { opacity: 0.0,
+                                            time: ANIMATION_TIME,
+                                            transition: 'easeOutQuad',
+                                            onComplete: function() { this.actor.hide(); },
+                                            onCompleteScope: this
+                                           });
+    }
+};
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
--- a/man/Makefile.am
+++ b/man/Makefile.am
@ -0,0 +1 @@
+dist_man_MANS = gnome-shell.1
--- a/man/gnome-shell.1
+++ b/man/gnome-shell.1
@ -0,0 +1,99 @@
+.\" Copyright (c) 2009, Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual 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 manual; if not, write to the Free
+.\" Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+.\" Boston, MA  02111-1301  USA.
+.TH GNOME-SHELL 1
+.SH NAME
+gnome-shell \- Graphical shell for the GNOME desktop
+
+.SH SYNOPSIS
+.B gnome-shell [options]
+
+.SH 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.
+
+.SH OPTIONS
+
+.TP
+.B \-r, \-\-replace
+Replace the running metacity/gnome-panel
+.br
+
+.TP
+.B \-v, \-\-verbose
+Shows details about the results of running `gnome-shell'.
+.br
+
+.TP
+.B \-g, \-\-debug
+Run under a debugger
+.br
+
+.TP
+.B \-\-debug\-command
+Command to use for debugging (defaults to 'gdb \-\-args')
+.br
+
+.TP
+.B \-\-sync
+.br
+Make X calls synchronously, useful when debugging down X errors
+.br
+
+.TP
+.B \-\-xephyr
+Run a debugging instance inside Xephyr
+.br
+
+.TP
+.B \-\-geometry
+Specify Xephyr screen geometry
+.br
+
+.TP
+.B \-w, \-\-wide
+Use widescreen (1280x800) with Xephyr
+.br
+
+.TP
+.B \-\-create\-extension
+Create a new GNOME Shell extension
+
+.TP
+.B \-\-eval\-file
+Evaluate the contents of the given JavaScript file
+.br
+
+.SH BUGS
+The bug tracker can be reached by visiting the website
+\fIhttps://bugzilla.gnome.org/buglist.cgi?product=gnome-shell\fR
+
+Before sending a bug report, please verify that you have the latest
+version of gnome-shell. Many bugs (major and minor) are fixed at each
+release, and if yours is out of date, the problem may already have
+been solved.
+
+.SH ADDITIONAL INFORMATION
+
+For further information, visit the website \fIhttp://live.gnome.org/GnomeShell\fR
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1,4 +1,5 @@
 ar
+bg
 ca
 cs
 da
@ -6,22 +7,36 @@ de
 el
 en_GB
 es
+et
 fi
 fr
 ga
 gl
 he
 hu
+id
 it
+ja
 ko
+lt
 nb
 nl
+nn
 pa
 pl
+pt
 pt_BR
 ro
 ru
 sl
+sr
+sr@latin
 sv
+ta
+th
 tr
+uk
+vi
 zh_CN
+zh_HK
+zh_TW
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,12 +1,23 @@
 data/gnome-shell.desktop.in.in
+data/gnome-shell-clock-preferences.desktop.in.in
+data/org.gnome.shell.gschema.xml.in
+data/org.gnome.accessibility.magnifier.gschema.xml.in
+[type: gettext/glade]data/clock-preferences.ui
 js/ui/appDisplay.js
-js/ui/appIcon.js
+js/ui/appFavorites.js
 js/ui/dash.js
+js/ui/docDisplay.js
+js/ui/lookingGlass.js
 js/ui/overview.js
 js/ui/panel.js
 js/ui/placeDisplay.js
+js/ui/popupMenu.js
 js/ui/runDialog.js
-js/ui/widget.js
+js/ui/statusMenu.js
+js/ui/status/accessibility.js
+js/ui/windowAttentionHandler.js
+js/ui/workspacesView.js
+src/gvc/gvc-mixer-control.c
 src/gdmuser/gdm-user.c
 src/shell-global.c
 src/shell-uri-util.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@ -1 +1,2 @@
 data/gnome-shell.desktop.in
+data/gnome-shell-clock-preferences.desktop.in
--- a/Show More
+++ b/Show More