Kill notification-daemon at startup when running in --replace mode

https://bugzilla.gnome.org/show_bug.cgi?id=606755
Line-wrap the notification content
2010-01-12 17:12:48 -05:00 · 2010-01-12 17:12:45 -05:00 · 2010-01-08 13:14:40 -05:00 · 2010-01-08 13:14:34 -05:00 · 2010-01-06 16:27:08 -05:00 · 2010-01-05 11:25:15 -05:00
148 changed files with 7748 additions and 15976 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,10 +22,8 @@ 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
@ -41,7 +39,6 @@ src/gnome-shell
 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,13 +1,9 @@
-# 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
+SUBDIRS = data js src tests po

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

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

 distcheck-hook:
 	@echo "Checking disted files against files in git"
-	@$(srcdir)/tools/check-for-missing.py $(srcdir) $(distdir) $(DIST_EXCLUDE)
+	@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
--- a/autogen.sh
+++ b/autogen.sh
@ -5,6 +5,7 @@ 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) || {
@ -14,7 +15,7 @@ PKG_NAME="gnome-shell"
 }

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

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

-AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign])
+AM_INIT_AUTOMAKE([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])],)

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

 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

@ -55,23 +50,14 @@ fi

 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

-CLUTTER_MIN_VERSION=1.2.0
-GOBJECT_INTROSPECTION_MIN_VERSION=0.6.9
-GJS_MIN_VERSION=0.6
-MUTTER_MIN_VERSION=2.29.1
-
 # 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 >= $MUTTER_MIN_VERSION
-                                 gjs-gi-1.0 >= $GJS_MIN_VERSION
-				 libgnome-menu $recorder_modules gconf-2.0
-                                 gdk-x11-2.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)
+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(TIDY, clutter-1.0)
-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-2.0 libcroco-0.6 gnome-desktop-2.0 >= 2.26)
+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)
@ -108,7 +94,8 @@ 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,
-  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
+  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+                 [Turn on compiler warnings]),,
  enable_compile_warnings=error)

 changequote(,)dnl
@ -135,7 +122,7 @@ changequote([,])dnl
 AC_PATH_PROG(mutter, [mutter])
 AC_SUBST(mutter)

-AC_CONFIG_FILES([
+AC_OUTPUT([
  Makefile
  data/Makefile
  js/Makefile
@ -144,6 +131,4 @@ AC_CONFIG_FILES([
  src/Makefile
  tests/Makefile
  po/Makefile.in
-  man/Makefile
 ])
-AC_OUTPUT
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -14,35 +14,24 @@ gnome-shell.desktop: gnome-shell.desktop.in

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

 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
-	theme/add-workspace.svg			\
-	theme/close-window.svg			\
-	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/remove-workspace.svg          \
-	theme/scroll-button-down-hover.png	\
+	theme/close.svg                 \
+	theme/close-window.svg			\
 	theme/scroll-button-down.png		\
-	theme/scroll-button-up-hover.png	\
+	theme/scroll-button-down-hover.png	\
 	theme/scroll-button-up.png		\
-	theme/scroll-hhandle.svg        \
-	theme/scroll-vhandle.svg        \
+	theme/scroll-button-up-hover.png	\
+	theme/scroll-vhandle.png        \
 	theme/section-back.svg          \
-	theme/section-more.svg          \
-	theme/section-more-open.svg          \
-	theme/single-view-active.svg          \
-	theme/single-view.svg          \
-	theme/ws-switch-arrow-left.svg		\
-	theme/ws-switch-arrow-right.svg
-
+	theme/section-more.svg

 schemadir  = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-shell.schemas
--- a/data/add-workspace.svg
+++ b/data/add-workspace.svg
@ -0,0 +1,70 @@
+<?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/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:#545454" />
+   style="fill-opacity:1;fill:#000000" />
 </svg>
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@ -45,18 +45,6 @@
 	</locale>
      </schema>

-      <schema>
-        <key>/schemas/desktop/gnome/shell/run_dialog/history</key>
-	<applyto>/desktop/gnome/shell/run_dialog/history</applyto>
-	<owner>gnome-shell</owner>
-	<type>list</type>
-	<list_type>string</list_type>
-	<default>[]</default>
-	<locale name="C">
-	  <short>History for command (Alt-F2) dialog</short>
-	</locale>
-      </schema>
-
      <schema>
        <key>/schemas/desktop/gnome/shell/sidebar/visible</key>
 	<applyto>/desktop/gnome/shell/sidebar/visible</applyto>
@ -85,20 +73,6 @@
 	</locale>
      </schema>

-      <schema>
-        <key>/schemas/desktop/gnome/shell/sidebar/autohide</key>
-	<applyto>/desktop/gnome/shell/sidebar/autohide</applyto>
-	<owner>gnome-shell</owner>
-	<type>bool</type>
-	<default>true</default>
-	<locale name="C">
-	  <short>Whether the sidebar should automatically hide itself in compact mode</short>
-	  <long>
-	    Controls the autohide state of the sidebar.
-	  </long>
-	</locale>
-      </schema>
-
      <schema>
        <key>/schemas/desktop/gnome/shell/sidebar/widgets</key>
 	<applyto>/desktop/gnome/shell/sidebar/widgets</applyto>
@ -129,68 +103,6 @@
        </locale>
      </schema>

-      <schema>
-        <key>/schemas/desktop/gnome/shell/recorder/framerate</key>
-        <applyto>/desktop/gnome/shell/recorder/framerate</applyto>
-        <owner>gnome-shell</owner>
-        <type>int</type>
-        <default>15</default>
-        <locale name="C">
-          <short>Framerate used for recording screencasts.</short>
-          <long>
-            The framerate of the resulting screencast recordered by GNOME Shell's screencast recorder in frames-per-second.
-         </long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/recorder/pipeline</key>
-        <applyto>/desktop/gnome/shell/recorder/pipeline</applyto>
-        <owner>gnome-shell</owner>
-        <type>string</type>
-        <default></default>
-        <locale name="C">
-          <short>The gstreamer pipeline used to encode the screencast</short>
-          <long>
-            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.
-         </long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/recorder/file_extension</key>
-        <applyto>/desktop/gnome/shell/recorder/file_extension</applyto>
-        <owner>gnome-shell</owner>
-        <type>string</type>
-        <default>ogv</default>
-        <locale name="C">
-          <short>File extension used for storing the screencast</short>
-          <long>
-            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.
-         </long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/desktop/gnome/shell/overview/workspaces_view</key>
-        <applyto>/desktop/gnome/shell/overview/workspaces_view</applyto>
-        <owner>gnome-shell</owner>
-        <type>string</type>
-        <default>single</default>
-        <locale name="C">
-          <short>Overview workspace view mode</short>
-          <long>
-            The selected workspace view mode in the overview.
-            Supported values are "single" and "grid".
-          </long>
-        </locale>
-      </schema>
-
  </schemalist>

 </gconfschemafile>
--- a/data/remove-workspace.svg
+++ b/data/remove-workspace.svg
@ -0,0 +1,71 @@
+<?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/theme/add-workspace.svg
+++ b/data/theme/add-workspace.svg
@ -1,98 +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="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
@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="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
@ -26,10 +26,6 @@
    color: #0000e0;
 }

-.label-shadow {
-    color: rgba(0,0,0,0.5);
-}
-
 StScrollBar
 {
  padding: 0px;
@ -41,48 +37,36 @@ StScrollView
  scrollbar-height: 16px;
 }

-StScrollView > .top-shadow
+StButton#up-stepper
 {
-    background-gradient-direction: vertical;
-    background-gradient-start: #111111;
-    background-gradient-end: rgba(17, 17, 17, 0);
-    height: 30px;
+  border-image: url("scroll-button-up.png") 5;
 }

-StScrollView > .bottom-shadow
+StButton#up-stepper:hover,
+StButton#up-stepper:active
 {
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(17, 17, 17, 0);
-    background-gradient-end: #111111;
-    height: 30px;
+  border-image: url("scroll-button-up-hover.png") 5;
 }

-StScrollBar {
-    background-color: #080808;
-    border: 1px solid #2d2d2d;
-    border-radius: 8px;
+StButton#down-stepper
+{
+  border-image: url("scroll-button-down.png") 5;
+}
+
+StButton#down-stepper:hover,
+StButton#down-stepper:active
+{
+  border-image: url("scroll-button-down-hover.png") 5;
 }

 StScrollBar StButton#vhandle
 {
-    background-image: url("scroll-vhandle.svg");
-    background-color: #252525;
-    border: 1px solid #080808;
-    border-radius: 8px;
+  border-image: url("scroll-vhandle.png") 5;
 }

-StScrollBar StButton#hhandle
-{
-    background-image: url("scroll-hhandle.svg");
-    background-color: #252525;
-    border: 1px solid #080808;
-    border-radius: 8px;
-}
-
-StScrollBar StButton#hhandle:hover,
 StScrollBar StButton#vhandle:hover
 {
-    background-color: #292929;
+  border-image: url("scroll-vhandle.png") 5;
 }

 StTooltip {
@ -98,13 +82,13 @@ StTooltip {
 #panel {
    color: #ffffff;
    font-size: 16px;
-    background-color: black;
-    border-bottom: 1px solid #1f1f1f;
+    background-gradient-direction: vertical;
+    background-gradient-start: #161616;
+    background-gradient-end: #000000;
 }

 #panelLeft, #panelCenter, #panelRight {
    spacing: 4px;
-    font-weight: bold;
 }

 #panelLeft {
@ -115,122 +99,40 @@ StTooltip {
    padding-left: 4px;
 }

+.panel-button:pressed {
+    background-color: rgba(50,76,111,0.98);
+    border-radius: 4px;
+}
+
 #appMenu {
+    spacing: 4px;
+}
+
+.app-menu-icon {
+    width: 24px;
+    height: 24px;
 }

 .panel-button {
    padding: 4px 12px 3px;
    border-radius: 5px;
-    border-radius-bottomleft: 0px;
-    border-radius-bottomright: 0px;
    font: 16px sans-serif;
-    font-weight: bold;
 }

-.panel-button:active, .panel-button:checked, .panel-button:pressed {
-    background-gradient-direction: vertical;
-    background-gradient-start: #3c3c3c;
-    background-gradient-end: #131313;
-}
-
-#panelActivities {
-    border-radius-topleft: 0px;
+.panel-button:active, .panel-button:checked {
+    background-color: #314a6c;
 }

 #panelStatus {
-    border-radius-topright: 0px;
-}
-
-#statusMenu {
    spacing: 4px;
 }

-/* Overview */
-
-.overview {
-    background-color: #111;
-}
-
-.info-bar {
-    color: #fff;
-    font-size: 14px;
-    spacing: 20px;
-}
-
-.info-bar-link-button {
-    background-color: #2d2d2d;
-    padding: 2px 14px;
-    border-radius: 10px;
-    border: 1px solid #181818;
-}
-
-.info-bar-link-button:hover {
-    border: 1px solid #666666;
-}
-
-.new-workspace-area {
-    border: 2px solid rgba(255, 255, 255, 0.8);
-    border-radius: 10px;
-    background-color: #111;
-}
-
-.new-workspace-area-internal {
-    background-gradient-direction: horizontal;
-    background-gradient-start: rgba(16, 16, 16, 0);
-    background-gradient-end: rgba(16, 16, 16, 1.0);
-    background-image: url("move-window-on-new.svg");
-}
-
-.new-workspace-area:hover {
-    border: 2px solid rgba(255, 255, 255, 1.0);
-    background-gradient-direction: horizontal;
-    background-gradient-start: rgba(130, 130, 130, 0.9);
-    background-gradient-end: rgba(16, 16, 16, 0.9);
-}
-
-.left-workspaces-shadow {
-    background-gradient-direction: horizontal;
-    background-gradient-start: rgba(16, 16, 16, 1.0);
-    background-gradient-end: rgba(16, 16, 16, 0.0);
-}
-
-.right-workspaces-shadow {
-    background-gradient-direction: horizontal;
-    background-gradient-end: rgba(16, 16, 16, 1.0);
-    background-gradient-start: rgba(16, 16, 16, 0);
-}
+/* Overlay */

 .workspaces {
    color: white;
 }

-.workspaces.single {
-    spacing: 25px;
-}
-
-.workspaces.mosaic {
-    spacing: 15px;
-}
-
-.workspaces-bar {
-    height: 48px;
-}
-
-.workspaces-bar {
-    spacing: 5px;
-}
-
-.workspace-indicator {
-    width: 24px;
-    height: 16px;
-    background: rgba(155,155,155,0.8);
-    border-spacing: 16px;
-}
-
-.workspace-indicator.active {
-    background: rgba(255,255,255,0.8);
-}
-
 .window-caption {
    background: rgba(0,0,0,0.8);
    border: 1px solid rgba(128,128,128,0.40);
@ -244,56 +146,14 @@ StTooltip {
    background-image: url("close-window.svg");
    height: 24px;
    width: 24px;
-    -st-shadow: -2px 2px 6px rgba(0,0,0,0.5);
    -shell-close-overlap: 16px;
 }

-.single-view-controls {
-    padding: 0px 15px;
-}
-
-.workspace-controls {
-    width: 24px;
-    height: 16px;
-}
-
-.workspace-controls.add {
-    background-image: url("add-workspace.svg");
-}
-
-.workspace-controls.remove {
-    background-image: url("remove-workspace.svg");
-}
-
-.workspace-controls.switch-single {
-    background-image: url("single-view.svg");
-}
-
-.workspace-controls.switch-mosaic {
-    background-image: url("mosaic-view.svg");
-}
-
-.workspace-controls.switch-single:checked {
-    background-image: url("single-view-active.svg");
-}
-
-.workspace-controls.switch-mosaic:checked {
-    background-image: url("mosaic-view-active.svg");
-}
-
-#SwitchScroll {
-    height: 14px;
-}
-
-#SwitchScroll #hhandle {
-    border-radius: 7px;
-}
-
 /* Dash */

 #dash {
    color: #5f5f5f;
-    font-size: 12px;
+    background-color: rgba(0,0,0,0.75);
    padding: 0px 14px;
 }

@ -303,24 +163,11 @@ StTooltip {

 #searchEntry {
    padding: 4px;
-    border-radius: 4px;
-    color: #a8a8a8;
-    border: 1px solid #565656;
-    background-color: #404040;
-    caret-color: #fff;
-    caret-size: 1px;
-    height: 16px;
+    border-bottom: 1px solid #262626;
 }

-#searchEntry:focus {
-    color: #545454;
-    border: 1px solid #3a3a3a;
-    background-color: #e8e8e8;
-    caret-color: #545454;
-}
-
-#searchEntry:hover {
-    border: 1px solid #767676;
+#searchEntry:active {
+    background-color: #c4c4c4;
 }

 .dash-section {
@ -328,9 +175,17 @@ StTooltip {
 }

 .section-header {
+    border: 1px solid #262626;
+    background-gradient-direction: vertical;
+    background-gradient-start: #161616;
+    background-gradient-end: #000000;
+    font-weight: bold;
+    font-size: 12px;
 }

 .section-header-inner {
+    border: 1px solid #000000;
+    padding: 0px 4px;
    spacing: 4px;
 }

@ -353,6 +208,7 @@ StTooltip {
 }

 .dash-section-content {
+    font-size: 14px;
    color: #ffffff;
    spacing: 8px;
 }
@ -366,18 +222,17 @@ StTooltip {
    height: 9px;
 }

-.more-link-expander.open {
-    background-image: url("section-more-open.svg");
-    width: 9px;
-    height: 9px;
+.dash-pane {
+    background-color: rgba(0,0,0,0.95);
+    border: 1px solid #262626;
+    padding: 4px;
+    spacing: 4px;
 }

-.dash-pane {
-    border-radius: 10px;
-    background-color: #111111;
-    border: 2px solid #868686;
-    color: #ffffff;
-    padding: 30px 10px 10px 20px;
+.dash-pane-close {
+    background-image: url("close.svg");
+    width: 16px;
+    height: 16px;
 }

 .dash-search-section-header {
@ -387,6 +242,7 @@ StTooltip {

 .dash-search-section-results {
    color: #ffffff;
+    padding-left: 4px;
 }

 .dash-search-section-list-results {
@ -394,14 +250,12 @@ StTooltip {
 }

 .dash-search-result-content {
-    padding: 3px;
+    padding: 2px;
 }

 .dash-search-result-content:selected {
-    padding: 2px;
-    border: 1px solid #5c5c5c;
-    border-radius: 2px;
-    background-color: #1e1e1e;
+    padding: 1px;
+    border: 1px solid #262626;
 }

 /* GenericDisplay */
@ -442,53 +296,22 @@ StTooltip {

 /* Apps */

-.overview-pane {
-    width: 440px;
-}
-
 #dashAppWell {
-    spacing: 6px;
-    -shell-grid-item-size: 70px;
-}
-
-.all-app {
-    border-radius: 10px;
-    background-color: #111111;
-    border: 2px solid #868686;
-    color: #ffffff;
-}
-
-.all-app-controls-panel {
-    height: 30px;
-}
-
-.all-app-scroll-view {
-    padding-right: 10px;
-    padding-left: 10px;
-    padding-bottom: 10px;
+    spacing: 2px;
+    -shell-grid-item-size: 74px;
 }

 .app-well-app {
-    border: 1px solid #181818;
-    border-radius: 4px;
+    border: 1px solid #080808;
+    border-radius: 2px;
    padding: 2px;
-    width: 70px;
-    height: 70px;
-    font-size: 10px;
-}
-
-.app-well-app.running {
-    background-gradient-direction: vertical;
-    background-gradient-start: #3d3d3d;
-    background-gradient-end: #181818;
-}
-
-.app-well-app.selected {
-    border: 1px solid #666666;
+    width: 74px;
+    height: 74px;
+    font-size: 12px;
 }

 .app-well-app:hover {
-    border: 1px solid #666666;
+    border: 1px solid #202020;
 }

 .app-well-app:active {
@ -496,6 +319,11 @@ StTooltip {
    border: 1px solid #5f5f5f;
 }

+.app-well-app-glow {
+    -shell-glow-extend-vertical: 3px;
+    -shell-glow-shrink-horizontal: 3px;
+}
+
 .app-well-menu {
    border: 1px solid #5f5f5f;
    border-radius: 4px;
@ -518,16 +346,8 @@ StTooltip {

 /* Places */

-.places-item-box {
-    spacing: 4px;
-}
-
-.places-item {
-    padding: 2px;
-}
-
 .places-actions {
-    spacing: 2px;
+    spacing: 4px;
 }

 #placesDevices {
@ -661,36 +481,11 @@ StTooltip {
 }

 #notification {
-    font-size: 16px;
    border-radius: 5px;
    background: rgba(0,0,0,0.9);
    color: white;
-    padding: 2px 10px 10px 10px;
-    spacing-rows: 5px;
-    spacing-columns: 10px;
-    max-width: 40em;
-}
-
-#notification-actions {
-    spacing: 5px;
-}
-
-.notification-button {
-    border: 2px rgba(0,0,0,0.0);
-    border-radius: 5px;
-    padding: 5px;
-    background: #c0c0c0;
-    color: black;
-    font-weight: bold;
-}
-
-.notification-button:hover {
-    border: 2px solid white;
-}
-
-.notification-button:active {
-    border: 2px solid white;
-    background: #808080;
+    padding: 2px 10px;
+    spacing: 10px;
 }

 #summary-mode {
@ -709,22 +504,6 @@ StTooltip {
    color: white;
 }

-.thumbnail-scroll-gradient-left {
-    background-gradient-direction: horizontal;
-    background-gradient-start: rgba(51, 51, 51, 1.0);
-    background-gradient-end: rgba(51, 51, 51, 0);
-    border-radius: 8px;
-    width: 60px;
-}
-
-.thumbnail-scroll-gradient-right {
-    background-gradient-direction: horizontal;
-    background-gradient-start: rgba(51, 51, 51, 0);
-    background-gradient-end: rgba(51, 51, 51, 1.0);
-    border-radius: 8px;
-    width: 60px;
-}
-
 .switcher-list .item-box {
    padding: 8px;
    border-radius: 4px;
@ -737,6 +516,7 @@ StTooltip {

 .switcher-list .thumbnail {
    width:  256px;
+    height: 256px;
 }

 .switcher-list .outlined-item-box {
@ -756,82 +536,3 @@ StTooltip {
    background: rgba(255,255,255,0.33);
 }

-.ripple-box {
-    width: 52px;
-    height: 52px;
-    background-image: url("corner-ripple.png");
-}
-
-/* Workspace Switcher */
-.workspace-switcher-container {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 8px;
-    padding: 12px;
-}
-
-.workspace-switcher {
-    background: transparent;
-    border: 0px;
-    border-radius: 0px;
-    padding: 4px;
-    spacing: 4.5px;
-}
-
-.ws-switcher-active-left {
-    height: 98px;
-    border: 0px;
-    background: rgba(255,255,255,0.5);
-    background-image: url("ws-switch-arrow-left.svg");
-    border-radius: 4px;
-}
-
-.ws-switcher-active-right {
-    height: 98px;
-    border: 0px;
-    background: rgba(255,255,255,0.5);
-    background-image: url("ws-switch-arrow-right.svg");
-    border-radius: 4px;
-}
-
-.ws-switcher-box {
-    height: 96px;
-    border: 2px solid rgba(85,85,85,0.5);
-    background: transparent;
-    border-radius: 4px;
-}
-
-/* Run Dialog */
-.run-dialog-label {
-    font: 12px sans-serif;
-    color: white;
-}
-
-.run-dialog-error-icon {
-    background-image: url("dialog-error.svg");
-    width: 36px;
-    height: 36px;
-}
-
-.run-dialog-error-label {
-    font: 16px sans-serif;
-    color: white;
-}
-
-.run-dialog-entry {
-    font: 14px sans-serif;
-    font-weight: bold;
-    width: 320px;
-    color: white;
-}
-
-.run-dialog {
-    padding: 8px;
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 4px;
-    background: rgba(0,0,0,0.8);
-}
-
-.lightbox {
-    background-color: rgba(0, 0, 0, 0.27);
-}
--- a/data/theme/mosaic-view-active.svg
+++ b/data/theme/mosaic-view-active.svg
@ -1,113 +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="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
@ -1,113 +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="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
@ -1,89 +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="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/remove-workspace.svg
+++ b/data/theme/remove-workspace.svg
@ -1,92 +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="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
@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="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
@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="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-more-open.svg
+++ b/data/theme/section-more-open.svg
@ -1,87 +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="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/single-view-active.svg
+++ b/data/theme/single-view-active.svg
@ -1,81 +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="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
@ -1,81 +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="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/ws-switch-arrow-left.svg
+++ b/data/theme/ws-switch-arrow-left.svg
@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="96" height="96" id="svg25070" version="1.1" inkscape:version="0.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
@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   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/misc/docInfo.js
+++ b/js/misc/docInfo.js
@ -3,9 +3,8 @@
 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;
@ -31,7 +30,7 @@ DocInfo.prototype = {
    },

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

    launch : function() {
--- a/js/ui/Makefile.am
+++ b/js/ui/Makefile.am
@ -29,8 +29,5 @@ dist_jsui_DATA =		\
 	tweener.js		\
 	widget.js		\
 	widgetBox.js		\
-	windowAttentionHandler.js      \
 	windowManager.js	\
-	workspacesView.js	\
-	workspaceSwitcherPopup.js	\
-	workspace.js
+	workspaces.js
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -23,16 +23,13 @@ TRANSPARENT_COLOR.from_pixel(0x00000000);

 const POPUP_APPICON_SIZE = 96;
 const POPUP_LIST_SPACING = 8;
-const POPUP_SCROLL_TIME = 0.10; // seconds

 const DISABLE_HOVER_TIMEOUT = 500; // milliseconds

-const THUMBNAIL_DEFAULT_SIZE = 256;
+const THUMBNAIL_SIZE = 256;
 const THUMBNAIL_POPUP_TIME = 500; // milliseconds
 const THUMBNAIL_FADE_TIME = 0.2; // seconds

-const iconSizes = [96, 64, 48, 32, 22];
-
 function mod(a, b) {
    return (a + b) % b;
 }
@ -43,11 +40,11 @@ function AltTabPopup() {

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

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

@ -65,55 +62,6 @@ AltTabPopup.prototype = {
        global.stage.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 focus = global.get_focus_monitor();
-
-        // 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(focus.width - POPUP_LIST_SPACING * 2);
-        let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight);
-        childBox.x1 = Math.max(POPUP_LIST_SPACING, focus.x + Math.floor((focus.width - childNaturalWidth) / 2));
-        childBox.x2 = Math.min(childBox.x1 + focus.width - POPUP_LIST_SPACING * 2, childBox.x1 + childNaturalWidth);
-        childBox.y1 = focus.y + Math.floor((focus.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;
-            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(POPUP_LIST_SPACING, Math.floor(thumbnailCenter - childNaturalWidth / 2));
-            if (childBox.x1 + childNaturalWidth > focus.width - POPUP_LIST_SPACING * 2) {
-                let offset = childBox.x1 + childNaturalWidth - focus.width + POPUP_LIST_SPACING * 2;
-                childBox.x1 = Math.max(POPUP_LIST_SPACING, childBox.x1 - offset - POPUP_LIST_SPACING * 2);
-            }
-
-            childBox.x2 = childBox.x1 +  childNaturalWidth;
-            if (childBox.x2 > focus.width - POPUP_LIST_SPACING)
-                childBox.x2 = focus.width - POPUP_LIST_SPACING;
-            childBox.y1 = this._appSwitcher.actor.allocation.y2 + POPUP_LIST_SPACING * 2;
-            this._thumbnails.addClones(focus.height - POPUP_LIST_SPACING - 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 ("");
@ -136,6 +84,10 @@ 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
@ -337,9 +289,6 @@ AltTabPopup.prototype = {
        if (this._haveModal)
            Main.popModal(this.actor);

-        if (this._thumbnails)
-            this._destroyThumbnails();
-
        if (this._keyPressEventId)
            global.stage.disconnect(this._keyPressEventId);
        if (this._keyReleaseEventId)
@ -426,6 +375,33 @@ 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,
@ -441,7 +417,7 @@ function SwitcherList(squareItems) {

 SwitcherList.prototype = {
    _init : function(squareItems) {
-        this.actor = new St.BoxLayout({ style_class: 'switcher-list' });
+        this.actor = new St.Bin({ style_class: 'switcher-list' });

        // Here we use a GenericContainer so that we can force all the
        // children except the separator to have the same width.
@ -452,36 +428,12 @@ SwitcherList.prototype = {
        this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
        this._list.connect('allocate', Lang.bind(this, this._allocate));

-        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();
-        this._leftArrow.connect('repaint', Lang.bind(this,
-                                            function (area) {
-                                                Shell.draw_box_pointer(area, Shell.PointerDirection.LEFT, TRANSPARENT_COLOR, POPUP_ARROW_COLOR);
-                                            }));
-
-        this._rightArrow = new St.DrawingArea();
-        this._rightArrow.connect('repaint', Lang.bind(this,
-                                            function (area) {
-                                                Shell.draw_box_pointer(area, Shell.PointerDirection.RIGHT, TRANSPARENT_COLOR, POPUP_ARROW_COLOR);
-                                            }));
-
-        this._leftGradient.add_actor(this._leftArrow);
-        this._rightGradient.add_actor(this._rightArrow);
+        this.actor.add_actor(this._list);

        this._items = [];
        this._highlighted = -1;
        this._separator = null;
        this._squareItems = squareItems;
-        this._scrollable = false;
    },

    addItem : function(item) {
@ -503,7 +455,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);
    },
@ -520,45 +472,6 @@ SwitcherList.prototype = {
            else
                this._items[this._highlighted].style_class = 'selected-item-box';
        }
-
-        let monitor = global.get_focus_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)
-            this._scrollToRight();
-        else if (posX < 0)
-            this._scrollToLeft();
-
-    },
-
-    _scrollToLeft : function() {
-        let x = this._items[this._highlighted].allocation.x1;
-        this._rightGradient.show();
-        Tweener.addTween(this._list, { anchor_x: x,
-                                        time: POPUP_SCROLL_TIME,
-                                        transition: 'easeOutQuad',
-                                        onComplete: Lang.bind(this, function () {
-                                                                        if (this._highlighted == 0)
-                                                                            this._leftGradient.hide();
-                                                             })
-                        });
-    },
-
-    _scrollToRight : function() {
-        let monitor = global.get_focus_monitor();
-        let padding = this.actor.get_theme_node().get_horizontal_padding();
-        let x = this._items[this._highlighted].allocation.x2 - monitor.width + padding + POPUP_LIST_SPACING * 2;
-        this._leftGradient.show();
-        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._rightGradient.hide();
-                                                             })
-                        });
    },

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

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

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

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

    _allocate: function (actor, box, flags) {
@ -640,15 +553,6 @@ SwitcherList.prototype = {
        let x = 0;
        let children = this._list.get_children();
        let childBox = new Clutter.ActorBox();
-
-        let focus = global.get_focus_monitor();
-        if (this.actor.allocation.x2 == focus.width - POPUP_LIST_SPACING) {
-            if (this._squareItems)
-                childWidth = childHeight;
-            else
-                childWidth = children[0].get_preferred_width(childHeight)[0];
-        }
-
        for (let i = 0; i < children.length; i++) {
            if (this._items.indexOf(children[i]) != -1) {
                let [childMin, childNat] = children[i].get_preferred_height(childWidth);
@ -673,44 +577,6 @@ 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);
-
-        // Show the arrows and gradients when scrolling is needed
-        if (children[children.length - 1].allocation.x2 > this.actor.width - leftPadding - rightPadding && !this._scrollable) {
-            this._leftGradient.set_height(this.actor.height);
-            this._leftGradient.x = this.actor.x;
-            this._leftGradient.y = this.actor.y;
-
-            this._rightGradient.set_height(this.actor.height);
-            this._rightGradient.x = this.actor.x + (this.actor.allocation.x2 - this.actor.allocation.x1) - this._rightGradient.width;
-            this._rightGradient.y = this.actor.y;
-
-            let arrowWidth = Math.floor(leftPadding / 3);
-            let arrowHeight = arrowWidth * 2;
-            this._leftArrow.set_size(arrowWidth, arrowHeight);
-            this._leftArrow.set_position(POPUP_LIST_SPACING, this.actor.height / 2 - arrowWidth);
-
-            arrowWidth = Math.floor(rightPadding / 3);
-            arrowHeight = arrowWidth * 2;
-            this._rightArrow.set_size(arrowWidth, arrowHeight);
-            this._rightArrow.set_position(this._rightGradient.width - arrowHeight, this.actor.height / 2 - arrowWidth);
-
-            this._scrollable = true;
-
-            this._leftGradient.hide();
-            this._rightGradient.show();
-        }
-        else if (!this._scrollable){
-            this._leftGradient.hide();
-            this._rightGradient.hide();
-        }
-
-        // 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);
    }
 };

@ -725,20 +591,12 @@ AppIcon.prototype = {
        this.app = app;
        this.actor = new St.BoxLayout({ style_class: "alt-tab-app",
                                         vertical: true });
-        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;
+        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 });
+    }
 }
-};

 function AppSwitcher(apps) {
    this._init(apps);
@ -778,50 +636,9 @@ 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 availWidth = focus.width - POPUP_LIST_SPACING * 2 - 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;
-        }
-
-        alloc.min_size = height;
-        alloc.natural_size = height;
    },

    _allocate: function (actor, box, flags) {
-        for(let i = 0; i < this.icons.length; i++) {
-            if (this.icons[i].icon != null)
-                break;
-            this.icons[i].set_size(this._iconSize);
-        }
-
        // Allocate the main list items
        SwitcherList.prototype._allocate.call(this, actor, box, flags);

@ -875,9 +692,9 @@ AppSwitcher.prototype = {

        let n = this._arrows.length;
        let arrow = new St.DrawingArea();
-        arrow.connect('repaint', Lang.bind(this,
-            function (area) {
-                Shell.draw_box_pointer(area, Shell.PointerDirection.DOWN,
+        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);
            }));
@ -919,69 +736,39 @@ ThumbnailList.prototype = {
        // 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",
                                         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 });

+            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 [found, spacing] = this._items[0].child.get_theme_node().get_length('spacing', false);
-        if (!found)
-            spacing = 0;
-
-        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
@ -19,250 +19,201 @@ const DND = imports.ui.dnd;
 const GenericDisplay = imports.ui.genericDisplay;
 const Main = imports.ui.main;
 const Search = imports.ui.search;
-const Workspace = imports.ui.workspace;
+const Workspaces = imports.ui.workspaces;

 const APPICON_SIZE = 48;
 const WELL_MAX_COLUMNS = 8;

-function AllAppView() {
-    this._init();
+/* This class represents a single display item containing information about an application.
+ *
+ * appInfo - AppInfo object containing information about the application
+ */
+function AppDisplayItem(appInfo) {
+    this._init(appInfo);
 }

-AllAppView.prototype = {
-    _init: function(apps) {
-        this.actor = new St.BoxLayout({ vertical: true });
-        this._grid = new WellGrid(true);
-        this._appSystem = Shell.AppSystem.get_default();
-        this.actor.add(this._grid.actor, { y_align: St.Align.START, expand: true });
+AppDisplayItem.prototype = {
+    __proto__:  GenericDisplay.GenericDisplayItem.prototype,
+
+    _init : function(appInfo) {
+        GenericDisplay.GenericDisplayItem.prototype._init.call(this);
+        this._appInfo = appInfo;
+
+        this._setItemInfo(appInfo.get_name(), appInfo.get_description());
    },

-    _removeAll: function() {
-        this._grid.removeAll();
-        this._apps = [];
+    getId: function() {
+        return this._appInfo.get_id();
    },

-    _addApp: function(app) {
-        let App = new AppWellIcon(this._appSystem.get_app(app.get_id()));
-        App.connect('launching', Lang.bind(this, function() {
-            this.emit('launching');
-        }));
-        App._draggable.connect('drag-begin', Lang.bind(this, function() {
-            this.emit('drag-begin');
-        }));
+    //// Public method overrides ////

-        this._grid.addItem(App.actor);
-
-        this._apps.push(App);
-    },
-
-    refresh: function(apps) {
-        let ids = [];
-        for (let i in apps)
-            ids.push(i);
-        ids.sort(function(a, b) {
-            return apps[a].get_name().localeCompare(apps[b].get_name());
-        });
-
-        this._removeAll();
-
-        for (let i = 0; i < ids.length; i++) {
-            this._addApp(apps[ids[i]]);
+    // Opens an application represented by this display item.
+    launch : function() {
+        let appSys = Shell.AppSystem.get_default();
+        let app = appSys.get_app(this._appInfo.get_id());
+        let windows = app.get_windows();
+        if (windows.length > 0) {
+            let mostRecentWindow = windows[0];
+            Main.overview.activateWindow(mostRecentWindow, global.get_current_time());
+        } else {
+            this._appInfo.launch();
        }
+    },
+
+    //// Protected method overrides ////
+
+    // Returns an icon for the item.
+    _createIcon : function() {
+        return this._appInfo.create_icon_texture(GenericDisplay.ITEM_DISPLAY_ICON_SIZE);
+    },
+
+    // Returns a preview icon for the item.
+    _createPreviewIcon : function() {
+        return this._appInfo.create_icon_texture(GenericDisplay.PREVIEW_ICON_SIZE);
+    },
+
+    shellWorkspaceLaunch: function() {
+        this.launch();
    }
 };

-Signals.addSignalMethods(AllAppView.prototype);
-
 /* This class represents a display containing a collection of application items.
- * The applications are sorted based on their name.
+ * The applications are sorted based on their popularity by default, and based on
+ * their name if some search filter is applied.
+ *
+ * showPrefs - a boolean indicating if this AppDisplay should contain preference
+ *             applets, rather than applications
 */
-function AllAppDisplay() {
-    this._init();
+function AppDisplay(showPrefs, flags) {
+    this._init(showPrefs, flags);
 }

-AllAppDisplay.prototype = {
-    _init: function() {
+AppDisplay.prototype = {
+    __proto__:  GenericDisplay.GenericDisplay.prototype,
+
+    _init : function(showPrefs, flags) {
+        GenericDisplay.GenericDisplay.prototype._init.call(this, flags);
+
+        this._showPrefs = showPrefs;
+
+        this._menus = [];
+        this._menuDisplays = [];
+        // map<search term, map<appId, true>>
+        // We use a map of appIds instead of an array to ensure that we don't have duplicates and for easier lookup.
+        this._menuSearchAppMatches = {};
+
        this._appSystem = Shell.AppSystem.get_default();
-        this._appSystem.connect('installed-changed', Lang.bind(this, function() {
-            Main.queueDeferredWork(this._workId);
+        this._appsStale = true;
+        this._appSystem.connect('installed-changed', Lang.bind(this, function(appSys) {
+            this._appsStale = true;
+            this._redisplay(GenericDisplay.RedisplayFlags.NONE);
        }));
-
-        let bin = new St.BoxLayout({ style_class: 'all-app-controls-panel',
-                                     reactive: true });
-        this.actor = new St.BoxLayout({ style_class: 'all-app', vertical: true });
-        this.actor.hide();
-
-        let view = new St.ScrollView({ x_fill: true,
-                                       y_fill: false,
-                                       style_class: 'all-app-scroll-view',
-                                       vshadows: true });
-        this._scrollView = view;
-        this.actor.add(bin);
-        this.actor.add(view, { expand: true, y_fill: false, y_align: St.Align.START });
-
-        this._appView = new AllAppView();
-        this._appView.connect('launching', Lang.bind(this, this.close));
-        this._appView.connect('drag-begin', Lang.bind(this, this.close));
-        this._scrollView.add_actor(this._appView.actor);
-
-        this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-
-        this._workId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplay));
    },

-    _redisplay: function() {
-        let apps = this._appSystem.get_flattened_apps().filter(function(app) {
-            return !app.get_is_nodisplay();
-        });
+    //// Private ////

-        this._appView.refresh(apps);
+    _addApp: function(appInfo) {
+        let appId = appInfo.get_id();
+        this._allItems[appId] = appInfo;
    },

-    toggle: function() {
-        this.emit('open-state-changed', !this.actor.visible);
+    //// Protected method overrides ////

-        this.actor.visible = !this.actor.visible;
-    },
-
-    close: function() {
-        if (!this.actor.visible)
-            return;
-        this.toggle();
-    }
-};
-
-Signals.addSignalMethods(AllAppDisplay.prototype);
-
-function AppSearchResultDisplay(provider) {
-    this._init(provider);
-}
-
-AppSearchResultDisplay.prototype = {
-    __proto__: Search.SearchResultDisplay.prototype,
-
-    _init: function (provider) {
-        Search.SearchResultDisplay.prototype._init.call(this, provider);
-        this._spacing = 0;
-        this.actor = new St.Bin({ name: 'dashAppSearchResults',
-                                  x_align: St.Align.START });
-        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
-        let container = new Shell.GenericContainer();
-        this._container = container;
-        this.actor.set_child(container);
-        container.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        container.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        container.connect('allocate', Lang.bind(this, this._allocate));
-    },
-
-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let children = actor.get_children();
-
-        for (let i = 0; i < children.length; i++) {
-            let [minSize, natSize] = children[i].get_preferred_width(forHeight);
-            alloc.natural_size += natSize;
-        }
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let children = actor.get_children();
-
-        for (let i = 0; i < children.length; i++) {
-            let [minSize, natSize] = children[i].get_preferred_height(forWidth);
-            if (minSize > alloc.min_size)
-                alloc.min_size = minSize;
-            if (natSize > alloc.natural_size)
-                alloc.natural_size = natSize;
-        }
-    },
-
-    _allocate: function (actor, box, flags) {
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-
-        let children = actor.get_children();
-
-        let x = 0;
-        let i;
-        for (i = 0; i < children.length; i++) {
-            let child = children[i];
-            let childBox = new Clutter.ActorBox();
-
-            let [minWidth, minHeight, natWidth, natHeight] = child.get_preferred_size();
-
-            if (x + natWidth > availWidth) {
-                actor.set_skip_paint(child, true);
-                continue;
-            }
-
-            let yPadding = Math.max(0, availHeight - natHeight);
-
-            childBox.x1 = x;
-            childBox.x2 = childBox.x1 + natWidth;
-            childBox.y1 = Math.floor(yPadding / 2);
-            childBox.y2 = availHeight - childBox.y1;
-
-            x = childBox.x2 + this._spacing;
-
-            child.allocate(childBox, flags);
-            actor.set_skip_paint(child, false);
-        }
-    },
-
-    _onStyleChanged: function () {
-        let themeNode = this.actor.get_theme_node();
-        let [success, len] = themeNode.get_length('spacing', false);
-        if (success)
-            this._spacing = len;
-        this._container.queue_relayout();
-    },
-
-    renderResults: function(results, terms) {
-        let appSys = Shell.AppSystem.get_default();
-        for (let i = 0; i < results.length && i < WELL_MAX_COLUMNS; i++) {
-            let result = results[i];
-            let app = appSys.get_app(result);
-            let display = new AppWellIcon(app);
-            this._container.add_actor(display.actor);
-        }
-    },
-
-    clear: function () {
-        this._container.get_children().forEach(function (actor) { actor.destroy(); });
-        this.selectionIndex = -1;
-    },
-
-    getVisibleResultCount: function() {
-        let nChildren = this._container.get_children().length;
-        return nChildren - this._container.get_n_skip_paint();
-    },
-
-    selectIndex: function (index) {
-        let nVisible = this.getVisibleResultCount();
-        let children = this._container.get_children();
-        if (this.selectionIndex >= 0) {
-            let prevActor = children[this.selectionIndex];
-            prevActor._delegate.setSelected(false);
-        }
-        this.selectionIndex = -1;
-        if (index >= nVisible)
-            return false;
-        else if (index < 0)
-            return false;
-        let targetActor = children[index];
-        targetActor._delegate.setSelected(true);
-        this.selectionIndex = index;
+    // Gets information about all applications by calling Gio.app_info_get_all().
+    _refreshCache : function() {
+        if (!this._appsStale)
            return true;
+        this._allItems = {};
+
+        if (this._showPrefs) {
+            // Get the desktop file ids for settings/preferences.
+            // These are used for search results, but not in the app menus.
+            let settings = this._appSystem.get_all_settings();
+            for (let i = 0; i < settings.length; i++) {
+                let app = settings[i];
+                this._addApp(app);
+            }
+        } else {
+            let apps = this._appSystem.get_flattened_apps();
+            for (let i = 0; i < apps.length; i++) {
+                let app = apps[i];
+                this._addApp(app);
+            }
+        }
+
+        this._appsStale = false;
+        return false;
    },

-    activateSelected: function() {
-        if (this.selectionIndex < 0)
-            return;
-        let children = this._container.get_children();
-        let targetActor = children[this.selectionIndex];
-        this.provider.activateResult(targetActor._delegate.app.get_id());
+    _setDefaultList : function() {
+        this._matchedItems = this._allItems;
+        this._matchedItemKeys = [];
+        for (let itemId in this._matchedItems) {
+            let app = this._allItems[itemId];
+            if (app.get_is_nodisplay())
+                continue;
+            this._matchedItemKeys.push(itemId);
+        }
+        this._matchedItemKeys.sort(Lang.bind(this, this._compareItems));
+    },
+
+    // Compares items associated with the item ids based on the alphabetical order
+    // of the item names.
+    // Returns an integer value indicating the result of the comparison.
+    _compareItems : function(itemIdA, itemIdB) {
+        let appA = this._allItems[itemIdA];
+        let appB = this._allItems[itemIdB];
+        return appA.get_name().localeCompare(appB.get_name());
+    },
+
+    // Checks if the item info can be a match for the search string by checking
+    // the name, description, execution command, and category for the application.
+    // Item info is expected to be Shell.AppInfo.
+    // Returns a boolean flag indicating if itemInfo is a match.
+    _isInfoMatching : function(itemInfo, search) {
+        // Don't show nodisplay items here
+        if (itemInfo.get_is_nodisplay())
+            return false;
+
+        if (search == null || search == '')
+            return true;
+
+        let fold = function(s) {
+            if (!s)
+                return s;
+            return GLib.utf8_casefold(GLib.utf8_normalize(s, -1,
+                                                          GLib.NormalizeMode.ALL), -1);
+        };
+        let name = fold(itemInfo.get_name());
+        if (name.indexOf(search) >= 0)
+            return true;
+
+        let description = fold(itemInfo.get_description());
+        if (description) {
+            if (description.indexOf(search) >= 0)
+                return true;
+        }
+
+        let exec = fold(itemInfo.get_executable());
+        if (exec == null) {
+            log("Missing an executable for " + itemInfo.name);
+        } else {
+            if (exec.indexOf(search) >= 0)
+                return true;
+        }
+
+        return false;
+    },
+
+    // Creates an AppDisplayItem based on itemInfo, which is expected be an Shell.AppInfo object.
+    _createDisplayItem: function(itemInfo) {
+        return new AppDisplayItem(itemInfo);
    }
 };

+Signals.addSignalMethods(AppDisplay.prototype);
+
 function BaseAppSearchProvider() {
    this._init();
 }
@ -285,16 +236,6 @@ BaseAppSearchProvider.prototype = {
    },

    activateResult: function(id) {
-        let app = this._appSys.get_app(id);
-        let windows = app.get_windows();
-
-        if (windows.length > 0)
-            Main.activateWindow(windows[0]);
-        else
-            app.launch();
-    },
-
-    dragActivateResult: function(id) {
        let app = this._appSys.get_app(id);
        app.launch();
    }
@ -319,18 +260,10 @@ AppSearchProvider.prototype = {
        return this._appSys.subsearch(false, previousResults, terms);
    },

-    createResultContainerActor: function () {
-        return new AppSearchResultDisplay(this);
-    },
-
-    createResultActor: function (resultMeta, terms) {
-        return new AppIcon(resultMeta.id);
-    },
-
    expandSearch: function(terms) {
        log("TODO expand search");
    }
-};
+}

 function PrefsSearchProvider() {
    this._init();
@ -356,7 +289,7 @@ PrefsSearchProvider.prototype = {
        controlCenter.launch();
        Main.overview.hide();
    }
-};
+}

 function AppIcon(app) {
    this._init(app);
@ -366,10 +299,15 @@ AppIcon.prototype = {
    _init : function(app) {
        this.app = app;

+        this._glowExtendVertical = 0;
+        this._glowShrinkHorizontal = 0;
+
        this.actor = new St.Bin({ style_class: 'app-icon',
                                  x_fill: true,
                                  y_fill: true });
        this.actor._delegate = this;
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this._workId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._rerenderGlow));

        let box = new St.BoxLayout({ vertical: true });
        this.actor.set_child(box);
@ -378,11 +316,97 @@ AppIcon.prototype = {

        box.add(this.icon, { expand: true, x_fill: false, y_fill: false });

+        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({ text: this.app.get_name() });
        this._name.clutter_text.line_alignment = Pango.Alignment.CENTER;
-        box.add_actor(this._name);
+        nameBox.add_actor(this._name);
+        this._glowBox = new St.BoxLayout({ style_class: 'app-well-app-glow' });
+        this._glowBox.connect('style-changed', Lang.bind(this, this._onStyleChanged));
+        this._nameBox.add_actor(this._glowBox);
+        this._glowBox.lower(this._name);
+        this._appWindowChangedId = this.app.connect('windows-changed', Lang.bind(this, this._queueRerenderGlow));
+
+        box.add(nameBox);
+    },
+
+    _nameBoxGetPreferredWidth: function (nameBox, forHeight, alloc) {
+        let [min, natural] = this._name.get_preferred_width(forHeight);
+        alloc.min_size = min;
+        alloc.natural_size = natural;
+    },
+
+    _nameBoxGetPreferredHeight: function (nameBox, forWidth, alloc) {
+        let [min, natural] = this._name.get_preferred_height(forWidth);
+        alloc.min_size = min + this._glowExtendVertical * 2;
+        alloc.natural_size = natural + this._glowExtendVertical * 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 = this._glowExtendVertical;
+        childBox.y2 = availHeight - this._glowExtendVertical;
+        this._name.allocate(childBox, flags);
+
+        // Now the glow
+        let glowPaddingHoriz = Math.max(0, xPadding - this._glowShrinkHorizontal);
+        glowPaddingHoriz = Math.max(this._glowShrinkHorizontal, 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);
+    },
+
+    _queueRerenderGlow: function() {
+        Main.queueDeferredWork(this._workId);
+    },
+
+    _onStyleChanged: function() {
+        let themeNode = this._glowBox.get_theme_node();
+
+        let success, len;
+        [success, len] = themeNode.get_length('-shell-glow-extend-vertical', false);
+        if (success)
+            this._glowExtendVertical = len;
+        [success, len] = themeNode.get_length('-shell-glow-shrink-horizontal', false);
+        if (success)
+            this._glowShrinkHorizontal = len;
+        this.actor.queue_relayout();
+    },
+
+    _rerenderGlow: function() {
+        this._glowBox.destroy_children();
+        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.add(glow);
+        }
+    }
 }
-};

 function AppWellIcon(app) {
    this._init(app);
@ -391,7 +415,6 @@ function AppWellIcon(app) {
 AppWellIcon.prototype = {
    _init : function(app) {
        this.app = app;
-        this._running = false;
        this.actor = new St.Clickable({ style_class: 'app-well-app',
                                         reactive: true,
                                         x_fill: true,
@ -404,42 +427,12 @@ AppWellIcon.prototype = {
        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
        this._menu = null;

-        this._draggable = DND.makeDraggable(this.actor,
-                                            { manualMode: true });
+        this._draggable = DND.makeDraggable(this.actor, true);
        this._dragStartX = null;
        this._dragStartY = null;

        this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
        this.actor.connect('notify::hover', Lang.bind(this, this._onHoverChange));
-        this.actor.connect('show', Lang.bind(this, this._onShow));
-        this.actor.connect('hide', Lang.bind(this, this._onHideDestroy));
-        this.actor.connect('destroy', Lang.bind(this, this._onHideDestroy));
-
-        this._appWindowChangedId = 0;
-    },
-
-    _onShow: function() {
-        this._appWindowChangedId = this.app.connect('windows-changed',
-                                                    Lang.bind(this,
-                                                              this._updateStyleClass));
-        this._updateStyleClass();
-    },
-
-    _onHideDestroy: function() {
-        if (this._appWindowChangedId > 0)
-            this.app.disconnect(this._appWindowChangedId);
-    },
-
-    _updateStyleClass: function() {
-        let windows = this.app.get_windows();
-        let running = windows.length > 0;
-        this._running = running;
-        let style = "app-well-app";
-        if (this._running)
-            style += " running";
-        if (this._selected)
-            style += " selected";
-        this.actor.style_class = style;
    },

    _onButtonPress: function(actor, event) {
@ -474,10 +467,6 @@ AppWellIcon.prototype = {
        return false;
    },

-    getId: function() {
-        return this.app.get_id();
-    },
-
    popupMenu: function(activatingButton) {
        if (!this._menu) {
            this._menu = new AppIconMenu(this);
@ -503,12 +492,10 @@ AppWellIcon.prototype = {

    activateMostRecentWindow: function () {
        let mostRecentWindow = this.app.get_windows()[0];
-        Main.activateWindow(mostRecentWindow);
+        Main.overview.activateWindow(mostRecentWindow, global.get_current_time());
    },

    highlightWindow: function(metaWindow) {
-        if (this._didActivateWindow)
-            return;
        if (!this._getRunning())
            return;
        Main.overview.getWorkspacesForWindow(metaWindow).setHighlightWindow(metaWindow);
@ -517,21 +504,15 @@ AppWellIcon.prototype = {
    activateWindow: function(metaWindow) {
        if (metaWindow) {
            this._didActivateWindow = true;
-            Main.activateWindow(metaWindow);
+            Main.overview.activateWindow(metaWindow, global.get_current_time());
        } else
            Main.overview.hide();
    },

-    setSelected: function (isSelected) {
-        this._selected = isSelected;
-        this._updateStyleClass();
-    },
-
    _onMenuPoppedUp: function() {
        if (this._getRunning()) {
            Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(this.app.get_id());
            this._setWindowSelection = true;
-            this._didActivateWindow = false;
        }
    },

@ -551,17 +532,14 @@ AppWellIcon.prototype = {

    _onActivate: function (event) {
        let running = this._getRunning();
-        this.emit('launching');

        if (!running) {
            this.app.launch();
-            Main.overview.hide();
        } else {
            let modifiers = Shell.get_event_state(event);

            if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
                this.app.launch();
-                Main.overview.hide();
            } else {
                this.activateMostRecentWindow();
            }
@ -584,12 +562,12 @@ AppWellIcon.prototype = {
        return this.app.create_icon_texture(APPICON_SIZE);
    },

-    // Returns the original actor that should align with the actor
-    // we show as the item is being dragged.
+    // Returns the original icon that is being used as a source for the cloned texture
+    // that represents the item as it is being dragged.
    getDragActorSource: function() {
-        return this._icon.icon;
+        return this.actor;
+    }
 }
-};
 Signals.addSignalMethods(AppWellIcon.prototype);

 function AppIconMenu(source) {
@ -634,8 +612,8 @@ AppIconMenu.prototype = {
        this._windowContainerBox.connect('style-changed', Lang.bind(this, this._onStyleChanged));

        this._arrow = new St.DrawingArea();
-        this._arrow.connect('repaint', Lang.bind(this, function (area) {
-            Shell.draw_box_pointer(area,
+        this._arrow.connect('redraw', Lang.bind(this, function (area, texture) {
+            Shell.draw_box_pointer(texture,
                                   Shell.PointerDirection.LEFT,
                                   this._borderColor,
                                   this._backgroundColor);
@ -696,7 +674,7 @@ AppIconMenu.prototype = {
        this._windowContainer.show();

        let iconsDiffer = false;
-        let texCache = St.TextureCache.get_default();
+        let texCache = Shell.TextureCache.get_default();
        if (windows.length > 0) {
            let firstIcon = windows[0].mini_icon;
            for (let i = 1; i < windows.length; i++) {
@ -779,7 +757,7 @@ AppIconMenu.prototype = {
    },

    _findMetaWindowForActor: function (actor) {
-        if (actor._delegate instanceof Workspace.WindowClone)
+        if (actor._delegate instanceof Workspaces.WindowClone)
            return actor._delegate.metaWindow;
        else if (actor.get_meta_window)
            return actor.get_meta_window();
@ -885,7 +863,7 @@ AppIconMenu.prototype = {
        if (themeNode.get_border_color(St.Side.LEFT, color)) {
            this._borderColor = color;
        }
-        this._arrow.queue_repaint();
+        this._arrow.emit_redraw();
    }
 };
 Signals.addSignalMethods(AppIconMenu.prototype);
@ -896,12 +874,12 @@ function WellGrid() {

 WellGrid.prototype = {
    _init: function() {
-        this.actor = new St.BoxLayout({ name: "dashAppWell", vertical: true });
+        this.actor = new St.Bin({ name: "dashAppWell" });
        // Pulled from CSS, but hardcode some defaults here
        this._spacing = 0;
        this._item_size = 48;
        this._grid = new Shell.GenericContainer();
-        this.actor.add(this._grid, { expand: true, y_align: St.Align.START });
+        this.actor.set_child(this._grid);
        this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));

        this._grid.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
@ -1014,7 +992,7 @@ WellGrid.prototype = {
    addItem: function(actor) {
        this._grid.add_actor(actor);
    }
-};
+}

 function AppWell() {
    this._init();
@ -1091,9 +1069,9 @@ AppWell.prototype = {
    // Draggable target interface
    acceptDrop : function(source, actor, x, y, time) {
        let app = null;
-        if (source instanceof AppWellIcon) {
+        if (source instanceof AppDisplayItem) {
            app = this._appSystem.get_app(source.getId());
-        } else if (source instanceof Workspace.WindowClone) {
+        } else if (source instanceof Workspaces.WindowClone) {
            app = this._tracker.get_window_app(source.metaWindow);
        }

--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -3,10 +3,7 @@
 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();
@ -64,50 +61,23 @@ AppFavorites.prototype = {
        return appId in this._favorites;
    },

-    _addFavorite: function(appId) {
+    addFavorite: function(appId) {
        if (appId in this._favorites)
-            return false;
-
+            return;
        let app = Shell.AppSystem.get_default().get_app(appId);
-
        if (!app)
-            return false;
-
+            return;
        let ids = this._getIds();
        ids.push(appId);
        this._gconf.set_string_list(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; });
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
-        return true;
    },

    removeFavorite: function(appId) {
-        if (!this._removeFavorite(appId))
+        if (!appId in this._favorites)
            return;
-
-        Main.overview.infoBar.setMessage(_("%s has been removed from your favorites.").format(this._favorites[appId].get_name()),
-                                         Lang.bind(this, function () {
-            this._addFavorite(appId);
-        }));
+        let ids = this._getIds().filter(function (id) { return id != appId; });
+        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
    }
 };
 Signals.addSignalMethods(AppFavorites.prototype);
--- a/js/ui/appIcon.js
+++ b/js/ui/appIcon.js
@ -0,0 +1,591 @@
+/* -*- 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/calendar.js
+++ b/js/ui/calendar.js
@ -16,7 +16,7 @@ function _sameDay(dateA, dateB) {

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

 Calendar.prototype = {
    _init: function() {
@ -31,7 +31,7 @@ Calendar.prototype = {

        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;
+            this.weekStart = 0;
        }

        // Find the ordering for month/year in the calendar heading
@ -63,19 +63,14 @@ Calendar.prototype = {
        this.actor.add(this._topBox,
                       { row: 0, col: 0, col_span: 7 });

-        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'  });
+        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: forwardlabel, style_class: 'calendar-change-month' });
+        let forward = new St.Button({ label: "&gt;", style_class: 'calendar-change-month' });
        this._topBox.add(forward);
        forward.connect("clicked", Lang.bind(this, this._nextMonth));

@ -89,7 +84,7 @@ Calendar.prototype = {
            this.actor.add(new St.Label({ text: iter.toLocaleFormat("%a") }),
                           { row: 1,
                             col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: St.Align.END });
+                             x_fill: false, x_align: 1.0 });
            iter.setTime(iter.getTime() + MSECS_IN_DAY);
        }

@ -168,7 +163,7 @@ Calendar.prototype = {
                label.style_class = "calendar-day";
            this.actor.add(label,
                           { row: row, col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: St.Align.END });
+                             x_fill: false, x_align: 1.0 });

            iter.setTime(iter.getTime() + MSECS_IN_DAY);
            if (iter.getDay() == this._weekStart) {
--- a/js/ui/chrome.js
+++ b/js/ui/chrome.js
@ -208,14 +208,9 @@ Chrome.prototype = {
        this._obscuredByFullscreen = false;
        for (let i = windows.length - 1; i > -1; i--) {
            let layer = windows[i].get_meta_window().get_layer();
-            if (layer == Meta.StackLayer.FULLSCREEN) {
-                if (windows[i].x >= primary.x && windows[i].x <= primary.x + primary.width &&
-                    windows[i].y >= primary.y && windows[i].y <= primary.y + primary.height) {
-                        this._obscuredByFullscreen = true;
-                        break;
-                }
-            }
-            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
+
+            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT ||
+                layer == Meta.StackLayer.FULLSCREEN) {
                if (windows[i].x <= primary.x &&
                    windows[i].x + windows[i].width >= primary.x + primary.width &&
                    windows[i].y <= primary.y &&
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@ -13,7 +13,6 @@ const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

 const AppDisplay = imports.ui.appDisplay;
-const DND = imports.ui.dnd;
 const DocDisplay = imports.ui.docDisplay;
 const PlaceDisplay = imports.ui.placeDisplay;
 const GenericDisplay = imports.ui.genericDisplay;
@ -24,7 +23,34 @@ const Search = imports.ui.search;
 const MAX_RENDERED_SEARCH_RESULTS = 25;

 const DEFAULT_PADDING = 4;
+const DEFAULT_SPACING = 4;

+const BACKGROUND_COLOR = new Clutter.Color();
+BACKGROUND_COLOR.from_pixel(0x000000c0);
+
+const PRELIGHT_COLOR = new Clutter.Color();
+PRELIGHT_COLOR.from_pixel(0x4f6fadaa);
+
+const TEXT_COLOR = new Clutter.Color();
+TEXT_COLOR.from_pixel(0x5f5f5fff);
+const BRIGHTER_TEXT_COLOR = new Clutter.Color();
+BRIGHTER_TEXT_COLOR.from_pixel(0xbbbbbbff);
+const BRIGHT_TEXT_COLOR = new Clutter.Color();
+BRIGHT_TEXT_COLOR.from_pixel(0xffffffff);
+const SEARCH_TEXT_COLOR = new Clutter.Color();
+SEARCH_TEXT_COLOR.from_pixel(0x333333ff);
+
+const SEARCH_CURSOR_COLOR = BRIGHT_TEXT_COLOR;
+const HIGHLIGHTED_SEARCH_CURSOR_COLOR = SEARCH_TEXT_COLOR;
+
+const SEARCH_BORDER_BOTTOM_COLOR = new Clutter.Color();
+SEARCH_BORDER_BOTTOM_COLOR.from_pixel(0x191919ff);
+
+const BROWSE_ACTIVATED_BG = new Clutter.Color();
+BROWSE_ACTIVATED_BG.from_pixel(0x303030f0);
+
+const APPS = "apps";
+const PREFS = "prefs";
 const DOCS = "docs";
 const PLACES = "places";

@ -42,7 +68,11 @@ function _getIndexWrapped(index, increment, length) {
 }

 function _createDisplay(displayType, flags) {
-    if (displayType == DOCS)
+    if (displayType == APPS)
+        return new AppDisplay.AppDisplay(false, flags);
+    else if (displayType == PREFS)
+        return new AppDisplay.AppDisplay(true, flags);
+    else if (displayType == DOCS)
        return new DocDisplay.DocDisplay(flags);
    else if (displayType == PLACES)
        return new PlaceDisplay.PlaceDisplay(flags);
@ -67,8 +97,13 @@ Pane.prototype = {

        let chromeTop = new St.BoxLayout();

+        let closeIcon = new St.Button({ style_class: "dash-pane-close" });
+        closeIcon.connect('clicked', Lang.bind(this, function (b, e) {
+            this.close();
+        }));
        let dummy = new St.Bin();
        chromeTop.add(dummy, { expand: true });
+        chromeTop.add(closeIcon, { x_align: St.Align.END });
        this.actor.add(chromeTop);

        this.content = new St.BoxLayout({ vertical: true });
@ -107,7 +142,7 @@ Pane.prototype = {
        else
            this.open();
    }
-};
+}
 Signals.addSignalMethods(Pane.prototype);

 function ResultArea(displayType, flags) {
@ -126,7 +161,7 @@ ResultArea.prototype = {
        this.resultsContainer.append(this.display.actor, Big.BoxPackFlags.EXPAND);
        this.display.load();
    }
-};
+}

 // Utility function shared between ResultPane and the DocDisplay in the main dash.
 // Connects to the detail signal of the display, and on-demand creates a new
@ -142,7 +177,7 @@ function createPaneForDetails(dash, display) {
                    detailPane.destroyContent();
                }
            }));
-            dash._addPane(detailPane, St.Align.START);
+            dash._addPane(detailPane);
        }

        if (index >= 0) {
@ -182,7 +217,7 @@ ResultPane.prototype = {
        }));
        return resultArea.display;
    }
-};
+}

 function SearchEntry() {
    this._init();
@ -190,44 +225,76 @@ function SearchEntry() {

 SearchEntry.prototype = {
    _init : function() {
-        this.actor = new St.Entry({ name: "searchEntry",
-                                    hint_text: _("Find") });
-        this.entry = this.actor.clutter_text;
-
-        this.actor.clutter_text.connect('text-changed', Lang.bind(this,
-            function() {
-                if (this.isActive())
-                    this.actor.set_secondary_icon_from_file(global.imagedir +
-                                                            "close-black.svg");
-                else
-                    this.actor.set_secondary_icon_from_file(null);
+        this.actor = new St.BoxLayout({ name: "searchEntry",
+                                        reactive: true });
+        let box = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                y_align: Big.BoxAlignment.CENTER });
+        this.actor.add(box, { expand: true });
+        this.actor.connect('button-press-event', Lang.bind(this, function () {
+            this._resetTextState(true);
+            return false;
        }));
-        this.actor.connect('secondary-icon-clicked', Lang.bind(this,
-            function() {
-                this.reset();
-            }));
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

        this.pane = null;

-        this._capturedEventId = 0;
-    },
+        this._defaultText = _("Find...");

-    show: function() {
-        if (this._capturedEventId == 0)
-            this._capturedEventId = global.stage.connect('captured-event',
-                                 Lang.bind(this, this._onCapturedEvent));
-        this.entry.set_cursor_visible(true);
-        this.entry.set_selection(0, 0);
-    },
+        let textProperties = { font_name: "Sans 16px" };
+        let entryProperties = { editable: true,
+                                activatable: true,
+                                single_line_mode: true,
+                                color: SEARCH_TEXT_COLOR,
+                                cursor_color: SEARCH_CURSOR_COLOR };
+        Lang.copyProperties(textProperties, entryProperties);
+        this.entry = new Clutter.Text(entryProperties);

-    hide: function() {
-        if (this.isActive())
-            this.reset();
-        if (this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
+        this.entry.connect('notify::text', Lang.bind(this, function () {
+            this._resetTextState(false);
+        }));
+        box.append(this.entry, Big.BoxPackFlags.EXPAND);
+
+        // Mark as editable just to get a cursor
+        let defaultTextProperties = { ellipsize: Pango.EllipsizeMode.END,
+                                      text: this._defaultText,
+                                      editable: true,
+                                      color: TEXT_COLOR,
+                                      cursor_visible: false,
+                                      single_line_mode: true };
+        Lang.copyProperties(textProperties, defaultTextProperties);
+        this._defaultText = new Clutter.Text(defaultTextProperties);
+        box.add_actor(this._defaultText);
+        this.entry.connect('notify::allocation', Lang.bind(this, function () {
+            this._repositionDefaultText();
+        }));
+
+        this._iconBox = new Big.Box({ x_align: Big.BoxAlignment.CENTER,
+                                      y_align: Big.BoxAlignment.CENTER,
+                                      padding_right: 4 });
+        box.append(this._iconBox, Big.BoxPackFlags.END);
+
+        let magnifierUri = "file://" + global.imagedir + "magnifier.svg";
+        this._magnifierIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
+                                                                             magnifierUri, 18, 18);
+        let closeUri = "file://" + global.imagedir + "close-black.svg";
+        this._closeIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
+                                                                         closeUri, 18, 18);
+        this._closeIcon.reactive = true;
+        this._closeIcon.connect('button-press-event', Lang.bind(this, function () {
+            // Resetting this.entry.text will trigger notify::text signal which will
+            // result in this._resetTextState() being called, but we should not rely
+            // on that not short-circuiting if the text was already empty, so we call
+            // this._resetTextState() explicitly in that case.
+            if (this.entry.text == '')
+                this._resetTextState(false);
+            else
+                this.entry.text = '';
+
+            // Return true to stop the signal emission, so that this.actor doesn't get
+            // the button-press-event and re-highlight itself.
+            return true;
+        }));
+        this._repositionDefaultText();
+        this._resetTextState();
    },

    setPane: function (pane) {
@ -236,93 +303,35 @@ SearchEntry.prototype = {

    reset: function () {
        this.entry.text = '';
-        global.stage.set_key_focus(null);
-        this.entry.set_cursor_visible(true);
-        this.entry.set_selection(0, 0);
    },

    getText: function () {
-        return this.entry.get_text().replace(/^\s+/g, '').replace(/\s+$/g, '');
+        return this.entry.text;
    },

-    // some search term has been entered
-    isActive: function() {
-        return this.actor.get_text() != '';
-    },
-
-    // the entry does not show the hint
-    _isActivated: function() {
-        return this.entry.text == this.actor.get_text();
-    },
-
-    _onCapturedEvent: function(actor, event) {
-        let source = event.get_source();
-        let panelEvent = false;
-
-        if (source) {
-            let parent = source;
-            do {
-                if (parent == Main.panel.actor)
-                    break;
-            } while ((parent = parent.get_parent()) != null);
-            panelEvent = (parent != null);
-        }
-
-        switch (event.type()) {
-            case Clutter.EventType.BUTTON_PRESS:
-                // the user clicked outside after activating the entry, but
-                // with no search term entered - cancel the search
-                if (source != this.entry && this.entry.text == '') {
-                    this.reset();
-                    // allow only panel events to continue
-                    return !panelEvent;
-                }
-                return false;
-            case Clutter.EventType.KEY_PRESS:
-                // If neither the stage nor our entry have key focus, some
-                // "special" actor grabbed the focus (run dialog, looking
-                // glass); we don't want to interfere with that
-                let focus = global.stage.get_key_focus();
-                if (focus != global.stage && focus != this.entry)
-                    return false;
-
-                let sym = event.get_key_symbol();
-
-                // If we have an active search, Escape cancels it - if we
-                // haven't, the key is ignored
-                if (sym == Clutter.Escape)
-                    if (this._isActivated()) {
-                        this.reset();
-                        return true;
+    _resetTextState: function (searchEntryClicked) {
+        let text = this.getText();
+        this._iconBox.remove_all();
+        // We highlight the search box if the user starts typing in it
+        // or just clicks in it to indicate that the search is active.
+        if (text != '' || searchEntryClicked) {
+            if (!searchEntryClicked)
+                this._defaultText.hide();
+            this._iconBox.append(this._closeIcon, Big.BoxPackFlags.NONE);
+            this.actor.set_style_pseudo_class('active');
+            this.entry.cursor_color = HIGHLIGHTED_SEARCH_CURSOR_COLOR;
        } else {
-                        return false;
-                    }
-
-                 // Ignore non-printable keys
-                 if (!Clutter.keysym_to_unicode(sym))
-                     return false;
-
-                // Search started - move the key focus to the entry and
-                // "repeat" the event
-                if (!this._isActivated()) {
-                    global.stage.set_key_focus(this.entry);
-                    this.entry.event(event, false);
-                }
-
-                return false;
-            default:
-                // Suppress all other events outside the panel while the entry
-                // is activated and no search has been entered - any click
-                // outside the entry will cancel the search
-                return (this.entry.text == '' && !panelEvent);
+            this._defaultText.show();
+            this._iconBox.append(this._magnifierIcon, Big.BoxPackFlags.NONE);
+            this.actor.set_style_pseudo_class(null);
+            this.entry.cursor_color = SEARCH_CURSOR_COLOR;
        }
    },

-    _onDestroy: function() {
-        if (this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
+    _repositionDefaultText: function () {
+        // Offset a little to show the cursor
+        this._defaultText.set_position(this.entry.x + 4, this.entry.y);
+        this._defaultText.set_size(this.entry.width, this.entry.height);
    }
 };
 Signals.addSignalMethods(SearchEntry.prototype);
@ -354,8 +363,6 @@ SearchResult.prototype = {
        this.actor.set_child(content);

        this.actor.connect('clicked', Lang.bind(this, this._onResultClicked));
-
-        let draggable = DND.makeDraggable(this.actor);
    },

    setSelected: function(selected) {
@ -369,23 +376,8 @@ SearchResult.prototype = {

    _onResultClicked: function(actor, event) {
        this.activate();
-    },
-
-    getDragActorSource: function() {
-        return this.metaInfo['icon'];
-    },
-
-    getDragActor: function(stageX, stageY) {
-        return new Clutter.Clone({ source: this.metaInfo['icon'] });
-    },
-
-    shellWorkspaceLaunch: function() {
-        if (this.provider.dragActivateResult)
-            this.provider.dragActivateResult(this.metaInfo.id);
-        else
-            this.provider.activateResult(this.metaInfo.id);
    }
-};
+}

 function OverflowSearchResults(provider) {
    this._init(provider);
@ -399,10 +391,6 @@ OverflowSearchResults.prototype = {
        this.actor = new St.OverflowBox({ style_class: 'dash-search-section-list-results' });
    },

-    getVisibleResultCount: function() {
-        return this.actor.get_n_visible();
-    },
-
    renderResults: function(results, terms) {
        for (let i = 0; i < results.length && i < MAX_RENDERED_SEARCH_RESULTS; i++) {
            let result = results[i];
@ -412,6 +400,10 @@ OverflowSearchResults.prototype = {
        }
    },

+    getVisibleCount: function() {
+        return this.actor.get_n_visible();
+    },
+
    selectIndex: function(index) {
        let nVisible = this.actor.get_n_visible();
        let children = this.actor.get_children();
@ -428,14 +420,8 @@ OverflowSearchResults.prototype = {
        targetActor._delegate.setSelected(true);
        this.selectionIndex = index;
        return true;
-    },
-
-    activateSelected: function() {
-        let children = this.actor.get_children();
-        let targetActor = children[this.selectionIndex];
-        targetActor._delegate.activate();
    }
-};
+}

 function SearchResults(searchSystem) {
    this._init(searchSystem);
@ -447,8 +433,9 @@ SearchResults.prototype = {

        this.actor = new St.BoxLayout({ name: 'dashSearchResults',
                                        vertical: true });
-        this._statusText = new St.Label({ style_class: 'dash-search-statustext' });
-        this.actor.add(this._statusText);
+        this._searchingNotice = new St.Label({ style_class: 'dash-search-starting',
+                                               text: _("Searching...") });
+        this.actor.add(this._searchingNotice);
        this._selectedProvider = -1;
        this._providers = this._searchSystem.getProviders();
        this._providerMeta = [];
@ -498,14 +485,13 @@ SearchResults.prototype = {

    reset: function() {
        this._searchSystem.reset();
-        this._statusText.hide();
+        this._searchingNotice.hide();
        this._clearDisplay();
    },

    startingSearch: function() {
        this.reset();
-        this._statusText.set_text(_("Searching..."));
-        this._statusText.show();
+        this._searchingNotice.show();
    },

    _metaForProvider: function(provider) {
@ -515,16 +501,9 @@ SearchResults.prototype = {
    updateSearch: function (searchString) {
        let results = this._searchSystem.updateSearch(searchString);

+        this._searchingNotice.hide();
        this._clearDisplay();

-        if (results.length == 0) {
-            this._statusText.set_text(_("No matching results."));
-            this._statusText.show();
-            return true;
-        } else {
-            this._statusText.hide();
-        }
-
        let terms = this._searchSystem.getTerms();

        for (let i = 0; i < results.length; i++) {
@ -548,7 +527,7 @@ SearchResults.prototype = {
        let success;
        let index = resultDisplay.getSelectionIndex();
        if (up && index == -1)
-            index = resultDisplay.getVisibleResultCount() - 1;
+            index = resultDisplay.getVisibleCount() - 1;
        else if (up)
            index = index - 1;
        else
@ -599,10 +578,11 @@ SearchResults.prototype = {
            return;
        let meta = this._providerMeta[current];
        let resultDisplay = meta.resultDisplay;
-        resultDisplay.activateSelected();
-        Main.overview.hide();
+        let children = resultDisplay.actor.get_children();
+        let targetActor = children[resultDisplay.getSelectionIndex()];
+        targetActor._delegate.activate();
+    }
 }
-};

 function MoreLink() {
    this._init();
@ -614,8 +594,8 @@ MoreLink.prototype = {
                                        reactive: true });
        this.pane = null;

-        this._expander = new St.Bin({ style_class: "more-link-expander" });
-        this.actor.add(this._expander, { expand: true, y_fill: false });
+        let expander = new St.Bin({ style_class: "more-link-expander" });
+        this.actor.add(expander, { expand: true, y_fill: false });
    },

    activate: function() {
@ -630,13 +610,9 @@ MoreLink.prototype = {
    setPane: function (pane) {
        this._pane = pane;
        this._pane.connect('open-state-changed', Lang.bind(this, function(pane, isOpen) {
-            if (!isOpen)
-                this._expander.style_class = 'more-link-expander';
-            else
-                this._expander.style_class = 'more-link-expander open';
        }));
    }
-};
+}

 Signals.addSignalMethods(MoreLink.prototype);

@ -650,7 +626,7 @@ BackLink.prototype = {
                                      reactive: true });
        this.actor.set_child(new St.Bin({ style_class: "section-header-back-image" }));
    }
-};
+}

 function SectionHeader(title, suppressBrowse) {
    this._init(title, suppressBrowse);
@ -721,7 +697,7 @@ SectionHeader.prototype = {
            this.countText.text = countText;
        }
    }
-};
+}

 Signals.addSignalMethods(SectionHeader.prototype);

@ -745,7 +721,7 @@ SearchSectionHeader.prototype = {

        this.actor.connect('clicked', onClick);
    }
-};
+}

 function Section(titleString, suppressBrowse) {
    this._init(titleString, suppressBrowse);
@ -761,7 +737,7 @@ Section.prototype = {
                                           vertical: true });
        this.actor.add(this.content);
    }
-};
+}

 function Dash() {
    this._init();
@ -811,11 +787,12 @@ Dash.prototype = {
        this.actor.add(this.searchResults.actor);
        this.searchResults.actor.hide();

-        this._keyPressId = 0;
        this._searchTimeoutId = 0;
        this._searchEntry.entry.connect('text-changed', Lang.bind(this, function (se, prop) {
+            let text = this._searchEntry.getText();
+            text = text.replace(/^\s+/g, "").replace(/\s+$/g, "");
            let searchPreviouslyActive = this._searchActive;
-            this._searchActive = this._searchEntry.isActive();
+            this._searchActive = text != '';
            this._searchPending = this._searchActive && !searchPreviouslyActive;
            if (this._searchPending) {
                this.searchResults.startingSearch();
@ -846,74 +823,17 @@ Dash.prototype = {
            this.searchResults.activateSelected();
            return true;
        }));
-
-        /***** Applications *****/
-
-        this._appsSection = new Section(_("APPLICATIONS"));
-        let appWell = new AppDisplay.AppWell();
-        this._appsSection.content.add(appWell.actor, { expand: true });
-
-        this._allApps = null;
-        this._appsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
-            if (this._allApps == null) {
-                this._allApps = new AppDisplay.AllAppDisplay();
-                this._addPane(this._allApps, St.Align.START);
-                link.setPane(this._allApps);
-           }
-        }));
-
-        this.sectionArea.add(this._appsSection.actor);
-
-        /***** Places *****/
-
-        /* Translators: This is in the sense of locations for documents,
-           network locations, etc. */
-        this._placesSection = new Section(_("PLACES & DEVICES"), true);
-        let placesDisplay = new PlaceDisplay.DashPlaceDisplay();
-        this._placesSection.content.add(placesDisplay.actor, { expand: true });
-        this.sectionArea.add(this._placesSection.actor);
-
-        /***** Documents *****/
-
-        this._docsSection = new Section(_("RECENT ITEMS"));
-
-        this._docDisplay = new DocDisplay.DashDocDisplay();
-        this._docsSection.content.add(this._docDisplay.actor, { expand: true });
-
-        this._moreDocsPane = null;
-        this._docsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
-            if (this._moreDocsPane == null) {
-                this._moreDocsPane = new ResultPane(this);
-                this._moreDocsPane.packResults(DOCS);
-                this._addPane(this._moreDocsPane, St.Align.END);
-                link.setPane(this._moreDocsPane);
-           }
-        }));
-
-        this._docDisplay.connect('changed', Lang.bind(this, function () {
-            this._docsSection.header.setMoreLinkVisible(
-                this._docDisplay.actor.get_children().length > 0);
-        }));
-        this._docDisplay.emit('changed');
-
-        this.sectionArea.add(this._docsSection.actor, { expand: true });
-    },
-
-    _onKeyPress: function(stage, event) {
-        // If neither the stage nor the search entry have key focus, some
-        // "special" actor grabbed the focus (run dialog, looking glass);
-        // we don't want to interfere with that
-        let focus = stage.get_key_focus();
-        if (focus != stage && focus != this._searchEntry.entry)
-            return false;
-
-        let symbol = event.get_key_symbol();
+        this._searchEntry.entry.connect('key-press-event', Lang.bind(this, function (se, e) {
+            let symbol = e.get_key_symbol();
            if (symbol == Clutter.Escape) {
-            // If we're in one of the "more" modes or showing the
-            // details pane, close them
-            if (this._activePane != null)
+                // Escape will keep clearing things back to the desktop.
+                // If we have an active search, we remove it.
+                if (this._searchActive)
+                    this._searchEntry.reset();
+                // Next, if we're in one of the "more" modes or showing the details pane, close them
+                else if (this._activePane != null)
                    this._activePane.close();
-            // Otherwise, just close the Overview entirely
+                // Finally, just close the Overview entirely
                else
                    Main.overview.hide();
                return true;
@ -931,6 +851,59 @@ Dash.prototype = {
                return true;
            }
            return false;
+        }));
+
+        /***** Applications *****/
+
+        this._appsSection = new Section(_("APPLICATIONS"));
+        let appWell = new AppDisplay.AppWell();
+        this._appsSection.content.add(appWell.actor, { expand: true });
+
+        this._moreAppsPane = null;
+        this._appsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
+            if (this._moreAppsPane == null) {
+                this._moreAppsPane = new ResultPane(this);
+                this._moreAppsPane.packResults(APPS);
+                this._addPane(this._moreAppsPane);
+                link.setPane(this._moreAppsPane);
+           }
+        }));
+
+        this.sectionArea.add(this._appsSection.actor);
+
+        /***** Places *****/
+
+        /* Translators: This is in the sense of locations for documents,
+           network locations, etc. */
+        this._placesSection = new Section(_("PLACES"), true);
+        let placesDisplay = new PlaceDisplay.DashPlaceDisplay();
+        this._placesSection.content.add(placesDisplay.actor, { expand: true });
+        this.sectionArea.add(this._placesSection.actor);
+
+        /***** Documents *****/
+
+        this._docsSection = new Section(_("RECENT DOCUMENTS"));
+
+        this._docDisplay = new DocDisplay.DashDocDisplay();
+        this._docsSection.content.add(this._docDisplay.actor, { expand: true });
+
+        this._moreDocsPane = null;
+        this._docsSection.header.moreLink.connect('activated', Lang.bind(this, function (link) {
+            if (this._moreDocsPane == null) {
+                this._moreDocsPane = new ResultPane(this);
+                this._moreDocsPane.packResults(DOCS);
+                this._addPane(this._moreDocsPane);
+                link.setPane(this._moreDocsPane);
+           }
+        }));
+
+        this._docDisplay.connect('changed', Lang.bind(this, function () {
+            this._docsSection.header.setMoreLinkVisible(
+                this._docDisplay.actor.get_children().length > 0);
+        }));
+        this._docDisplay.emit('changed');
+
+        this.sectionArea.add(this._docsSection.actor, { expand: true });
    },

    _doSearch: function () {
@ -942,21 +915,14 @@ Dash.prototype = {
    },

    show: function() {
-        this._searchEntry.show();
-        if (this._keyPressId == 0)
-            this._keyPressId = global.stage.connect('key-press-event',
-                                                    Lang.bind(this, this._onKeyPress));
+        global.stage.set_key_focus(this._searchEntry.entry);
    },

    hide: function() {
        this._firstSelectAfterOverlayShow = true;
-        this._searchEntry.hide();
+        this._searchEntry.reset();
        if (this._activePane != null)
            this._activePane.close();
-        if (this._keyPressId > 0) {
-            global.stage.disconnect(this._keyPressId);
-            this._keyPressId = 0;
-        }
    },

    closePanes: function () {
@ -964,7 +930,7 @@ Dash.prototype = {
            this._activePane.close();
    },

-    _addPane: function(pane, align) {
+    _addPane: function(pane) {
        pane.connect('open-state-changed', Lang.bind(this, function (pane, isOpen) {
            if (isOpen) {
                if (pane != this._activePane && this._activePane != null) {
@ -975,7 +941,7 @@ Dash.prototype = {
                this._activePane = null;
            }
        }));
-        Main.overview.addPane(pane, align);
+        Main.overview.addPane(pane);
    }
 };
 Signals.addSignalMethods(Dash.prototype);
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -6,11 +6,6 @@ const Lang = imports.lang;
 const Signals = imports.signals;
 const Tweener = imports.ui.tweener;

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

 let eventHandlerActor = null;
@ -32,29 +27,18 @@ function _getEventHandlerActor() {
    return eventHandlerActor;
 }

-function _Draggable(actor, params) {
-    this._init(actor, params);
+function _Draggable(actor, manualMode) {
+    this._init(actor, manualMode);
 }

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

-        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.
@ -156,8 +140,8 @@ _Draggable.prototype = {
            this._ungrabActor();
        this._grabEvents();

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

        if (this.actor._delegate && this.actor._delegate.getDragActor) {
            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
@ -170,9 +154,10 @@ _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 + this._dragActor.width &&
-                    stageY > sourceY && stageY <= sourceY + this._dragActor.height) {
+                if (stageX > sourceX && stageX <= sourceX + sourceWidth &&
+                    stageY > sourceY && stageY <= sourceY + sourceHeight) {
                    x = sourceX;
                    y = sourceY;
                } else {
@ -208,45 +193,6 @@ _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) {
@ -265,8 +211,6 @@ _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) {
@ -276,7 +220,8 @@ _Draggable.prototype = {
            // we have to temporarily hide this._dragActor.
            this._dragActor.hide();
            let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                      stageX, stageY);
+                                                                      stageX + this._dragOffsetX,
+                                                                      stageY + this._dragOffsetY);
            this._dragActor.show();
            while (target) {
                if (target._delegate && target._delegate.handleDragOver) {
@ -285,8 +230,8 @@ _Draggable.prototype = {
                    // 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 - targX) / target.scale_x,
-                                                    (stageY - targY) / target.scale_y,
+                                                    (stageX + this._dragOffsetX - targX) / target.scale_x,
+                                                    (stageY + this._dragOffsetY - targY) / target.scale_y,
                                                    event.get_time());
                }
                target = target.get_parent();
@ -335,8 +280,8 @@ _Draggable.prototype = {
        // 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._snapBackX;
-        let snapBackY = this._snapBackY;
+        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();
        }
@ -346,9 +291,6 @@ _Draggable.prototype = {
        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,
@ -384,24 +326,10 @@ Signals.addSignalMethods(_Draggable.prototype);
 /**
 * makeDraggable:
 * @actor: Source actor
- * @params: (optional) Additional parameters
+ * @manualMode: If given, do not automatically start drag and drop on click
 *
 * 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, params) {
-    return new _Draggable(actor, params);
+function makeDraggable(actor, manualMode) {
+    return new _Draggable(actor, manualMode);
 }
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -85,7 +85,7 @@ DocDisplayItem.prototype = {
            return null;

        try {
-            return St.TextureCache.get_default().load_uri_sync(St.TextureCachePolicy.NONE,
+            return Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.NONE,
                                                                  this._docInfo.uri, -1, -1);
        } catch (e) {
            // An exception will be raised when the image format isn't know
@ -357,37 +357,34 @@ DashDocDisplay.prototype = {
    _getPreferredHeight: function(actor, forWidth, alloc) {
        let children = actor.get_children();

-        // 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;
+        // Two columns, where we go vertically down first.  So just take
+        // the height of half of the children as our preferred height.

        let firstColumnChildren = Math.ceil(children.length / 2);
-        alloc.natural_size = (firstColumnChildren * maxNatural +
-                              (firstColumnChildren - 1) * DEFAULT_SPACING);
+
+        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;
    },

    _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();

-        let x = 0;
-        let y = 0;
+        // 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 columnIndex = 0;
        let i = 0;
        // Loop over the children, going vertically down first.  When we run
@ -396,7 +393,9 @@ DashDocDisplay.prototype = {
        while (i < children.length) {
            let child = children[i];

-            if (y + this._itemHeight > box.y2) {
+            let [minSize, naturalSize] = child.get_preferred_height(-1);
+
+            if (y + naturalSize > 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.
@ -405,9 +404,9 @@ DashDocDisplay.prototype = {
                }
                // Set x to the halfway point.
                columnIndex += 1;
-                x = x + this._itemWidth + DEFAULT_SPACING;
+                x = x + itemWidth + DEFAULT_SPACING;
                // And y is back to the top.
-                y = 0;
+                y = box.y1;
                // 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.
@ -417,13 +416,13 @@ DashDocDisplay.prototype = {
            let childBox = new Clutter.ActorBox();
            childBox.x1 = x;
            childBox.y1 = y;
-            childBox.x2 = childBox.x1 + this._itemWidth;
-            childBox.y2 = y + this._itemHeight;
+            childBox.x2 = childBox.x1 + itemWidth;
+            childBox.y2 = y + naturalSize;

            y = childBox.y2 + DEFAULT_SPACING;

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

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

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

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

--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@ -240,7 +240,7 @@ 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.
@ -259,13 +259,11 @@ GenericDisplay.prototype = {
            this.actor = this._list = new Shell.OverflowList({ spacing: 6,
                                                                 item_height: 50 });
        } else {
-            this.actor = new St.ScrollView({ x_fill: true,
-                                             y_fill: false,
-                                             vshadows: true });
+            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.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
        }

        this._pendingRedisplay = RedisplayFlags.NONE;
@ -700,7 +698,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);
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -2,12 +2,16 @@

 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
-const St = imports.gi.St;
+
+const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;
+
+const SHADE_COLOR = new Clutter.Color();
+SHADE_COLOR.from_pixel(0x00000044);

 /**
 * Lightbox:
 * @container: parent Clutter.Container
- * @inhibitEvents: whether to inhibit events for @container
 * @width: (optional) shade actor width
 * @height: (optional) shade actor height
 *
@ -25,23 +29,24 @@ const St = imports.gi.St;
 * @container and will track any changes in its size. You can override
 * this by passing an explicit width and height
 */
-function Lightbox(container, inhibitEvents, width, height) {
-    this._init(container, inhibitEvents, width, height);
+function Lightbox(container, width, height) {
+    this._init(container, width, height);
 }

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

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

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

        if (width && height) {
            this.actor.width = width;
@ -129,24 +134,18 @@ Lightbox.prototype = {
    /**
     * destroy:
     *
-     * Destroys the lightbox.
+     * Destroys the lightbox. This is called automatically if the
+     * lightbox's container is destroyed.
     */
    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/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -136,7 +136,7 @@ Notebook.prototype = {
        let vAdjust = tabData.scrollView.vscroll.adjustment;
        vAdjust.value = vAdjust.upper - vAdjust.page_size;
    }
-};
+}
 Signals.addSignalMethods(Notebook.prototype);

 function Result(command, o, index) {
@ -164,7 +164,7 @@ Result.prototype = {
        padBin.add_actor(line);
        this.actor.append(padBin, Big.BoxPackFlags.NONE);
    }
-};
+}

 function ActorHierarchy() {
    this._init();
@ -215,7 +215,7 @@ ActorHierarchy.prototype = {
        let link = children[idx];
        this.emit('selection', actor);
    }
-};
+}
 Signals.addSignalMethods(ActorHierarchy.prototype);

 function PropertyInspector() {
@ -249,7 +249,7 @@ PropertyInspector.prototype = {
            this.actor.add_actor(propDisplay);
        }
    }
-};
+}

 function Inspector() {
    this._init();
@ -295,14 +295,7 @@ Inspector.prototype = {
            let target = global.stage.get_actor_at_pos(Clutter.PickMode.ALL,
                                                       stageX,
                                                       stageY);
-            let id, style_class;
-            if (target instanceof St.Widget) {
-                id = target.get_theme_node().get_element_id();
-                style_class = target.get_theme_node().get_element_class();
-            }
-            let position = '<inspect x: ' + stageX + ' y: ' + stageY + '>';
-            let style = '<style id: ' + id  + ' class: ' + style_class + '>';
-            displayText.text = position + ' ' + style + ' ' + target;
+            displayText.text = '<inspect x: ' + stageX + ' y: ' + stageY + '> ' + target;
            if (borderPaintTarget != null)
                borderPaintTarget.disconnect(borderPaintId);
            borderPaintTarget = target;
@ -311,7 +304,7 @@ Inspector.prototype = {
        }));
        Clutter.grab_pointer(eventHandler);
    }
-};
+}

 Signals.addSignalMethods(Inspector.prototype);

@ -329,13 +322,13 @@ ErrorLog.prototype = {
    },

    _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() {
@ -349,7 +342,7 @@ ErrorLog.prototype = {
        }
        this.text.text = text;
    }
-};
+}

 function Extensions() {
    this._init();
@ -484,7 +477,7 @@ LookingGlass.prototype = {

        let toolbar = new St.BoxLayout({ name: "Toolbar" });
        this.actor.add_actor(toolbar);
-        let inspectIcon = St.TextureCache.get_default().load_gicon(new Gio.ThemedIcon({ name: 'gtk-color-picker' }),
+        let inspectIcon = Shell.TextureCache.get_default().load_gicon(new Gio.ThemedIcon({ name: 'gtk-color-picker' }),
                                                                      24);
        toolbar.add_actor(inspectIcon);
        inspectIcon.reactive = true;
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -22,7 +22,6 @@ 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 ShellDBus = imports.ui.shellDBus;
 const Sidebar = imports.ui.sidebar;
 const WindowManager = imports.ui.windowManager;
@ -39,8 +38,8 @@ let runDialog = null;
 let lookingGlass = null;
 let wm = null;
 let notificationDaemon = null;
+let notificationPopup = null;
 let messageTray = null;
-let windowAttentionHandler = null;
 let recorder = null;
 let shellDBusService = null;
 let modalCount = 0;
@ -48,8 +47,6 @@ let modalActorFocusStack = [];
 let _errorLogStack = [];
 let _startDate;

-let background = null;
-
 function start() {
    // Add a binding for "global" in the global JS namespace; (gjs
    // keeps the web browser convention of having that namespace be
@ -90,11 +87,21 @@ 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 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 () {
@ -112,7 +119,7 @@ function start() {
    sidebar = new Sidebar.Sidebar();
    wm = new WindowManager.WindowManager();
    notificationDaemon = new NotificationDaemon.NotificationDaemon();
-    windowAttentionHandler = new WindowAttentionHandler.WindowAttentionHandler();
+    notificationPopup = new MessageTray.Notification();
    messageTray = new MessageTray.MessageTray();

    _startDate = new Date();
@ -125,25 +132,11 @@ function start() {
        if (recorder.is_recording()) {
            recorder.pause();
        } else {
-            //read the parameters from GConf always in case they have changed
-            let gconf = Shell.GConf.get_default();
-            recorder.set_framerate(gconf.get_int("recorder/framerate"));
-            recorder.set_filename("shell-%d%u-%c." + gconf.get_string("recorder/file_extension"));
-            let pipeline = gconf.get_string("recorder/pipeline");
-            if (!pipeline.match(/^\s*$/))
-                recorder.set_pipeline(pipeline);
-            else
-                recorder.set_pipeline(null);
-
            recorder.record();
        }
    });

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

    ExtensionSystem.init();
    ExtensionSystem.loadExtensions();
@ -152,11 +145,11 @@ 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);

    _log('info', 'loaded at ' + _startDate);
-    log('GNOME Shell started at ' + _startDate);

    Mainloop.idle_add(_removeUnusedWorkspaces);
 }
@ -207,15 +200,6 @@ 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,
@ -279,9 +263,6 @@ function _globalKeyPressHandler(actor, event) {
        }
    } else if (type == Clutter.EventType.KEY_RELEASE) {
        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.
@ -289,25 +270,8 @@ function _globalKeyPressHandler(actor, event) {
                overview.hide();

            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(symbol, keyCode, modifierState);
-        switch (action) {
-            case Meta.KeyBindingAction.WORKSPACE_LEFT:
-                wm.actionMoveWorkspaceLeft();
-                return true;
-            case Meta.KeyBindingAction.WORKSPACE_RIGHT:
-                wm.actionMoveWorkspaceRight();
-                return true;
-            case Meta.KeyBindingAction.PANEL_RUN_DIALOG:
-            case Meta.KeyBindingAction.COMMAND_2:
+        } else if (symbol == Clutter.F2 && (Shell.get_event_state(event) & Clutter.ModifierType.MOD1_MASK)) {
            getRunDialog().open();
-                return true;
        }
    }

@ -417,14 +381,12 @@ 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,
- * and switching out of the overview if it's currently active
+ * Activates @window, switching to its workspace first if necessary
 */
-function activateWindow(window, time, workspaceNum) {
+function activateWindow(window, time) {
    let activeWorkspaceNum = global.screen.get_active_workspace_index();
-    let windowWorkspaceNum = (workspaceNum !== undefined) ? workspaceNum : window.get_workspace().index();
+    let windowWorkspaceNum = window.get_workspace().index();

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

 // TODO - replace this timeout with some system to guess when the user might
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -5,319 +5,84 @@ 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 Signals = imports.signals;
 const Tweener = imports.ui.tweener;

 const Main = imports.ui.main;

 const ANIMATION_TIME = 0.2;
 const NOTIFICATION_TIMEOUT = 4;
-const SUMMARY_TIMEOUT = 1;

 const MESSAGE_TRAY_TIMEOUT = 0.2;

 const ICON_SIZE = 24;

-const State = {
-    HIDDEN:  0,
-    SHOWING: 1,
-    SHOWN:   2,
-    HIDING:  3
-};
-
-function _cleanMarkup(text) {
-    // Support &amp;, &quot;, &apos;, &lt; and &gt;, escape all other
-    // occurrences of '&'.
-    let _text = text.replace(/&(?!amp;|quot;|apos;|lt;|gt;)/g, "&amp;");
-    // Support <b>, <i>, and <u>, escape anything else
-    // so it displays as raw markup.
-    return _text.replace(/<(\/?[^biu]>|[^>\/][^>])/g, "&lt;$1");
-}
-
-// Notification:
-// @id: the notification's id
-// @source: the notification's Source
-// @title: the title
-// @banner: the banner text
-// @bannerBody: whether or not to promote the banner to the body on overflow
-//
-// Creates a notification. In banner mode, it will show
-// @source's icon, @title (in bold) and @banner, all on a single line
-// (with @banner ellipsized if necessary).
-//
-// Additional notification details can be added via addBody(),
-// addAction(), and addActor(). If any of these are called, then the
-// notification will expand to show the additional actors (while
-// hiding the @banner) if the pointer is moved into it while it is
-// visible.
-//
-// If @bannerBody is %true, then @banner will also be used as the body
-// of the notification (as with addBody()) when the banner is expanded.
-// In this case, if @banner is too long to fit in the single-line mode,
-// the notification will be made expandable automatically.
-function Notification(id, source, title, banner, bannerBody) {
-    this._init(id, source, title, banner, bannerBody);
+function Notification(icon, text) {
+    this._init(icon, text);
 }

 Notification.prototype = {
-    _init: function(id, source, title, banner, bannerBody) {
-        this.id = id;
-        this.source = source;
-        this._bannerBody = bannerBody;
-
-        source.connect('clicked', Lang.bind(this,
-            function() {
-                this.emit('dismissed');
-            }));
-
-        this.actor = new St.Table({ name: 'notification' });
-        this.update(title, banner, true);
-    },
-
-    // update:
-    // @title: the new title
-    // @banner: the new banner
-    // @clear: whether or not to clear out extra actors
-    //
-    // Updates the notification by regenerating its icon and updating
-    // the title/banner. If @clear is %true, it will also remove any
-    // additional actors/action buttons previously added.
-    update: function(title, banner, clear) {
-        let children = this.actor.get_children();
-        for (let i = 0; i < children.length; i++) {
-            let meta = this.actor.get_child_meta(children[i]);
-            if (clear || meta.row == 0 || (this._bannerBody && meta.row == 1))
-                children[i].destroy();
-        }
-        if (clear) {
-            this.actions = {};
-            this._actionBox = null;
-        }
-
-        let icon = this.source.createIcon(ICON_SIZE);
-        icon.reactive = true;
-        this.actor.add(icon, { row: 0,
-                               col: 0,
-                               x_expand: false,
-                               y_expand: false,
-                               y_fill: false });
-
-        icon.connect('button-release-event', Lang.bind(this,
-            function () {
-                this.source.clicked();
-            }));
-
-        // The first line should have the title, followed by the
-        // banner text, but ellipsized if they won't both fit. We can't
-        // make St.Table or St.BoxLayout do this the way we want (don't
-        // show banner at all if title needs to be ellipsized), so we
-        // use Shell.GenericContainer.
-        this._bannerBox = new Shell.GenericContainer();
-        this._bannerBox.connect('get-preferred-width', Lang.bind(this, this._bannerBoxGetPreferredWidth));
-        this._bannerBox.connect('get-preferred-height', Lang.bind(this, this._bannerBoxGetPreferredHeight));
-        this._bannerBox.connect('allocate', Lang.bind(this, this._bannerBoxAllocate));
-        this.actor.add(this._bannerBox, { row: 0,
-                                          col: 1,
-                                          y_expand: false,
-                                          y_fill: false });
-
-        this._titleLabel = new St.Label();
-        title = title ? _cleanMarkup(title.replace(/\n/g, ' ')) : '';
-        this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
-        this._bannerBox.add_actor(this._titleLabel);
-
-        if (this._bannerBody)
-            this._bannerBodyText = banner;
-        else
-            this._bannerBodyText = null;
-
-        this._bannerLabel = new St.Label();
-        banner = banner ? _cleanMarkup(banner.replace(/\n/g, '  ')) : '';
-        this._bannerLabel.clutter_text.set_markup(banner);
-        this._bannerBox.add_actor(this._bannerLabel);
-    },
-
-    // addActor:
-    // @actor: actor to add to the notification
-    // @props: (optional) child properties
-    //
-    // Adds @actor to the notification's St.Table, using @props.
-    //
-    // If @props does not specify a %row, then @actor will be added
-    // to the bottom of the notification (unless there are action
-    // buttons present, in which case it will be added above them).
-    //
-    // If @props does not specify a %col, it will default to column 1.
-    // (Normally only the icon is in column 0.)
-    //
-    // If @props specifies an already-occupied cell, then the existing
-    // contents of the table will be shifted down to make room for it.
-    addActor: function(actor, props) {
-        if (!props)
-            props = {};
-
-        if (!('col' in props))
-            props.col = 1;
-
-        if ('row' in props) {
-            let children = this.actor.get_children();
-            let i, meta, collision = false;
-
-            for (i = 0; i < children.length; i++) {
-                meta = this.actor.get_child_meta(children[i]);
-                if (meta.row == props.row && meta.col == props.col) {
-                    collision = true;
-                    break;
+    _init: function(icon, text) {
+        this.icon = icon;
+        this.text = text;
    }
 }

-            if (collision) {
-                for (i = 0; i < children.length; i++) {
-                    meta = this.actor.get_child_meta(children[i]);
-                    if (meta.row >= props.row)
-                        meta.row++;
-                }
-            }
-        } else {
-            if (this._actionBox) {
-                props.row = this.actor.row_count - 1;
-                this.actor.get_child_meta(this._actionBox).row++;
-            } else {
-                props.row = this.actor.row_count;
-            }
+function NotificationBox() {
+    this._init();
 }

-        this.actor.add(actor, props);
+NotificationBox.prototype = {
+    _init: function() {
+        this.actor = new St.BoxLayout({ name: 'notification' });
+
+        this._iconBox = new St.Bin();
+        this.actor.add(this._iconBox);
+
+        this._textBox = new Shell.GenericContainer();
+        this._textBox.connect('get-preferred-width', Lang.bind(this, this._textBoxGetPreferredWidth));
+        this._textBox.connect('get-preferred-height', Lang.bind(this, this._textBoxGetPreferredHeight));
+        this._textBox.connect('allocate', Lang.bind(this, this._textBoxAllocate));
+        this.actor.add(this._textBox, { expand: true, x_fill: false, y_fill: false, y_align: St.Align.MIDDLE });
+
+        this._text = new St.Label();
+        this._text.clutter_text.line_wrap = true;
+        this._text.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+        this._textBox.add_actor(this._text);
    },

-    // addBody:
-    // @text: the text
-    // @props: (optional) properties for addActor()
-    //
-    // Adds a multi-line label containing @text to the notification.
-    addBody: function(text, props) {
-        let body = new St.Label();
-        body.clutter_text.line_wrap = true;
-        body.clutter_text.line_wrap_mode = Pango.WrapMode.WORD_CHAR;
-        body.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+    _textBoxGetPreferredWidth: function (actor, forHeight, alloc) {
+        let [min, nat] = this._text.get_preferred_width(forHeight);

-        text = text ? _cleanMarkup(text) : '';
-        body.clutter_text.set_markup(text);
-
-        this.addActor(body, props);
+        alloc.min_size = alloc.nat_size = Math.min(nat, global.screen_width / 2);
    },

-    _addBannerBody: function() {
-        this.addBody(this._bannerBodyText, { row: 1 });
-        this._bannerBodyText = null;
+    _textBoxGetPreferredHeight: function (actor, forWidth, alloc) {
+        // St.BoxLayout passes -1 for @forWidth, which isn't what we want.
+        let prefWidth = {};
+        this._textBoxGetPreferredWidth(this._textBox, -1, prefWidth);
+        [alloc.min_size, alloc.nat_size] = this._text.get_preferred_height(prefWidth.nat_size);
+        log('for width ' + prefWidth.nat_size + ', height ' + alloc.nat_size);
    },

-    // addAction:
-    // @id: the action ID
-    // @label: the label for the action's button
-    //
-    // Adds a button with the given @label to the notification. All
-    // action buttons will appear in a single row at the bottom of
-    // the notification.
-    //
-    // If the button is clicked, the notification will emit the
-    // %action-invoked signal with @id as a parameter
-    addAction: function(id, label) {
-        if (!this._actionBox) {
-            if (this._bannerBodyText)
-                this._addBannerBody();
-
-            let box = new St.BoxLayout({ name: 'notification-actions' });
-            this.addActor(box, { x_expand: false,
-                                 x_fill: false,
-                                 x_align: St.Align.END });
-            this._actionBox = box;
-        }
-
-        let button = new St.Button({ style_class: 'notification-button',
-                                     label: label });
-        this._actionBox.add(button);
-        button.connect('clicked', Lang.bind(this, function() { this.emit('action-invoked', id); }));
+    _textBoxAllocate: function (actor, box, flags) {
+        let childBox = new Clutter.ActorBox();
+        childBox.x1 = childBox.y1 = 0;
+        childBox.x2 = box.x2 - box.x1;
+        childBox.y2 = box.y2 - box.y1;
+        this._text.allocate(childBox, flags);
    },

-    _bannerBoxGetPreferredWidth: function(actor, forHeight, alloc) {
-        let [titleMin, titleNat] = this._titleLabel.get_preferred_width(forHeight);
-        let [bannerMin, bannerNat] = this._bannerLabel.get_preferred_width(forHeight);
-        let [has_spacing, spacing] = this.actor.get_theme_node().get_length('spacing-columns', false);
+    setContent: function(notification) {
+        this._iconBox.child = notification.icon;

-        alloc.min_size = titleMin;
-        alloc.natural_size = titleNat + (has_spacing ? spacing : 0) + bannerNat;
-    },
-
-    _bannerBoxGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] =
-            this._titleLabel.get_preferred_height(forWidth);
-    },
-
-    _bannerBoxAllocate: function(actor, box, flags) {
-        let [titleMinW, titleNatW] = this._titleLabel.get_preferred_width(-1);
-        let [titleMinH, titleNatH] = this._titleLabel.get_preferred_height(-1);
-        let [bannerMinW, bannerNatW] = this._bannerLabel.get_preferred_width(-1);
-        let [has_spacing, spacing] = this.actor.get_theme_node().get_length('spacing-columns', false);
-        if (!has_spacing)
-            spacing = 0;
-        let availWidth = box.x2 - box.x1;
-
-        let titleBox = new Clutter.ActorBox();
-        titleBox.x1 = titleBox.y1 = 0;
-        titleBox.x2 = Math.min(titleNatW, availWidth);
-        titleBox.y2 = titleNatH;
-        this._titleLabel.allocate(titleBox, flags);
-
-        let overflow = false;
-        if (titleBox.x2 + spacing > availWidth) {
-            this._bannerLabel.hide();
-            overflow = true;
-        } else {
-            let bannerBox = new Clutter.ActorBox();
-            bannerBox.x1 = titleBox.x2 + spacing;
-            bannerBox.y1 = 0;
-            bannerBox.x2 = Math.min(bannerBox.x1 + bannerNatW, availWidth);
-            bannerBox.y2 = titleNatH;
-            this._bannerLabel.show();
-            this._bannerLabel.allocate(bannerBox, flags);
-
-            if (bannerBox.x2 < bannerBox.x1 + bannerNatW)
-                overflow = true;
-        }
-
-        if (this._bannerBodyText &&
-            (overflow || this._bannerBodyText.indexOf('\n') > -1))
-            this._addBannerBody();
-    },
-
-    popOut: function() {
-        if (this.actor.row_count <= 1)
-            return false;
-
-        Tweener.addTween(this._bannerLabel,
-                         { opacity: 0,
-                           time: ANIMATION_TIME,
-                           transition: "easeOutQuad" });
-        return true;
-    },
-
-    popIn: function() {
-        if (this.actor.row_count <= 1)
-            return false;
-        Tweener.addTween(this._bannerLabel,
-                         { opacity: 255,
-                           time: ANIMATION_TIME,
-                           transition: "easeOutQuad" });
-        return true;
-    },
-
-    destroy: function() {
-        this.emit('destroy');
+        // Support <b>, <i>, and <u>, escape anything else
+        // so it displays as raw markup.
+        let markup = notification.text.replace(/<(\/?[^biu]>|[^>\/][^>])/g, "&lt;$1");
+        this._text.clutter_text.set_markup(markup);
    }
 };
-Signals.addSignalMethods(Notification.prototype);

 function Source(id, createIcon) {
    this._init(id, createIcon);
@ -326,10 +91,8 @@ function Source(id, createIcon) {
 Source.prototype = {
    _init: function(id, createIcon) {
        this.id = id;
-        this.text = null;
        if (createIcon)
            this.createIcon = createIcon;
-        this.handleReplacing = true;
    },

    // This can be overridden by a subclass, or by the createIcon
@ -338,8 +101,8 @@ Source.prototype = {
        throw new Error('no implementation of createIcon in ' + this);
    },

-    notify: function(notification) {
-        this.emit('notify', notification);
+    notify: function(text) {
+        Main.messageTray.showNotification(new Notification(this.createIcon(ICON_SIZE), text));
    },

    clicked: function() {
@ -361,74 +124,37 @@ MessageTray.prototype = {
        this.actor = new St.BoxLayout({ name: 'message-tray',
                                        reactive: true });

-        this._notificationBin = new St.Bin({ reactive: true,
-                                             x_align: St.Align.MIDDLE });
-        this.actor.add(this._notificationBin);
-        this._notificationBin.hide();
+        let primary = global.get_primary_monitor();
+        this.actor.x = 0;
+        this.actor.y = primary.height - 1;
+
+        this.actor.width = primary.width;
+
+        this._summaryBin = new St.Bin({ x_align: St.Align.END });
+        this.actor.add(this._summaryBin, { expand: true });
+        this._summaryBin.hide();
+
+        this._notificationBox = new NotificationBox();
        this._notificationQueue = [];
-        this._notification = null;
+        this.actor.add(this._notificationBox.actor);
+        this._notificationBox.actor.hide();

-        this._summaryBin = new St.BoxLayout();
-        this.actor.add(this._summaryBin);
-        this._summary = new St.BoxLayout({ name: 'summary-mode',
-                                           reactive: true });
-        this._summaryBin.add(this._summary, { x_align: St.Align.END,
-                                              x_fill: false,
-                                              expand: true });
-        this._summary.connect('enter-event',
-                              Lang.bind(this, this._onSummaryEntered));
-        this._summary.connect('leave-event',
-                              Lang.bind(this, this._onSummaryLeft));
-        this._summaryBin.opacity = 0;
-
-        this.actor.connect('enter-event', Lang.bind(this, this._onTrayEntered));
-        this.actor.connect('leave-event', Lang.bind(this, this._onTrayLeft));
-
-        this._trayState = State.HIDDEN;
-        this._trayLeftTimeoutId = 0;
-        this._pointerInTray = false;
-        this._summaryState = State.HIDDEN;
-        this._summaryTimeoutId = 0;
-        this._pointerInSummary = false;
-        this._notificationState = State.HIDDEN;
-        this._notificationTimeoutId = 0;
-        this._overviewVisible = false;
-        this._notificationRemoved = false;
+        Main.chrome.addActor(this.actor, { affectsStruts: false });

+        this.actor.connect('enter-event',
+                           Lang.bind(this, this._onMessageTrayEntered));
+        this.actor.connect('leave-event',
+                           Lang.bind(this, this._onMessageTrayLeft));
+        this._isShowing = false;
        this.actor.show();
-        Main.chrome.addActor(this.actor, { affectsStruts: false,
-                                           visibleInOverview: true });
-        Main.chrome.trackActor(this._notificationBin, { affectsStruts: false });

-        global.connect('screen-size-changed',
-                       Lang.bind(this, this._setSizePosition));
-        this._setSizePosition();
-
-        Main.overview.connect('showing', Lang.bind(this,
-            function() {
-                this._overviewVisible = true;
-                this._updateState();
-            }));
-        Main.overview.connect('hiding', Lang.bind(this,
-            function() {
-                this._overviewVisible = false;
-                this._updateState();
-            }));
+        this._summary = new St.BoxLayout({ name: 'summary-mode' });
+        this._summaryBin.child = this._summary;

        this._sources = {};
        this._icons = {};
    },

-    _setSizePosition: function() {
-        let primary = global.get_primary_monitor();
-        this.actor.x = primary.x;
-        this.actor.y = primary.y + primary.height - 1;
-        this.actor.width = primary.width;
-
-        this._notificationBin.x = this._summaryBin.x = 0;
-        this._notificationBin.width = this._summaryBin.width = primary.width;
-    },
-
    contains: function(source) {
        return this._sources.hasOwnProperty(source.id);
    },
@ -442,12 +168,9 @@ MessageTray.prototype = {
        let iconBox = new St.Bin({ reactive: true });
        iconBox.child = source.createIcon(ICON_SIZE);
        this._summary.insert_actor(iconBox, 0);
-        this._summaryNeedsToBeShown = true;
        this._icons[source.id] = iconBox;
        this._sources[source.id] = source;

-        source.connect('notify', Lang.bind(this, this._onNotify));
-
        iconBox.connect('button-release-event', Lang.bind(this,
            function () {
                source.clicked();
@ -455,313 +178,94 @@ MessageTray.prototype = {

        source.connect('destroy', Lang.bind(this,
            function () {
-                this.removeSource(source);
+                this.remove(source);
            }));
    },

-    removeSource: function(source) {
+    remove: function(source) {
        if (!this.contains(source))
            return;

-        // remove all notifications with this source from the queue
-        let newNotificationQueue = [];
-        for (let i = 0; i < this._notificationQueue.length; i++) {
-            if (this._notificationQueue[i].source != source)
-                newNotificationQueue.push(this._notificationQueue[i]);
-        }
-        this._notificationQueue = newNotificationQueue;
-
        this._summary.remove_actor(this._icons[source.id]);
-        if (this._summary.get_children().length > 0)
-            this._summaryNeedsToBeShown = true;
-        else
-            this._summaryNeedsToBeShown = false;
        delete this._icons[source.id];
        delete this._sources[source.id];
-
-        if (this._notification && this._notification.source == source) {
-            if (this._notificationTimeoutId) {
-                Mainloop.source_remove(this._notificationTimeoutId);
-                this._notificationTimeoutId = 0;
-            }
-            this._notificationRemoved = true;
-            this._updateState();
-        }
-    },
-
-    removeSourceByApp: function(app) {
-        for (let source in this._sources)
-            if (this._sources[source].app == app)
-                this.removeSource(this._sources[source]);
-    },
-
-    removeNotification: function(notification) {
-        if (this._notification == notification && (this._notificationState == State.SHOWN || this._notificationState == State.SHOWING)) {
-            if (this._notificationTimeoutId) {
-                Mainloop.source_remove(this._notificationTimeoutId);
-                this._notificationTimeoutId = 0;
-            }
-            this._notificationRemoved = true;
-            this._updateState();
-            return;
-        }
-
-        let index = this._notificationQueue.indexOf(notification);
-        if (index != -1)
-            this._notificationQueue.splice(index, 1);
    },

    getSource: function(id) {
        return this._sources[id];
    },

-    _getNotification: function(id, source) {
-        if (this._notification && this._notification.id == id)
-            return this._notification;
+    _onMessageTrayEntered: function() {
+        // Don't hide the message tray after a timeout if the user has moved the mouse over it.
+        // We might have a timeout in place if the user moved the mouse away from the message tray for a very short period of time
+        // or if we are showing a notification.
+        if (this._hideTimeoutId > 0)
+            Mainloop.source_remove(this._hideTimeoutId);

-        for (let i = 0; i < this._notificationQueue.length; i++) {
-            if (this._notificationQueue[i].id == id && this._notificationQueue[i].source == source)
-                return this._notificationQueue[i];
-        }
+        if (this._isShowing)
+            return;

-        return null;
+        // If the message tray was not already showing, we'll show it in the summary mode.
+        this._summaryBin.show();
+        this._show();
    },

-    _onNotify: function(source, notification) {
-        if (!notification.source.handleReplacing || this._getNotification(notification.id, source) == null) {
-            notification.connect('destroy',
-                                 Lang.bind(this, this.removeNotification));
+    _onMessageTrayLeft: function() {
+        if (!this._isShowing)
+            return;
+
+        // We wait just a little before hiding the message tray in case the user will quickly move the mouse back over it.
+        this._hideTimeoutId = Mainloop.timeout_add(MESSAGE_TRAY_TIMEOUT * 1000, Lang.bind(this, this._hide));
+    },
+
+    _show: function() {
+        this._isShowing = true;
+        let primary = global.get_primary_monitor();
+        Tweener.addTween(this.actor,
+                         { y: primary.height - this.actor.height,
+                           time: ANIMATION_TIME,
+                           transition: "easeOutQuad"
+                         });
+    },
+
+    _hide: function() {
+        this._hideTimeoutId = 0;
+
+        let primary = global.get_primary_monitor();
+
+        Tweener.addTween(this.actor,
+                         { y: primary.height - 1,
+                           time: ANIMATION_TIME,
+                           transition: "easeOutQuad",
+                           onComplete: this._hideComplete,
+                           onCompleteScope: this
+                         });
+        return false;
+    },
+
+    _hideComplete: function() {
+        this._isShowing = false;
+        this._summaryBin.hide();
+        this._notificationBox.actor.hide();
+        if (this._notificationQueue.length > 0)
+            this.showNotification(this._notificationQueue.shift());
+    },
+
+    showNotification: function(notification) {
+        if (this._isShowing) {
            this._notificationQueue.push(notification);
-        }
-
-        this._updateState();
-    },
-
-    _onSummaryEntered: function() {
-        this._pointerInSummary = true;
-        this._updateState();
-    },
-
-    _onSummaryLeft: function() {
-        this._pointerInSummary = false;
-        this._updateState();
-    },
-
-    _onTrayEntered: function() {
-        if (this._trayLeftTimeoutId) {
-            Mainloop.source_remove(this._trayLeftTimeoutId);
-            this._trayLeftTimeoutId = 0;
            return;
        }

-        this._pointerInTray = true;
-        this._updateState();
-    },
+        this._notificationBox.setContent(notification);

-    _onTrayLeft: function() {
-        // We wait just a little before hiding the message tray in case the
-        // user quickly moves the mouse back into it.
-        let timeout = MESSAGE_TRAY_TIMEOUT * 1000;
-        this._trayLeftTimeoutId = Mainloop.timeout_add(timeout, Lang.bind(this, this._onTrayLeftTimeout));
-    },
+        this._notificationBox.actor.x = Math.round((this.actor.width - this._notificationBox.actor.width) / 2);
+        this._notificationBox.actor.show();

-    _onTrayLeftTimeout: function() {
-        this._trayLeftTimeoutId = 0;
-        this._pointerInTray = false;
-        this._pointerInSummary = false;
-        this._updateState();
-        return false;
-    },
+        // Because we set up the timeout before we do the animation, we add ANIMATION_TIME to NOTIFICATION_TIMEOUT, so that
+        // NOTIFICATION_TIMEOUT represents the time the notifiation is fully shown.
+        this._hideTimeoutId = Mainloop.timeout_add((NOTIFICATION_TIMEOUT + ANIMATION_TIME) * 1000, Lang.bind(this, this._hide));

-    // All of the logic for what happens when occurs here; the various
-    // event handlers merely update variables such as
-    // "this._pointerInTray", "this._summaryState", etc, and
-    // _updateState() figures out what (if anything) needs to be done
-    // at the present time.
-    _updateState: function() {
-        // Notifications
-        let notificationsPending = this._notificationQueue.length > 0;
-        let notificationPinned = this._pointerInTray && !this._pointerInSummary && !this._notificationRemoved;
-        let notificationExpanded = this._notificationBin.y < 0;
-        let notificationExpired = (this._notificationTimeoutId == 0 && !this._pointerInTray) || this._notificationRemoved;
-
-        if (this._notificationState == State.HIDDEN) {
-            if (notificationsPending)
-                this._showNotification();
-        } else if (this._notificationState == State.SHOWN) {
-            if (notificationExpired)
-                this._hideNotification();
-            else if (notificationPinned && !notificationExpanded)
-                this._expandNotification();
-        }
-
-        // Summary
-        let summarySummoned = this._pointerInSummary || this._overviewVisible;
-        let summaryPinned = this._summaryTimeoutId != 0 || this._pointerInTray || summarySummoned;
-
-        let notificationsVisible = (this._notificationState == State.SHOWING ||
-                                    this._notificationState == State.SHOWN);
-        let notificationsDone = !notificationsVisible && !notificationsPending;
-
-        if (this._summaryState == State.HIDDEN) {
-            if (notificationsDone && this._summaryNeedsToBeShown)
-                this._showSummary(true);
-            else if (!notificationsVisible && summarySummoned)
-                this._showSummary(false);
-        } else if (this._summaryState == State.SHOWN) {
-            if (!summaryPinned)
-                this._hideSummary();
-        }
-
-        // Tray itself
-        let trayIsVisible = (this._trayState == State.SHOWING ||
-                             this._trayState == State.SHOWN);
-        let trayShouldBeVisible = (!notificationsDone ||
-                                   this._summaryState == State.SHOWING ||
-                                   this._summaryState == State.SHOWN);
-        if (!trayIsVisible && trayShouldBeVisible)
-            this._showTray();
-        else if (trayIsVisible && !trayShouldBeVisible)
-            this._hideTray();
-    },
-
-    _tween: function(actor, statevar, value, params) {
-        let onComplete = params.onComplete;
-        let onCompleteScope = params.onCompleteScope;
-        let onCompleteParams = params.onCompleteParams;
-
-        params.onComplete = this._tweenComplete;
-        params.onCompleteScope = this;
-        params.onCompleteParams = [statevar, value, onComplete, onCompleteScope, onCompleteParams];
-
-        Tweener.addTween(actor, params);
-
-        let valuing = (value == State.SHOWN) ? State.SHOWING : State.HIDING;
-        this[statevar] = valuing;
-    },
-
-    _tweenComplete: function(statevar, value, onComplete, onCompleteScope, onCompleteParams) {
-        this[statevar] = value;
-        if (onComplete)
-            onComplete.apply(onCompleteScope, onCompleteParams);
-        this._updateState();
-    },
-
-    _showTray: function() {
-        let primary = global.get_primary_monitor();
-        this._tween(this.actor, "_trayState", State.SHOWN,
-                    { y: primary.y + primary.height - this.actor.height,
-                      time: ANIMATION_TIME,
-                      transition: "easeOutQuad"
-                    });
-    },
-
-    _hideTray: function() {
-        let primary = global.get_primary_monitor();
-        this._tween(this.actor, "_trayState", State.HIDDEN,
-                    { y: primary.y + primary.height - 1,
-                      time: ANIMATION_TIME,
-                      transition: "easeOutQuad"
-                    });
-    },
-
-    _showNotification: function() {
-        this._notification = this._notificationQueue.shift();
-        this._notificationBin.child = this._notification.actor;
-
-        this._notificationBin.opacity = 0;
-        this._notificationBin.y = this.actor.height;
-        this._notificationBin.show();
-
-        this._tween(this._notificationBin, "_notificationState", State.SHOWN,
-                    { y: 0,
-                      opacity: 255,
-                      time: ANIMATION_TIME,
-                      transition: "easeOutQuad",
-                      onComplete: this._showNotificationCompleted,
-                      onCompleteScope: this
-                    });
-    },
-
-    _showNotificationCompleted: function() {
-        this._notificationTimeoutId =
-            Mainloop.timeout_add(NOTIFICATION_TIMEOUT * 1000,
-                                 Lang.bind(this, this._notificationTimeout));
-    },
-
-    _notificationTimeout: function() {
-        this._notificationTimeoutId = 0;
-        this._updateState();
-        return false;
-    },
-
-    _hideNotification: function() {
-        this._notification.popIn();
-
-        this._tween(this._notificationBin, "_notificationState", State.HIDDEN,
-                    { y: this.actor.height,
-                      opacity: 0,
-                      time: ANIMATION_TIME,
-                      transition: "easeOutQuad",
-                      onComplete: this._hideNotificationCompleted,
-                      onCompleteScope: this
-                    });
-    },
-
-    _hideNotificationCompleted: function() {
-        this._notificationRemoved = false;
-        this._notificationBin.hide();
-        this._notificationBin.child = null;
-        this._notification = null;
-    },
-
-    _expandNotification: function() {
-        if (this._notification && this._notification.popOut()) {
-            this._tween(this._notificationBin, "_notificationState", State.SHOWN,
-                        { y: this.actor.height - this._notificationBin.height,
-                          time: ANIMATION_TIME,
-                          transition: "easeOutQuad"
-                        });
-        }
-    },
-
-    _showSummary: function(withTimeout) {
-        let primary = global.get_primary_monitor();
-        this._summaryBin.opacity = 0;
-        this._summaryBin.y = this.actor.height;
-        this._tween(this._summaryBin, "_summaryState", State.SHOWN,
-                    { y: 0,
-                      opacity: 255,
-                      time: ANIMATION_TIME,
-                      transition: "easeOutQuad",
-                      onComplete: this._showSummaryCompleted,
-                      onCompleteScope: this,
-                      onCompleteParams: [withTimeout]
-                    });
-    },
-
-    _showSummaryCompleted: function(withTimeout) {
-        this._summaryNeedsToBeShown = false;
-
-        if (withTimeout) {
-            this._summaryTimeoutId =
-                Mainloop.timeout_add(SUMMARY_TIMEOUT * 1000,
-                                     Lang.bind(this, this._summaryTimeout));
-        }
-    },
-
-    _summaryTimeout: function() {
-        this._summaryTimeoutId = 0;
-        this._updateState();
-        return false;
-    },
-
-    _hideSummary: function() {
-        this._tween(this._summaryBin, "_summaryState", State.HIDDEN,
-                    { opacity: 0,
-                      time: ANIMATION_TIME,
-                      transition: "easeOutQuad"
-                    });
-        this._summaryNeedsToBeShown = false;
+        this._show();
     }
 };
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -5,36 +5,13 @@ const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Mainloop = imports.mainloop;
-const St = imports.gi.St;

 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;

-const EMPATHY = 'Empathy';
-
 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',
@ -72,16 +49,6 @@ const Urgency = {
    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();
 }
@ -99,13 +66,6 @@ NotificationDaemon.prototype = {
                                  DBus.MANY_INSTANCES,
                                  Lang.bind(this, this._acquiredName),
                                  Lang.bind(this, this._lostName));
-
-        this._currentNotifications = {};
-
-        Shell.WindowTracker.get_default().connect('notify::focus-app',
-            Lang.bind(this, this._onFocusAppChanged));
-        Main.overview.connect('hidden',
-            Lang.bind(this, this._onFocusAppChanged));
    },

    _acquiredName: function() {
@ -134,119 +94,51 @@ NotificationDaemon.prototype = {
    },

    _sourceId: function(id) {
-        return 'source-' + id;
+        return 'notification-' + id;
    },

    Notify: function(appName, replacesId, icon, summary, body,
                     actions, hints, timeout) {
-        let notification, id;
-        // We associate each application with a source and set the source id to be based on
-        // the appName. We support application updates by creating a new Notification object
-        // only if replacesId was not specified or if we no longer have the notification with
-        // the specified replacesId.
-        //
-        // We are planning to add Empathy-specific features in the message tray, but in the
-        // meantime we handle Empathy notifications received through the notification daemon
-        // differently from other notifications.
-        // 1) We display different people sending messages as different sources. So we use
-        //    notification id instead of the appName when creating id for the source.
-        // 2) We queue notification with different messages to show them one after another,
-        //    rather than replace the notification on the spot. So we create a new Notification
-        //    object each time, disregarding the fact that we might already have another
-        //    notification with the same replacesId.
-        // Empathy uses replacesId for all the notifications from the same window until the
-        // notification with that id is dismissed. Notifications from different people in
-        // different tabs have the same replacesId. So while being closer to the eventual design,
-        // our special-handling of Empathy notifications is somewhat buggy. The user might end up
-        // with multiple icons for the same person if the user dismisses the window for that person
-        // (which doesn't result in removing the icon) or the user might not get the icon for
-        // the person after a new notification in one of the tabs of the chat window for which
-        // another person's icon is already displayed.
+        let id, source = null;

-        let isEmpathy = appName == EMPATHY;
        if (replacesId != 0) {
            id = replacesId;
-            if (!isEmpathy)
-                notification = this._currentNotifications[id];
-        } else {
-            id = nextNotificationId++;
+            source = Main.messageTray.getSource(this._sourceId(id));
+            // source may be null if the current source was destroyed
+            // right as the client sent the new notification
        }

-        let sourceId = this._sourceId(isEmpathy ? id : appName);
-        let source = Main.messageTray.getSource(sourceId);
-
-        // Source may be null if we have never received a notification from
-        // this app or if all notifications from this app have been acknowledged.
        if (source == null) {
-            source = new Source(sourceId, icon, hints);
+            id = nextNotificationId++;
+
+            source = new Source(this._sourceId(id), icon, hints);
            Main.messageTray.add(source);

            source.connect('clicked', Lang.bind(this,
                function() {
                    source.destroy();
+                    this._emitNotificationClosed(id, NotificationClosedReason.DISMISSED);
                }));
-
-            let sender = DBus.getCurrentMessageContext().sender;
-            let busProxy = new Bus();
-            busProxy.GetConnectionUnixProcessIDRemote(sender, function (result, excp) {
-                let app = Shell.WindowTracker.get_default().get_app_from_pid(result);
-                source.setApp(app);
-            });
-        } else {
-            source.update(icon, hints);
        }

        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);
-            }
-        }
-
-        if (notification == null) {
-            notification = new MessageTray.Notification(id, source, summary, body, true);
-            // This will result in us keeping only the latest Empathy notification with the given
-            // id in this._currentNotifications, which will only affect not being able to close all
-            // the Empathy notifications with a given id in CloseNotification(). Since this not a
-            // a likely scenario and this special-casing of Empathy in the notification daemon is
-            // temporary, it doesn't seem worthwhile to change this._currentNotifications to
-            // {id, [array of notifications]} just for that case.
-            this._currentNotifications[id] = notification;
-            notification.connect('dismissed', Lang.bind(this,
-                function(n) {
-                    n.destroy();
-                    this._emitNotificationClosed(n.id, NotificationClosedReason.DISMISSED);
-                }));
-        } else {
-            // passing in true as the last parameter will clear out extra actors,
-            // such as actions
-            notification.update(summary, body, true);
-        }
-
-        if (actions.length) {
-            for (let i = 0; i < actions.length - 1; i += 2)
-                notification.addAction(actions[i], actions[i + 1]);
-            notification.connect('action-invoked', Lang.bind(this, this._actionInvoked, source, id));
-        }
-
-        source.notify(notification);
+        if (body)
+            source.notify('<b>' + summary + '</b>: ' + body);
+        else
+            source.notify('<b>' + summary + '</b>');
        return id;
    },

    CloseNotification: function(id) {
-        let notification = this._currentNotifications[id];
-        if (notification)
-            notification.destroy();
+        let source = Main.messageTray.getSource(this._sourceId(id));
+        if (source)
+            source.destroy();
        this._emitNotificationClosed(id, NotificationClosedReason.APP_CLOSED);
    },

    GetCapabilities: function() {
        return [
-            'actions',
+            // 'actions',
            'body',
            // 'body-hyperlinks',
            // 'body-images',
@ -266,29 +158,11 @@ NotificationDaemon.prototype = {
        ];
    },

-    _onFocusAppChanged: function() {
-        let tracker = Shell.WindowTracker.get_default();
-        Main.messageTray.removeSourceByApp(tracker.focus_app);
-    },
-
-    _actionInvoked: function(notification, action, source, id) {
-        this._emitActionInvoked(id, action);
-        source.destroy();
-    },
-
    _emitNotificationClosed: function(id, reason) {
-        delete this._currentNotifications[id];
        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]);
    }
 };

@ -304,13 +178,6 @@ Source.prototype = {
    _init: function(sourceId, icon, hints) {
        MessageTray.Source.prototype._init.call(this, sourceId);

-        this.app = null;
-        this._openAppRequested = false;
-
-        this.update(icon, hints);
-    },
-
-    update: function(icon, hints) {
        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);

        this._icon = icon;
@ -319,7 +186,7 @@ Source.prototype = {
    },

    createIcon: function(size) {
-        let textureCache = St.TextureCache.get_default();
+        let textureCache = Shell.TextureCache.get_default();

        if (this._icon) {
            if (this._icon.substr(0, 7) == 'file://')
@ -347,32 +214,5 @@ Source.prototype = {
            }
            return textureCache.load_icon_name(stockIcon, size);
        }
-    },
-
-    clicked: function() {
-        this.openApp();
-        MessageTray.Source.prototype.clicked.call(this);
-    },
-
-    setApp: function(app) {
-        this.app = app;
-        if (this._openAppRequested)
-            this.openApp();
-
-        if (app.get_name() == EMPATHY)
-            this.handleReplacing = false;
-    },
-
-    openApp: function() {
-        if (this.app == null) {
-            this._openAppRequested = true;
-            return;
-        }
-        let windows = this.app.get_windows();
-        if (windows.length > 0) {
-            let mostRecentWindow = windows[0];
-            Main.activateWindow(mostRecentWindow);
-        }
-        this._openAppRequested = false;
    }
 };
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -8,9 +8,6 @@ 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;
@ -19,7 +16,10 @@ const Main = imports.ui.main;
 const Panel = imports.ui.panel;
 const Dash = imports.ui.dash;
 const Tweener = imports.ui.tweener;
-const WorkspacesView = imports.ui.workspacesView;
+const Workspaces = imports.ui.workspaces;
+
+const ROOT_OVERVIEW_COLOR = new Clutter.Color();
+ROOT_OVERVIEW_COLOR.from_pixel(0x000000ff);

 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;
@ -73,121 +73,10 @@ const SHADOW_WIDTH = 6;

 const NUMBER_OF_SECTIONS_IN_SEARCH = 2;

-const INFO_BAR_HIDE_TIMEOUT = 30;
-
 let wideScreen = false;
 let displayGridColumnWidth = null;
 let displayGridRowHeight = 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));
-
-        this._overviewWasHidden = false;
-        this._hidingOverviewId = 0;
-    },
-
-    _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() {
-        this._overviewWasHidden = false;
-        Tweener.addTween(this.actor,
-                         { opacity: 0,
-                           transition: 'easeOutQuad',
-                           time: ANIMATION_TIME,
-                           onComplete: this._hideDone,
-                           onCompleteScope: this
-                         });
-    },
-
-    _onTimeout: function() {
-        this._timeoutId = 0;
-        if (this._overviewWasHidden)
-            this._hide();
-        return false;
-    },
-
-    _onOverviewHiding: function() {
-        if (this._timeoutId == 0)
-            this._hide();
-        else
-            this._overviewWasHidden = true;
-    },
-
-    setMessage: function(text, undoCallback, undoLabel) {
-        if (this._timeoutId)
-            Mainloop.source_remove(this._timeoutId);
-
-        if (this._hidingOverviewId == 0) {
-            // Set here, because when constructor is called, overview is null.
-            if (!Main.overview)
-                return;
-            // We don't actually use the ID, it's just a way of tracking whether we've hooked up the signal
-            this._hidingOverviewId = Main.overview.connect('hiding', Lang.bind(this, this._onOverviewHiding));
-        }
-        this._timeout = false;
-        this._overviewWasHidden = 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();
-    }
-};
+let addRemoveButtonSize = null;

 function Overview() {
    this._init();
@ -195,14 +84,9 @@ function Overview() {

 Overview.prototype = {
    _init : function() {
-        this._group = new St.BoxLayout({ style_class: 'overview' });
+        this._group = new Clutter.Group();
        this._group._delegate = this;

-        this.infoBar = new InfoBar();
-        this._group.add_actor(this.infoBar.actor);
-
-        this._workspacesManager = null;
-
        this.visible = false;
        this.animationInProgress = false;
        this._hideInProgress = false;
@ -226,7 +110,7 @@ Overview.prototype = {
        this._group.add_actor(this._transparentBackground);

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

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

        // Container to hold popup pane chrome.
-        this._paneContainer = new St.BoxLayout({ style_class: 'overview-pane' });
+        this._paneContainer = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                             spacing: 6 });
        // 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) {
@ -247,25 +132,13 @@ Overview.prototype = {
        this._group.add_actor(this._paneContainer);

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

        this._coverPane.lower_bottom();

        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 () {
        let primary = global.get_primary_monitor();
        wideScreen = (primary.width/primary.height > WIDE_SCREEN_CUT_OFF_RATIO) &&
@ -284,9 +157,6 @@ 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);

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

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

-        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
-        this._workspacesBarX = this._workspacesX;
-        this._workspacesBarWidth = this._workspacesWidth;
-        this._workspacesBarY = primary.height - displayGridRowHeight;
+        addRemoveButtonSize = Math.floor(displayGridRowHeight * 3/5);
+        this._addButtonX = this._workspacesX + this._workspacesWidth - addRemoveButtonSize;
+        this._addButtonY = primary.height - Math.floor(displayGridRowHeight * 4/5);

        // The parent (this._group) is positioned at the top left of the primary monitor
        // while this._backOver occupies the entire screen.
@ -342,22 +199,17 @@ 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(primary.x, primary.y);
-        this._transparentBackground.set_size(primary.width, primary.height);
+        this._transparentBackground.set_position(this._paneContainer.x, this._paneContainer.y);
+        this._transparentBackground.set_size(primary.width - this._paneContainer.x,
+                                             this._paneContainer.height);

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

-    addPane: function (pane, align) {
-        pane.actor.height = .9 * this._workspacesHeight;
-        this._paneContainer.add(pane.actor, { expand: true,
-                                              y_fill: false,
-                                              y_align: align });
+    addPane: function (pane) {
+        this._paneContainer.append(pane.actor, Big.BoxPackFlags.NONE);
        // 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.
@ -365,20 +217,13 @@ 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('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)
+                backgroundEventId = this._transparentBackground.connect('button-release-event', Lang.bind(this, function () {
                    this._activeDisplayPane.close();
                    return true;
                }));
@ -390,7 +235,7 @@ Overview.prototype = {
                    backgroundEventId = null;
                }
                this._transparentBackground.lower_bottom();
-                this._paneContainer.hide();
+                this._paneContainer.lower_bottom();
                this._workspaces.actor.opacity = 255;
            }
        }));
@ -451,14 +296,8 @@ Overview.prototype = {
        this._dash.show();

        /* TODO: make this stuff dynamic */
-        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._workspaces = new Workspaces.Workspaces(this._workspacesWidth, this._workspacesHeight,
+                                                     this._workspacesX, this._workspacesY);
        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
@ -466,13 +305,11 @@ Overview.prototype = {
        // be as big as the screen.
        this._dash.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);
+        // 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);

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

-        // Make Dash fade in so that it doesn't appear too big.
+        // Make Dash fade in so that it doesn't appear to big.
        this._dash.actor.opacity = 0;
        Tweener.addTween(this._dash.actor,
                         { opacity: 255,
@ -524,6 +361,10 @@ Overview.prototype = {
            this._activeDisplayPane.close();
        this._workspaces.hide();

+        this._addButton.actor.destroy();
+        this._addButton.actor = null;
+        this._addButton = null;
+
        // Create a zoom in effect by transforming the Overview group so that
        // the active workspace fills up the whole screen. The opposite
        // transition is used in show().
@ -570,6 +411,20 @@ Overview.prototype = {
        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);
+    },
+
    //// Private methods ////

    _showDone: function() {
@ -588,11 +443,6 @@ Overview.prototype = {
        this._workspaces.destroy();
        this._workspaces = null;

-        this._workspacesBar.destroy();
-        this._workspacesBar = null;
-
-        this._workspacesManager = null;
-
        this._dash.hide();
        this._group.hide();

@ -604,6 +454,43 @@ 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
@ -13,7 +13,6 @@ const Signals = imports.signals;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const AppDisplay = imports.ui.appDisplay;
 const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;
 const StatusMenu = imports.ui.statusMenu;
@ -39,7 +38,7 @@ const TRAY_BORDER_WIDTH = 0;

 const HOT_CORNER_ACTIVATION_TIMEOUT = 0.5;

-const STANDARD_TRAY_ICON_ORDER = ['keyboard', 'volume', 'bluetooth', 'network', 'battery'];
+const STANDARD_TRAY_ICON_ORDER = ['keyboard', 'volume', 'bluetooth', 'network', 'battery']
 const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'bluetooth-applet': 'bluetooth',
    'gnome-volume-control-applet': 'volume',
@ -47,99 +46,6 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
    'gnome-power-manager': 'battery'
 };

-function TextShadower() {
-    this._init();
-}
-
-TextShadower.prototype = {
-    _init: function() {
-        this.actor = new Shell.GenericContainer();
-        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._label = new St.Label();
-        this.actor.add_actor(this._label);
-        for (let i = 0; i < 4; i++) {
-            let actor = new St.Label({ style_class: 'label-shadow' });
-            this.actor.add_actor(actor);
-        }
-        this._label.raise_top();
-    },
-
-    setText: function(text) {
-        let children = this.actor.get_children();
-        for (let i = 0; i < children.length; i++)
-            children[i].set_text(text);
-    },
-
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let [minWidth, natWidth] = this._label.get_preferred_width(forHeight);
-        alloc.min_size = minWidth;
-        alloc.natural_size = natWidth;
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let [minHeight, natHeight] = this._label.get_preferred_height(forWidth);
-        alloc.min_size = minHeight;
-        alloc.natural_size = natHeight;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let children = this.actor.get_children();
-
-        let availWidth = box.x2 - box.x1;
-        let availHeight = box.y2 - box.y1;
-
-        let [minChildWidth, minChildHeight, natChildWidth, natChildHeight] =
-            this._label.get_preferred_size();
-
-        let childWidth = Math.min(natChildWidth, availWidth);
-        let childHeight = Math.min(natChildHeight, availHeight);
-
-        for (let i = 0; i < children.length; i++) {
-            let child = children[i];
-            let childBox = new Clutter.ActorBox();
-            // The order of the labels here is arbitrary, except
-            // we know the "real" label is at the end because Clutter.Group
-            // sorts by Z order
-            switch (i) {
-                case 0: // top
-                    childBox.x1 = 1;
-                    childBox.y1 = 0;
-                    break;
-                case 1: // right
-                    childBox.x1 = 2;
-                    childBox.y1 = 1;
-                    break;
-                case 2: // bottom
-                    childBox.x1 = 1;
-                    childBox.y1 = 2;
-                    break;
-                case 3: // left
-                    childBox.x1 = 0;
-                    childBox.y1 = 1;
-                    break;
-                case 4: // center
-                    childBox.x1 = 1;
-                    childBox.y1 = 1;
-                    break;
-            }
-            childBox.x2 = childBox.x1 + childWidth;
-            childBox.y2 = childBox.y1 + childHeight;
-            child.allocate(childBox, flags);
-        }
-    }
-};
-
-/**
- * AppPanelMenu:
- *
- * This class manages the "application menu" component.  It tracks the
- * currently focused application.  However, when an app is launched,
- * this menu also handles startup notification for it.  So when we
- * have an active startup notification, we switch modes to display that.
- */
 function AppPanelMenu() {
    this._init();
 }
@ -152,17 +58,14 @@ AppPanelMenu.prototype = {
        this._activeSequence = null;
        this._startupSequences = {};

-        this.actor = new St.Bin({ name: 'appMenu' });
-        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.actor = new St.BoxLayout({ name: 'appMenu' });
+        this._iconBox = new St.Bin({ name: 'appMenuIcon' });
+        this.actor.add(this._iconBox);
+        this._label = new St.Label();
+        this.actor.add(this._label, { expand: true, y_fill: false });

-        this._iconBox = new Shell.Slicer({ name: 'appMenuIcon' });
-        this._container.add_actor(this._iconBox);
-        this._label = new TextShadower();
-        this._container.add_actor(this._label.actor);
+        this._startupBox = new St.BoxLayout();
+        this.actor.add(this._startupBox);

        Main.overview.connect('hiding', Lang.bind(this, function () {
            this.actor.opacity = 255;
@ -183,65 +86,6 @@ AppPanelMenu.prototype = {
        this._sync();
    },

-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        let [minSize, naturalSize] = this._iconBox.get_preferred_width(forHeight);
-        alloc.min_size = minSize;
-        alloc.natural_size = naturalSize;
-        [minSize, naturalSize] = this._label.actor.get_preferred_width(forHeight);
-        alloc.min_size = alloc.min_size + Math.max(0, minSize - Math.floor(alloc.min_size / 2));
-        alloc.natural_size = alloc.natural_size + Math.max(0, naturalSize - Math.floor(alloc.natural_size / 2));
-    },
-
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        let [minSize, naturalSize] = this._iconBox.get_preferred_height(forWidth);
-        alloc.min_size = minSize;
-        alloc.natural_size = naturalSize;
-        [minSize, naturalSize] = this._label.actor.get_preferred_height(forWidth);
-        if (minSize > alloc.min_size)
-            alloc.min_size = minSize;
-        if (naturalSize > alloc.natural_size)
-            alloc.natural_size = naturalSize;
-    },
-
-    _allocate: function(actor, box, flags) {
-        let allocWidth = box.x2 - box.x1;
-        let allocHeight = box.y2 - box.y1;
-        let childBox = new Clutter.ActorBox();
-
-        let [minWidth, minHeight, naturalWidth, naturalHeight] = this._iconBox.get_preferred_size();
-
-        let direction = this.actor.get_direction();
-
-        let yPadding = Math.floor(Math.max(0, allocHeight - naturalHeight) / 2);
-        childBox.y1 = yPadding;
-        childBox.y2 = childBox.y1 + Math.min(naturalHeight, allocHeight);
-        if (direction == St.TextDirection.LTR) {
-            childBox.x1 = 0;
-            childBox.x2 = childBox.x1 + Math.min(naturalWidth, allocWidth);
-        } else {
-            childBox.x1 = Math.max(0, allocWidth - naturalWidth);
-            childBox.x2 = allocWidth;
-        }
-        this._iconBox.allocate(childBox, flags);
-
-        let iconWidth = childBox.x2 - childBox.x1;
-
-        [minWidth, minHeight, naturalWidth, naturalHeight] = this._label.actor.get_preferred_size();
-
-        yPadding = Math.floor(Math.max(0, allocHeight - naturalHeight) / 2);
-        childBox.y1 = yPadding;
-        childBox.y2 = childBox.y1 + Math.min(naturalHeight, allocHeight);
-
-        if (direction == St.TextDirection.LTR) {
-            childBox.x1 = Math.floor(iconWidth / 2);
-            childBox.x2 = Math.min(childBox.x1 + naturalWidth, allocWidth);
-        } else {
-            childBox.x2 = allocWidth - Math.floor(iconWidth / 2);
-            childBox.x1 = Math.max(0, childBox.x2 - naturalWidth);
-        }
-        this._label.actor.allocate(childBox, flags);
-    },
-
    _sync: function() {
        let tracker = Shell.WindowTracker.get_default();

@ -268,26 +112,24 @@ AppPanelMenu.prototype = {
        if (this._iconBox.child != null)
            this._iconBox.child.destroy();
        this._iconBox.hide();
-        this._label.setText('');
-        let icon;
+        this._label.set_text('');
        if (this._focusedApp != null) {
-            icon = this._focusedApp.get_faded_icon(AppDisplay.APPICON_SIZE);
-            this._label.setText(this._focusedApp.get_name());
-        } else if (this._activeSequence != null) {
-            icon = this._activeSequence.create_icon(AppDisplay.APPICON_SIZE);
-            this._label.setText(this._activeSequence.get_name());
-        } else {
-            icon = null;
-        }
-
-        if (icon != null) {
+            let icon = this._focusedApp.create_icon_texture(PANEL_ICON_SIZE);
            this._iconBox.set_child(icon);
            this._iconBox.show();
+            let appName = this._focusedApp.get_name();
+            // Use _set_text to work around http://bugzilla.openedhand.com/show_bug.cgi?id=1851
+            this._label.set_text(appName);
+        } else if (this._activeSequence != null) {
+            let icon = this._activeSequence.create_icon(PANEL_ICON_SIZE);
+            this._iconBox.set_child(icon);
+            this._iconBox.show();
+            this._label.set_text(this._activeSequence.get_name());
        }

        this.emit('changed');
    }
-};
+}

 Signals.addSignalMethods(AppPanelMenu.prototype);

@ -447,7 +289,6 @@ Panel.prototype = {

        this._clock = new St.Label();
        clockButton.set_child(this._clock);
-        this._clockButton = clockButton;

        this._calendarPopup = null;

@ -535,13 +376,6 @@ Panel.prototype = {
        this._updateClock();
    },

-    hideCalendar: function() {
-        if (this._calendarPopup != null) {
-            this._clockButton.checked = false;
-            this._calendarPopup.actor.hide();
-        }
-    },
-
    startupAnimation: function() {
        this.actor.y = -this.actor.height;
        Tweener.addTween(this.actor,
@ -602,22 +436,8 @@ Panel.prototype = {
            displayDate.setMinutes(displayDate.getMinutes() + 1);
            msecRemaining += 60000;
        }
-
-        // if the locale representations of 05:00 and 17:00 do not
-        // start with the same 2 digits, it must be a 24h clock
-        let fiveAm = new Date();
-        fiveAm.setHours(5);
-        let fivePm = new Date();
-        fivePm.setHours(17);
-        let isTime24h = fiveAm.toLocaleFormat("%X").substr(0,2) !=
-                        fivePm.toLocaleFormat("%X").substr(0,2);
-        if (isTime24h) {
-            /* Translators: This is the time format used in 24-hour mode. */
-            this._clock.set_text(displayDate.toLocaleFormat(_("%a %R")));
-        } else {
-            /* Translators: This is a time format used for AM/PM. */
+        /* Translators: This is a time format.  */
        this._clock.set_text(displayDate.toLocaleFormat(_("%a %l:%M %p")));
-        }
        Mainloop.timeout_add(msecRemaining, Lang.bind(this, this._updateClock));
        return false;
    },
@ -632,47 +452,11 @@ Panel.prototype = {
        }
    },

-    _addRipple : function(delay, time, startScale, startOpacity, finalScale, finalOpacity) {
-        // We draw a ripple by using a source image and animating it scaling
-        // outwards and fading away. We want the ripples to move linearly
-        // or it looks unrealistic, but if the opacity of the ripple goes
-        // linearly to zero it fades away too quickly, so we use Tweener's
-        // 'onUpdate' to give a non-linear curve to the fade-away and make
-        // it more visible in the middle section.
-
-        let [x, y] = this._hotCorner.get_transformed_position();
-        let ripple = new St.BoxLayout({ style_class: 'ripple-box',
-                                        opacity: 255 * Math.sqrt(startOpacity),
-                                        scale_x: startScale,
-                                        scale_y: startScale,
-                                        x: x,
-                                        y: y });
-        ripple._opacity =  startOpacity;
-        Tweener.addTween(ripple, { _opacity: finalOpacity,
-                                   scale_x: finalScale,
-                                   scale_y: finalScale,
-                                   delay: delay,
-                                   time: time,
-                                   transition: 'linear',
-                                   onUpdate: function() { ripple.opacity = 255 * Math.sqrt(ripple._opacity); },
-                                   onComplete: function() { ripple.destroy(); } });
-        global.stage.add_actor(ripple);
-    },
-
    _onHotCornerEntered : function() {
        if (!this._hotCornerEntered) {
            this._hotCornerEntered = true;
            if (!Main.overview.animationInProgress) {
                this._hotCornerActivationTime = Date.now() / 1000;
-
-                // Show three concentric ripples expanding outwards; the exact
-                // parameters were found by trial and error, so don't look
-                // for them to make perfect sense mathematically
-
-                //              delay  time  scale opacity => scale opacity
-                this._addRipple(0.0,   0.83,  0.25,  1.0,    1.5,  0.0);
-                this._addRipple(0.05,  1.0,   0.0,   0.7,    1.25, 0.0);
-                this._addRipple(0.35,  1.0,   0.0,   0.3,    1,    0.0);
                Main.overview.toggle();
            }
        }
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -59,7 +59,7 @@ PlaceInfo.prototype = {
    isRemovable: function() {
        return false;
    }
-};
+}

 function PlaceDeviceInfo(mount) {
    this._init(mount);
@ -77,7 +77,7 @@ PlaceDeviceInfo.prototype = {

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

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

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

    _removeFinish: function(o, res, data) {
-        try {
        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() {
@ -121,7 +114,7 @@ PlacesManager.prototype = {
        this._defaultPlaces = [];
        this._mounts = [];
        this._bookmarks = [];
-        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);
+        this._isDesktopHome = false;

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

        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
            function (size) {
-                return St.TextureCache.get_default().load_icon_name("applications-internet", size);
+                return Shell.TextureCache.get_default().load_icon_name("applications-internet", size);
            },
            function () {
                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
@ -179,7 +172,6 @@ PlacesManager.prototype = {

        this._defaultPlaces.push(this._home);

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

@ -219,6 +211,7 @@ PlacesManager.prototype = {
        }));

        this._reloadBookmarks();
+        this._updateDesktopMenuVisibility();

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

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

            let item = new PlaceInfo('bookmark:' + bookmark, label,
                function(size) {
-                    return St.TextureCache.get_default().load_gicon(icon, size);
+                    return Shell.TextureCache.get_default().load_gicon(icon, size);
                },
                function() {
                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
@ -334,12 +327,6 @@ PlacesManager.prototype = {
        let gconf = Shell.GConf.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');
@ -366,13 +353,13 @@ PlacesManager.prototype = {
        return this._mounts;
    },

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

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

@ -408,45 +391,31 @@ DashPlaceDisplayItem.prototype = {
        this.name = info.name;
        this._info = info;
        this._icon = info.iconFactory(PLACES_ICON_SIZE);
-
-        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 });
+        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);

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

-        this.actor.connect('clicked', Lang.bind(this, this._onClicked));
-        this.actor.connect('notify::hover',
-                           Lang.bind(this, this._onHoverChanged));
-        this.actor.connect('button-press-event',
-                           Lang.bind(this, this._onButtonPress));
-        this.actor.connect('button-release-event',
-                           Lang.bind(this, this._onButtonRelease));
-
        this.actor._delegate = this;
-        this._dragStartX = null;
-        this._dragStartY = null;
-        this._draggable = DND.makeDraggable(this.actor,
-                                            { manualMode: true });
+        let draggable = DND.makeDraggable(this.actor);
    },

    _onClicked: function(b) {
@ -454,36 +423,6 @@ DashPlaceDisplayItem.prototype = {
        Main.overview.hide();
    },

-    _onButtonPress: function(actor, event) {
-        if (event.get_button() != 1)
-            return false;
-
-        let [stageX, stageY] = event.get_coords();
-        this._dragStartX = stageX;
-        this._dragStartY = stageY;
-        return false;
-    },
-
-    _onButtonRelease: function(actor, event) {
-        if (event.get_button() != 1)
-            return false;
-
-        this._dragStartX = null;
-        this._dragStartY = null;
-        return false;
-    },
-
-    _onHoverChanged: function(button) {
-        let hover = button.hover;
-        if (!hover) {
-            if (button.pressed && this._dragStartX != null) {
-                button.fake_release();
-                this._draggable.startDrag(this._dragStartX, this._dragStartY,
-                                          global.get_current_time());
-            }
-        }
-    },
-
    getDragActorSource: function() {
        return this._icon;
    },
@ -577,7 +516,7 @@ PlaceSearchProvider.prototype = {
    __proto__: Search.SearchProvider.prototype,

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

    getResultMeta: function(resultId) {
@ -632,4 +571,4 @@ PlaceSearchProvider.prototype = {
        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
        return this._searchPlaces(places, terms);
    }
-};
+}
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -7,7 +7,6 @@ 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');
@ -16,10 +15,17 @@ const _ = Gettext.gettext;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;

-const MAX_FILE_DELETED_BEFORE_INVALID = 10;
+const BOX_BACKGROUND_COLOR = new Clutter.Color();
+BOX_BACKGROUND_COLOR.from_pixel(0x000000cc);

-const HISTORY_KEY = 'run_dialog/history';
-const HISTORY_LIMIT = 512;
+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;

 function CommandCompleter() {
    this._init();
@ -29,7 +35,6 @@ 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);
@ -37,14 +42,7 @@ 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;
-            try {
-                info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
-            } catch (e) {
-                // FIXME catchall
-                this._paths[i] = null;
-                continue;
-            }
+            let info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);

            if (info.get_attribute_uint32(Gio.FILE_ATTRIBUTE_STANDARD_TYPE) != Gio.FileType.DIRECTORY)
                continue;
@ -55,15 +53,12 @@ CommandCompleter.prototype = {
                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));
+        this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete), null);
    },

    _onNextFileComplete : function(obj, res) {
@ -72,7 +67,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));
+            this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete), null);
        } else {
            this._enumerator.close(null);
            this._enumerator = null;
@ -99,7 +94,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));
+        file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onGetEnumerateComplete), null);
    },

    _onChanged : function(m, f, of, type) {
@ -171,25 +166,17 @@ CommandCompleter.prototype = {

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

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

-        this._gconf = Shell.GConf.get_default();
-        this._gconf.connect('changed::development_tools', Lang.bind(this, function () {
-            this._enableInternalCommands = this._gconf.get_boolean('development_tools');
-        }));
-        this._enableInternalCommands = this._gconf.get_boolean('development_tools');
-
-        this._history = this._gconf.get_string_list(HISTORY_KEY);
-        this._historyIndex = -1;
-
-        this._gconf.connect('changed::' + HISTORY_KEY, Lang.bind(this, function() {
-            this._history = this._gconf.get_string_list(HISTORY_KEY);
-            this._historyIndex = this._history.length;
+        let gconf = Shell.GConf.get_default();
+        gconf.connect('changed::development_tools', Lang.bind(this, function () {
+            this._enableInternalCommands = gconf.get_boolean('development_tools');
        }));
+        this._enableInternalCommands = gconf.get_boolean('development_tools');

        this._internalCommands = { 'lg':
                                   Lang.bind(this, function() {
@ -213,69 +200,87 @@ 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 });
+                                          x: 0,
+                                          y: 0,
+                                          width: global.screen_width,
+                                          height: global.screen_height });
        global.stage.add_actor(this._group);

-        let lightbox = new Lightbox.Lightbox(this._group, true);
+        let lightbox = new Lightbox.Lightbox(this._group);

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

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

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

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

-        let label = new St.Label({ style_class: 'run-dialog-label',
+
+        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 });
+
+        this._boxH.append(dialogBox, Big.BoxPackFlags.NONE);
+
+        let label = new Clutter.Text({ color: BOX_TEXT_COLOR,
+                                       font_name: '18px Sans',
                                       text: _("Please enter a command:") });

-        dialogBox.add(label, { expand: true, y_fill: false });
+        dialogBox.append(label, Big.BoxPackFlags.EXPAND);

-        let entry = new St.Entry({ style_class: 'run-dialog-entry' });
+        this._entry = new Clutter.Text({ color: BOX_TEXT_COLOR,
+                                         font_name: '20px Sans Bold',
+                                         editable: true,
+                                         activatable: true,
+                                         singleLineMode: true });

-        this._entryText = entry.clutter_text;
-        dialogBox.add(entry, { expand: true });
+        dialogBox.append(this._entry, Big.BoxPackFlags.EXPAND);

-        this._errorBox = new St.BoxLayout();
+        this._errorBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                       padding_top: DIALOG_PADDING });

-        dialogBox.add(this._errorBox, { expand: true });
+        dialogBox.append(this._errorBox, Big.BoxPackFlags.EXPAND);

-        let errorIcon = new St.Button({ style_class: 'run-dialog-error-icon' });
+        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.add(errorIcon);
+        this._errorBox.append(iconBox, Big.BoxPackFlags.NONE);

        this._commandError = false;

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

-        this._errorBox.add(this._errorMessage, { expand: 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.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._entryText.connect('key-press-event', Lang.bind(this, function(o, e) {
+        this._entry.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) {
-                if (e.get_state() & 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;
@ -320,80 +325,34 @@ RunDialog.prototype = {
        }
    },

-    _saveHistory : function() {
-        if (this._history.length > HISTORY_LIMIT) {
-            this._history.splice(0, this._history.length - HISTORY_LIMIT);
-        }
-        this._gconf.set_string_list(HISTORY_KEY, this._history);
-    },
-
-    _run : function(input, inTerminal) {
-        let command = input;
-
-        this._history.push(input);
-        this._saveHistory();
-
+    _run : function(command) {
        this._commandError = false;
        let f;
        if (this._enableInternalCommands)
-            f = this._internalCommands[input];
+            f = this._internalCommands[command];
        else
            f = null;
        if (f) {
            f();
-        } else if (input) {
+        } else if (command) {
            try {
-                if (inTerminal)
-                    command = 'gnome-terminal -x ' + input;
                let [ok, len, args] = GLib.shell_parse_argv(command);
                let p = new Shell.Process({'args' : args});
                p.run();
            } catch (e) {
-                // 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.
+                /*
+                 * 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() {
@ -406,15 +365,13 @@ RunDialog.prototype = {
        // Position the dialog on the current monitor
        let monitor = global.get_focus_monitor();

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

        this._isOpen = true;
        this._group.show();

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

    close : function() {
@ -427,7 +384,7 @@ RunDialog.prototype = {
        this._commandError = false;

        this._group.hide();
-        this._entryText.set_text('');
+        this._entry.set_text('');

        Main.popModal(this._group);
    }
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -80,13 +80,6 @@ SearchResultDisplay.prototype = {
     */
    selectIndex: function() {
        throw new Error("not implemented");
-    },
-
-    /**
-     * Activate the currently selected search result.
-     */
-    activateSelected: function() {
-        throw new Error("not implemented");
    }
 };

@ -207,7 +200,7 @@ SearchProvider.prototype = {
    expandSearch: function(terms) {
        throw new Error("not implemented");
    }
-};
+}
 Signals.addSignalMethods(SearchProvider.prototype);

 function SearchSystem() {
@ -275,5 +268,5 @@ SearchSystem.prototype = {

        return results;
    }
-};
+}
 Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/sidebar.js
+++ b/js/ui/sidebar.js
@ -4,7 +4,6 @@ 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 Panel = imports.ui.panel;
@ -59,8 +58,6 @@ Sidebar.prototype = {
        if (this._visible)
            Main.chrome.addActor(this.actor);

-        this._hidden = false;
-        this._hideTimeoutId = 0;
        this._widgets = [];
        this.addWidget(new ToggleWidget());

@ -72,14 +69,8 @@ Sidebar.prototype = {
                            Lang.bind(this, this._expandedChanged));
        this._gconf.connect('changed::sidebar/visible',
                            Lang.bind(this, this._visibleChanged));
-        this._gconf.connect('changed::sidebar/autohide',
-                            Lang.bind(this, this._autohideChanged));
-
-        this.actor.connect('enter-event',Lang.bind(this,this._restoreHidden));
-        this.actor.connect('leave-event',Lang.bind(this,this._startHideTimeout));

        this._adjustPosition();
-        this._autohideChanged();
    },

    addWidget: function(widget) {
@ -99,7 +90,7 @@ Sidebar.prototype = {
    _adjustPosition: function() {
        let primary=global.get_primary_monitor();

-        this.actor.y = Math.floor(Math.max(primary.y + Panel.PANEL_HEIGHT,primary.height/2 - this.actor.height/2));
+        this.actor.y = Math.max(primary.y + Panel.PANEL_HEIGHT,primary.height/2 - this.actor.height/2);
        this.actor.x = primary.x;
    },

@ -127,21 +118,6 @@ Sidebar.prototype = {
            this._collapse();
    },

-    _autohideChanged: function() {
-        let autohide = this._gconf.get_boolean("sidebar/autohide");
-        if (autohide == this._autohide)
-            return;
-
-        this._autohide = autohide;
-        if (autohide) {
-            this.actor.set_reactive(true);
-            this._hide();
-        } else {
-            this.actor.set_reactive(false);
-            this._restore();
-        }
-    },
-
    _expand: function() {
        this._expanded = true;
        for (let i = 0; i < this._widgets.length; i++)
@ -159,70 +135,16 @@ Sidebar.prototype = {
        for (let i = 0; i < this._widgets.length; i++)
            this._widgets[i].collapse();

-        // Update the strut/stage area after the animation completes
-        Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME,
-                                 onComplete: Lang.bind(this, function () {
-                                     this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
-                                 }) });
-    },
-
-    _hide: function() {
-        if (!this._expanded) {
-            this._hidden = true;
-            for (let i = 0; i < this._widgets.length; i++)
-                this._widgets[i].hide();
-
-            // Update the strut/stage area after the animation completes
-            Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME / 2,
-                                     onComplete: Lang.bind(this, function () {
-                                         this.actor.width = Math.floor(WidgetBox.WIDGETBOX_PADDING * 2 + SIDEBAR_PADDING);
-                                     }) });
-        }
-    },
-
-    _restore: function() {
-        if (!this._expanded) {
-            this._hidden = false;
-            for (let i = 0; i < this._widgets.length; i++)
-                this._widgets[i].restore();
-
        // Updated the strut/stage area after the animation completes
-            Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME / 2,
+        Tweener.addTween(this, { time: WidgetBox.ANIMATION_TIME,
                                 onComplete: function () {
                                     this.actor.width = SIDEBAR_COLLAPSED_WIDTH;
                                 } });
-        }
-    },
-
-    _restoreHidden: function(actor, event) {
-        this._cancelHideTimeout();
-        if (this._hidden)
-            this._restore();
-        return false;
-    },
-
-    _startHideTimeout: function(actor, event) {
-        if (!this._expanded) {
-            this._cancelHideTimeout();
-            this._hideTimeoutId = Mainloop.timeout_add_seconds(2, Lang.bind(this,this._hideTimeoutFunc));
-        }
-        return false;
-    },
-
-    _cancelHideTimeout: function() {
-        if (this._hideTimeoutId != 0) {
-            Mainloop.source_remove(this._hideTimeoutId);
-            this._hideTimeoutId = 0;
-        }
-    },
-
-    _hideTimeoutFunc: function() {
-        this._hide();
-        return false;
    },

    destroy: function() {
        this.hide();
+
        for (let i = 0; i < this._widgets.length; i++)
            this._widgets[i].destroy();
        this.actor.destroy();
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@ -30,13 +30,13 @@ StatusMenu.prototype = {
        this._user = this._gdm.get_user(GLib.get_user_name());
        this._presence = new GnomeSessionPresence();

-        this.actor = new St.BoxLayout({ name: 'statusMenu' });
+        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 });

-        let textureCache = St.TextureCache.get_default();
+        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);
@ -104,17 +104,17 @@ StatusMenu.prototype = {

        let item;

-        item = this._createImageMenuItem(_("Available"), 'gtk-yes', true);
+        item = this._createImageMenuItem(_('Available'), 'gtk-yes', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.AVAILABLE));
        this._menu.append(item);
        item.show();

-        item = this._createImageMenuItem(_("Busy"), 'gtk-no', true);
+        item = this._createImageMenuItem(_('Busy'), 'gtk-no', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.BUSY));
        this._menu.append(item);
        item.show();

-        item = this._createImageMenuItem(_("Invisible"), 'gtk-close', true);
+        item = this._createImageMenuItem(_('Invisible'), 'gtk-close', true);
        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.INVISIBLE));
        this._menu.append(item);
        item.show();
@ -123,13 +123,13 @@ StatusMenu.prototype = {
        this._menu.append(item);
        item.show();

-        item = this._createImageMenuItem(_("Account Information..."), 'user-info');
+        item = this._createImageMenuItem(_('Account Information...'), 'user-info');
        item.connect('activate', Lang.bind(this, this._onAccountInformationActivate));
        this._menu.append(item);
        item.show();

        let gconf = Shell.GConf.get_default();
-        item = new Gtk.CheckMenuItem({ label: _("Sidebar"),
+        item = new Gtk.CheckMenuItem({ label: _('Sidebar'),
                                       active: gconf.get_boolean(SIDEBAR_VISIBLE_KEY) });
        item.connect('activate', Lang.bind(this,
            function() {
@ -139,7 +139,7 @@ StatusMenu.prototype = {
        item.show();
        this._sidebarItem = item;

-        item = this._createImageMenuItem(_("System Preferences..."), 'preferences-desktop');
+        item = this._createImageMenuItem(_('System Preferences...'), 'preferences-desktop');
        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
        this._menu.append(item);
        item.show();
@ -148,23 +148,23 @@ StatusMenu.prototype = {
        this._menu.append(item);
        item.show();

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

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

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

-        item = this._createImageMenuItem(_("Shut Down..."), 'system-shutdown');
+        item = this._createImageMenuItem(_('Shut Down...'), 'system-shutdown');
        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
        this._menu.append(item);
        item.show();
@ -233,12 +233,7 @@ StatusMenu.prototype = {
            let [panelX, panelY] = panel.get_transformed_position();
            let [panelWidth, panelHeight] = panel.get_transformed_size();

-            let menuX;
-            if (St.Widget.get_default_direction() == St.TextDirection.RTL) {
-                menuX = panelX;
-            } else {
-                menuX = Math.round(panelX + panelWidth - menuWidth);
-            }
+            let menuX = Math.round(panelX + panelWidth - menuWidth);
            let menuY = Math.round(panelY + panelHeight);

            Shell.popup_menu(this._menu, event.get_button(), event.get_time(),
--- a/js/ui/widget.js
+++ b/js/ui/widget.js
@ -9,7 +9,6 @@ const Lang = imports.lang;
 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;

@ -118,9 +117,10 @@ ClockWidget.prototype = {
                                        // it's the same in both modes
                                        height: COLLAPSED_WIDTH });

-        this.collapsedActor = new St.DrawingArea({ width: COLLAPSED_WIDTH,
-                                                   height: COLLAPSED_WIDTH });
-        this.collapsedActor.connect('repaint', Lang.bind(this, this._repaintClock));
+        this.collapsedActor = new Clutter.CairoTexture({ width: COLLAPSED_WIDTH,
+                                                         height: COLLAPSED_WIDTH,
+                                                         surface_width: COLLAPSED_WIDTH,
+                                                         surface_height: COLLAPSED_WIDTH });

        this._update();
    },
@ -139,18 +139,18 @@ ClockWidget.prototype = {
    },

    _update: function() {
-        this.currentTime = new Date();
-        let msec_remaining = 60000 - (1000 * this.currentTime.getSeconds() +
-                                      this.currentTime.getMilliseconds());
+        let time = new Date();
+        let msec_remaining = 60000 - (1000 * time.getSeconds() +
+                                      time.getMilliseconds());
        if (msec_remaining < 500) {
-            this.currentTime.setMinutes(this.currentTime.getMinutes() + 1);
+            time.setMinutes(time.getMinutes() + 1);
            msec_remaining += 60000;
        }

        if (this.state == STATE_COLLAPSED || this.state == STATE_COLLAPSING)
-            this.collapsedActor.queue_repaint();
+            this._updateCairo(time);
        else
-            this._updateText();
+            this._updateText(time);

        if (this.timer)
            Mainloop.source_remove(this.timer);
@ -160,13 +160,13 @@ ClockWidget.prototype = {

    _updateText: function(time) {
        // Translators: This is a time format.
-        this.actor.set_text(this.currentTime.toLocaleFormat(_("%H:%M")));
+        this.actor.set_text(time.toLocaleFormat(_("%H:%M")));
    },

-    _repaintClock: function(area) {
-        Shell.draw_clock(area,
-                         this.currentTime.getHours() % 12,
-                         this.currentTime.getMinutes());
+    _updateCairo: function(time) {
+        Shell.draw_clock(this.collapsedActor,
+                         time.getHours() % 12,
+                         time.getMinutes());
    }
 };

@ -302,7 +302,7 @@ AppsWidgetInfo.prototype = {
    launch : function() {
        this._info.launch();
    }
-};
+}

 function AppsWidget() {
    this._init.apply(this, arguments);
--- a/js/ui/widgetBox.js
+++ b/js/ui/widgetBox.js
@ -196,7 +196,7 @@ WidgetBox.prototype = {
        this._egroup.show();

        if (this._singleActor) {
-            this._widget.actor.get_parent().remove_actor(this._widget.actor);
+            this._widget.actor.unparent();
            this._ebox.append(this._widget.actor, Big.BoxPackFlags.NONE);
        }

@ -244,7 +244,7 @@ WidgetBox.prototype = {
        this._cgroup.show();

        if (this._singleActor) {
-            this._widget.actor.get_parent().remove_actor(this._widget.actor);
+            this._widget.actor.unparent();
            this._cbox.append(this._widget.actor, Big.BoxPackFlags.NONE);
        }

@ -373,20 +373,6 @@ WidgetBox.prototype = {
        Main.chrome.untrackActor(this._hbox);
    },

-    hide: function() {
-        if (this.state == Widget.STATE_COLLAPSED)
-            Tweener.addTween(this._cbox, { x: -Widget.COLLAPSED_WIDTH,
-                                           time: ANIMATION_TIME / 2,
-                                           transition: "easeOutQuad" });
-    },
-
-    restore: function() {
-        if (this.state == Widget.STATE_COLLAPSED)
-            Tweener.addTween(this._cbox, { x: 0,
-                                           time: ANIMATION_TIME / 2,
-                                           transition: "easeOutQuad" });
-    },
-
    destroy: function() {
        if (this._widget.destroy)
            this._widget.destroy();
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@ -1,109 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Meta = imports.gi.Meta;
-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() {
-        let display = global.screen.get_display();
-        display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
-        let tracker = Shell.WindowTracker.get_default();
-        this._startupIds = {};
-        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;
-        }
-    },
-
-    _sourceId : function(appId) {
-        return 'attention-' + appId;
-    },
-
-    _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 source = Main.messageTray.getSource(this._sourceId(app.get_id()));
-        if (source == null) {
-            source = new Source(this._sourceId(app.get_id()), app, window);
-            Main.messageTray.add(source);
-            source.connect('clicked', Lang.bind(this, function() { source.destroy(); }));
-        }
-
-        let notification = new MessageTray.Notification(window.get_startup_id(), source, this._getTitle(app, window), this._getBanner(app, window), true);
-        source.notify(notification);
-
-        window.connect('notify::title', Lang.bind(this, function(win) {
-                                                            notification.update(this._getTitle(app, win), this._getBanner(app, win), false);
-                                                        }));
-        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(sourceId, app, window) {
-    this._init(sourceId, app, window);
-}
-
-Source.prototype = {
-    __proto__ : MessageTray.Source.prototype,
-
-    _init: function(sourceId, app, window) {
-        MessageTray.Source.prototype._init.call(this, sourceId);
-        this._window = window;
-        this._app = app;
-    },
-
-    createIcon : function(size) {
-        return this._app.create_icon_texture(size);
-    },
-
-    clicked : function() {
-        Main.activateWindow(this._window);
-        MessageTray.Source.prototype.clicked.call(this);
-    }
-
-};
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -5,10 +5,8 @@ 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;

@ -20,9 +18,8 @@ function WindowManager() {

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

-        this._keyBindingHandlers = [];
        this._minimizing = [];
        this._maximizing = [];
        this._unmaximizing = [];
@ -30,35 +27,21 @@ WindowManager.prototype = {
        this._destroying = [];

        this._switchData = null;
-        this._shellwm.connect('switch-workspace', Lang.bind(this, this._switchWorkspace));
-        this._shellwm.connect('kill-switch-workspace', Lang.bind(this, this._switchWorkspaceDone));
-        this._shellwm.connect('minimize', Lang.bind(this, this._minimizeWindow));
-        this._shellwm.connect('kill-minimize', Lang.bind(this, this._minimizeWindowDone));
-        this._shellwm.connect('maximize', Lang.bind(this, this._maximizeWindow));
-        this._shellwm.connect('kill-maximize', Lang.bind(this, this._maximizeWindowDone));
-        this._shellwm.connect('unmaximize', Lang.bind(this, this._unmaximizeWindow));
-        this._shellwm.connect('kill-unmaximize', Lang.bind(this, this._unmaximizeWindowDone));
-        this._shellwm.connect('map', Lang.bind(this, this._mapWindow));
-        this._shellwm.connect('kill-map', Lang.bind(this, this._mapWindowDone));
-        this._shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
-        this._shellwm.connect('kill-destroy', Lang.bind(this, this._destroyWindowDone));
+        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._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));
-    },
-
-    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);
+        shellwm.takeover_keybinding('switch_windows');
+        shellwm.connect('keybinding::switch_windows', Lang.bind(this, this._startAppSwitcher));
    },

    _shouldAnimate : function(actor) {
@ -91,17 +74,9 @@ 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",
                           onComplete: this._minimizeWindowDone,
@ -297,55 +272,9 @@ 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/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -1,99 +0,0 @@
-/* -*- 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 Tweener = imports.ui.tweener;
-
-const ANIMATION_TIME = 0.075;
-const DISPLAY_TIMEOUT = 600;
-
-const LEFT = -1;
-const RIGHT = 1;
-
-function WorkspaceSwitcherPopup() {
-    this._init();
-}
-
-WorkspaceSwitcherPopup.prototype = {
-    _init : function() {
-        this.actor = new Clutter.Group({ reactive: true,
-                                         x: 0,
-                                         y: 0,
-                                         width: global.screen_width,
-                                         height: global.screen_height });
-        global.stage.add_actor(this.actor);
-
-        this._scaleWidth = global.screen_width / global.screen_height;
-
-        this._container = new St.BoxLayout({ style_class: "workspace-switcher-container" });
-        this._list = new St.BoxLayout({ style_class: "workspace-switcher" });
-
-        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));
-    },
-
-    _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(indicator);
-           indicator.set_width(Math.round(indicator.get_height() * this._scaleWidth));
-
-        }
-    },
-
-    _position: function() {
-        let focus = global.get_focus_monitor();
-        this._container.x = focus.x + Math.floor((focus.width - this._container.width) / 2);
-        this._container.y = focus.y + Math.floor((focus.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/workspaces.js
+++ b/js/ui/workspaces.js
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
--- a/man/Makefile.am
+++ b/man/Makefile.am
@ -1 +0,0 @@
-dist_man_MANS = gnome-shell.1
--- a/man/gnome-shell.1
+++ b/man/gnome-shell.1
@ -1,99 +0,0 @@
-.\" 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,5 +1,4 @@
 ar
-bg
 ca
 cs
 da
@ -23,9 +22,6 @@ pt_BR
 ro
 ru
 sl
-sr
-sr@latin
 sv
 tr
-vi
 zh_CN
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,16 +1,12 @@
 data/gnome-shell.desktop.in.in
 js/ui/appDisplay.js
-js/ui/appFavorites.js
+js/ui/appIcon.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/runDialog.js
-js/ui/statusMenu.js
 js/ui/widget.js
-js/ui/windowAttentionHandler.js
 src/gdmuser/gdm-user.c
 src/shell-global.c
 src/shell-uri-util.c
--- a/po/ar.po
+++ b/po/ar.po
@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Khaled Hosny <khaledhosny@eglug.org>, 2009, 2010.
+# Khaled Hosny <khaledhosny@eglug.org>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-17 11:29+0200\n"
-"PO-Revision-Date: 2010-01-17 11:29+0300\n"
+"POT-Creation-Date: 2009-11-08 20:55+0200\n"
+"PO-Revision-Date: 2009-11-08 20:55+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
@ -16,7 +16,7 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.5.1\n"
+"X-Generator: Virtaal 0.4.1\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -26,75 +26,84 @@ msgstr "صدفة جنوم"
 msgid "Window management and application launching"
 msgstr "إدارة النوافذ وإطلاق التطبيقات"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:865
-msgid "APPLICATIONS"
-msgstr "التطبيقات"
+#: ../js/ui/appDisplay.js:332
+msgid "Frequent"
+msgstr "متكرر"

-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "التفضيلات"
-
-#: ../js/ui/appDisplay.js:644
-msgid "New Window"
-msgstr "نافذة جديدة"
-
-#: ../js/ui/appDisplay.js:648
-msgid "Remove from Favorites"
-msgstr "أزِل من المفضّلة"
-
-#: ../js/ui/appDisplay.js:649
-msgid "Add to Favorites"
-msgstr "أضِف إلى المفضّلة"
-
-#: ../js/ui/appDisplay.js:1001
+#: ../js/ui/appDisplay.js:867
 msgid "Drag here to add favorites"
 msgstr "اسحب إلى هنا ليضاف إلى المفضّلة"

-#: ../js/ui/dash.js:240
+#: ../js/ui/appIcon.js:426
+msgid "New Window"
+msgstr "نافذة جديدة"
+
+#: ../js/ui/appIcon.js:430
+msgid "Remove from Favorites"
+msgstr "أزِل من المفضّلة"
+
+#: ../js/ui/appIcon.js:431
+msgid "Add to Favorites"
+msgstr "أضِف إلى المفضّلة"
+
+#: ../js/ui/dash.js:267
 msgid "Find..."
 msgstr "ابحث..."

-#: ../js/ui/dash.js:493
-msgid "Searching..."
-msgstr "يبحث..."
+#: ../js/ui/dash.js:376
+msgid "More"
+msgstr "المزيد"

-#: ../js/ui/dash.js:507
-msgid "No matching results."
-msgstr "لا نتائج مطابقة."
+#: ../js/ui/dash.js:532
+msgid "(see all)"
+msgstr "(انظر الكل)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:711 ../js/ui/dash.js:773
+msgid "APPLICATIONS"
+msgstr "التطبيقات"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:885 ../js/ui/placeDisplay.js:519
-msgid "PLACES & DEVICES"
-msgstr "الأماكن والأجهزة"
+#: ../js/ui/dash.js:731
+msgid "PLACES"
+msgstr "الأماكن"

 #. **** Documents ****
-#: ../js/ui/dash.js:892
-msgid "RECENT ITEMS"
-msgstr "العناصر الحديثة"
+#: ../js/ui/dash.js:738 ../js/ui/dash.js:783
+msgid "RECENT DOCUMENTS"
+msgstr "المستندات الحديثة"
+
+#. **** Search Results ****
+#: ../js/ui/dash.js:763 ../js/ui/dash.js:947
+msgid "SEARCH RESULTS"
+msgstr "نتائج البحث"
+
+#: ../js/ui/dash.js:778
+msgid "PREFERENCES"
+msgstr "التفضيلات"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
+#: ../js/ui/panel.js:274
 msgid "Activities"
 msgstr "الأنشطة"

 #. Translators: This is a time format.
-#: ../js/ui/panel.js:549
+#: ../js/ui/panel.js:491
 msgid "%a %l:%M %p"
 msgstr "%A %Ol:%OM %p"

-#: ../js/ui/placeDisplay.js:144
+#: ../js/ui/places.js:178
 msgid "Connect to..."
 msgstr "اتّصل ب‍..."

-#: ../js/ui/runDialog.js:245
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "من فضلك اكتب أمرا:"

-#: ../js/ui/runDialog.js:361
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "فشل تنفيذ '%s':‏"
@ -112,11 +121,11 @@ msgstr "التطبيقات"
 msgid "Recent Documents"
 msgstr "المستندات الحديثة"

-#: ../src/shell-global.c:890
+#: ../src/shell-global.c:821
 msgid "Less than a minute ago"
 msgstr "منذ أقل من دقيقة"

-#: ../src/shell-global.c:894
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@ -127,7 +136,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"

-#: ../src/shell-global.c:899
+#: ../src/shell-global.c:827
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@ -138,7 +147,7 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"

-#: ../src/shell-global.c:904
+#: ../src/shell-global.c:830
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@ -149,7 +158,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"

-#: ../src/shell-global.c:909
+#: ../src/shell-global.c:833
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -160,17 +169,67 @@ msgstr[3] "منذ %d أسابيع"
 msgstr[4] "منذ %d أسبوعا"
 msgstr[5] "منذ %d أسبوع"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "مجهول"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "تعذّر إيصاد الشاشة: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "تعذّر ضبك حافظة الشاشة مؤقتا لتكون شاشة خالية: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "تعذّر الخروج: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "معلومات الحساب..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "الشريط الجانبي"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "تفضيلات النظام..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "أوصد الشاشة"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "بدّل المستخدم"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "اخرج..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "أطفئ..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "مجلد المنزل"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "نظام الملفات"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "ابحث"

@ -179,58 +238,10 @@ msgstr "ابحث"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "‏%1$s:‏ %2$s"

-#~ msgid "Frequent"
-#~ msgstr "متكرر"
-
-#~ msgid "More"
-#~ msgstr "المزيد"
-
-#~ msgid "(see all)"
-#~ msgstr "(انظر الكل)"
-
-#~ msgid "PLACES"
-#~ msgstr "الأماكن"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "نتائج البحث"
-
-#~ msgid "Unknown"
-#~ msgstr "مجهول"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "تعذّر إيصاد الشاشة: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "تعذّر ضبك حافظة الشاشة مؤقتا لتكون شاشة خالية: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "تعذّر الخروج: %s"
-
-#~ msgid "Account Information..."
-#~ msgstr "معلومات الحساب..."
-
-#~ msgid "Sidebar"
-#~ msgstr "الشريط الجانبي"
-
-#~ msgid "System Preferences..."
-#~ msgstr "تفضيلات النظام..."
-
-#~ msgid "Lock Screen"
-#~ msgstr "أوصد الشاشة"
-
-#~ msgid "Switch User"
-#~ msgstr "بدّل المستخدم"
-
-#~ msgid "Log Out..."
-#~ msgstr "اخرج..."
-
-#~ msgid "Shut Down..."
-#~ msgstr "أطفئ..."
-
 #~ msgid "Browse"
 #~ msgstr "استعرض"
--- a/po/bg.po
+++ b/po/bg.po
@ -1,263 +0,0 @@
-# Bulgarian translation of gnome-shell po-file.
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-# Ivaylo Valkov <ivaylo@e-valkov.org>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-18 13:09+0200\n"
-"PO-Revision-Date: 2010-03-18 11:30+0200\n"
-"Last-Translator: Ivaylo Valkov <ivaylo@e-valkov.org>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Обвивка на GNOME"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Управление на прозорци и стартиране на програми"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:852
-msgid "APPLICATIONS"
-msgstr "ПРОГРАМИ"
-
-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "ПРЕДПОЧИТАНИЯ"
-
-#: ../js/ui/appDisplay.js:728
-msgid "New Window"
-msgstr "Нов прозорец"
-
-#: ../js/ui/appDisplay.js:732
-msgid "Remove from Favorites"
-msgstr "Премахване от „Любими“"
-
-#: ../js/ui/appDisplay.js:733
-msgid "Add to Favorites"
-msgstr "Добавяне в „Любими“"
-
-#: ../js/ui/appDisplay.js:1085
-msgid "Drag here to add favorites"
-msgstr "Довлачете до тук обектите за да ги добавите към „Любими“"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "Програмата „%s“ беше добавена в „Любими“"
-
-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "Програмата „%s“ беше премахната от „Любими“"
-
-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Търсене"
-
-#: ../js/ui/dash.js:507
-msgid "Searching..."
-msgstr "Търсене…"
-
-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "Няма съвпадения."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:871 ../js/ui/placeDisplay.js:536
-msgid "PLACES & DEVICES"
-msgstr "МЕСТА И УСТРОЙСТВА"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:878 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "СКОРО ОТВАРЯНИ"
-
-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Няма инсталирани разширения"
-
-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Включено"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Изключено"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Грешка"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Остаряло"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Преглед на програмния код"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Домашна страница"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Отмяна"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
-msgid "Activities"
-msgstr "Дейности"
-
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%a, %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "Неуспех при демонтиране на „%s“"
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Повторен опит"
-
-#: ../js/ui/placeDisplay.js:151
-msgid "Connect to..."
-msgstr "Свързване към…"
-
-#: ../js/ui/runDialog.js:221
-msgid "Please enter a command:"
-msgstr "Въведете команда:"
-
-#: ../js/ui/runDialog.js:344
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Неуспешно изпълнение на „%s“:"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Налично"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Заето"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Невидимо"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Информация за настройките на потребителя…"
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Странична лента"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Системни настройки…"
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Заключване на екрана"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Смяна на потребител"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Изход…"
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Изключване на компютъра…"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Програми"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Скоро отваряни документи"
-
-#: ../src/shell-global.c:967
-msgid "Less than a minute ago"
-msgstr "Преди по-малко от минута"
-
-#: ../src/shell-global.c:971
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "преди %d минута"
-msgstr[1] "преди %d минути"
-
-#: ../src/shell-global.c:976
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "преди %d час"
-msgstr[1] "преди %d часа"
-
-#: ../src/shell-global.c:981
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "преди %d ден"
-msgstr[1] "преди %d дни"
-
-#: ../src/shell-global.c:986
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "преди %d седмица"
-msgstr[1] "преди %d седмици"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Домашна папка"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Файлова система"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Търсене"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/cs.po
+++ b/po/cs.po
@ -1,14 +1,14 @@
 # Czech translation of gnome-shell.
-# Copyright (C) 2009, 2010 the author(s) of gnome-shell.
+# Copyright (C) 2009 the author(s) of gnome-shell.
 # This file is distributed under the same license as the gnome-shell package.
 # Andre Klapper <ak-47@gmx.net>, 2009.
-# Petr Kovar <pknbe@volny.cz>, 2009, 2010.
+# Petr Kovar <pknbe@volny.cz>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 03:11+0100\n"
-"PO-Revision-Date: 2010-03-20 03:11+0100\n"
+"POT-Creation-Date: 2009-11-05 18:03+0100\n"
+"PO-Revision-Date: 2009-11-05 18:03+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@ -25,177 +25,88 @@ msgstr "Prostředí GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Správa oken a spouštění aplikací"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:852
-msgid "APPLICATIONS"
-msgstr "APLIKACE"
+#: ../js/ui/appDisplay.js:332
+msgid "Frequent"
+msgstr "Časté"

-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "PŘEDVOLBY"
-
-#: ../js/ui/appDisplay.js:728
-msgid "New Window"
-msgstr "Nové okno"
-
-#: ../js/ui/appDisplay.js:732
-msgid "Remove from Favorites"
-msgstr "Odstranit z oblíbených"
-
-#: ../js/ui/appDisplay.js:733
-msgid "Add to Favorites"
-msgstr "Přidat mezi oblíbené"
-
-#: ../js/ui/appDisplay.js:1085
+#: ../js/ui/appDisplay.js:867
 msgid "Drag here to add favorites"
 msgstr "Oblíbené přidáte přetažením sem"

-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s byl přidán mezi oblíbené."
+#: ../js/ui/appIcon.js:426
+msgid "New Window"
+msgstr "Nové okno"

-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s byl odstraněn z oblíbených."
+#: ../js/ui/appIcon.js:430
+msgid "Remove from Favorites"
+msgstr "Odstranit z oblíbených"

-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Najít"
+#: ../js/ui/appIcon.js:431
+msgid "Add to Favorites"
+msgstr "Přidat mezi oblíbené"

-#: ../js/ui/dash.js:507
-msgid "Searching..."
-msgstr "Hledá se..."
+#: ../js/ui/dash.js:267
+msgid "Find..."
+msgstr "Najít..."

-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "Neodpovídá ani jeden z výsledků."
+#: ../js/ui/dash.js:376
+msgid "More"
+msgstr "Více"
+
+#: ../js/ui/dash.js:532
+msgid "(see all)"
+msgstr "(zobrazit vše)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:711 ../js/ui/dash.js:773
+msgid "APPLICATIONS"
+msgstr "APLIKACE"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:871 ../js/ui/placeDisplay.js:579
-msgid "PLACES & DEVICES"
-msgstr "MÍSTA A ZAŘÍZENÍ"
+#: ../js/ui/dash.js:731
+msgid "PLACES"
+msgstr "MÍSTA"

 #. **** Documents ****
-#: ../js/ui/dash.js:878 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "NEDÁVNÉ POLOŽKY"
+#: ../js/ui/dash.js:738 ../js/ui/dash.js:783
+msgid "RECENT DOCUMENTS"
+msgstr "NEDÁVNÉ DOKUMENTY"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Nejsou nainstalována žádná rozšíření"
+#. **** Search Results ****
+#: ../js/ui/dash.js:763 ../js/ui/dash.js:947
+msgid "SEARCH RESULTS"
+msgstr "VÝSLEDKY HLEDÁNÍ"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Povoleno"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Zakázáno"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Chyba"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Neaktuální"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Zobrazit zdroj"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Webová stránka"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Zpět"
+#: ../js/ui/dash.js:778
+msgid "PREFERENCES"
+msgstr "PŘEDVOLBY"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
+#: ../js/ui/panel.js:274
 msgid "Activities"
 msgstr "Činnosti"

-# Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%A, %R"
-
-# Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:491
 msgid "%a %l:%M %p"
-msgstr "%A, %l:%M %p"
+msgstr "%a, %H:%M"

-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "Nelze odpojit \"%s\""
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Opakovat"
-
-#: ../js/ui/placeDisplay.js:151
+#: ../js/ui/places.js:178
 msgid "Connect to..."
 msgstr "Připojit se k..."

-#: ../js/ui/runDialog.js:232
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Zadejte prosím příkaz:"

-#: ../js/ui/runDialog.js:374
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Vykonání \"%s\" selhalo:"

-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Přítomen"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Zaneprázdněn"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Neviditelný"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Informace o účtu..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Postranní lišta"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Předvolby systému..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Uzamknout obrazovku"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Přepnout uživatele"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Odhlásit..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Vypnout..."
-
 #. Translators: This is a time format.
 #: ../js/ui/widget.js:163
 msgid "%H:%M"
@ -209,11 +120,11 @@ msgstr "Aplikace"
 msgid "Recent Documents"
 msgstr "Nedávné dokumenty"

-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:821
 msgid "Less than a minute ago"
 msgstr "Před méně než minutou"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@ -221,7 +132,7 @@ msgstr[0] "Před %d minutou"
 msgstr[1] "Před %d minutami"
 msgstr[2] "Před %d minutami"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:827
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@ -229,7 +140,7 @@ msgstr[0] "Před %d hodinou"
 msgstr[1] "Před %d hodinami"
 msgstr[2] "Před %d hodinami"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:830
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@ -237,7 +148,7 @@ msgstr[0] "Před %d dnem"
 msgstr[1] "Před %d dny"
 msgstr[2] "Před %d dny"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:833
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -245,17 +156,67 @@ msgstr[0] "Před %d týdnem"
 msgstr[1] "Před %d týdny"
 msgstr[2] "Před %d týdny"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Neznámé"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Nelze uzamknout obrazovku: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "Šetřič obrazovky nelze dočasně nastavit na prázdnou obrazovku: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Nelze se odhlásit: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Informace o účtu..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Postranní lišta"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Předvolby systému..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Uzamknout obrazovku"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Přepnout uživatele"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Odhlásit..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Vypnout..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Domovská složka"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Systém souborů"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Hledat"

@ -264,38 +225,11 @@ msgstr "Hledat"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Frequent"
-#~ msgstr "Časté"
-
-#~ msgid "More"
-#~ msgstr "Více"
-
-#~ msgid "(see all)"
-#~ msgstr "(zobrazit vše)"
-
-#~ msgid "PLACES"
-#~ msgstr "MÍSTA"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "VÝSLEDKY HLEDÁNÍ"
-
-#~ msgid "Unknown"
-#~ msgstr "Neznámé"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Nelze uzamknout obrazovku: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "Šetřič obrazovky nelze dočasně nastavit na prázdnou obrazovku: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Nelze se odhlásit: %s"
-
 #~ msgid "Browse"
 #~ msgstr "Procházet"

--- a/po/da.po
+++ b/po/da.po
@ -1,14 +1,14 @@
 # Danish translation of gnome-shell
-# Copyright (C) 2010 gnome-shell
+# Copyright (C) 2009 gnome-shell
 # This file is distributed under the same license as the gnome-shell package.
-# Kris Thomsen <lakristho@gmail.com>, 2009, 2010.
+# Kris Thomsen <lakristho@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-23 22:07+0100\n"
-"PO-Revision-Date: 2010-02-11 22:32+0200\n"
+"POT-Creation-Date: 2009-10-21 22:51+0200\n"
+"PO-Revision-Date: 2009-10-18 17:32+0200\n"
 "Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@ -24,166 +24,84 @@ msgstr "Skal til GNOME"
 msgid "Window management and application launching"
 msgstr "Vinduehåndtering og åbning af programmer"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:180 ../js/ui/dash.js:881
-msgid "APPLICATIONS"
-msgstr "PROGRAMMER"
+#: ../js/ui/appDisplay.js:332
+msgid "Frequent"
+msgstr "Ofte"

-#: ../js/ui/appDisplay.js:204
-msgid "PREFERENCES"
-msgstr "INDSTILLINGER"
-
-#: ../js/ui/appDisplay.js:582
+#: ../js/ui/appIcon.js:410
 msgid "New Window"
 msgstr "Nyt vindue"

-#: ../js/ui/appDisplay.js:586
+#: ../js/ui/appIcon.js:414
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"

-#: ../js/ui/appDisplay.js:587
+#: ../js/ui/appIcon.js:415
 msgid "Add to Favorites"
 msgstr "Tilføj til favoritter"

-#: ../js/ui/appDisplay.js:939
-msgid "Drag here to add favorites"
-msgstr "Træk hertil for at tilføje til favoritter"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr ""
-
-#: ../js/ui/appFavorites.js:107
-#, fuzzy, c-format
-msgid "%s has been removed from your favorites."
-msgstr "Fjern fra favoritter"
-
-#: ../js/ui/dash.js:235
+#: ../js/ui/dash.js:283
 msgid "Find..."
 msgstr "Find..."

-#: ../js/ui/dash.js:505
-msgid "Searching..."
-msgstr "Søger..."
+#: ../js/ui/dash.js:400
+msgid "More"
+msgstr "Mere"

-#: ../js/ui/dash.js:519
-msgid "No matching results."
-msgstr "Ingen matchende resultater."
+#: ../js/ui/dash.js:543
+msgid "(see all)"
+msgstr "(se alle)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
+msgid "APPLICATIONS"
+msgstr "PROGRAMMER"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:900 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "STEDER & ENHEDER"
+#: ../js/ui/dash.js:745
+msgid "PLACES"
+msgstr "STEDER"

 #. **** Documents ****
-#: ../js/ui/dash.js:907 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "SENESTE ELEMENTER"
+#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
+msgid "RECENT DOCUMENTS"
+msgstr "SENESTE DOKUMENTER"

-#: ../js/ui/lookingGlass.js:356
-msgid "No extensions installed"
-msgstr ""
+#. **** Search Results ****
+#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
+msgid "SEARCH RESULTS"
+msgstr "SØGERESULTATER"

-#: ../js/ui/lookingGlass.js:393
-msgid "Enabled"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:395
-msgid "Disabled"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:397
-msgid "Error"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:399
-msgid "Out of date"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:424
-msgid "View Source"
-msgstr ""
-
-#: ../js/ui/lookingGlass.js:430
-msgid "Web Page"
-msgstr ""
-
-#: ../js/ui/overview.js:92
-msgid "Undo"
-msgstr ""
+#: ../js/ui/dash.js:792
+msgid "PREFERENCES"
+msgstr "INDSTILLINGER"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
+#: ../js/ui/panel.js:274
 msgid "Activities"
 msgstr "Aktiviteter"

-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:560
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:563
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:491
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"

-#: ../js/ui/placeDisplay.js:144
+#: ../js/ui/places.js:178
 msgid "Connect to..."
 msgstr "Forbind til..."

-#: ../js/ui/runDialog.js:245
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Indtast en kommando:"

-#: ../js/ui/runDialog.js:361
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Kørsel af \"%s\" mislykkedes:"

-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr ""
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr ""
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr ""
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Kontoinformation..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Sidebjælke"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Systemindstillinger..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Lås skærm"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Skift bruger"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Log ud..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Luk ned..."
-
 #. Translators: This is a time format.
 #: ../js/ui/widget.js:163
 msgid "%H:%M"
@ -197,49 +115,99 @@ msgstr "Programmer"
 msgid "Recent Documents"
 msgstr "Seneste dokumenter"

-#: ../src/shell-global.c:954
+#: ../src/shell-global.c:812
 msgid "Less than a minute ago"
 msgstr "Mindre end et minut siden"

-#: ../src/shell-global.c:958
+#: ../src/shell-global.c:815
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut siden"
 msgstr[1] "%d minutter siden"

-#: ../src/shell-global.c:963
+#: ../src/shell-global.c:818
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"

-#: ../src/shell-global.c:968
+#: ../src/shell-global.c:821
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dage siden"

-#: ../src/shell-global.c:973
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uge siden"
 msgstr[1] "%d uger siden"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Kan ikke låse skærm: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "Kan ikke midlertidigt sætte pauseskærm til blank skærm: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Kan ikke logge ud: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Kontoinformation..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Sidebjælke"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Systemindstillinger..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Lås skærm"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Skift bruger"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Log ud..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Luk ned..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Hjemmemappe"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Filsystem"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Søg"

@ -248,38 +216,11 @@ msgstr "Søg"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Frequent"
-#~ msgstr "Ofte"
-
-#~ msgid "More"
-#~ msgstr "Mere"
-
-#~ msgid "(see all)"
-#~ msgstr "(se alle)"
-
-#~ msgid "PLACES"
-#~ msgstr "STEDER"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "SØGERESULTATER"
-
-#~ msgid "Unknown"
-#~ msgstr "Ukendt"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Kan ikke låse skærm: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "Kan ikke midlertidigt sætte pauseskærm til blank skærm: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Kan ikke logge ud: %s"
-
 #~ msgid "Browse"
 #~ msgstr "Gennemse"

--- a/po/de.po
+++ b/po/de.po
@ -5,23 +5,21 @@
 # Hendrik Brandt <heb@gnome-de.org>, 2009.
 # Hendrik Richter <hendrikr@gnome.org>, 2009.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-# Mario Blättermann <mariobl@gnome.org>, 2009, 2010.
+# Mario Blättermann <mariobl@gnome.org>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-03-20 22:48+0000\n"
-"PO-Revision-Date: 2010-03-21 16:27+0100\n"
-"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
+"POT-Creation-Date: 2009-10-16 20:05+0000\n"
+"PO-Revision-Date: 2009-10-17 23:37+0200\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -31,241 +29,192 @@ msgstr "GNOME-Shell"
 msgid "Window management and application launching"
 msgstr "Fenster verwalten und Anwendungen starten"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:852
-msgid "APPLICATIONS"
-msgstr "ANWENDUNGEN"
+#: ../js/ui/appDisplay.js:335
+msgid "Frequent"
+msgstr "Häufig"

-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "EINSTELLUNGEN"
-
-#: ../js/ui/appDisplay.js:728
+#: ../js/ui/appIcon.js:407
 msgid "New Window"
 msgstr "Neues Fenster"

-#: ../js/ui/appDisplay.js:732
+#: ../js/ui/appIcon.js:420
 msgid "Remove from Favorites"
 msgstr "Aus Favoriten entfernen"

-#: ../js/ui/appDisplay.js:733
+#: ../js/ui/appIcon.js:421
 msgid "Add to Favorites"
 msgstr "Zu Favoriten hinzufügen"

-#: ../js/ui/appDisplay.js:1085
-msgid "Drag here to add favorites"
-msgstr "Hier ablegen, um zu Favoriten hinzuzufügen"
+#: ../js/ui/dash.js:283
+msgid "Find..."
+msgstr "Suchen …"

-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s wurde zu Ihren Favoriten hinzugefügt"
+#: ../js/ui/dash.js:400
+msgid "More"
+msgstr "Mehr"

-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s wurde aus Ihren Favoriten entfernt"
+#: ../js/ui/dash.js:543
+msgid "(see all)"
+msgstr "(alle sehen)"

-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Suchen"
-
-#: ../js/ui/dash.js:507
-msgid "Searching..."
-msgstr "Suche läuft …"
-
-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "Keine passenden Ergebnisse."
+#. **** Applications ****
+#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
+msgid "APPLICATIONS"
+msgstr "ANWENDUNGEN"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:871 ../js/ui/placeDisplay.js:579
-msgid "PLACES & DEVICES"
-msgstr "ORTE UND GERÄTE"
+#: ../js/ui/dash.js:745
+msgid "PLACES"
+msgstr "ORTE"

 #. **** Documents ****
-#: ../js/ui/dash.js:878 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
+#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
+msgid "RECENT DOCUMENTS"
 msgstr "ZULETZT GEÖFFNETE DOKUMENTE"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Keine Erweiterungen installiert"
+#. **** Search Results ****
+#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
+msgid "SEARCH RESULTS"
+msgstr "SUCHERGEBNISSE"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Fehler"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Veraltet"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Quelle zeigen"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Webseite"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Rückgängig"
+#: ../js/ui/dash.js:792
+msgid "PREFERENCES"
+msgstr "EINSTELLUNGEN"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
+#: ../js/ui/panel.js:273
 msgid "Activities"
 msgstr "Aktivitäten"

-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:465
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"

-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "»%s« konnte nicht ausgehängt werden"
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Erneut versuchen"
-
-#: ../js/ui/placeDisplay.js:151
+#: ../js/ui/places.js:178
 msgid "Connect to..."
 msgstr "Verbinden mit …"

-#: ../js/ui/runDialog.js:232
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Bitte geben Sie einen Befehl ein:"

-#: ../js/ui/runDialog.js:374
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Ausführung von »%s« ist gescheitert:"

-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Verfügbar"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Unsichtbar"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Benutzerinformationen …"
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Seitenleiste"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Systemeinstellungen …"
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Bildschirm sperren"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Benutzer wechseln"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Abmelden …"
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Ausschalten …"
-
 #. Translators: This is a time format.
-#: ../js/ui/widget.js:163
+#: ../js/ui/widget.js:162
 msgid "%H:%M"
 msgstr "%H:%M"

-#: ../js/ui/widget.js:317
+#: ../js/ui/widget.js:316
 msgid "Applications"
 msgstr "Anwendungen"

-#: ../js/ui/widget.js:339
+#: ../js/ui/widget.js:341
 msgid "Recent Documents"
 msgstr "Zuletzt geöffnete Dokumente"

-#: ../js/ui/windowAttentionHandler.js:47
-#, c-format
-msgid "%s has finished starting"
-msgstr "Start von %s ist abgeschlossen"
-
-#: ../js/ui/windowAttentionHandler.js:49
-#, c-format
-msgid "'%s' is ready"
-msgstr "»%s« ist bereit"
-
-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:812
 msgid "Less than a minute ago"
 msgstr "Vor weniger als einer Minute"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:815
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Vor %d Minute"
 msgstr[1] "Vor %d Minuten"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:818
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Vor %d Stunde"
 msgstr[1] "Vor %d Stunden"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:821
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Vor %d Tag"
 msgstr[1] "Vor %d Tagen"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Vor %d Woche"
 msgstr[1] "Vor %d Wochen"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Bildschirm kann nicht gesperrt werden: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"Der Bildschirmschoner kann vorübergehend nicht auf einen leeren Schirm "
+"gesetzt werden: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Abmelden ist nicht möglich: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Benutzerinformationen …"
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Seitenleiste"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Systemeinstellungen …"
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Bildschirm sperren"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Benutzer wechseln"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Abmelden …"
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Ausschalten …"
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Persönlicher Ordner"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Dateisystem"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Suchen"

@ -274,40 +223,11 @@ msgstr "Suchen"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Frequent"
-#~ msgstr "Häufig"
-
-#~ msgid "More"
-#~ msgstr "Mehr"
-
-#~ msgid "(see all)"
-#~ msgstr "(alle sehen)"
-
-#~ msgid "PLACES"
-#~ msgstr "ORTE"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "SUCHERGEBNISSE"
-
-#~ msgid "Unknown"
-#~ msgstr "Unbekannt"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Bildschirm kann nicht gesperrt werden: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "Der Bildschirmschoner kann vorübergehend nicht auf einen leeren Schirm "
-#~ "gesetzt werden: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Abmelden ist nicht möglich: %s"
-
 #~ msgid "Find apps or documents"
 #~ msgstr "Anwendungen oder Dokumente suchen"

--- a/po/en_GB.po
+++ b/po/en_GB.po
@ -2,22 +2,20 @@
 # Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 # Philip Withnall <philip@tecnocode.co.uk>, 2009.
-# Bruce Cowan <bcowan@fastmail.co.uk>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-03-20 22:31+0000\n"
-"PO-Revision-Date: 2010-03-20 22:32+0100\n"
-"Last-Translator: Bruce Cowan <bcowan@fastmail.co.uk>\n"
-"Language-Team: British English <en@li.org>\n"
-"Language: en_GB\n"
+"POT-Creation-Date: 2009-09-12 12:41+0000\n"
+"PO-Revision-Date: 2009-09-12 12:41+0000\n"
+"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
+"Language-Team: British English <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.2\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -27,231 +25,151 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Window management and application launching"

+#. left side
+#: ../js/ui/panel.js:269
+msgid "Activities"
+msgstr "Activities"
+
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:452
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"
+
+#: ../js/ui/dash.js:283
+msgid "Find..."
+msgstr "Find…"
+
+#: ../js/ui/dash.js:400
+msgid "Browse"
+msgstr "Browse"
+
+#: ../js/ui/dash.js:536
+msgid "(see all)"
+msgstr "(see all)"
+
 #. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:852
+#: ../js/ui/dash.js:753 ../js/ui/dash.js:809
 msgid "APPLICATIONS"
 msgstr "APPLICATIONS"

-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "PREFERENCES"
-
-#: ../js/ui/appDisplay.js:728
-msgid "New Window"
-msgstr "New Window"
-
-#: ../js/ui/appDisplay.js:732
-msgid "Remove from Favorites"
-msgstr "Remove from Favourites"
-
-#: ../js/ui/appDisplay.js:733
-msgid "Add to Favorites"
-msgstr "Add to Favourites"
-
-#: ../js/ui/appDisplay.js:1085
-msgid "Drag here to add favorites"
-msgstr "Drag here to add favourites"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s has been added to your favourites."
-
-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s has been removed from your favourites."
-
-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Find"
-
-#: ../js/ui/dash.js:507
-msgid "Searching..."
-msgstr "Searching…"
-
-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "No matching results."
-
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:871 ../js/ui/placeDisplay.js:579
-msgid "PLACES & DEVICES"
-msgstr "PLACES & DEVICES"
+#: ../js/ui/dash.js:773
+msgid "PLACES"
+msgstr "PLACES"

 #. **** Documents ****
-#: ../js/ui/dash.js:878 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "RECENT ITEMS"
+#: ../js/ui/dash.js:780 ../js/ui/dash.js:819
+msgid "RECENT DOCUMENTS"
+msgstr "RECENT DOCUMENTS"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "No extensions installed"
+#. **** Search Results ****
+#: ../js/ui/dash.js:799 ../js/ui/dash.js:931
+msgid "SEARCH RESULTS"
+msgstr "SEARCH RESULTS"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Enabled"
+#: ../js/ui/dash.js:814
+msgid "PREFERENCES"
+msgstr "PREFERENCES"

-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Disabled"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Error"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Out of date"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "View Source"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Web Page"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Undo"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
-msgid "Activities"
-msgstr "Activities"
-
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "Failed to unmount '%s'"
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Retry"
-
-#: ../js/ui/placeDisplay.js:151
-msgid "Connect to..."
-msgstr "Connect to…"
-
-#: ../js/ui/runDialog.js:232
+#: ../js/ui/runDialog.js:90
 msgid "Please enter a command:"
 msgstr "Please enter a command:"

-#: ../js/ui/runDialog.js:374
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Execution of '%s' failed:"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Available"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Busy"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Account Information…"
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Sidebar"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "System Preferences…"
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Lock Screen"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Switch User"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Log Out…"
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Shut Down…"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Applications"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Recent Documents"
-
-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:799
 msgid "Less than a minute ago"
 msgstr "Less than a minute ago"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:802
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minute ago"
 msgstr[1] "%d minutes ago"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:805
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hour ago"
 msgstr[1] "%d hours ago"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:808
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d day ago"
 msgstr[1] "%d days ago"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:811
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d week ago"
 msgstr[1] "%d weeks ago"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Can't lock screen: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "Can't temporarily set screensaver to blank screen: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Can't logout: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Account Information…"
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Sidebar"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "System Preferences…"
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Lock Screen"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Switch User"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Log Out…"
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Shut Down…"
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Home Folder"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "File System"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Search"

@ -260,31 +178,7 @@ msgstr "Search"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Browse"
-
-#~ msgid "(see all)"
-#~ msgstr "(see all)"
-
-#~ msgid "PLACES"
-#~ msgstr "PLACES"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "SEARCH RESULTS"
-
-#~ msgid "Unknown"
-#~ msgstr "Unknown"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Can't lock screen: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "Can't temporarily set screensaver to blank screen: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Can't logout: %s"
--- a/po/es.po
+++ b/po/es.po
@ -1,14 +1,15 @@
 # Spanish translation of gnome-shell.
 # Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
-# Jorge González <jorgegonz@svn.gnome.org>, 2009, 2010.
+#
+# Jorge González <jorgegonz@svn.gnome.org>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-03-20 22:48+0000\n"
-"PO-Revision-Date: 2010-03-21 16:48+0100\n"
+"POT-Creation-Date: 2009-12-18 15:06+0000\n"
+"PO-Revision-Date: 2009-12-19 14:41+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@ -25,174 +26,75 @@ msgid "Window management and application launching"
 msgstr "Gestión de ventanas e inicio de aplicaciones"

 #. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:852
+#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:852
 msgid "APPLICATIONS"
 msgstr "APLICACIONES"

-#: ../js/ui/appDisplay.js:343
+#: ../js/ui/appDisplay.js:276
 msgid "PREFERENCES"
 msgstr "PREFERENCIAS"

-#: ../js/ui/appDisplay.js:728
+#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
 msgid "New Window"
 msgstr "Ventana nueva"

-#: ../js/ui/appDisplay.js:732
+#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"

-#: ../js/ui/appDisplay.js:733
+#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"

-#: ../js/ui/appDisplay.js:1085
+#: ../js/ui/appDisplay.js:1064
 msgid "Drag here to add favorites"
 msgstr "Arrastrar aquí para añadir a los favoritos"

-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "Se ha añadido %s a sus favoritos."
+#: ../js/ui/dash.js:240
+msgid "Find..."
+msgstr "Buscar…"

-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "Se ha quitado %s de sus favoritos."
-
-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Buscar"
-
-#: ../js/ui/dash.js:507
+#: ../js/ui/dash.js:437
+#| msgid "Search"
 msgid "Searching..."
 msgstr "Buscando…"

-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "No se encontró ningún resultado coincidente."
-
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:871 ../js/ui/placeDisplay.js:579
-msgid "PLACES & DEVICES"
-msgstr "LUGARES Y DISPOSITIVOS"
+#: ../js/ui/dash.js:872 ../js/ui/placeDisplay.js:471
+msgid "PLACES"
+msgstr "LUGARES"

 #. **** Documents ****
-#: ../js/ui/dash.js:878 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "ELEMENTOS RECIENTES"
-
-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "No hay extensiones instaladas"
-
-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Error"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Caducado"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Ver fuente"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Página web"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Deshacer"
+#: ../js/ui/dash.js:879
+msgid "RECENT DOCUMENTS"
+msgstr "DOCUMENTOS RECIENTES"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
+#: ../js/ui/panel.js:227
 msgid "Activities"
 msgstr "Actividades"

-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:440
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"

-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "Falló al desmontar «%s»"
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Reintentar"
-
-#: ../js/ui/placeDisplay.js:151
+#: ../js/ui/placeDisplay.js:99
 msgid "Connect to..."
 msgstr "Conectar a…"

-#: ../js/ui/runDialog.js:232
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Introduzca un comando:"

-#: ../js/ui/runDialog.js:374
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Falló la ejecución de «%s»:"

-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Disponible"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Ocupado"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Información de la cuenta…"
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Preferencias del sistema…"
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Bloquear la pantalla"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Cambiar de usuario"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Salir…"
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Apagar…"
-
 #. Translators: This is a time format.
 #: ../js/ui/widget.js:163
 msgid "%H:%M"
@ -206,42 +108,32 @@ msgstr "Aplicaciones"
 msgid "Recent Documents"
 msgstr "Documentos recientes"

-#: ../js/ui/windowAttentionHandler.js:47
-#, c-format
-msgid "%s has finished starting"
-msgstr "%s finalizó su lanzamiento"
-
-#: ../js/ui/windowAttentionHandler.js:49
-#, c-format
-msgid "'%s' is ready"
-msgstr "«%s» está preparado"
-
-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:826
 msgid "Less than a minute ago"
 msgstr "Hace menos de un minuto"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:829
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Hace %d minuto"
 msgstr[1] "Hace %d minutos"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:832
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Hace %d hora"
 msgstr[1] "Hace %d horas"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:835
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Hace %d día"
 msgstr[1] "Hace %d días"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:838
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -272,9 +164,6 @@ msgstr "Buscar"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "PLACES"
-#~ msgstr "LUGARES"
-
 #~ msgid "Frequent"
 #~ msgstr "Frecuentes"

@ -301,6 +190,27 @@ msgstr "%1$s: %2$s"
 #~ msgid "Can't logout: %s"
 #~ msgstr "No se puede salir de la sesión: %s"

+#~ msgid "Account Information..."
+#~ msgstr "Información de la cuenta…"
+
+#~ msgid "Sidebar"
+#~ msgstr "Barra lateral"
+
+#~ msgid "System Preferences..."
+#~ msgstr "Preferencias del sistema…"
+
+#~ msgid "Lock Screen"
+#~ msgstr "Bloquear la pantalla"
+
+#~ msgid "Switch User"
+#~ msgstr "Cambiar de usuario"
+
+#~ msgid "Log Out..."
+#~ msgstr "Salir…"
+
+#~ msgid "Shut Down..."
+#~ msgstr "Apagar…"
+
 #~ msgid "Browse"
 #~ msgstr "Examine"

--- a/po/fi.po
+++ b/po/fi.po
@ -1,14 +1,14 @@
 # gnome-shell Finnish translation
-# Copyright (C) 2009-2010 Timo Jyrinki
+# Copyright (C) 2009 Timo Jyrinki
 # This file is distributed under the same license as the gnome-shell package.
-# Timo Jyrinki <timo.jyrinki@iki.fi>, 2009-2010.
+# Timo Jyrinki <timo.jyrinki@iki.fi>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-01 20:24+0200\n"
-"PO-Revision-Date: 2010-03-01 20:27+0200\n"
+"POT-Creation-Date: 2009-11-04 11:16+0200\n"
+"PO-Revision-Date: 2009-11-04 11:16+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@ -24,165 +24,87 @@ msgstr ""
 msgid "Window management and application launching"
 msgstr "Ikkunanhallinta ja sovelluksien käynnistäminen"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:180 ../js/ui/dash.js:881
-msgid "APPLICATIONS"
-msgstr "SOVELLUKSET"
+#: ../js/ui/appDisplay.js:332
+msgid "Frequent"
+msgstr "Usein käytetyt"

-#: ../js/ui/appDisplay.js:204
-msgid "PREFERENCES"
-msgstr "ASETUKSET"
-
-#: ../js/ui/appDisplay.js:582
-msgid "New Window"
-msgstr "Uusi ikkuna"
-
-#: ../js/ui/appDisplay.js:586
-msgid "Remove from Favorites"
-msgstr "Poista suosikeista"
-
-#: ../js/ui/appDisplay.js:587
-msgid "Add to Favorites"
-msgstr "Lisää suosikkeihin"
-
-#: ../js/ui/appDisplay.js:939
+#: ../js/ui/appDisplay.js:867
 msgid "Drag here to add favorites"
 msgstr "Raahaa tähän lisätäksesi suosikkeihin"

-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s on lisätty suosikkeihin."
+#: ../js/ui/appIcon.js:426
+msgid "New Window"
+msgstr "Uusi ikkuna"

-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s on poistettu suosikeista."
+#: ../js/ui/appIcon.js:430
+msgid "Remove from Favorites"
+msgstr "Poista suosikeista"

-#: ../js/ui/dash.js:235
+#: ../js/ui/appIcon.js:431
+msgid "Add to Favorites"
+msgstr "Lisää suosikkeihin"
+
+#: ../js/ui/dash.js:283
 msgid "Find..."
 msgstr "Etsi..."

-#: ../js/ui/dash.js:505
-msgid "Searching..."
-msgstr "Haetaan..."
+#: ../js/ui/dash.js:400
+msgid "More"
+msgstr "Lisää"

-#: ../js/ui/dash.js:519
-msgid "No matching results."
-msgstr "Ei tuloksia."
+#: ../js/ui/dash.js:543
+msgid "(see all)"
+msgstr "(näytä kaikki)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
+msgid "APPLICATIONS"
+msgstr "SOVELLUKSET"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:900 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "SIJAINNIT JA LAITTEET"
+#: ../js/ui/dash.js:745
+msgid "PLACES"
+msgstr "SIJAINNIT"

 #. **** Documents ****
-#: ../js/ui/dash.js:907 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "VIIMEISIMMÄT"
+#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
+msgid "RECENT DOCUMENTS"
+msgstr "VIIMEISIMMÄT ASIAKIRJAT"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Laajennuksia ei asennettu"
+#. **** Search Results ****
+#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
+msgid "SEARCH RESULTS"
+msgstr "HAKUTULOKSET"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Käytössä"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Ei käytössä"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Virhe"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Ei ajan tasalla"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Näytä lähde"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "WWW-sivu"
-
-#: ../js/ui/overview.js:92
-msgid "Undo"
-msgstr "Kumoa"
+#: ../js/ui/dash.js:792
+msgid "PREFERENCES"
+msgstr "ASETUKSET"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:399
+#: ../js/ui/panel.js:274
 msgid "Activities"
 msgstr "Toiminnot"

-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:623
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:626
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:491
 msgid "%a %l:%M %p"
 msgstr "%a %I.%M"

-#: ../js/ui/placeDisplay.js:144
+#: ../js/ui/places.js:178
 msgid "Connect to..."
 msgstr "Yhdistä..."

-#: ../js/ui/runDialog.js:220
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Syötä komento:"

-#: ../js/ui/runDialog.js:328
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
-msgstr "”%s” suorittaminen epäonnistui:"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Tavoitettavissa"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Kiireinen"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Näkymätön"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Käyttäjätilin tiedot..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Sivupalkki"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Järjestelmän asetukset"
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Lukitse näyttö"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Vaihda käyttäjää"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Kirjaudu ulos..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Sammuta..."
+msgstr ""

 #. Translators: This is a time format.
 #: ../js/ui/widget.js:163
@ -197,49 +119,99 @@ msgstr "Sovellukset"
 msgid "Recent Documents"
 msgstr "Viimeisimmät asiakirjat"

-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:821
 msgid "Less than a minute ago"
 msgstr "Alle minuutti sitten"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:827
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:830
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:833
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d viikko sitten"
 msgstr[1] "%d viikkoa sitten"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Näyttöä ei voi lukita: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr ""
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Käyttäjätilin tiedot..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Sivupalkki"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Järjestelmän asetukset"
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Lukitse näyttö"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Vaihda käyttäjää"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Kirjaudu ulos..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Sammuta..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Kotikansio"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Tiedostojärjestelmä"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Haku"

@ -248,28 +220,7 @@ msgstr "Haku"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
-
-#~ msgid "Frequent"
-#~ msgstr "Usein käytetyt"
-
-#~ msgid "More"
-#~ msgstr "Lisää"
-
-#~ msgid "(see all)"
-#~ msgstr "(näytä kaikki)"
-
-#~ msgid "PLACES"
-#~ msgstr "SIJAINNIT"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "HAKUTULOKSET"
-
-#~ msgid "Unknown"
-#~ msgstr "Tuntematon"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Näyttöä ei voi lukita: %s"
--- a/po/fr.po
+++ b/po/fr.po
@ -1,19 +1,17 @@
 # French translations for gnome-shell package.
-# Copyright (C) 2009-2010 Listed translators
+# Copyright (C) 2009 THE gnome-shell'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 #
-# Mathieu Bridon <bochecha@fedoraproject.org>, 2009
-# Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>, 2010
-# Claude Paroz <claude@2xlibre.net>, 2010
+# Mathieu Bridon <bochecha@fedoraproject.org>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master fr\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-03-08 23:07+0000\n"
-"PO-Revision-Date: 2010-03-09 22:55+0100\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
+"POT-Creation-Date: 2009-11-13 17:44+0000\n"
+"PO-Revision-Date: 2009-12-05 16:43+0100\n"
+"Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -28,166 +26,76 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Gestion des fenêtres et lancement des applications"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:886
-msgid "APPLICATIONS"
-msgstr "APPLICATIONS"
-
-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "PRÉFÉRENCES"
-
-#: ../js/ui/appDisplay.js:728
-msgid "New Window"
-msgstr "Nouvelle fenêtre"
-
-#: ../js/ui/appDisplay.js:732
-msgid "Remove from Favorites"
-msgstr "Enlever des favoris"
-
-#: ../js/ui/appDisplay.js:733
-msgid "Add to Favorites"
-msgstr "Ajouter aux favoris"
-
-#: ../js/ui/appDisplay.js:1085
+#: ../js/ui/appDisplay.js:696
 msgid "Drag here to add favorites"
 msgstr "Glisser ici pour ajouter aux favoris"

-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s a été ajouté à vos favoris."
+#: ../js/ui/appIcon.js:425
+msgid "New Window"
+msgstr "Nouvelle fenêtre"

-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s a été supprimé de vos favoris."
+#: ../js/ui/appIcon.js:429
+msgid "Remove from Favorites"
+msgstr "Enlever des favoris"

-#: ../js/ui/dash.js:235
+#: ../js/ui/appIcon.js:430
+msgid "Add to Favorites"
+msgstr "Ajouter aux favoris"
+
+#: ../js/ui/dash.js:237
 msgid "Find..."
 msgstr "Rechercher..."

-#: ../js/ui/dash.js:511
-msgid "Searching..."
-msgstr "Recherche en cours..."
-
-#: ../js/ui/dash.js:525
-msgid "No matching results."
-msgstr "Aucun résultat correspondant."
+#. **** Applications ****
+#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
+msgid "APPLICATIONS"
+msgstr "APPLICATIONS"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:905 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "RACCOURCIS et PÉRIPHÉRIQUES"
+#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
+msgid "PLACES"
+msgstr "RACCOURCIS"

 #. **** Documents ****
-#: ../js/ui/dash.js:912 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "ÉLÉMENTS RÉCENTS"
+#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
+msgid "RECENT DOCUMENTS"
+msgstr "DOCUMENTS RÉCENTS"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Aucune extension installée"
+#. **** Search Results ****
+#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
+msgid "SEARCH RESULTS"
+msgstr "RÉSULTATS DE LA RECHERCHE"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Activé"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Désactivé"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Erreur"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Périmé"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Afficher la source"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Page Web"
-
-#: ../js/ui/overview.js:92
-msgid "Undo"
-msgstr "Annuler"
+#: ../js/ui/dash.js:723
+msgid "PREFERENCES"
+msgstr "PRÉFÉRENCES"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:399
+#: ../js/ui/panel.js:274
 msgid "Activities"
 msgstr "Activités"

-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:630
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:633
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:491
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"

-#: ../js/ui/placeDisplay.js:144
+#: ../js/ui/placeDisplay.js:84
 msgid "Connect to..."
 msgstr "Connexion à..."

-#: ../js/ui/runDialog.js:221
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Veuillez saisir une commande :"

-#: ../js/ui/runDialog.js:344
+#: ../js/ui/runDialog.js:173
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Exécution de « %s » impossible :"

-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Disponible"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Occupé"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Invisible"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Informations personnelles..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Préférences du système..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Verrouiller l'écran"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Changer d'utilisateur"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Fermer la session..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Éteindre..."
-
 #. Translators: This is a time format.
 #: ../js/ui/widget.js:163
 msgid "%H:%M"
@ -201,49 +109,100 @@ msgstr "Applications"
 msgid "Recent Documents"
 msgstr "Documents récents"

-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:821
 msgid "Less than a minute ago"
 msgstr "Il y a moins d'une minute"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Il y a %d minute"
 msgstr[1] "Il y a %d minutes"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:827
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Il y a %d heure"
 msgstr[1] "Il y a %d heures"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:830
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Il y a %d jour"
 msgstr[1] "Il y a %d jours"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:833
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Il y a %d semaine"
 msgstr[1] "Il y a %d semaines"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Impossible de verrouiller l'écran : %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"Impossible de régler temporairement l'écran de veille sur un écran vide : %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Impossible de fermer la session : %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Informations personnelles..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Barre latérale"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Préférences du système..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Verrouiller l'écran"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Changer d'utilisateur"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Fermer la session..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Éteindre..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Dossier personnel"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Système de fichiers"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Recherche"

@ -252,7 +211,10 @@ msgstr "Recherche"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s : %2$s"
+
+#~ msgid "Browse"
+#~ msgstr "Parcourir"
--- a/po/hu.po
+++ b/po/hu.po
@ -2,13 +2,13 @@
 # Copyright 2009. Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-shell package.
 #
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010.
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 10:04+0100\n"
-"PO-Revision-Date: 2010-02-16 10:10+0100\n"
+"POT-Creation-Date: 2009-09-28 13:41+0200\n"
+"PO-Revision-Date: 2009-09-28 13:42+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
@ -25,222 +25,153 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Ablakkezelés és alkalmazásindítás"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:880
-msgid "APPLICATIONS"
-msgstr "ALKALMAZÁSOK"
+#. left side
+#: ../js/ui/panel.js:269
+msgid "Activities"
+msgstr "Tevékenységek"

-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "BEÁLLÍTÁSOK"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:452
+msgid "%a %l:%M %p"
+msgstr "%a., %k.%M"

-#: ../js/ui/appDisplay.js:649
-msgid "New Window"
-msgstr "Új ablak"
-
-#: ../js/ui/appDisplay.js:653
-msgid "Remove from Favorites"
-msgstr "Eltávolítás a Kedvencek közül"
-
-#: ../js/ui/appDisplay.js:654
-msgid "Add to Favorites"
-msgstr "Hozzáadás a Kedvencekhez"
-
-#: ../js/ui/appDisplay.js:1006
-msgid "Drag here to add favorites"
-msgstr "Ide húzással kedvenceket vehet fel"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s felvéve a Kedvencek közé."
-
-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s eltávolítva a Kedvencek közül"
-
-#: ../js/ui/dash.js:241
+#: ../js/ui/dash.js:283
 msgid "Find..."
 msgstr "Keresés…"

-#: ../js/ui/dash.js:508
-msgid "Searching..."
-msgstr "Keresés…"
+#: ../js/ui/dash.js:400
+msgid "More"
+msgstr "Több"

-#: ../js/ui/dash.js:522
-msgid "No matching results."
-msgstr "Nincs találat."
+#: ../js/ui/dash.js:543
+msgid "(see all)"
+msgstr "(összes megjelenítése)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
+msgid "APPLICATIONS"
+msgstr "ALKALMAZÁSOK"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:900 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "HELYEK ÉS ESZKÖZÖK"
+#: ../js/ui/dash.js:783
+msgid "PLACES"
+msgstr "HELYEK"

 #. **** Documents ****
-#: ../js/ui/dash.js:907 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "LEGUTÓBBI ELEMEK"
+#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
+msgid "RECENT DOCUMENTS"
+msgstr "LEGUTÓBBI DOKUMENTUMOK"

-#: ../js/ui/lookingGlass.js:356
-msgid "No extensions installed"
-msgstr "Nincsenek kiterjesztések telepítve"
+#. **** Search Results ****
+#: ../js/ui/dash.js:815 ../js/ui/dash.js:958
+msgid "SEARCH RESULTS"
+msgstr "TALÁLATOK"

-#: ../js/ui/lookingGlass.js:393
-msgid "Enabled"
-msgstr "Engedélyezve"
+#: ../js/ui/dash.js:830
+msgid "PREFERENCES"
+msgstr "BEÁLLÍTÁSOK"

-#: ../js/ui/lookingGlass.js:395
-msgid "Disabled"
-msgstr "Tiltva"
-
-#: ../js/ui/lookingGlass.js:397
-msgid "Error"
-msgstr "Hiba"
-
-#: ../js/ui/lookingGlass.js:399
-msgid "Out of date"
-msgstr "Elavult"
-
-#: ../js/ui/lookingGlass.js:424
-msgid "View Source"
-msgstr "Forrás megtekintése"
-
-#: ../js/ui/lookingGlass.js:430
-msgid "Web Page"
-msgstr "Weblap"
-
-#: ../js/ui/overview.js:92
-msgid "Undo"
-msgstr "Visszavonás"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
-msgid "Activities"
-msgstr "Tevékenységek"
-
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:560
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:563
-msgid "%a %l:%M %p"
-msgstr "%a, %p %l.%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Kapcsolódás…"
-
-#: ../js/ui/runDialog.js:245
+#: ../js/ui/runDialog.js:94
 msgid "Please enter a command:"
 msgstr "Adjon meg egy parancsot:"

-#: ../js/ui/runDialog.js:361
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "„%s” végrehajtása meghiúsult:"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Elérhető"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Elfoglalt"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Láthatatlan"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Fiókinformációk…"
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Oldalsáv"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Rendszerbeállítások…"
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Képernyő zárolása"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Felhasználóváltás"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Kijelentkezés…"
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Leállítás…"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%k.%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Alkalmazások"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Legutóbbi dokumentumok"
-
-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:799
 msgid "Less than a minute ago"
 msgstr "Kevesebb, mint egy perce"

-#: ../src/shell-global.c:980
+#: ../src/shell-global.c:802
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d perce"
 msgstr[1] "%d perce"

-#: ../src/shell-global.c:985
+#: ../src/shell-global.c:805
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d órája"
 msgstr[1] "%d órája"

-#: ../src/shell-global.c:990
+#: ../src/shell-global.c:808
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d napja"
 msgstr[1] "%d napja"

-#: ../src/shell-global.c:995
+#: ../src/shell-global.c:811
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d hete"
 msgstr[1] "%d hete"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Nem lehet zárolni a képernyőt: %s "
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"Átmenetileg nem lehet beállítani a képernyővédőt a képernyő elsötétítésére: %"
+"s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Nem lehet kijelentkezni: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Fiókinformációk…"
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Oldalsáv"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Rendszerbeállítások…"
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Képernyő zárolása"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Felhasználóváltás"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Kijelentkezés…"
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Leállítás…"
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Saját mappa"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Fájlrendszer"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Oldalsáv"

@ -249,7 +180,7 @@ msgstr "Oldalsáv"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
--- a/po/it.po
+++ b/po/it.po
@ -1,14 +1,14 @@
 # Italian translations for gnome-shell package.
 # Copyright (C) 2009 the gnome-shell copyright holder
 # This file is distributed under the same license as the gnome-shell package.
+# Milo Casagrande <milo@ubuntu.com>, 2009.
 #
-# Milo Casagrande <milo@ubuntu.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-10 22:30+0100\n"
-"PO-Revision-Date: 2010-02-10 22:31+0100\n"
+"POT-Creation-Date: 2009-12-28 21:58+0100\n"
+"PO-Revision-Date: 2009-12-28 21:59+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@ -25,7 +25,7 @@ msgid "Window management and application launching"
 msgstr "Gestione finestre e avvio applicazioni"

 #. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:880
+#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:858
 msgid "APPLICATIONS"
 msgstr "Applicazioni"

@ -33,55 +33,51 @@ msgstr "Applicazioni"
 msgid "PREFERENCES"
 msgstr "Preferenze"

-#: ../js/ui/appDisplay.js:649
+#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
 msgid "New Window"
 msgstr "Nuova finestra"

-#: ../js/ui/appDisplay.js:653
+#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"

-#: ../js/ui/appDisplay.js:654
+#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
 msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"

-#: ../js/ui/appDisplay.js:1006
+#: ../js/ui/appDisplay.js:1064
 msgid "Drag here to add favorites"
 msgstr "Trascinare qui per aggiungere ai preferiti"

-#: ../js/ui/dash.js:241
+#: ../js/ui/dash.js:240
 msgid "Find..."
 msgstr "Trova..."

-#: ../js/ui/dash.js:508
+#: ../js/ui/dash.js:437
 msgid "Searching..."
 msgstr "Ricerca..."

-#: ../js/ui/dash.js:522
-msgid "No matching results."
-msgstr "Nessun risultato."
-
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:900 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "Risorse e dispositivi"
+#: ../js/ui/dash.js:878 ../js/ui/placeDisplay.js:519
+msgid "PLACES"
+msgstr "Risorse"

 #. **** Documents ****
-#: ../js/ui/dash.js:907
-msgid "RECENT ITEMS"
-msgstr "Elementi recenti"
+#: ../js/ui/dash.js:885
+msgid "RECENT DOCUMENTS"
+msgstr "Documenti recenti"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
+#: ../js/ui/panel.js:227
 msgid "Activities"
 msgstr "Attività"

 # (ndt) proviamo col k, se non funge, sappiamo il perché...
 #. Translators: This is a time format.
-#: ../js/ui/panel.js:557
+#: ../js/ui/panel.js:440
 msgid "%a %l:%M %p"
 msgstr "%a %k.%M"

@ -89,11 +85,11 @@ msgstr "%a %k.%M"
 msgid "Connect to..."
 msgstr "Connetti a..."

-#: ../js/ui/runDialog.js:245
+#: ../js/ui/runDialog.js:235
 msgid "Please enter a command:"
 msgstr "Inserire un comando:"

-#: ../js/ui/runDialog.js:361
+#: ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Esecuzione di «%s» non riuscita:"
@ -111,32 +107,32 @@ msgstr "Applicazioni"
 msgid "Recent Documents"
 msgstr "Documenti recenti"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:890
 msgid "Less than a minute ago"
 msgstr "Meno di un minuto fa"

-#: ../src/shell-global.c:980
+#: ../src/shell-global.c:893
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto fa"
 msgstr[1] "%d minuti fa"

-#: ../src/shell-global.c:985
+#: ../src/shell-global.c:896
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora fa"
 msgstr[1] "%d ore fa"

-#: ../src/shell-global.c:990
+#: ../src/shell-global.c:899
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"

-#: ../src/shell-global.c:995
+#: ../src/shell-global.c:902
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -168,9 +164,6 @@ msgstr "Cerca"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "PLACES"
-#~ msgstr "Risorse"
-
 #~ msgid "Frequent"
 #~ msgstr "Frequente"

--- a/po/nb.po
+++ b/po/nb.po
@ -1,14 +1,14 @@
 # Norwegian bokmål translation of gnome-shell.
 # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
-# Kjartan Maraas <kmaraas@broadpark.no>, 2009-2010.
+# Kjartan Maraas <kmaraas@broadpark.no>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 2.28.x\n"
+"Project-Id-Version: gnome-shell 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-09 17:45+0100\n"
-"PO-Revision-Date: 2010-03-09 17:47+0100\n"
+"POT-Creation-Date: 2009-10-03 10:47+0200\n"
+"PO-Revision-Date: 2009-10-03 10:48+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@ -24,222 +24,151 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Vindushåndtering og oppstart av programmer"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:886
-msgid "APPLICATIONS"
-msgstr "PROGRAMMER"
+#. left side
+#: ../js/ui/panel.js:271
+msgid "Activities"
+msgstr "Aktiviteter"

-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "BRUKERVALG"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:461
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M"

-#: ../js/ui/appDisplay.js:728
-msgid "New Window"
-msgstr "Nytt vindu"
-
-#: ../js/ui/appDisplay.js:732
-msgid "Remove from Favorites"
-msgstr "Fjern fra favoritter"
-
-#: ../js/ui/appDisplay.js:733
-msgid "Add to Favorites"
-msgstr "Legg til i favoritter"
-
-#: ../js/ui/appDisplay.js:1085
-msgid "Drag here to add favorites"
-msgstr "Dra hit for å legge til favoritter"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s ble lagt til i dine favoritter."
-
-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s ble fjernet fra dine favoritter."
-
-#: ../js/ui/dash.js:235
+#: ../js/ui/dash.js:283
 msgid "Find..."
 msgstr "Finn..."

-#: ../js/ui/dash.js:511
-msgid "Searching..."
-msgstr "Søker..."
+#: ../js/ui/dash.js:400
+msgid "More"
+msgstr "Mer"

-#: ../js/ui/dash.js:525
-msgid "No matching results."
-msgstr "Ingen treff."
+#: ../js/ui/dash.js:543
+msgid "(see all)"
+msgstr "(se alle)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
+msgid "APPLICATIONS"
+msgstr "PROGRAMMER"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:905 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "STEDER & ENHETER"
+#: ../js/ui/dash.js:783
+msgid "PLACES"
+msgstr "STEDER"

 #. **** Documents ****
-#: ../js/ui/dash.js:912 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "SISTE OPPFØRINGER"
+#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
+msgid "RECENT DOCUMENTS"
+msgstr "SISTE DOKUMENTER"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Ingen utvidelser installert"
+#. **** Search Results ****
+#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
+msgid "SEARCH RESULTS"
+msgstr "SØKERESULTATER"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Aktivert"
+#: ../js/ui/dash.js:830
+msgid "PREFERENCES"
+msgstr "BRUKERVALG"

-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Feil"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Utdatert"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Vis kildekode"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Nettside"
-
-#: ../js/ui/overview.js:92
-msgid "Undo"
-msgstr "Angre"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:399
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:630
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:633
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Koble til..."
-
-#: ../js/ui/runDialog.js:221
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Oppgi en kommando:"

-#: ../js/ui/runDialog.js:344
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Kjøring av «%s» feilet:"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Tilgjengelig"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Opptatt"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Usynlig"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Kontoinformasjon..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Sidelinje"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Brukervalg for systemet..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Lås skjerm"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Bytt bruker"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Logg ut..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Avslutt..."
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Programmer"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Siste dokumenter"
-
-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:812
 msgid "Less than a minute ago"
 msgstr "Mindre enn ett minutt siden"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:815
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:818
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:821
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:824
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uke siden"
 msgstr[1] "%d uker siden"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Kan ikke låse skjermen: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "Kan ikke sette skjermsparer midlertidig til blank skjerm: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Kan ikke logge ut: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Kontoinformasjon..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Sidelinje"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Brukervalg for systemet..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Lås skjerm"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Bytt bruker"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Logg ut..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Slå av..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Hjemmemappe"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "Filsystem"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Søk"

@ -248,7 +177,7 @@ msgstr "Søk"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
--- a/po/pl.po
+++ b/po/pl.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-19 13:08+0100\n"
-"PO-Revision-Date: 2010-03-19 13:07+0100\n"
+"POT-Creation-Date: 2009-09-09 03:06+0200\n"
+"PO-Revision-Date: 2009-09-09 03:02+0100\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "MIME-Version: 1.0\n"
@ -28,193 +28,59 @@ msgstr "Powłoka środowiska GNOME"
 msgid "Window management and application launching"
 msgstr "Zarządzanie oknami i uruchamianiem programów"

+#. left side
+#: ../js/ui/panel.js:269
+msgid "Activities"
+msgstr "Czynności"
+
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:452
+msgid "%a %l:%M %p"
+msgstr "%a, %H:%M"
+
+#: ../js/ui/dash.js:255
+msgid "Find..."
+msgstr "Znajdź..."
+
+#: ../js/ui/dash.js:372
+msgid "Browse"
+msgstr "Przeglądaj"
+
+#: ../js/ui/dash.js:508
+msgid "(see all)"
+msgstr "(wyświetl wszystko)"
+
 #. **** Applications ****
-#: ../js/ui/appDisplay.js:311 ../js/ui/dash.js:852
+#: ../js/ui/dash.js:700 ../js/ui/dash.js:756 ../js/ui/dash.js:887
 msgid "APPLICATIONS"
 msgstr "Programy"

-#: ../js/ui/appDisplay.js:343
-msgid "PREFERENCES"
-msgstr "Preferencje"
-
-#: ../js/ui/appDisplay.js:728
-msgid "New Window"
-msgstr "Nowe okno"
-
-#: ../js/ui/appDisplay.js:732
-msgid "Remove from Favorites"
-msgstr "Usuń z ulubionych"
-
-#: ../js/ui/appDisplay.js:733
-msgid "Add to Favorites"
-msgstr "Dodaj do ulubionych"
-
-#: ../js/ui/appDisplay.js:1085
-msgid "Drag here to add favorites"
-msgstr "Przeciągnięcie tutaj doda do ulubionych"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "%s zostało dodane do ulubionych."
-
-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "%s zostało usunięte z ulubionych."
-
-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Znajdź"
-
-#: ../js/ui/dash.js:507
-msgid "Searching..."
-msgstr "Wyszukiwanie..."
-
-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "Brak wyników."
-
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:871 ../js/ui/placeDisplay.js:579
-msgid "PLACES & DEVICES"
-msgstr "Miejsca i urządzenia"
+#: ../js/ui/dash.js:720
+msgid "PLACES"
+msgstr "Miejsca"

 #. **** Documents ****
-#: ../js/ui/dash.js:878 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
+#: ../js/ui/dash.js:727 ../js/ui/dash.js:768 ../js/ui/dash.js:861
+msgid "RECENT DOCUMENTS"
 msgstr "Ostatnie dokumenty"

-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Nie zainstalowano rozszerzeń"
+#. **** Search Results ****
+#: ../js/ui/dash.js:746 ../js/ui/dash.js:850 ../js/ui/dash.js:876
+msgid "SEARCH RESULTS"
+msgstr "Wyniki wyszukiwania"

-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Włączone"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Wyłączone"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Błąd"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Przestarzałe"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Wyświetl źródło"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Strona WWW"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Cofnij"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
-msgid "Activities"
-msgstr "Podgląd"
-
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%a, %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "Odmontowanie \"%s\" się nie powiodło"
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Ponów"
-
-#: ../js/ui/placeDisplay.js:151
-msgid "Connect to..."
-msgstr "Połącz z..."
-
-#: ../js/ui/runDialog.js:232
+#: ../js/ui/runDialog.js:90
 msgid "Please enter a command:"
 msgstr "Proszę wprowadzić polecenie:"

-#: ../js/ui/runDialog.js:374
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Wykonanie \"%s\" się nie powiodło:"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Dostępny"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Zajęty"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Niewidoczny"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Informacje o koncie..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Panel boczny"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Preferencje systemu..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Zablokuj ekran"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Przełącz użytkownika"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Wyloguj się..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Wyłącz komputer..."
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Programy"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Ostatnie dokumenty"
-
-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:799
 msgid "Less than a minute ago"
 msgstr "Mniej niż minutę temu"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:802
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@ -222,7 +88,7 @@ msgstr[0] "%d minuta temu"
 msgstr[1] "%d minuty temu"
 msgstr[2] "%d minut temu"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:805
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@ -230,7 +96,7 @@ msgstr[0] "%d godzina temu"
 msgstr[1] "%d godziny temu"
 msgstr[2] "%d godzin temu"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:808
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@ -238,7 +104,7 @@ msgstr[0] "%d dzień temu"
 msgstr[1] "%d dni temu"
 msgstr[2] "%d dni temu"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:811
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -246,17 +112,68 @@ msgstr[0] "%d tydzień temu"
 msgstr[1] "%d tygodnie temu"
 msgstr[2] "%d tygodni temu"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Nieznane"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Nie można zablokować ekranu: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"Nie można tymczasowo ustawić wygaszacza ekranu na wygaszenie ekranu: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Nie można się wylogować: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Informacje o koncie..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Panel boczny"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Preferencje systemu..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Zablokuj ekran"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Przełącz użytkownika"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Wyloguj się..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Wyłącz komputer..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Katalog domowy"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "System plików"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "Wyszukaj"

@ -265,7 +182,7 @@ msgstr "Wyszukaj"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
--- a/po/sl.po
+++ b/po/sl.po
@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2010-03-21 15:49+0000\n"
-"PO-Revision-Date: 2010-03-21 21:59+0100\n"
+"POT-Creation-Date: 2010-01-05 01:21+0000\n"
+"PO-Revision-Date: 2010-01-05 09:09+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@ -23,184 +23,86 @@ msgstr ""

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
-msgstr "Gnome Lupina"
+msgstr "Gnome lupina"

 #: ../data/gnome-shell.desktop.in.in.h:2
 msgid "Window management and application launching"
 msgstr "Upravljanje oken in zaganjanje programov"

 #. **** Applications ****
-#: ../js/ui/appDisplay.js:311
-#: ../js/ui/dash.js:852
+#: ../js/ui/appDisplay.js:252
+#: ../js/ui/dash.js:858
 msgid "APPLICATIONS"
 msgstr "Programi"

-#: ../js/ui/appDisplay.js:343
+#: ../js/ui/appDisplay.js:276
 msgid "PREFERENCES"
 msgstr "Možnosti"

-#: ../js/ui/appDisplay.js:728
+#: ../js/ui/appDisplay.js:707
+#: ../js/ui/appIcon.js:425
 msgid "New Window"
 msgstr "Novo okno"

-#: ../js/ui/appDisplay.js:732
+#: ../js/ui/appDisplay.js:711
+#: ../js/ui/appIcon.js:429
 msgid "Remove from Favorites"
 msgstr "Odstrani iz priljubljenih"

-#: ../js/ui/appDisplay.js:733
+#: ../js/ui/appDisplay.js:712
+#: ../js/ui/appIcon.js:430
 msgid "Add to Favorites"
 msgstr "Dodaj med priljubljene"

-#: ../js/ui/appDisplay.js:1085
+#: ../js/ui/appDisplay.js:1064
 msgid "Drag here to add favorites"
 msgstr "S potegom na to mesto se izbor doda med priljubljene"

-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "Program \"%s\" je dodan med priljubljeno."
+#: ../js/ui/dash.js:240
+msgid "Find..."
+msgstr "Najdi ..."

-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "Program \"%s\" je odstranjen iz priljubljenih."
-
-#: ../js/ui/dash.js:194
-msgid "Find"
-msgstr "Najdi"
-
-#: ../js/ui/dash.js:507
+#: ../js/ui/dash.js:437
 msgid "Searching..."
 msgstr "Iskanje ..."

-#: ../js/ui/dash.js:521
-msgid "No matching results."
-msgstr "Ni zadetkov iskanja"
-
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:871
-#: ../js/ui/placeDisplay.js:579
-msgid "PLACES & DEVICES"
-msgstr "Mesta in naprave"
+#: ../js/ui/dash.js:878
+#: ../js/ui/placeDisplay.js:519
+msgid "PLACES"
+msgstr "Mesta"

 #. **** Documents ****
-#: ../js/ui/dash.js:878
-#: ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "Nedavni predmeti"
-
-#: ../js/ui/lookingGlass.js:363
-msgid "No extensions installed"
-msgstr "Ni nameščenih razširitev"
-
-#: ../js/ui/lookingGlass.js:400
-msgid "Enabled"
-msgstr "Omogočeno"
-
-#: ../js/ui/lookingGlass.js:402
-msgid "Disabled"
-msgstr "Onemogočeno"
-
-#: ../js/ui/lookingGlass.js:404
-msgid "Error"
-msgstr "Napaka"
-
-#: ../js/ui/lookingGlass.js:406
-msgid "Out of date"
-msgstr "Zastarelo"
-
-#: ../js/ui/lookingGlass.js:431
-msgid "View Source"
-msgstr "Poglej vir"
-
-#: ../js/ui/lookingGlass.js:437
-msgid "Web Page"
-msgstr "Spletna stran"
-
-#: ../js/ui/overview.js:182
-msgid "Undo"
-msgstr "Razveljavi"
+#: ../js/ui/dash.js:885
+msgid "RECENT DOCUMENTS"
+msgstr "Nedavni dokumenti"

 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:385
+#: ../js/ui/panel.js:227
 msgid "Activities"
 msgstr "Dejavnosti"

-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:616
-msgid "%a %R"
-msgstr "%a. %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:619
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:440
 msgid "%a %l:%M %p"
 msgstr "%a, %H:%M"

-#: ../js/ui/placeDisplay.js:103
-#, c-format
-msgid "Failed to unmount '%s'"
-msgstr "Ni mogoče odklopiti '%s'"
-
-#: ../js/ui/placeDisplay.js:106
-msgid "Retry"
-msgstr "Poskusi znova"
-
-#: ../js/ui/placeDisplay.js:151
+#: ../js/ui/placeDisplay.js:144
 msgid "Connect to..."
 msgstr "Povezava z ..."

-#: ../js/ui/runDialog.js:232
+#: ../js/ui/runDialog.js:235
 msgid "Please enter a command:"
 msgstr "Vnos ukaza:"

-#: ../js/ui/runDialog.js:374
+#: ../js/ui/runDialog.js:351
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "Izvajanje '%s' je spodletelo:"

-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Razpoložljivo"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Zasedeno"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Nevidno"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Podrobnosti računa ..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Stranska vrstica"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Sistemske možnosti ..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Zakleni zaslon"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Preklop uporabnika"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Odjava ..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Izklopi ..."
-
 #. Translators: This is a time format.
 #: ../js/ui/widget.js:163
 msgid "%H:%M"
@ -214,21 +116,11 @@ msgstr "Programi"
 msgid "Recent Documents"
 msgstr "Nedavni dokumenti"

-#: ../js/ui/windowAttentionHandler.js:47
-#, c-format
-msgid "%s has finished starting"
-msgstr "%s je končal začenjanje"
-
-#: ../js/ui/windowAttentionHandler.js:49
-#, c-format
-msgid "'%s' is ready"
-msgstr "'%s' storitev je pripravljena"
-
-#: ../src/shell-global.c:967
+#: ../src/shell-global.c:890
 msgid "Less than a minute ago"
 msgstr "Pred manj kot eno minuto"

-#: ../src/shell-global.c:971
+#: ../src/shell-global.c:893
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@ -237,7 +129,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"

-#: ../src/shell-global.c:976
+#: ../src/shell-global.c:896
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@ -246,7 +138,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"

-#: ../src/shell-global.c:981
+#: ../src/shell-global.c:899
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@ -255,7 +147,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"

-#: ../src/shell-global.c:986
+#: ../src/shell-global.c:902
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -288,8 +180,6 @@ msgstr "Poišči"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "PLACES"
-#~ msgstr "Mesta"
 #~ msgid "SEARCH RESULTS"
 #~ msgstr "Rezultati iskanja"
 #~ msgid "Unknown"
@ -301,6 +191,20 @@ msgstr "%1$s: %2$s"
 #~ "Ni mogoče začasno nastaviti črnega zaslona za ohranjevalnik zaslona: %s"
 #~ msgid "Can't logout: %s"
 #~ msgstr "Ni se mogoče odjaviti: %s"
+#~ msgid "Account Information..."
+#~ msgstr "Podrobnosti računa ..."
+#~ msgid "Sidebar"
+#~ msgstr "Stranska vrstica"
+#~ msgid "System Preferences..."
+#~ msgstr "Sistemske možnosti ..."
+#~ msgid "Lock Screen"
+#~ msgstr "Zakleni zaslon"
+#~ msgid "Switch User"
+#~ msgstr "Preklop uporabnika"
+#~ msgid "Log Out..."
+#~ msgstr "Odjava ..."
+#~ msgid "Shut Down..."
+#~ msgstr "Izklopi ..."
 #~ msgid "Frequent"
 #~ msgstr "Pogosto"
 #~ msgid "More"
--- a/po/sr.po
+++ b/po/sr.po
@ -1,177 +0,0 @@
-# Serbian translation for gnome-shell.
-# Copyright (C) 2010 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Милош Поповић <gpopac@gmail.com>, 2010.
-# Милош Поповић <gpopac@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2010-01-18 20:13+0000\n"
-"PO-Revision-Date: 2010-01-19 00:14+0000\n"
-"Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Гномова шкољка"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Управник прозорима и покретач програма"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:865
-msgid "APPLICATIONS"
-msgstr "ПРОГРАМИ"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "ПОСТАВКЕ"
-
-#: ../js/ui/appDisplay.js:647
-msgid "New Window"
-msgstr "Нови прозор"
-
-#: ../js/ui/appDisplay.js:651
-msgid "Remove from Favorites"
-msgstr "Уклони из омиљених"
-
-#: ../js/ui/appDisplay.js:652
-msgid "Add to Favorites"
-msgstr "Додај у омиљене"
-
-#: ../js/ui/appDisplay.js:1004
-msgid "Drag here to add favorites"
-msgstr "Превуците овде како би додали у омиљене"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Нађи..."
-
-#: ../js/ui/dash.js:493
-msgid "Searching..."
-msgstr "Тражим..."
-
-#: ../js/ui/dash.js:507
-msgid "No matching results."
-msgstr "Ништа није пронађено."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:885 ../js/ui/placeDisplay.js:519
-msgid "PLACES & DEVICES"
-msgstr "МЕСТА И УРЕЂАЈИ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:892
-msgid "RECENT ITEMS"
-msgstr "СКОРАШЊЕ СТАВКЕ"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
-msgid "Activities"
-msgstr "Активности"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:549
-msgid "%a %l:%M %p"
-msgstr "%A, %H:%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Повежи се на..."
-
-#: ../js/ui/runDialog.js:245
-msgid "Please enter a command:"
-msgstr "Унесите наредбу:"
-
-#: ../js/ui/runDialog.js:361
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Није успело покретање „%s“:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Програми"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Скорашњи документи"
-
-#: ../src/shell-global.c:890
-msgid "Less than a minute ago"
-msgstr "Пре мање од једног минута"
-
-#: ../src/shell-global.c:894
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Пре %d минут"
-msgstr[1] "Пре %d минута"
-msgstr[2] "Пре %d минута"
-msgstr[3] "Пре %d минута"
-
-#: ../src/shell-global.c:899
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Пре %d сат"
-msgstr[1] "Пре %d сата"
-msgstr[2] "Пре %d сата"
-msgstr[3] "Пре %d сата"
-
-#: ../src/shell-global.c:904
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Пре %d дан"
-msgstr[1] "Пре %d дана"
-msgstr[2] "Пре %d дана"
-msgstr[3] "Пре %d дана"
-
-#: ../src/shell-global.c:909
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Пре %d недеље"
-msgstr[1] "Пре %d недеље"
-msgstr[2] "Пре %d недеље"
-msgstr[3] "Пре %d недеља"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Лична фасцикла"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Систем датотека"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Тражи"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@ -1,177 +0,0 @@
-# Serbian translation for gnome-shell.
-# Copyright (C) 2010 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Miloš Popović <gpopac@gmail.com>, 2010.
-# Miloš Popović <gpopac@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2010-01-18 20:13+0000\n"
-"PO-Revision-Date: 2010-01-19 00:14+0000\n"
-"Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
-"Language-Team: Serbian <gnom@prevod.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "Gnomova školjka"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Upravnik prozorima i pokretač programa"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:865
-msgid "APPLICATIONS"
-msgstr "PROGRAMI"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "POSTAVKE"
-
-#: ../js/ui/appDisplay.js:647
-msgid "New Window"
-msgstr "Novi prozor"
-
-#: ../js/ui/appDisplay.js:651
-msgid "Remove from Favorites"
-msgstr "Ukloni iz omiljenih"
-
-#: ../js/ui/appDisplay.js:652
-msgid "Add to Favorites"
-msgstr "Dodaj u omiljene"
-
-#: ../js/ui/appDisplay.js:1004
-msgid "Drag here to add favorites"
-msgstr "Prevucite ovde kako bi dodali u omiljene"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Nađi..."
-
-#: ../js/ui/dash.js:493
-msgid "Searching..."
-msgstr "Tražim..."
-
-#: ../js/ui/dash.js:507
-msgid "No matching results."
-msgstr "Ništa nije pronađeno."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:885 ../js/ui/placeDisplay.js:519
-msgid "PLACES & DEVICES"
-msgstr "MESTA I UREĐAJI"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:892
-msgid "RECENT ITEMS"
-msgstr "SKORAŠNJE STAVKE"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
-msgid "Activities"
-msgstr "Aktivnosti"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:549
-msgid "%a %l:%M %p"
-msgstr "%A, %H:%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Poveži se na..."
-
-#: ../js/ui/runDialog.js:245
-msgid "Please enter a command:"
-msgstr "Unesite naredbu:"
-
-#: ../js/ui/runDialog.js:361
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Nije uspelo pokretanje „%s“:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Programi"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Skorašnji dokumenti"
-
-#: ../src/shell-global.c:890
-msgid "Less than a minute ago"
-msgstr "Pre manje od jednog minuta"
-
-#: ../src/shell-global.c:894
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Pre %d minut"
-msgstr[1] "Pre %d minuta"
-msgstr[2] "Pre %d minuta"
-msgstr[3] "Pre %d minuta"
-
-#: ../src/shell-global.c:899
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Pre %d sat"
-msgstr[1] "Pre %d sata"
-msgstr[2] "Pre %d sata"
-msgstr[3] "Pre %d sata"
-
-#: ../src/shell-global.c:904
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Pre %d dan"
-msgstr[1] "Pre %d dana"
-msgstr[2] "Pre %d dana"
-msgstr[3] "Pre %d dana"
-
-#: ../src/shell-global.c:909
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Pre %d nedelje"
-msgstr[1] "Pre %d nedelje"
-msgstr[2] "Pre %d nedelje"
-msgstr[3] "Pre %d nedelja"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Lična fascikla"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Sistem datoteka"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Traži"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/vi.po
+++ b/po/vi.po
@ -1,250 +0,0 @@
-# Vietnamese translation for gnome-shell.
-# Copyright (C) 2010 GNOME i18n Project for Vietnamese.
-# This file is distributed under the same license as the gnome-shell package.
-# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 19:32+0700\n"
-"PO-Revision-Date: 2010-02-16 19:36+0700\n"
-"Last-Translator: Duy <pclouds@gmail.com>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-msgstr "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Quản lý cửa sổ và chạy ứng dụng"
-
-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:880
-msgid "APPLICATIONS"
-msgstr "ỨNG DỤNG"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "TUỲ THÍCH"
-
-#: ../js/ui/appDisplay.js:649
-msgid "New Window"
-msgstr "Cửa sổ mới"
-
-#: ../js/ui/appDisplay.js:653
-msgid "Remove from Favorites"
-msgstr "Bỏ đánh dấu ưa thích"
-
-#: ../js/ui/appDisplay.js:654
-msgid "Add to Favorites"
-msgstr "Đánh dấu ưa thích"
-
-#: ../js/ui/appDisplay.js:1006
-msgid "Drag here to add favorites"
-msgstr "Kéo vào đây để thêm vào danh mục ưa thích"
-
-#: ../js/ui/appFavorites.js:89
-#, c-format
-msgid "%s has been added to your favorites."
-msgstr "Đã được đánh dấu ưa thích cho %s."
-
-#: ../js/ui/appFavorites.js:107
-#, c-format
-msgid "%s has been removed from your favorites."
-msgstr "Đã bỏ đánh dấu ưa thích cho %s"
-
-#: ../js/ui/dash.js:241
-msgid "Find..."
-msgstr "Tìm"
-
-#: ../js/ui/dash.js:508
-msgid "Searching..."
-msgstr "Đang tìm..."
-
-#: ../js/ui/dash.js:522
-msgid "No matching results."
-msgstr "Không tìm thấy."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:900 ../js/ui/placeDisplay.js:529
-msgid "PLACES & DEVICES"
-msgstr "ĐỊA ĐIỂM & THIẾT BỊ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:907 ../js/ui/docDisplay.js:488
-msgid "RECENT ITEMS"
-msgstr "MỤC GẦN ĐÂY"
-
-#: ../js/ui/lookingGlass.js:356
-msgid "No extensions installed"
-msgstr "Chưa cài phần mở rộng"
-
-#: ../js/ui/lookingGlass.js:393
-msgid "Enabled"
-msgstr "Bật"
-
-#: ../js/ui/lookingGlass.js:395
-msgid "Disabled"
-msgstr "Tắt"
-
-#: ../js/ui/lookingGlass.js:397
-msgid "Error"
-msgstr "Lỗi"
-
-#: ../js/ui/lookingGlass.js:399
-msgid "Out of date"
-msgstr "Hết hạn"
-
-#: ../js/ui/lookingGlass.js:424
-msgid "View Source"
-msgstr "Xem mã nguồn"
-
-#: ../js/ui/lookingGlass.js:430
-msgid "Web Page"
-msgstr "Trang Web"
-
-#: ../js/ui/overview.js:92
-msgid "Undo"
-msgstr "Hoàn lại"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
-msgid "Activities"
-msgstr "Hoạt động"
-
-#. Translators: This is the time format used in 24-hour mode.
-#: ../js/ui/panel.js:560
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is a time format used for AM/PM.
-#: ../js/ui/panel.js:563
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Kết nối đến..."
-
-#: ../js/ui/runDialog.js:245
-msgid "Please enter a command:"
-msgstr "Vui lòng nhập lệnh:"
-
-#: ../js/ui/runDialog.js:361
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Lỗi thực hiện '%s':"
-
-#: ../js/ui/statusMenu.js:107
-msgid "Available"
-msgstr "Có mặt"
-
-#: ../js/ui/statusMenu.js:112
-msgid "Busy"
-msgstr "Bận"
-
-#: ../js/ui/statusMenu.js:117
-msgid "Invisible"
-msgstr "Giấu mặt"
-
-#: ../js/ui/statusMenu.js:126
-msgid "Account Information..."
-msgstr "Thông tin tài khoản..."
-
-#: ../js/ui/statusMenu.js:132
-msgid "Sidebar"
-msgstr "Thanh bên"
-
-#: ../js/ui/statusMenu.js:142
-msgid "System Preferences..."
-msgstr "Thiết lập hệ thống..."
-
-#: ../js/ui/statusMenu.js:151
-msgid "Lock Screen"
-msgstr "Khoá màn hình"
-
-#: ../js/ui/statusMenu.js:156
-msgid "Switch User"
-msgstr "Chuyển người dùng"
-
-#: ../js/ui/statusMenu.js:162
-msgid "Log Out..."
-msgstr "Đăng xuất..."
-
-#: ../js/ui/statusMenu.js:167
-msgid "Shut Down..."
-msgstr "Tắt máy..."
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Ứng dụng"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Tài liệu gần đây"
-
-#: ../src/shell-global.c:976
-msgid "Less than a minute ago"
-msgstr "Chưa đến một phút"
-
-#: ../src/shell-global.c:980
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d phút trước"
-
-#: ../src/shell-global.c:985
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d giờ trước"
-
-#: ../src/shell-global.c:990
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ngày trước"
-
-#: ../src/shell-global.c:995
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d tuần trước"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Thư mục chính"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Hệ tập tin"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Tìm"
-
-#. Translators: the first string is the name of a gvfs
-#. * method, and the second string is a path. For
-#. * example, "Trash: some-directory". It means that the
-#. * directory called "some-directory" is in the trash.
-#.
-#: ../src/shell-uri-util.c:300
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@ -2,19 +2,19 @@
 # Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 # Ray Wang <raywang@gnome.org>, 2009.
-# jiero <lililjlj@gmail.com>, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-01-15 17:17+0000\n"
-"PO-Revision-Date: 2010-01-17 15:30+0800\n"
-"Last-Translator: jiero <lililjlj@gmail.com>\n"
-"Language-Team: Simplified Chinese <i10n>\n"
+"POT-Creation-Date: 2009-08-29 19:32+0000\n"
+"PO-Revision-Date: 2009-08-30 00:08+0800\n"
+"Last-Translator: Ray Wang <raywang@gnome.org>\n"
+"Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
+"Content-Transfer-Encoding: utf-8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
@ -25,133 +25,143 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "窗口管理和应用程序启动"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:865
-msgid "APPLICATIONS"
-msgstr "应用程序"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "首选项"
-
-#: ../js/ui/appDisplay.js:644
-msgid "New Window"
-msgstr "新窗口"
-
-#: ../js/ui/appDisplay.js:648
-msgid "Remove from Favorites"
-msgstr "从收藏夹中移除"
-
-#: ../js/ui/appDisplay.js:649
-msgid "Add to Favorites"
-msgstr "添加到收藏夹"
-
-#: ../js/ui/appDisplay.js:1001
-msgid "Drag here to add favorites"
-msgstr "拖到这里加入收藏"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "查找..."
-
-#: ../js/ui/dash.js:493
-msgid "Searching..."
-msgstr "搜索..."
-
-#: ../js/ui/dash.js:507
-msgid "No matching results."
-msgstr ""
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:885 ../js/ui/placeDisplay.js:519
-msgid "PLACES & DEVICES"
-msgstr ""
-
-#. **** Documents ****
-#: ../js/ui/dash.js:892
-#, fuzzy
-#| msgid "RECENT DOCUMENTS"
-msgid "RECENT ITEMS"
-msgstr "最近的文档"
-
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:336
+#. left side
+#: ../js/ui/panel.js:271
 msgid "Activities"
 msgstr "活动"

 #. Translators: This is a time format.
-#: ../js/ui/panel.js:549
+#: ../js/ui/panel.js:454
 msgid "%a %l:%M %p"
 msgstr "%A %H:%M"

-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "连接到..."
+#: ../js/ui/dash.js:256
+msgid "Find..."
+msgstr "查找..."

-#: ../js/ui/runDialog.js:245
+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "浏览"
+
+#: ../js/ui/dash.js:451
+msgid "(see all)"
+msgstr "(查看所有)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:633 ../js/ui/dash.js:681
+msgid "APPLICATIONS"
+msgstr "应用程序"
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:653
+msgid "PLACES"
+msgstr "位置"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:660 ../js/ui/dash.js:692
+msgid "RECENT DOCUMENTS"
+msgstr "最近的文档"
+
+#. **** Search Results ****
+#: ../js/ui/dash.js:679
+msgid "SEARCH RESULTS"
+msgstr "搜索结果"
+
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "请输入一个命令："

-#: ../js/ui/runDialog.js:361
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "运行“%s”失败"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "应用程序"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "最近文档"
-
-#: ../src/shell-global.c:890
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "少于一分钟前"

-#: ../src/shell-global.c:894
+#: ../src/shell-global.c:843
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"

-#: ../src/shell-global.c:899
+#: ../src/shell-global.c:846
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"

-#: ../src/shell-global.c:904
+#: ../src/shell-global.c:849
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"

-#: ../src/shell-global.c:909
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 周前"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "不能锁住屏幕：%s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "不能临时将屏幕保护设置成空白屏幕：%s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "不能退出：%s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "帐户信息..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "侧边栏"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "系统首选项..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "锁住屏幕"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "切换用户"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "退出..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "关机..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "主文件夹"

 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-uri-util.c:104
+#: ../src/shell-uri-util.c:102
 msgid "File System"
 msgstr "文件系统"

-#: ../src/shell-uri-util.c:250
+#: ../src/shell-uri-util.c:248
 msgid "Search"
 msgstr "搜索"

@ -160,52 +170,7 @@ msgstr "搜索"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-uri-util.c:300
+#: ../src/shell-uri-util.c:298
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
-
-#~ msgid "PLACES"
-#~ msgstr "位置"
-
-#~ msgid "Browse"
-#~ msgstr "浏览"
-
-#~ msgid "(see all)"
-#~ msgstr "(查看所有)"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "搜索结果"
-
-#~ msgid "Unknown"
-#~ msgstr "未知"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "不能锁住屏幕：%s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "不能临时将屏幕保护设置成空白屏幕：%s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "不能退出：%s"
-
-#~ msgid "Account Information..."
-#~ msgstr "帐户信息..."
-
-#~ msgid "Sidebar"
-#~ msgstr "侧边栏"
-
-#~ msgid "System Preferences..."
-#~ msgstr "系统首选项..."
-
-#~ msgid "Lock Screen"
-#~ msgstr "锁住屏幕"
-
-#~ msgid "Switch User"
-#~ msgstr "切换用户"
-
-#~ msgid "Log Out..."
-#~ msgstr "退出..."
-
-#~ msgid "Shut Down..."
-#~ msgstr "关机..."
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@ -83,29 +83,21 @@ st_source_h =					\
    st/st-scrollable.h				\
    st/st-scroll-bar.h				\
    st/st-scroll-view.h				\
-    st/st-shadow-texture.h                      \
-    st/st-shadow.h                              \
    st/st-subtexture.h				\
    st/st-table.h				\
    st/st-table-child.h				\
+    st/st-table-private.h			\
    st/st-texture-cache.h			\
    st/st-texture-frame.h			\
    st/st-theme.h				\
    st/st-theme-context.h			\
    st/st-theme-node.h				\
+    st/st-theme-private.h			\
    st/st-tooltip.h				\
    st/st-types.h				\
    st/st-widget.h				\
    $(NULL)

-st.h: Makefile
-	$(AM_V_GEN) (echo "#define ST_H_INSIDE 1";	\
-	for name in $(st_source_h); do			\
-	  echo "#include <"$$name">";			\
-	done; echo "#undef ST_H_INSIDE") > st.h.tmp && mv st.h.tmp st.h
-
-BUILT_SOURCES += st.h
-
 st_source_private_h =				\
    st/st-private.h				\
    st/st-table-private.h			\
@ -130,8 +122,6 @@ st_source_c =					\
    st/st-scrollable.c				\
    st/st-scroll-bar.c				\
    st/st-scroll-view.c				\
-    st/st-shadow-texture.c                      \
-    st/st-shadow.c                              \
    st/st-subtexture.c				\
    st/st-table.c				\
    st/st-table-child.c				\
@ -149,10 +139,8 @@ noinst_LTLIBRARIES += libst-1.0.la
 libst_1_0_la_LIBADD = $(ST_LIBS)
 libst_1_0_la_SOURCES =				\
    $(st_source_c)				\
-    $(st_source_private_h)			\
    $(st_source_private_c)			\
    $(st_source_h)				\
-    st.h					\
    $(st_built_sources)				\
    $(NULL)
 libst_1_0_la_CPPFLAGS = $(st_cflags)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -18,7 +18,6 @@ gnome-shell: gnome-shell.in
 	    -e "s|@libdir[@]|$(libdir)|" \
 	    -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
 	    -e "s|@PYTHON[@]|$(PYTHON)|" \
-	    -e "s|@VERSION[@]|$(VERSION)|" \
 	    -e "s|@sysconfdir[@]|$(sysconfdir)|" \
 	    $< > $@ && chmod a+x $@
 CLEANFILES += gnome-shell
@ -33,6 +32,7 @@ gnome_shell_cflags =				\
 	$(MUTTER_PLUGIN_CFLAGS)			\
        $(LIBGNOMEUI_CFLAGS)                    \
 	-I$(srcdir)/tray			\
+	-DGETTEXT_PACKAGE=\"gnome-shell\"		\
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DGNOME_SHELL_DATADIR=\"$(pkgdatadir)\"	\
 	-DGNOME_SHELL_PKGLIBDIR=\"$(pkglibdir)\" \
@ -85,12 +85,12 @@ libgnome_shell_la_SOURCES =			\
 	shell-global.c				\
 	shell-global.h				\
 	shell-global-private.h			\
-	shell-slicer.c              \
-	shell-slicer.h              \
 	shell-stack.c				\
 	shell-stack.h				\
 	shell-tray-manager.c			\
 	shell-tray-manager.h			\
+	shell-texture-cache.c			\
+	shell-texture-cache.h			\
 	shell-uri-util.c           \
 	shell-uri-util.h           \
 	shell-window-tracker.c		\
@ -169,7 +169,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir St-1.0.gir libgnome-shell.l
 		--nsversion=0.1				\
 		--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
 		--include=Clutter-1.0			\
-		--include=Meta-2.29			\
+		--include=Meta-2.28			\
 		--libtool="$(LIBTOOL)"    \
 		--add-include-path=$(builddir)     \
 		--include=Big-1.0     \
@ -178,7 +178,6 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir St-1.0.gir libgnome-shell.l
 	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
 		$(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \
 		$(libgnome_shell_la_CPPFLAGS)		\
-		-I $(srcdir)				\
 		-o $@
 CLEANFILES += Shell-0.1.gir

@ -192,14 +191,15 @@ Shell-0.1.typelib: libgnome-shell.la Shell-0.1.gir Big-1.0.gir
 		Shell-0.1.gir -o $@
 CLEANFILES += Shell-0.1.typelib

-Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libbig-1.0.la Makefile
+Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
 	$(AM_V_GEN) $(G_IR_SCANNER)			\
 		--namespace=Big				\
 		--nsversion=1.0				\
 		--include=Clutter-1.0			\
 		--include=GdkPixbuf-2.0			\
 		--libtool="$(LIBTOOL)"    \
-		--library=libbig-1.0.la			\
+		--program=mutter			\
+	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
 		$(addprefix $(srcdir)/,$(big_source_h))	\
 		$(addprefix $(srcdir)/,$(big_source_c))	\
 		$(srcdir)/big-enum-types.h		\
@ -211,16 +211,15 @@ Big-1.0.typelib: libbig-1.0.la Big-1.0.gir
 	$(AM_V_GEN) $(G_IR_COMPILER) Big-1.0.gir -o $@
 CLEANFILES += Big-1.0.typelib

-St-1.0.gir: $(mutter) $(G_IR_SCANNER) libst-1.0.la Makefile
+St-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libst-1.0.la Makefile
 	$(AM_V_GEN) $(G_IR_SCANNER)						\
 	        --namespace=St							\
 	        --nsversion=1.0							\
 	        --include=Clutter-1.0						\
-	        --include=Gtk-2.0						\
 		--add-include-path=$(builddir)     				\
 	        --libtool="$(LIBTOOL)"						\
-	        --library=libst-1.0.la						\
-	        --library=libbig-1.0.la						\
+	        --program=mutter						\
+		--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la	\
 	        -DST_COMPILATION						\
 	        $(addprefix $(srcdir)/,$(st_source_h))				\
 	        $(addprefix $(srcdir)/,$(st_source_c))				\
--- a/src/big/rectangle.c
+++ b/src/big/rectangle.c
@ -233,7 +233,7 @@ corner_unref(Corner *corner)
    if (corner->ref_count == 0) {
        g_hash_table_remove(all_corners, corner);

-        cogl_handle_unref(corner->texture);
+        cogl_texture_unref(corner->texture);
        g_free(corner->data);
        g_free(corner);
    }
@ -608,17 +608,17 @@ big_rectangle_dispose(GObject *object)
    }

    if (rectangle->corner_material) {
-        cogl_handle_unref (rectangle->corner_material);
+        cogl_material_unref (rectangle->corner_material);
        rectangle->corner_material = NULL;
    }

    if (rectangle->background_material) {
-        cogl_handle_unref (rectangle->background_material);
+        cogl_material_unref (rectangle->background_material);
        rectangle->background_material = NULL;
    }

    if (rectangle->border_material) {
-        cogl_handle_unref (rectangle->border_material);
+        cogl_material_unref (rectangle->border_material);
        rectangle->border_material = NULL;
    }

--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@ -14,54 +14,6 @@ import termios
 import time
 import errno

-def show_version(option, opt_str, value, parser):
-    print "GNOME Shell @VERSION@"
-    sys.exit()
-
-def get_running_session_environs():
-    wanted_environment = ['DBUS_SESSION_BUS_ADDRESS', 'DISPLAY', 'XDG_DATA_DIRS',
-                          'XAUTHORITY', 'XDG_SESSION_COOKIE', 'ORBIT_SOCKETDIR',
-                          'SESSION_MANAGER']
-    num_re = re.compile('^[0-9]+$')
-    myuid = os.getuid()
-    if not os.path.isdir('/proc'):
-        return {}
-    for filename in os.listdir('/proc'):
-        if not num_re.match(filename):
-            continue
-        piddir = '/proc/' + filename
-        try:
-            stat = os.stat(piddir)
-        except OSError, e:
-            continue
-        if not stat.st_uid == myuid:
-            continue
-        try:
-            exe = os.readlink(piddir + '/exe')
-        except OSError, e:
-            continue
-        if os.path.basename(exe) != 'gnome-session':
-            continue
-        try:
-            f = open(os.path.join(piddir, 'environ'))
-        except OSError, e:
-            continue
-        environ_data = f.read()
-        f.close()
-        # There's a trailing null at the last one, so remove the
-        # empty string
-        environs = environ_data.split('\0')[:-1]
-        # Rumor has it the presence of just FOO (instead of FOO=bar)
-        # represents a deleted environment variable
-        environs = filter(lambda x: '=' in x, environs)
-        # Turn it into a dictionary
-        environs = dict(map(lambda x: x.split('=', 1), environs))
-        result = {}
-        for key in wanted_environment:
-            if key in environs:
-                result[key] = environs[key]
-        return result
-
 def start_xephyr():
    tmpdir = tempfile.mkdtemp("", "gnome-shell.")
    atexit.register(shutil.rmtree, tmpdir)
@ -262,8 +214,6 @@ parser.add_option("", "--eval-file", metavar="EVAL_FILE",
                  help="Evaluate the contents of the given JavaScript file")
 parser.add_option("", "--create-extension", action="store_true",
                  help="Create a new GNOME Shell extension")
-parser.add_option("", "--version", action="callback", callback=show_version,
-                  help="Display version and exit")

 options, args = parser.parse_args()

@ -393,12 +343,6 @@ else:
 if options.verbose:
    print "Starting shell"

-
-# Handle ssh logins
-if 'DISPLAY' not in os.environ:
-    running_env = get_running_session_environs()
-    os.environ.update(running_env)
-
 if options.debug:
    # Record initial terminal state so we can reset it to that
    # later, in case we kill gdb at a bad time
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@ -14,7 +14,7 @@

 #include "shell-app-private.h"
 #include "shell-global.h"
-#include "st/st-texture-cache.h"
+#include "shell-texture-cache.h"
 #include "display.h"

 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
@ -83,7 +83,6 @@ struct _ShellAppInfo {
  char *casefolded_name;
  char *name_collation_key;
  char *casefolded_description;
-  char *casefolded_exec;

  GMenuTreeItem *entry;

@ -484,32 +483,6 @@ shell_app_system_get_app (ShellAppSystem   *self,
  return app;
 }

-/**
- * shell_app_system_get_app_for_window:
- * @self: A #ShellAppSystem
- * @window: A #MetaWindow
- *
- * Find or create a #ShellApp for window
- *
- * Return value: (transfer full): The #ShellApp for window, or %NULL if none
- */
-ShellApp *
-shell_app_system_get_app_for_window (ShellAppSystem *self,
-                                     MetaWindow *window)
-{
-  char *id = g_strdup_printf ("window:%p", window);
-  ShellApp *app = g_hash_table_lookup (self->priv->app_id_to_app, id);
-
-  if (app)
-    g_object_ref (G_OBJECT (app));
-  else
-    app = _shell_app_new_for_window (window);
-
-  g_free (id);
-
-  return app;
-}
-
 /* ShellAppSystem ensures we have a unique instance of
 * apps per id.
 */
@ -639,29 +612,11 @@ normalize_and_casefold (const char *str)
  return result;
 }

-static char *
-trim_exec_line (const char *str)
-{
-  const char *start, *end, *pos;
-
-  end = strchr (str, ' ');
-  if (end == NULL)
-    end = str + strlen (str);
-
-  start = str;
-  while ((pos = strchr (start, '/')) && pos < end)
-    start = ++pos;
-
-  return g_strndup (start, end - start);
-}
-
 static void
 shell_app_info_init_search_data (ShellAppInfo *info)
 {
  const char *name;
-  const char *exec;
  const char *comment;
-  char *normalized_exec;

  g_assert (info->type == SHELL_APP_INFO_TYPE_ENTRY);

@ -670,11 +625,6 @@ shell_app_info_init_search_data (ShellAppInfo *info)

  comment = gmenu_tree_entry_get_comment ((GMenuTreeEntry*)info->entry);
  info->casefolded_description = normalize_and_casefold (comment);
-
-  exec = gmenu_tree_entry_get_exec ((GMenuTreeEntry*)info->entry);
-  normalized_exec = normalize_and_casefold (exec);
-  info->casefolded_exec = trim_exec_line (normalized_exec);
-  g_free (normalized_exec);
 }

 static ShellAppInfoSearchMatch
@ -704,17 +654,6 @@ shell_app_info_match_terms (ShellAppInfo  *info,
      else if (p != NULL)
        match = MATCH_SUBSTRING;

-      p = strstr (info->casefolded_exec, term);
-      if (p == info->casefolded_exec)
-        {
-          if (match != MATCH_NONE)
-            return MATCH_MULTIPLE;
-          else
-            match = MATCH_PREFIX;
-         }
-      else if (p != NULL)
-        match = MATCH_SUBSTRING;
-
      if (!info->casefolded_description)
        continue;
      p = strstr (info->casefolded_description, term);
@ -831,7 +770,7 @@ shell_app_system_initial_search_internal (ShellAppSystem  *self,
 /**
 * shell_app_system_initial_search:
 * @self: A #ShellAppSystem
- * @prefs: %TRUE if we should search preferences instead of apps
+ * @prefs: %TRUE iff we should search preferences instead of apps
 * @terms: (element-type utf8): List of terms, logical OR
 *
 * Search through applications for the given search terms.  Note that returned
@ -851,7 +790,7 @@ shell_app_system_initial_search (ShellAppSystem  *self,
 /**
 * shell_app_system_subsearch:
 * @self: A #ShellAppSystem
- * @prefs: %TRUE if we should search preferences instead of apps
+ * @prefs: %TRUE iff we should search preferences instead of apps
 * @previous_results: (element-type utf8): List of previous results
 * @terms: (element-type utf8): List of terms, logical OR
 *
@ -1021,16 +960,7 @@ themed_icon_from_name (const char *iconname)
  return icon;
 }

-/**
- * shell_app_info_get_icon:
- * @info: A #ShellAppInfo
- *
- * Get the #GIcon associated with this app; for apps "faked" from a #MetaWindow,
- * return %NULL.
- *
- * Returns: (transfer full): The icon for @info, or %NULL
- */
-GIcon *
+static GIcon *
 shell_app_info_get_icon (ShellAppInfo *info)
 {
  char *iconname = NULL;
@ -1109,7 +1039,7 @@ shell_app_info_create_icon_texture (ShellAppInfo *info, float size)

  if (info->type == SHELL_APP_INFO_TYPE_WINDOW)
    {
-      return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
+      return shell_texture_cache_bind_pixbuf_property (shell_texture_cache_get_default (),
                                                       G_OBJECT (info->window),
                                                       "icon");
    }
@ -1122,28 +1052,13 @@ shell_app_info_create_icon_texture (ShellAppInfo *info, float size)
    }
  else
    {
-      ret = st_texture_cache_load_gicon (st_texture_cache_get_default (), icon, (int)size);
+      ret = shell_texture_cache_load_gicon (shell_texture_cache_get_default (), icon, (int)size);
      g_object_unref (icon);
    }

  return ret;
 }

-/**
- * shell_app_info_get_source_window:
- * @info: A #ShellAppInfo
- *
- * If @info is tracking a #MetaWindow, return that window.
- * Otherwise, return %NULL.
- */
-MetaWindow *
-shell_app_info_get_source_window (ShellAppInfo *info)
-{
-  if (info->type == SHELL_APP_INFO_TYPE_WINDOW)
-    return info->window;
-  return NULL;
-}
-
 /**
 * shell_app_info_launch_full:
 * @timestamp: Event timestamp, or 0 for current event timestamp
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@ -50,14 +50,10 @@ char *shell_app_info_get_name (ShellAppInfo *info);
 char *shell_app_info_get_description (ShellAppInfo *info);
 char *shell_app_info_get_executable (ShellAppInfo *info);
 char *shell_app_info_get_desktop_file_path (ShellAppInfo *info);
-GIcon *shell_app_info_get_icon (ShellAppInfo *info);
 ClutterActor *shell_app_info_create_icon_texture (ShellAppInfo *info, float size);
 GSList *shell_app_info_get_categories (ShellAppInfo *info);
 gboolean shell_app_info_get_is_nodisplay (ShellAppInfo *info);
 gboolean shell_app_info_is_transient (ShellAppInfo *info);
-
-MetaWindow *shell_app_info_get_source_window (ShellAppInfo *info);
-
 gboolean shell_app_info_launch_full (ShellAppInfo *info,
                            guint         timestamp,
                            GList        *uris,
@ -70,7 +66,6 @@ gboolean shell_app_info_launch (ShellAppInfo *info,
 ShellAppInfo *shell_app_system_load_from_desktop_file (ShellAppSystem *system, const char *filename, GError **error);

 ShellApp *shell_app_system_get_app (ShellAppSystem *system, const char *id);
-ShellApp *shell_app_system_get_app_for_window (ShellAppSystem *self, MetaWindow *window);

 void _shell_app_system_register_app (ShellAppSystem *self, ShellApp *app);

--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@ -517,6 +517,22 @@ ensure_queued_save (ShellAppUsage *self)
  self->save_id = g_timeout_add_seconds (SAVE_APPS_TIMEOUT_SECONDS, idle_save_application_usage, self);
 }

+/* Used to sort highest scores at the top */
+static gint
+usage_sort_apps (gconstpointer data1,
+                 gconstpointer data2)
+{
+  const UsageData *u1 = data1;
+  const UsageData *u2 = data2;
+
+  if (u1->score > u2->score)
+    return -1;
+  else if (u1->score == u2->score)
+    return 0;
+  else
+    return 1;
+}
+
 /* Clean up apps we see rarely.
 * The logic behind this is that if an app was seen less than SCORE_MIN times
 * and not seen for a week, it can probably be forgotten about.
@ -784,7 +800,7 @@ shell_app_usage_start_element_handler  (GMarkupParseContext *context,
              guint count = strtoul (*value, NULL, 10);
              if (count > 0)
                 data->self->previously_running = g_slist_prepend (data->self->previously_running,
-                                                                   g_strdup (appid));
+                                                                      usage);
            }
          else if (strcmp (*attribute, "score") == 0)
            {
@ -881,6 +897,7 @@ out:
  g_object_unref (input);

  idle_clean_usage (self);
+  self->previously_running = g_slist_sort (self->previously_running, usage_sort_apps);

  if (error)
    {
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -4,9 +4,6 @@

 #include "shell-app-private.h"
 #include "shell-global.h"
-#include "st.h"
-
-#include <string.h>

 /**
 * SECTION:shell-app
@ -25,7 +22,6 @@ struct _ShellApp

  gboolean window_sort_stale;
  GSList *windows;
-
 };

 G_DEFINE_TYPE (ShellApp, shell_app, G_TYPE_OBJECT);
@ -57,149 +53,6 @@ shell_app_create_icon_texture (ShellApp   *app,
 {
  return shell_app_info_create_icon_texture (app->info, size);
 }
-typedef struct {
-  ShellApp *app;
-  int size;
-} CreateFadedIconData;
-
-static CoglHandle
-shell_app_create_faded_icon_cpu (StTextureCache *cache,
-                                 const char     *key,
-                                 void           *datap,
-                                 GError        **error)
-{
-  CreateFadedIconData *data = datap;
-  ShellApp *app;
-  GdkPixbuf *pixbuf;
-  int size;
-  CoglHandle texture;
-  gint width, height, rowstride;
-  guint8 n_channels;
-  gboolean have_alpha;
-  gint fade_start;
-  gint fade_range;
-  guint i, j;
-  guint pixbuf_byte_size;
-  guint8 *orig_pixels;
-  guint8 *pixels;
-  GIcon *icon;
-  GtkIconInfo *info;
-
-  app = data->app;
-  size = data->size;
-
-  icon = shell_app_info_get_icon (app->info);
-  if (icon == NULL)
-    return COGL_INVALID_HANDLE;
-
-  info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (),
-                                         icon, (int) (size + 0.5),
-                                         GTK_ICON_LOOKUP_FORCE_SIZE);
-  g_object_unref (icon);
-  if (info == NULL)
-    return COGL_INVALID_HANDLE;
-
-  pixbuf = gtk_icon_info_load_icon (info, NULL);
-  gtk_icon_info_free (info);
-
-  if (pixbuf == NULL)
-    return COGL_INVALID_HANDLE;
-
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-  orig_pixels = gdk_pixbuf_get_pixels (pixbuf);
-  have_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-
-  pixbuf_byte_size = (height - 1) * rowstride +
-    + width * ((n_channels * gdk_pixbuf_get_bits_per_sample (pixbuf) + 7) / 8);
-
-  pixels = g_malloc0 (rowstride * height);
-  memcpy (pixels, orig_pixels, pixbuf_byte_size);
-
-  fade_start = width / 2;
-  fade_range = width - fade_start;
-  for (i = fade_start; i < width; i++)
-    {
-      for (j = 0; j < height; j++)
-        {
-          guchar *pixel = &pixels[j * rowstride + i * n_channels];
-          float fade = 1.0 - ((float) i - fade_start) / fade_range;
-          pixel[0] = 0.5 + pixel[0] * fade;
-          pixel[1] = 0.5 + pixel[1] * fade;
-          pixel[2] = 0.5 + pixel[2] * fade;
-          if (have_alpha)
-            pixel[3] = 0.5 + pixel[3] * fade;
-        }
-    }
-
-  texture = cogl_texture_new_from_data (width,
-                                        height,
-                                        COGL_TEXTURE_NONE,
-                                        have_alpha ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
-                                        COGL_PIXEL_FORMAT_ANY,
-                                        rowstride,
-                                        pixels);
-  g_free (pixels);
-  g_object_unref (pixbuf);
-
-  return texture;
-}
-
-/**
- * shell_app_get_faded_icon:
- * @app: A #ShellApp
- * @size: Size in pixels
- *
- * Return an actor with a horizontally faded look.
- *
- * Return value: (transfer none): A floating #ClutterActor, or %NULL if no icon
- */
-ClutterActor *
-shell_app_get_faded_icon (ShellApp *app, float size)
-{
-  MetaWindow *window;
-  CoglHandle texture;
-  ClutterActor *result;
-  char *cache_key;
-  CreateFadedIconData data;
-
-  /* Punt for WINDOW types for now...easier to reuse the property tracking bits,
-   * and this helps us visually distinguish app-tracked from not.
-   */
-  window = shell_app_info_get_source_window (app->info);
-  if (window)
-    {
-      return st_texture_cache_bind_pixbuf_property (st_texture_cache_get_default (),
-                                                    G_OBJECT (window),
-                                                    "icon");
-    }
-
-  cache_key = g_strdup_printf ("faded-icon:%s,size=%f", shell_app_get_id (app), size);
-  data.app = app;
-  data.size = (int) (0.5 + size);
-  texture = st_texture_cache_load (st_texture_cache_get_default (),
-                                   cache_key,
-                                   ST_TEXTURE_CACHE_POLICY_FOREVER,
-                                   shell_app_create_faded_icon_cpu,
-                                   &data,
-                                   NULL);
-  g_free (cache_key);
-
-  if (texture != COGL_INVALID_HANDLE)
-    {
-      result = clutter_texture_new ();
-      clutter_texture_set_cogl_texture (CLUTTER_TEXTURE (result), texture);
-    }
-  else
-    {
-      result = clutter_texture_new ();
-      g_object_set (result, "opacity", 0, "width", size, "height", size, NULL);
-
-    }
-  return result;
-}

 char *
 shell_app_get_name (ShellApp *app)
@ -507,8 +360,6 @@ shell_app_dispose (GObject *object)
    _shell_app_remove_window (app, app->windows->data);

  disconnect_workspace_switch (app);
-
-  G_OBJECT_CLASS(shell_app_parent_class)->dispose (object);
 }

 static void
--- a/src/shell-app.h
+++ b/src/shell-app.h
@ -30,7 +30,6 @@ GType shell_app_get_type (void) G_GNUC_CONST;
 const char *shell_app_get_id (ShellApp *app);

 ClutterActor *shell_app_create_icon_texture (ShellApp *app, float size);
-ClutterActor *shell_app_get_faded_icon (ShellApp *app, float size);
 char *shell_app_get_name (ShellApp *app);
 char *shell_app_get_description (ShellApp *app);
 gboolean shell_app_is_transient (ShellApp *app);
--- a/src/shell-doc-system.c
+++ b/src/shell-doc-system.c
@ -5,6 +5,7 @@
 #include "shell-doc-system.h"

 #include "shell-global.h"
+#include "shell-texture-cache.h"


 /**
--- a/src/shell-drawing.c
+++ b/src/shell-drawing.c
@ -6,7 +6,7 @@
 #include <math.h>

 void
-shell_draw_clock (StDrawingArea       *area,
+shell_draw_clock (ClutterCairoTexture *texture,
                  int                  hour,
                  int                  minute)
 {
@ -15,14 +15,15 @@ shell_draw_clock (StDrawingArea       *area,
  double xc, yc, radius, hour_radius, minute_radius;
  double angle;

-  st_drawing_area_get_surface_size (area, &width, &height);
+  clutter_cairo_texture_get_surface_size (texture, &width, &height);
  xc = (double)width / 2;
  yc = (double)height / 2;
  radius = (double)(MIN(width, height)) / 2 - 2;
  minute_radius = radius - 3;
  hour_radius = radius / 2;

-  cr = st_drawing_area_get_context (area);
+  clutter_cairo_texture_clear (texture);
+  cr = clutter_cairo_texture_create (texture);
  cairo_set_line_width (cr, 1.0);

  /* Outline */
@ -47,10 +48,12 @@ shell_draw_clock (StDrawingArea       *area,
                 xc + minute_radius * cos (angle),
                 yc + minute_radius * sin (angle));
  cairo_stroke (cr);
+
+  cairo_destroy (cr);
 }

 void
-shell_draw_box_pointer (StDrawingArea         *area,
+shell_draw_box_pointer (ClutterCairoTexture   *texture,
                        ShellPointerDirection  direction,
                        ClutterColor          *border_color,
                        ClutterColor          *background_color)
@ -58,9 +61,10 @@ shell_draw_box_pointer (StDrawingArea         *area,
  guint width, height;
  cairo_t *cr;

-  st_drawing_area_get_surface_size (area, &width, &height);
+  clutter_cairo_texture_get_surface_size (texture, &width, &height);

-  cr = st_drawing_area_get_context (area);
+  clutter_cairo_texture_clear (texture);
+  cr = clutter_cairo_texture_create (texture);

  cairo_set_line_width (cr, 1.0);

@ -101,6 +105,8 @@ shell_draw_box_pointer (StDrawingArea         *area,
  clutter_cairo_set_source_color (cr, background_color);

  cairo_fill (cr);
+
+  cairo_destroy (cr);
 }

 static void
--- a/src/shell-drawing.h
+++ b/src/shell-drawing.h
@ -4,7 +4,6 @@
 #define __SHELL_DRAWING_H__

 #include <clutter/clutter.h>
-#include "st.h"

 G_BEGIN_DECLS

@ -15,12 +14,12 @@ typedef enum {
  SHELL_POINTER_RIGHT
 } ShellPointerDirection;

-void shell_draw_box_pointer (StDrawingArea         *area,
+void shell_draw_box_pointer (ClutterCairoTexture   *texture,
                             ShellPointerDirection  direction,
                             ClutterColor          *border_color,
                             ClutterColor          *background_color);

-void shell_draw_clock (StDrawingArea       *area,
+void shell_draw_clock (ClutterCairoTexture *texture,
 	               int                  hour,
 	               int                  minute);

--- a/src/shell-embedded-window.c
+++ b/src/shell-embedded-window.c
@ -138,42 +138,14 @@ shell_embedded_window_check_resize (GtkContainer *container)
    clutter_actor_queue_relayout (CLUTTER_ACTOR (window->priv->actor));
 }

-static GObject *
-shell_embedded_window_constructor (GType                  gtype,
-                                   guint                  n_properties,
-                                   GObjectConstructParam *properties)
-{
-  GObject *object;
-  GObjectClass *parent_class;
-
-  parent_class = G_OBJECT_CLASS (shell_embedded_window_parent_class);
-  object = parent_class->constructor (gtype, n_properties, properties);
-
-  /* Setting the resize mode to immediate means that calling queue_resize()
-   * on a widget within the window will immmediately call check_resize()
-   * to be called, instead of having it queued to an idle. From our perspective,
-   * this is ideal since we just are going to queue a resize to Clutter's
-   * idle resize anyways.
-   */
-  g_object_set (object,
-                "resize-mode", GTK_RESIZE_IMMEDIATE,
-                "type", GTK_WINDOW_POPUP,
-                NULL);
-
-  return object;
-}
-
 static void
 shell_embedded_window_class_init (ShellEmbeddedWindowClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);

  g_type_class_add_private (klass, sizeof (ShellEmbeddedWindowPrivate));

-  object_class->constructor     = shell_embedded_window_constructor;
-
  widget_class->show            = shell_embedded_window_show;
  widget_class->hide            = shell_embedded_window_hide;
  widget_class->realize         = shell_embedded_window_realize;
@ -187,6 +159,17 @@ shell_embedded_window_init (ShellEmbeddedWindow *window)
 {
  window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, SHELL_TYPE_EMBEDDED_WINDOW,
                                              ShellEmbeddedWindowPrivate);
+
+  /* Setting the resize mode to immediate means that calling queue_resize()
+   * on a widget within the window will immmediately call check_resize()
+   * to be called, instead of having it queued to an idle. From our perspective,
+   * this is ideal since we just are going to queue a resize to Clutter's
+   * idle resize anyways.
+   */
+  g_object_set (G_OBJECT (window),
+                "resize-mode", GTK_RESIZE_IMMEDIATE,
+                "type", GTK_WINDOW_POPUP,
+                NULL);
 }

 /*
--- a/src/shell-gconf.c
+++ b/src/shell-gconf.c
@ -46,21 +46,9 @@ static void gconf_value_changed (GConfClient *client, const char *key,
 static void
 shell_gconf_init (ShellGConf *gconf)
 {
-  GConfValue *val;
-
  gconf->client = gconf_client_get_default ();
  gconf_client_add_dir (gconf->client, SHELL_GCONF_DIR,
                        GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-
-  val = gconf_client_get (gconf->client,
-                          SHELL_GCONF_DIR "/development_tools", NULL);
-  if (!val)
-    {
-      g_error ("GNOME Shell GConf schemas not found.\n"
-               "This generally indicates a building or packaging problem.");
-    }
-  gconf_value_free (val);
-
  g_signal_connect (gconf->client, "value_changed",
                    G_CALLBACK (gconf_value_changed), gconf);
 }
--- a/src/shell-generic-container.c
+++ b/src/shell-generic-container.c
@ -8,9 +8,90 @@
 * lack of GObject subclassing + vfunc overrides in gjs.  We
 * implement the container interface, but proxy the virtual functions
 * into signals, which gjs can catch.
- *
- * #ShellGenericContainer is an #StWidget, and automatically takes its
- * borders and padding into account during size request and allocation.
+ */
+
+/* Example implementation of a horzontal box with PACK_EXPAND for all,
+ vertically and horizontally centering.
+
+function TestFixedBox() {
+    this._init();
+}
+
+TestFixedBox.prototype = {
+    _init : function () {
+        this.actor = new Shell.GenericContainer();
+        this.spacing = 4;
+        this.actor.connect('get-preferred-width', Lang.bind(this, function (actor, for_height, alloc) {
+            let children = this.actor.get_children();
+            let max_child_min = 0;
+            let max_child_nat = 0;
+            for (let i = 0; i < children.length; i++) {
+                let spacing = i > 0 && i < children.length-1 ? this.spacing : 0;
+                let [child_min, child_nat] = children[i].get_preferred_width(for_height);
+                if (child_min > max_child_min)
+                    max_child_min = child_min;
+                if (child_nat > max_child_nat)
+                    max_child_nat = child_nat;
+            }
+            let totalSpacing = this.spacing * Math.abs(children.length - 1);
+            alloc.min_size = children.length * max_child_min + totalSpacing;
+            alloc.nat_size = children.length * max_child_nat + totalSpacing;
+        }));
+        this.actor.connect('get-preferred-height', Lang.bind(this, function (actor, for_width, alloc) {
+            let children = this.actor.get_children();
+            let max_child_min = 0;
+            let max_child_nat = 0;
+            for (let i = 0; i < children.length; i++) {
+                let [child_min, child_nat] = children[i].get_preferred_height(for_width);
+                if (child_min > max_child_min)
+                    max_child_min = child_min;
+                if (child_nat > max_child_nat)
+                    max_child_nat = child_nat;
+            }
+            alloc.min_size = max_child_min;
+            alloc.nat_size = max_child_nat;
+        }));
+        this.actor.connect('allocate', Lang.bind(this, function (actor, box, flags) {
+            let children = this.actor.get_children();
+            let totalSpacing = (this.spacing * Math.abs(children.length - 1));
+            let child_width = (box.x2 - box.x1 - totalSpacing) / (children.length);
+            let child_height = box.y2 - box.y1;
+
+            let x = box.x1;
+            for (let i = 0; i < children.length; i++) {
+                let [child_min, child_nat] = children[i].get_preferred_height(child_width);
+                let vSpacing = Math.abs(child_height - child_nat) / 2;
+                let childBox = new Clutter.ActorBox();
+                childBox.x1 = x;
+                childBox.y1 = vSpacing;
+                childBox.x2 = x+child_width;
+                childBox.y2 = child_height - vSpacing;
+                children[i].allocate(childBox, flags);
+                x += this.spacing + child_width;
+            }
+        }));
+    }
+}
+
+function runTestFixedBox() {
+    let testBox = new TestFixedBox();
+    let c = new Clutter.Color();
+    c.from_pixel(0xff0000a0);
+    let r = new Clutter.Rectangle({ width: 50, height: 100, color: c });
+    testBox.actor.add_actor(r);
+    r = new Clutter.Rectangle({ width: 90, height: 70, color: c });
+    testBox.actor.add_actor(r);
+    r = new Clutter.Rectangle({ width: 90, height: 70, color: c });
+    testBox.actor.add_actor(r);
+    r = new Clutter.Rectangle({ width: 30, height: 10, color: c });
+    testBox.actor.add_actor(r);
+
+    c.from_pixel(0x00ff00a0);
+    let borderBox = new Big.Box({ border: 1, border_color: c });
+    borderBox.set_position(100, 100);
+    borderBox.append(testBox.actor, Big.BoxPackFlags.NONE);
+    Shell.Global.get().stage.add_actor(borderBox);
+}
 */

 #include "config.h"
@ -21,16 +102,9 @@
 #include <gtk/gtk.h>
 #include <girepository.h>

-static void shell_generic_container_iface_init (ClutterContainerIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE(ShellGenericContainer,
-                        shell_generic_container,
-                        ST_TYPE_WIDGET,
-                        G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
-                                               shell_generic_container_iface_init));
+G_DEFINE_TYPE(ShellGenericContainer, shell_generic_container, CLUTTER_TYPE_GROUP);

 struct _ShellGenericContainerPrivate {
-  GList *children;
  GHashTable *skip_paint;
 };

@ -45,6 +119,7 @@ enum

 static guint shell_generic_container_signals [LAST_SIGNAL] = { 0 };

+
 static gpointer
 shell_generic_container_allocation_ref (ShellGenericContainerAllocation *alloc)
 {
@ -56,7 +131,9 @@ static void
 shell_generic_container_allocation_unref (ShellGenericContainerAllocation *alloc)
 {
  if (--alloc->_refcount == 0)
-    g_slice_free (ShellGenericContainerAllocation, alloc);
+    {
+      g_slice_free1 (sizeof (ShellGenericContainerAllocation), alloc);
+    }
 }

 static void
@ -64,16 +141,11 @@ shell_generic_container_allocate (ClutterActor           *self,
                                  const ClutterActorBox *box,
                                  ClutterAllocationFlags flags)
 {
-  StThemeNode *theme_node;
-  ClutterActorBox content_box;
-
-  CLUTTER_ACTOR_CLASS (shell_generic_container_parent_class)->allocate (self, box, flags);
-
-  theme_node = st_widget_get_theme_node (ST_WIDGET (self));
-  st_theme_node_get_content_box (theme_node, box, &content_box);
+  /* chain up to set actor->allocation */
+  (CLUTTER_ACTOR_CLASS (g_type_class_peek (clutter_actor_get_type ())))->allocate (self, box, flags);

  g_signal_emit (G_OBJECT (self), shell_generic_container_signals[ALLOCATE], 0,
-                 &content_box, flags);
+                 box, flags);
 }

 static void
@ -82,11 +154,7 @@ shell_generic_container_get_preferred_width (ClutterActor *actor,
                                             gfloat *min_width_p,
                                             gfloat *natural_width_p)
 {
-  ShellGenericContainerAllocation *alloc = g_slice_new0 (ShellGenericContainerAllocation);
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
-
-  st_theme_node_adjust_for_height (theme_node, &for_height);
-
+  ShellGenericContainerAllocation *alloc = g_slice_alloc0 (sizeof (ShellGenericContainerAllocation));
  alloc->_refcount = 1;
  g_signal_emit (G_OBJECT (actor), shell_generic_container_signals[GET_PREFERRED_WIDTH], 0,
                 for_height, alloc);
@ -103,11 +171,7 @@ shell_generic_container_get_preferred_height (ClutterActor *actor,
                                              gfloat *min_height_p,
                                              gfloat *natural_height_p)
 {
-  ShellGenericContainerAllocation *alloc = g_slice_new0 (ShellGenericContainerAllocation);
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
-
-  st_theme_node_adjust_for_width (theme_node, &for_width);
-
+  ShellGenericContainerAllocation *alloc = g_slice_alloc0 (sizeof (ShellGenericContainerAllocation));
  alloc->_refcount = 1;
  g_signal_emit (G_OBJECT (actor), shell_generic_container_signals[GET_PREFERRED_HEIGHT], 0,
                 for_width, alloc);
@ -122,11 +186,11 @@ static void
 shell_generic_container_paint (ClutterActor  *actor)
 {
  ShellGenericContainer *self = (ShellGenericContainer*) actor;
-  GList *iter;
+  GList *iter, *children;

-  CLUTTER_ACTOR_CLASS (shell_generic_container_parent_class)->paint (actor);
+  children = clutter_container_get_children ((ClutterContainer*) actor);

-  for (iter = self->priv->children; iter; iter = iter->next)
+  for (iter = children; iter; iter = iter->next)
    {
      ClutterActor *child = iter->data;

@ -135,6 +199,8 @@ shell_generic_container_paint (ClutterActor  *actor)

      clutter_actor_paint (child);
    }
+
+  g_list_free (children);
 }

 static void
@ -142,11 +208,13 @@ shell_generic_container_pick (ClutterActor        *actor,
                              const ClutterColor  *color)
 {
  ShellGenericContainer *self = (ShellGenericContainer*) actor;
-  GList *iter;
+  GList *iter, *children;

-  CLUTTER_ACTOR_CLASS (shell_generic_container_parent_class)->pick (actor, color);
+  (CLUTTER_ACTOR_CLASS (g_type_class_peek (clutter_actor_get_type ())))->pick (actor, color);

-  for (iter = self->priv->children; iter; iter = iter->next)
+  children = clutter_container_get_children ((ClutterContainer*) actor);
+
+  for (iter = children; iter; iter = iter->next)
    {
      ClutterActor *child = iter->data;

@ -155,18 +223,17 @@ shell_generic_container_pick (ClutterActor        *actor,

      clutter_actor_paint (child);
    }
+
+  g_list_free (children);
 }

-/**
- * shell_generic_container_get_n_skip_paint:
- * @container:  A #ShellGenericContainer
- *
- * Returns: Number of children which will not be painted.
- */
-guint
-shell_generic_container_get_n_skip_paint (ShellGenericContainer  *self)
+static void
+on_skip_paint_weakref (gpointer  user_data,
+                       GObject  *location)
 {
-  return g_hash_table_size (self->priv->skip_paint);
+  ShellGenericContainer *self = SHELL_GENERIC_CONTAINER (user_data);
+
+  g_hash_table_remove (self->priv->skip_paint, location);
 }

 /**
@ -190,51 +257,27 @@ shell_generic_container_set_skip_paint (ShellGenericContainer  *self,
    return;

  if (!skip)
+    {
+      g_object_weak_unref ((GObject*) child, on_skip_paint_weakref, self);
      g_hash_table_remove (self->priv->skip_paint, child);
+    }
  else
+    {
+      g_object_weak_ref ((GObject*) child, on_skip_paint_weakref, self);
      g_hash_table_insert (self->priv->skip_paint, child, child);
    }
-
-/**
- * shell_generic_container_remove_all:
- * @self: A #ShellGenericContainer
- *
- * Removes all child actors from @self.
- */
-void
-shell_generic_container_remove_all (ShellGenericContainer *self)
-{
-  /* copied from clutter_group_remove_all() */
-
-  GList *children;
-
-  children = self->priv->children;
-  while (children)
-    {
-      ClutterActor *child = children->data;
-      children = children->next;
-
-      clutter_container_remove_actor (CLUTTER_CONTAINER (self), child);
-    }
-}
-
-static void
-shell_generic_container_finalize (GObject *object)
-{
-  ShellGenericContainer *self = (ShellGenericContainer*) object;
-
-  g_hash_table_destroy (self->priv->skip_paint);
-
-  G_OBJECT_CLASS (shell_generic_container_parent_class)->finalize (object);
 }

 static void
 shell_generic_container_dispose (GObject  *object)
 {
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (object)->priv;
+  ShellGenericContainer *self = (ShellGenericContainer*) object;

-  while (priv->children)
-    clutter_actor_destroy (priv->children->data);
+  if (self->priv->skip_paint != NULL)
+    {
+      g_hash_table_destroy (self->priv->skip_paint);
+      self->priv->skip_paint = NULL;
+    }

  G_OBJECT_CLASS (shell_generic_container_parent_class)->dispose (object);
 }
@ -245,7 +288,6 @@ shell_generic_container_class_init (ShellGenericContainerClass *klass)
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);

-  gobject_class->finalize = shell_generic_container_finalize;
  gobject_class->dispose = shell_generic_container_dispose;

  actor_class->get_preferred_width = shell_generic_container_get_preferred_width;
@ -284,86 +326,15 @@ shell_generic_container_class_init (ShellGenericContainerClass *klass)
  g_type_class_add_private (gobject_class, sizeof (ShellGenericContainerPrivate));
 }

-static void
-shell_generic_container_add_actor (ClutterContainer *container,
-                                   ClutterActor     *actor)
-{
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
-
-  _st_container_add_actor (container, actor, &priv->children);
-}
-
-static void
-shell_generic_container_remove_actor (ClutterContainer *container,
-                                      ClutterActor     *actor)
-{
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
-
-  g_hash_table_remove (priv->skip_paint, actor);
-
-  _st_container_remove_actor (container, actor, &priv->children);
-}
-
-static void
-shell_generic_container_foreach (ClutterContainer *container,
-                                 ClutterCallback   callback,
-                                 gpointer          callback_data)
-{
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
-
-  _st_container_foreach (container, callback, callback_data,
-                         &priv->children);
-}
-
-static void
-shell_generic_container_lower (ClutterContainer *container,
-                               ClutterActor     *actor,
-                               ClutterActor     *sibling)
-{
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
-
-  _st_container_lower (container, actor, sibling, &priv->children);
-}
-
-static void
-shell_generic_container_raise (ClutterContainer *container,
-                        ClutterActor     *actor,
-                        ClutterActor     *sibling)
-{
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
-
-  _st_container_raise (container, actor, sibling, &priv->children);
-}
-
-static void
-shell_generic_container_sort_depth_order (ClutterContainer *container)
-{
-  ShellGenericContainerPrivate *priv = SHELL_GENERIC_CONTAINER (container)->priv;
-
-  _st_container_sort_depth_order (container, &priv->children);
-}
-
-static void
-shell_generic_container_iface_init (ClutterContainerIface *iface)
-{
-  iface->add = shell_generic_container_add_actor;
-  iface->remove = shell_generic_container_remove_actor;
-  iface->foreach = shell_generic_container_foreach;
-  iface->lower = shell_generic_container_lower;
-  iface->raise = shell_generic_container_raise;
-  iface->sort_depth_order = shell_generic_container_sort_depth_order;
-}
-
 static void
 shell_generic_container_init (ShellGenericContainer *area)
 {
  area->priv = G_TYPE_INSTANCE_GET_PRIVATE (area, SHELL_TYPE_GENERIC_CONTAINER,
                                            ShellGenericContainerPrivate);
-  area->priv->skip_paint = g_hash_table_new (NULL, NULL);
+  area->priv->skip_paint = g_hash_table_new_full (NULL, NULL, (GDestroyNotify)g_object_unref, NULL);
 }

-GType
-shell_generic_container_allocation_get_type (void)
+GType shell_generic_container_allocation_get_type (void)
 {
  static GType gtype = G_TYPE_INVALID;
  if (gtype == G_TYPE_INVALID)
--- a/src/shell-generic-container.h
+++ b/src/shell-generic-container.h
@ -2,7 +2,8 @@
 #ifndef __SHELL_GENERIC_CONTAINER_H__
 #define __SHELL_GENERIC_CONTAINER_H__

-#include "st.h"
+#include <clutter/clutter.h>
+#include <gtk/gtk.h>

 #define SHELL_TYPE_GENERIC_CONTAINER                 (shell_generic_container_get_type ())
 #define SHELL_GENERIC_CONTAINER(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_GENERIC_CONTAINER, ShellGenericContainer))
@ -29,23 +30,20 @@ typedef struct _ShellGenericContainerPrivate ShellGenericContainerPrivate;

 struct _ShellGenericContainer
 {
-    StWidget parent;
+    ClutterGroup parent;

    ShellGenericContainerPrivate *priv;
 };

 struct _ShellGenericContainerClass
 {
-    StWidgetClass parent_class;
+    ClutterGroupClass parent_class;
 };

 GType shell_generic_container_get_type (void) G_GNUC_CONST;

-guint shell_generic_container_get_n_skip_paint (ShellGenericContainer *self);
-
-void  shell_generic_container_set_skip_paint   (ShellGenericContainer *self,
+void shell_generic_container_set_skip_paint (ShellGenericContainer  *container,
                                             ClutterActor           *actor,
                                             gboolean                skip);
-void  shell_generic_container_remove_all       (ShellGenericContainer *self);

 #endif /* __SHELL_GENERIC_CONTAINER_H__ */
--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -6,7 +6,6 @@
 #include "shell-wm.h"

 #include "display.h"
-#include "util.h"
 #include <clutter/glx/clutter-glx.h>
 #include <clutter/x11/clutter-x11.h>
 #include <gdk/gdkx.h>
@ -18,6 +17,7 @@
 #include <unistd.h>
 #include <dbus/dbus-glib.h>
 #include <gio/gio.h>
+#include <glib/gi18n-lib.h>
 #include <math.h>
 #include <X11/extensions/Xfixes.h>
 #include <gjs/gjs.h>
@ -28,7 +28,6 @@
 #define SHELL_DBUS_SERVICE "org.gnome.Shell"

 static void grab_notify (GtkWidget *widget, gboolean is_grab, gpointer user_data);
-static void update_root_window_pixmap (ShellGlobal *global);

 struct _ShellGlobal {
  GObject parent;
@ -54,8 +53,6 @@ struct _ShellGlobal {

  /* Displays the root window; see shell_global_create_root_pixmap_actor() */
  ClutterActor *root_pixmap;
-
-  gint last_change_screen_width, last_change_screen_height;
 };

 enum {
@ -76,7 +73,8 @@ enum {
 /* Signals */
 enum
 {
-  SCREEN_SIZE_CHANGED,
+  PANEL_RUN_DIALOG,
+  PANEL_MAIN_MENU,
  LAST_SIGNAL
 };

@ -191,9 +189,6 @@ shell_global_init (ShellGlobal *global)
  global->root_pixmap = NULL;

  global->input_mode = SHELL_STAGE_INPUT_MODE_NORMAL;
-
-  global->last_change_screen_width = 0;
-  global->last_change_screen_height = 0;
 }

 static void
@ -204,14 +199,23 @@ shell_global_class_init (ShellGlobalClass *klass)
  gobject_class->get_property = shell_global_get_property;
  gobject_class->set_property = shell_global_set_property;

-  shell_global_signals[SCREEN_SIZE_CHANGED] =
-    g_signal_new ("screen-size-changed",
+  shell_global_signals[PANEL_RUN_DIALOG] =
+    g_signal_new ("panel-run-dialog",
 		  G_TYPE_FROM_CLASS (klass),
 		  G_SIGNAL_RUN_LAST,
-		  G_STRUCT_OFFSET (ShellGlobalClass, screen_size_changed),
+		  G_STRUCT_OFFSET (ShellGlobalClass, panel_run_dialog),
 		  NULL, NULL,
-		  g_cclosure_marshal_VOID__VOID,
-		  G_TYPE_NONE, 0);
+		  g_cclosure_marshal_VOID__INT,
+		  G_TYPE_NONE, 1, G_TYPE_INT);
+
+  shell_global_signals[PANEL_MAIN_MENU] =
+    g_signal_new ("panel-main-menu",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (ShellGlobalClass, panel_main_menu),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__INT,
+		  G_TYPE_NONE, 1, G_TYPE_INT);

  g_object_class_install_property (gobject_class,
                                   PROP_OVERLAY_GROUP,
@ -437,73 +441,6 @@ shell_global_get_windows (ShellGlobal *global)
  return mutter_plugin_get_windows (global->plugin);
 }

-static gboolean
-on_screen_size_changed_cb (gpointer data)
-{
-  ShellGlobal *global = SHELL_GLOBAL (data);
-
-  int width, height;
-
-  mutter_plugin_query_screen_size (global->plugin, &width, &height);
-
-  if (global->last_change_screen_width != width || global->last_change_screen_height != height)
-    {
-      g_signal_emit (G_OBJECT (global), shell_global_signals[SCREEN_SIZE_CHANGED], 0);
-      global->last_change_screen_width = width;
-      global->last_change_screen_height = height;
-
-      /* update size of background actor to fix tiled backgrounds */
-      clutter_actor_set_size (CLUTTER_ACTOR (global->root_pixmap),
-                              width, height);
-    }
-
-  return FALSE;
-}
-
-static void
-global_stage_notify_width (GObject    *gobject,
-                           GParamSpec *pspec,
-                           gpointer    data)
-{
-  ShellGlobal *global = SHELL_GLOBAL (data);
-
-  g_object_notify (G_OBJECT (global), "screen-width");
-
-  meta_later_add (META_LATER_BEFORE_REDRAW,
-                  on_screen_size_changed_cb,
-                  global,
-                  NULL);
-}
-
-static void
-global_stage_notify_height (GObject    *gobject,
-                            GParamSpec *pspec,
-                            gpointer    data)
-{
-  ShellGlobal *global = SHELL_GLOBAL (data);
-
-  g_object_notify (G_OBJECT (global), "screen-height");
-
-  meta_later_add (META_LATER_BEFORE_REDRAW,
-                  on_screen_size_changed_cb,
-                  global,
-                  NULL);
-}
-
-static void
-global_plugin_notify_screen (GObject    *gobject,
-                             GParamSpec *pspec,
-                             gpointer    data)
-{
-  ShellGlobal *global = SHELL_GLOBAL (data);
-  ClutterActor *stage = mutter_plugin_get_stage (MUTTER_PLUGIN (gobject));
-
-  g_signal_connect (stage, "notify::width",
-                    G_CALLBACK (global_stage_notify_width), global);
-  g_signal_connect (stage, "notify::height",
-                    G_CALLBACK (global_stage_notify_height), global);
-}
-
 void
 _shell_global_set_plugin (ShellGlobal  *global,
                          MutterPlugin *plugin)
@ -513,14 +450,6 @@ _shell_global_set_plugin (ShellGlobal  *global,

  global->plugin = plugin;
  global->wm = shell_wm_new (plugin);
-
-  /* At this point screen is NULL, so we can't yet do signal connections
-   * to the width and height; we wait until the screen property is set
-   * to do that. Note that this is a one time thing - screen will never
-   * change once first set.
-   */
-  g_signal_connect (plugin, "notify::screen",
-                    G_CALLBACK (global_plugin_notify_screen), global);
 }

 void
@ -593,6 +522,12 @@ shell_global_display_is_grabbed (ShellGlobal *global)
  return meta_display_get_grab_op (display) != META_GRAB_OP_NONE;
 }

+/* Defining this here for now, see
+ * https://bugzilla.gnome.org/show_bug.cgi?id=604075
+ * for upstreaming status.
+ */
+JSContext * gjs_context_get_context (GjsContext *context);
+
 /**
 * shell_global_add_extension_importer:
 * @target_object_script: JavaScript code evaluating to a target object
@ -615,7 +550,7 @@ shell_global_add_extension_importer (ShellGlobal *global,
 {
  jsval target_object;
  JSObject *importer;
-  JSContext *context = gjs_context_get_native_context (global->js_context);
+  JSContext *context = gjs_context_get_context (global->js_context);
  char *search_path[2] = { 0, 0 };

  // This is a bit of a hack; ideally we'd be able to pass our target
@ -783,34 +718,6 @@ shell_global_reexec_self (ShellGlobal *global)
  g_ptr_array_free (arr, TRUE);
 }

-/**
- * shell_global_breakpoint:
- * @global: A #ShellGlobal
- *
- * Using G_BREAKPOINT(), interrupt the current process.  This is useful
- * in conjunction with a debugger such as gdb.
- */
-void
-shell_global_breakpoint (ShellGlobal *global)
-{
-  G_BREAKPOINT ();
-}
-
-/**
- * shell_global_gc:
- * @global: A #ShellGlobal
- *
- * Start a garbage collection process.  For more information, see
- * https://developer.mozilla.org/En/JS_GC
- */
-void
-shell_global_gc (ShellGlobal *global)
-{
-  JSContext *context = gjs_context_get_native_context (global->js_context);
-
-  JS_GC (context);
-}
-
 void 
 shell_global_grab_dbus_service (ShellGlobal *global)
 {
@ -928,6 +835,22 @@ root_window_filter (GdkXEvent *native, GdkEvent *event, gpointer data)
  return GDK_FILTER_CONTINUE;
 }

+/* Workaround for a clutter bug where if ClutterGLXTexturePixmap
+ * is painted without the pixmap being set, a crash will occur inside
+ * Cogl.
+ *
+ * http://bugzilla.openedhand.com/show_bug.cgi?id=1644
+ */
+static void
+root_pixmap_paint (ClutterActor *actor, gpointer data)
+{
+  Pixmap pixmap;
+
+  g_object_get (G_OBJECT (actor), "pixmap", &pixmap, NULL);
+  if (!pixmap)
+    g_signal_stop_emission_by_name (actor, "paint");
+}
+
 /*
 * Called when the root window pixmap actor is destroyed.
 */
@ -967,24 +890,16 @@ shell_global_format_time_relative_pretty (ShellGlobal *global,
    *text = g_strdup (_("Less than a minute ago"));
    *next_update = MINUTE - delta;
   } else if (delta < HOUR) {
-     *text = g_strdup_printf (dngettext (GETTEXT_PACKAGE,
-                                         "%d minute ago", "%d minutes ago",
-                                         delta / MINUTE), delta / MINUTE);
+     *text = g_strdup_printf (ngettext ("%d minute ago", "%d minutes ago", delta / MINUTE), delta / MINUTE);
     *next_update = MINUTE - (delta % MINUTE);
   } else if (delta < DAY) {
-     *text = g_strdup_printf (dngettext (GETTEXT_PACKAGE,
-                                         "%d hour ago", "%d hours ago",
-                                         delta / HOUR), delta / HOUR);
+     *text = g_strdup_printf (ngettext ("%d hour ago", "%d hours ago", delta / HOUR), delta / HOUR);
     *next_update = HOUR - (delta % HOUR);
   } else if (delta < WEEK) {
-     *text = g_strdup_printf (dngettext (GETTEXT_PACKAGE,
-                                         "%d day ago", "%d days ago",
-                                         delta / DAY), delta / DAY);
+     *text = g_strdup_printf (ngettext ("%d day ago", "%d days ago", delta / DAY), delta / DAY);
     *next_update = DAY - (delta % DAY);
   } else {
-     *text = g_strdup_printf (dngettext (GETTEXT_PACKAGE,
-                                         "%d week ago", "%d weeks ago",
-                                         delta / WEEK), delta / WEEK);
+     *text = g_strdup_printf (ngettext ("%d week ago", "%d weeks ago", delta / WEEK), delta / WEEK);
     *next_update = WEEK - (delta % WEEK);
   }
 }
@ -1003,7 +918,6 @@ shell_global_create_root_pixmap_actor (ShellGlobal *global)
 {
  GdkWindow *window;
  ClutterActor *stage;
-  ClutterColor stage_color;

  /* The actor created is actually a ClutterClone of global->root_pixmap. */

@ -1011,32 +925,20 @@ shell_global_create_root_pixmap_actor (ShellGlobal *global)
    {
      global->root_pixmap = clutter_glx_texture_pixmap_new ();

-      clutter_texture_set_repeat (CLUTTER_TEXTURE (global->root_pixmap),
-                                  TRUE, TRUE);
-
      /* The low and medium quality filters give nearest-neighbor resizing. */
      clutter_texture_set_filter_quality (CLUTTER_TEXTURE (global->root_pixmap),
                                          CLUTTER_TEXTURE_QUALITY_HIGH);

-      /* Initialize to the stage color, since that's what will be seen
-       * in the main view if there's no actual background window.
-       */
-      stage = mutter_plugin_get_stage (global->plugin);
-      clutter_stage_get_color (CLUTTER_STAGE (stage), &stage_color);
-      clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (global->root_pixmap),
-                                         /* ClutterColor has the same layout
-                                          * as one pixel of RGB(A) data.
-                                          */
-                                         (const guchar *)&stage_color, FALSE,
-                                         /* w, h, rowstride, bpp, flags */
-                                         1, 1, 3, 3, 0, NULL);
-
      /* We can only clone an actor within a stage, so we hide the source
       * texture then add it to the stage */
      clutter_actor_hide (global->root_pixmap);
+      stage = mutter_plugin_get_stage (global->plugin);
      clutter_container_add_actor (CLUTTER_CONTAINER (stage),
                                   global->root_pixmap);

+      g_signal_connect (global->root_pixmap, "paint",
+                        G_CALLBACK (root_pixmap_paint), NULL);
+
      /* This really should never happen; but just in case... */
      g_signal_connect (global->root_pixmap, "destroy",
                        G_CALLBACK (root_pixmap_destroy), global);
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -26,7 +26,10 @@ struct _ShellGlobalClass
 {
  GObjectClass parent_class;

-  void (*screen_size_changed) (ShellGlobal *global);
+  void (*panel_run_dialog) (ShellGlobal *global,
+			    int      timestamp);
+  void (*panel_main_menu) (ShellGlobal *global,
+			   int      timestamp);
 };

 GType            shell_global_get_type            (void) G_GNUC_CONST;
@ -70,10 +73,6 @@ gboolean shell_global_display_is_grabbed (ShellGlobal *global);

 void shell_global_reexec_self (ShellGlobal *global);

-void shell_global_breakpoint (ShellGlobal *global);
-
-void shell_global_gc (ShellGlobal *global);
-
 void shell_global_format_time_relative_pretty (ShellGlobal *global, guint delta, char **text, guint *update_time);

 ClutterActor *shell_global_create_root_pixmap_actor (ShellGlobal *global);
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -61,9 +61,6 @@ struct _ShellRecorder {

  gboolean only_paint; /* Used to temporarily suppress recording */

-  gboolean have_pack_invert; /* True when GL_MESA_pack_invert is available */
-
-  int framerate;
  char *pipeline_description;
  char *filename;
  gboolean filename_has_count; /* %c used: handle pausing differently */
@ -94,8 +91,6 @@ struct _RecorderPipeline

 static void recorder_set_stage    (ShellRecorder *recorder,
                                   ClutterStage  *stage);
-static void recorder_set_framerate (ShellRecorder *recorder,
-                                    int framerate);
 static void recorder_set_pipeline (ShellRecorder *recorder,
                                   const char    *pipeline);
 static void recorder_set_filename (ShellRecorder *recorder,
@ -107,7 +102,6 @@ static void recorder_pipeline_closed   (RecorderPipeline *pipeline);
 enum {
  PROP_0,
  PROP_STAGE,
-  PROP_FRAMERATE,
  PROP_PIPELINE,
  PROP_FILENAME
 };
@ -121,7 +115,7 @@ G_DEFINE_TYPE(ShellRecorder, shell_recorder, G_TYPE_OBJECT);
 * as theora for a minimal size increase. This may be an artifact of the
 * encoding process.
 */
-#define DEFAULT_FRAMES_PER_SECOND 15
+#define FRAMES_PER_SECOND 15

 /* The time (in milliseconds) between querying the server for the cursor
 * position.
@ -250,7 +244,6 @@ shell_recorder_init (ShellRecorder *recorder)
  recorder->memory_target = get_memory_target();

  recorder->state = RECORDER_STATE_CLOSED;
-  recorder->framerate = DEFAULT_FRAMES_PER_SECOND;
 }

 static void
@ -280,7 +273,7 @@ shell_recorder_finalize (GObject  *object)
  recorder_set_pipeline (recorder, NULL);
  recorder_set_filename (recorder, NULL);

-  cogl_handle_unref (recorder->recording_icon);
+  cogl_texture_unref (recorder->recording_icon);

  G_OBJECT_CLASS (shell_recorder_parent_class)->finalize (object);
 }
@ -430,14 +423,11 @@ recorder_draw_cursor (ShellRecorder *recorder,
                                                 recorder->stage_height,
                                                 recorder->stage_width * 4);

-  /* When not using GL_MESA_pack_invert the data we get from glReadPixels is "upside down",
-   * so transform our cairo drawing to match */
+  /* The data we get from glReadPixels is "upside down", so transform
+   * our cairo drawing to match */
  cr = cairo_create (surface);
-  if (!recorder->have_pack_invert)
-    {
  cairo_translate(cr, 0, recorder->stage_height);
  cairo_scale(cr, 1, -1);
-    }

  cairo_set_source_surface (cr,
                            recorder->cursor_image,
@ -514,27 +504,6 @@ recorder_record_frame (ShellRecorder *recorder)

  GST_BUFFER_TIMESTAMP(buffer) = get_wall_time() - recorder->start_time;

-  /* We could use cogl_read_pixels, but it only currently supports
-   * COGL_PIXEL_FORMAT_RGBA_8888, while we prefer the native framebuffer
-   * format. (COGL_PIXEL_FORMAT_ARGB_8888_PRE,
-   * COGL_PIXEL_FORMAT_BGRA_PRE, depending on endianess)
-   *
-   * http://bugzilla.openedhand.com/show_bug.cgi?id=1959
-   */
-
-  /* Flush any primitives that Cogl has batched up */
-  cogl_flush ();
-
-  /* Set the parameters for how data is stored; these are the initial
-   * values but Cogl will have modified them for its own purposes */
-  glPixelStorei (GL_PACK_ALIGNMENT, 4);
-  glPixelStorei (GL_PACK_ROW_LENGTH, 0);
-  glPixelStorei (GL_PACK_SKIP_PIXELS, 0);
-  glPixelStorei (GL_PACK_SKIP_ROWS, 0);
-
-  if (recorder->have_pack_invert)
-    glPixelStorei (GL_PACK_INVERT_MESA, TRUE);
-
  glReadBuffer (GL_BACK_LEFT);
  glReadPixels (0, 0,
                recorder->stage_width, recorder->stage_height,
@ -542,9 +511,6 @@ recorder_record_frame (ShellRecorder *recorder)
                GL_UNSIGNED_INT_8_8_8_8_REV,
                data);

-  if (recorder->have_pack_invert)
-    glPixelStorei (GL_PACK_INVERT_MESA, FALSE);
-
  recorder_draw_cursor (recorder, buffer);

  shell_recorder_src_add_buffer (SHELL_RECORDER_SRC (recorder->current_pipeline->src), buffer);
@ -846,7 +812,6 @@ recorder_set_stage (ShellRecorder *recorder,
  if (recorder->stage)
    {
      int error_base;
-      const char *gl_extensions;

      recorder->stage = stage;
      g_signal_connect (recorder->stage, "destroy",
@ -870,29 +835,10 @@ recorder_set_stage (ShellRecorder *recorder,
                                   clutter_x11_get_stage_window (stage),
                                 XFixesDisplayCursorNotifyMask);

-      clutter_stage_ensure_current (stage);
-      gl_extensions = (const char *)glGetString (GL_EXTENSIONS);
-      recorder->have_pack_invert = strstr (gl_extensions, "GL_MESA_pack_invert") != NULL;
-
      recorder_get_initial_cursor_position (recorder);
    }
 }

-static void
-recorder_set_framerate (ShellRecorder *recorder,
-                        int framerate)
-{
-  if (framerate == recorder->framerate)
-    return;
-
-  if (recorder->current_pipeline)
-    shell_recorder_close (recorder);
-
-  recorder->framerate = framerate;
-
-  g_object_notify (G_OBJECT (recorder), "framerate");
-}
-
 static void
 recorder_set_pipeline (ShellRecorder *recorder,
                       const char    *pipeline)
@ -944,9 +890,6 @@ shell_recorder_set_property (GObject      *object,
    case PROP_STAGE:
      recorder_set_stage (recorder, g_value_get_object (value));
      break;
-    case PROP_FRAMERATE:
-      recorder_set_framerate (recorder, g_value_get_int (value));
-      break;
    case PROP_PIPELINE:
      recorder_set_pipeline (recorder, g_value_get_string (value));
      break;
@ -972,9 +915,6 @@ shell_recorder_get_property (GObject         *object,
    case PROP_STAGE:
      g_value_set_object (value, G_OBJECT (recorder->stage));
      break;
-    case PROP_FRAMERATE:
-      g_value_set_int (value, recorder->framerate);
-      break;
    case PROP_PIPELINE:
      g_value_set_string (value, recorder->pipeline_description);
      break;
@ -1003,17 +943,6 @@ shell_recorder_class_init (ShellRecorderClass *klass)
                                                        "Stage to record",
                                                        CLUTTER_TYPE_STAGE,
                                                        G_PARAM_READWRITE));
-
-  g_object_class_install_property (gobject_class,
-                                   PROP_FRAMERATE,
-                                   g_param_spec_int ("framerate",
-                                                     "Framerate",
-                                                     "Framerate used for resulting video in frames-per-second",
-                                                      0,
-                                                      G_MAXINT,
-                                                      DEFAULT_FRAMES_PER_SECOND,
-                                                      G_PARAM_READWRITE));
-
  g_object_class_install_property (gobject_class,
                                   PROP_PIPELINE,
                                   g_param_spec_string ("pipeline",
@ -1055,7 +984,7 @@ recorder_pipeline_set_caps (RecorderPipeline *pipeline)
                              "blue_mask",  G_TYPE_INT, 0x0000ff,
 #endif
                              "endianness", G_TYPE_INT, G_BIG_ENDIAN,
-                              "framerate", GST_TYPE_FRACTION, pipeline->recorder->framerate, 1,
+                              "framerate", GST_TYPE_FRACTION, FRAMES_PER_SECOND, 1,
                              "width", G_TYPE_INT, pipeline->recorder->stage_width,
                              "height", G_TYPE_INT, pipeline->recorder->stage_height,
                              NULL);
@ -1105,17 +1034,12 @@ recorder_pipeline_add_source (RecorderPipeline *pipeline)
  gst_bin_add (GST_BIN (pipeline->pipeline), ffmpegcolorspace);

  /* glReadPixels gives us an upside-down buffer, so we have to flip it back
-   * right-side up.
-   *
-   * When available MESA_pack_invert extension is used to avoid the
-   * flip entirely, since the data is actually stored in the frame buffer
-   * in the order that we expect.
+   * right-side up. We do this after the color space conversion in the theory
+   * that we might have a smaller buffer to flip; on the other hand flipping
+   * YUV 422 is more complicated than flipping RGB. Probably a toss-up.
   *
   * We use gst_parse_launch to avoid having to know the enum value for flip-vertical
   */
-
-  if (!pipeline->recorder->have_pack_invert)
-    {
  videoflip = gst_parse_launch_full ("videoflip method=vertical-flip", NULL,
                                     GST_PARSE_FLAG_FATAL_ERRORS,
                                     &error);
@ -1125,18 +1049,12 @@ recorder_pipeline_add_source (RecorderPipeline *pipeline)
      g_error_free (error);
      goto out;
    }
-
  gst_bin_add (GST_BIN (pipeline->pipeline), videoflip);
-      gst_element_link_many (pipeline->src, ffmpegcolorspace, videoflip, NULL);
+
+  gst_element_link_many (pipeline->src, ffmpegcolorspace, videoflip,
+                         NULL);

  src_pad = gst_element_get_static_pad (videoflip, "src");
-    }
-  else
-    {
-      gst_element_link_many (pipeline->src, ffmpegcolorspace, NULL);
-      src_pad = gst_element_get_static_pad (ffmpegcolorspace, "src");
-    }
-
  if (!src_pad)
    {
      g_warning("ShellRecorder: can't get src pad to link into pipeline");
@ -1560,24 +1478,6 @@ shell_recorder_new (ClutterStage  *stage)
                       NULL);
 }

-/**
- * shell_recorder_set_framerate:
- * @recorder: the #ShellRecorder
- * @framerate: Framerate used for resulting video in frames-per-second.
- *
- * Sets the number of frames per second we configure for the GStreamer pipeline.
- *
- * The default value is 15.
- */
-void
-shell_recorder_set_framerate (ShellRecorder *recorder,
-                             int framerate)
-{
-  g_return_if_fail (SHELL_IS_RECORDER (recorder));
-
-  recorder_set_framerate (recorder, framerate);
-}
-
 /**
 * shell_recorder_set_filename:
 * @recorder: the #ShellRecorder
@ -1613,8 +1513,8 @@ shell_recorder_set_filename (ShellRecorder *recorder,
 /**
 * shell_recorder_set_pipeline:
 * @recorder: the #ShellRecorder
- * @pipeline: (allow-none): the GStreamer pipeline used to encode recordings
- *            or %NULL for the default value.
+ * @filename: the GStreamer pipeline used to encode recordings
+ *            or %NULL for the defalt value.
 *
 * Sets the GStreamer pipeline used to encode recordings.
 * It follows the syntax used for gst-launch. The pipeline
--- a/src/shell-recorder.h
+++ b/src/shell-recorder.h
@ -30,8 +30,6 @@ GType              shell_recorder_get_type     (void) G_GNUC_CONST;

 ShellRecorder     *shell_recorder_new (ClutterStage  *stage);

-void               shell_recorder_set_framerate (ShellRecorder *recorder,
-                                                 int framerate);
 void               shell_recorder_set_filename (ShellRecorder *recorder,
 						const char    *filename);
 void               shell_recorder_set_pipeline (ShellRecorder *recorder,
--- a/src/shell-slicer.c
+++ b/src/shell-slicer.c
@ -1,165 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/**
- * SECTION:shell-slicer
- * @short_description: Display only part of another actor
- *
- * A #StBin that has 0 minimum size, and will clip its child
- * in the middle.
- */
-
-#include "config.h"
-
-#include "shell-slicer.h"
-
-G_DEFINE_TYPE (ShellSlicer,
-               shell_slicer,
-               ST_TYPE_BIN);
-
-static void
-shell_slicer_get_preferred_width (ClutterActor *self,
-                                  gfloat        for_height,
-                                  gfloat       *min_width_p,
-                                  gfloat       *natural_width_p)
-{
-  ClutterActor *child = st_bin_get_child (ST_BIN (self));
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
-
-  st_theme_node_adjust_for_height (theme_node, &for_height);
-
-  if (min_width_p)
-    *min_width_p = 0;
-
-  if (child == NULL)
-    {
-      if (natural_width_p)
-        *natural_width_p = 0;
-    }
-  else
-    {
-      _st_actor_get_preferred_width (child, for_height, FALSE,
-                                     NULL,
-                                     natural_width_p);
-    }
-
-  st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
-}
-
-static void
-shell_slicer_get_preferred_height (ClutterActor *self,
-                                   gfloat        for_width,
-                                   gfloat       *min_height_p,
-                                   gfloat       *natural_height_p)
-{
-  ClutterActor *child = st_bin_get_child (ST_BIN (self));
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
-
-  st_theme_node_adjust_for_width (theme_node, &for_width);
-
-  if (min_height_p)
-    *min_height_p = 0;
-
-  if (child == NULL)
-    {
-      if (natural_height_p)
-        *natural_height_p = 0;
-    }
-  else
-    {
-      _st_actor_get_preferred_height (child, for_width, FALSE,
-                                      NULL,
-                                      natural_height_p);
-    }
-
-  st_theme_node_adjust_preferred_height (theme_node, min_height_p, natural_height_p);
-}
-
-static void
-shell_slicer_allocate (ClutterActor           *self,
-                       const ClutterActorBox  *box,
-                       ClutterAllocationFlags  flags)
-{
-  ClutterActor *child;
-
-  /* Chain up directly to ClutterActor to set actor->allocation.  We explicitly skip our parent class
-   * StBin here because we want to override the allocate function. */
-  CLUTTER_ACTOR_CLASS (g_type_class_peek (clutter_actor_get_type ()))->allocate (self, box, flags);
-
-  child = st_bin_get_child (ST_BIN (self));
-  if (child)
-    clutter_actor_allocate_preferred_size (child, flags);
-}
-
-static void
-shell_slicer_paint_child (ShellSlicer *self)
-{
-  ClutterActor *child;
-  ClutterActorBox self_box;
-  ClutterActorBox child_box;
-  float width, height, child_width, child_height;
-  StAlign x_align, y_align;
-  double x_align_factor, y_align_factor;
-
-  child = st_bin_get_child (ST_BIN (self));
-
-  if (!child)
-    return;
-
-  st_bin_get_alignment (ST_BIN (self), &x_align, &y_align);
-  _st_get_align_factors (ST_WIDGET (self), x_align, y_align,
-                         &x_align_factor, &y_align_factor);
-
-  clutter_actor_get_allocation_box (CLUTTER_ACTOR (self), &self_box);
-  clutter_actor_get_allocation_box (child, &child_box);
-
-  width = self_box.x2 - self_box.x1;
-  height = self_box.y2 - self_box.y1;
-  child_width = child_box.x2 - child_box.x1;
-  child_height = child_box.y2 - child_box.y1;
-
-  cogl_push_matrix ();
-
-  cogl_clip_push_rectangle (0, 0, width, height);
-  cogl_translate ((int)(0.5 + x_align_factor * (width - child_width)),
-                  (int)(0.5 + y_align_factor * (height - child_height)),
-                  0);
-
-  clutter_actor_paint (child);
-
-  cogl_clip_pop ();
-
-  cogl_pop_matrix ();
-}
-
-static void
-shell_slicer_paint (ClutterActor *self)
-{
-  /* StWidget paints CSS elements */
-  CLUTTER_ACTOR_CLASS (g_type_class_peek (st_widget_get_type ()))->paint (self);
-
-  shell_slicer_paint_child (SHELL_SLICER (self));
-}
-
-static void
-shell_slicer_pick (ClutterActor       *self,
-                   const ClutterColor *pick_color)
-{
-  shell_slicer_paint_child (SHELL_SLICER (self));
-}
-
-static void
-shell_slicer_class_init (ShellSlicerClass *klass)
-{
-  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-
-  actor_class->get_preferred_width = shell_slicer_get_preferred_width;
-  actor_class->get_preferred_height = shell_slicer_get_preferred_height;
-  actor_class->allocate = shell_slicer_allocate;
-  actor_class->paint = shell_slicer_paint;
-  actor_class->pick = shell_slicer_pick;
-}
-
-static void
-shell_slicer_init (ShellSlicer *actor)
-{
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dan Winship	8fc9d0c8ba	Kill notification-daemon at startup when running in --replace mode https://bugzilla.gnome.org/show_bug.cgi?id=606755	2010-01-12 17:12:48 -05:00
Dan Winship	803a204604	Line-wrap the notification content Doesn't quite work for very long notifications yet, because the message tray itself has a fixed height. https://bugzilla.gnome.org/show_bug.cgi?id=606755	2010-01-12 17:12:45 -05:00
Dan Winship	a02e6d30f7	remove messaging.js; use notificationDaemon.js for empathy messages too Empathy sends notifications on all the events we care about, so just use those rather than fiddling with Telepathy to get duplicate copies of them. https://bugzilla.gnome.org/show_bug.cgi?id=606331	2010-01-08 13:14:40 -05:00
Dan Winship	a424bbbabf	Show both summary and body of notifications, and support body-markup Previously we were only showing the summary for notifications, but most notifications only make sense if you show both. https://bugzilla.gnome.org/show_bug.cgi?id=606331	2010-01-08 13:14:34 -05:00
Marina Zhurakhinskaya	4ab513ca77	Combine notifications and the summary mode in a single message tray We should either be showing the message tray in the notification or the summary mode. This is best achieved if the message tray actor contains both, and either one is shown at any given time. Queue notifications so that each queued notification is shown when the previous one times out or when the user is done interacting with the message tray and moves the mouse away from it. (In the future, we will have some sort of an indication that there are queued notifications and a way to have the next notification displayed without moving the mouse away from the message tray.)	2010-01-06 16:27:08 -05:00
Dan Winship	09653fbaf6	Merge branch 'master' into message-tray Conflicts: js/ui/main.js	2010-01-05 11:25:15 -05:00
Dan Winship	b1791951cb	rebase fail. fix `ef49ada575`	2010-01-05 11:24:21 -05:00
Dan Winship	af1a3b11f5	Implement additional notification daemon icon types https://bugzilla.gnome.org/show_bug.cgi?id=603546	2010-01-05 11:18:02 -05:00
Dan Winship	ef49ada575	add an explicit message tray Source type https://bugzilla.gnome.org/show_bug.cgi?id=603546	2010-01-05 11:17:21 -05:00
Dan Winship	6c3b8e2add	[messaging] update avatar code to use non-deprecated interfaces Also fixes it to notice avatar updates https://bugzilla.gnome.org/show_bug.cgi?id=603546	2010-01-05 11:15:46 -05:00
Dan Winship	3658f8a8b4	Fix icon/text alignment in message tray https://bugzilla.gnome.org/show_bug.cgi?id=603546	2010-01-05 11:15:45 -05:00
Dan Winship	74418f2129	update for chrome.js changes in master	2009-12-02 17:14:04 -05:00
Dan Winship	3b4e2202f7	Merge branch 'master' into message-tray	2009-12-02 17:03:48 -05:00
Marina Zhurakhinskaya	3b5c468cbf	Add a message tray with icons for ongoing conversations Add a message tray that slides out when you move your mouse to the bottom of the screen. The icons for ongoing conversations are added to the message tray when the first message in the conversation is received. The icon is removed when the corresponding conversation window is closed. Store the avatar icons in the texture cache and use the checksum for the data bytes for the icon as the key. This allows to reuse the icon data for the message tray icon. Add st_box_layout_insert_actor() that allows inserting an actor at the arbitrary position in the container. It is needed to be able to add the icon representing the most recent conversation to the front of the list of icons in the message tray.	2009-12-02 16:34:48 -05:00
Dan Winship	b0a0ee297c	Merge branch 'master' into message-tray Conflicts: data/theme/gnome-shell.css	2009-11-18 13:43:54 -05:00
Dan Winship	b48b21e578	add notificationDaemon.js currently supports summary+icon only, and requires you to manually kill the existing notification-daemon first	2009-11-18 13:42:38 -05:00
Dan Winship	e823a3b554	Fixed some problems noticed by marina	2009-11-18 13:42:07 -05:00
Dan Winship	e5b12619ef	acquire the list of already-active telepathy connections at startup	2009-11-03 14:30:10 -05:00
Dan Winship	242c2bce04	fix tabs->spaces	2009-11-03 12:13:08 -05:00
Dan Winship	64373fe77e	add avatar icons to message tray	2009-11-03 10:47:58 -05:00
Marina Zhurakhinskaya	f106ee7182	Add a notification popup for messages Use the notification popup when the messaging module receives new messages https://bugzilla.gnome.org/show_bug.cgi?id=599193	2009-11-03 10:28:44 -05:00
Dan Winship	56d2691c31	Reorganize a bit, fix missing-first-message bug https://bugzilla.gnome.org/show_bug.cgi?id=599193	2009-11-03 10:28:42 -05:00
Dan Winship	f883e32f26	Add shell_texture_cache_load_from_data, for loading non-file-based images Based on a patch from Will Thompson https://bugzilla.gnome.org/show_bug.cgi?id=599193	2009-11-03 10:28:34 -05:00
Dan Winship	c985c3cf78	Add some very minimal telepathy support Original code from Will Thompson https://bugzilla.gnome.org/show_bug.cgi?id=599193	2009-11-03 10:28:29 -05:00