lookingGlass: Get font from GConf

Instead of using "Monospace", pick the users configured monospace font name up from GConf. (This is a nice touch, but is more done here to demonstrate that we can do it rather than for any great utility.)
Port LookingGlass console to NBTK
2009-09-21 20:13:00 -04:00 · 2009-09-21 20:11:09 -04:00 · 2009-09-21 19:32:38 -04:00 · 2009-09-21 19:32:38 -04:00 · 2009-09-21 19:32:33 -04:00 · 2009-09-21 19:32:33 -04:00
244 changed files with 17357 additions and 29432 deletions
--- a/.gitignore
+++ b/.gitignore
@ -42,5 +42,3 @@ src/test-theme
 stamp-h1
 tests/run-test.sh
 xmldocs.make
-*~
-*.patch
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT(gnome-shell, 2.28.1)
+AC_INIT(gnome-shell, 2.27.3)

 AC_CONFIG_AUX_DIR(config)

@ -57,9 +57,10 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugin
                                 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)
+PKG_CHECK_MODULES(NBTK, clutter-1.0 gtk+-2.0 clutter-imcontext-0.1)
 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(TOOLKIT, clutter-1.0 libcroco-0.6)
 PKG_CHECK_MODULES(TRAY, gtk+-2.0)

 MUTTER_BIN_DIR=`$PKG_CONFIG --variable=exec_prefix mutter-plugins`/bin
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -16,22 +16,21 @@ imagesdir = $(pkgdatadir)/images
 dist_images_DATA =				\
 	add-workspace.svg			\
 	app-well-glow.png			\
+	back.svg				\
+	close.svg				\
 	close-black.svg				\
+	info.svg				\
 	magnifier.svg				\
 	remove-workspace.svg

 themedir = $(pkgdatadir)/theme
 dist_theme_DATA =				\
 	theme/gnome-shell.css			\
-	theme/close.svg                 \
-	theme/close-window.svg			\
 	theme/scroll-button-down.png		\
 	theme/scroll-button-down-hover.png	\
 	theme/scroll-button-up.png		\
 	theme/scroll-button-up-hover.png	\
-	theme/scroll-vhandle.png        \
-	theme/section-back.svg          \
-	theme/section-more.svg
+	theme/scroll-vhandle.png

 schemadir  = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = gnome-shell.schemas
--- a/data/theme/section-back.svg
+++ b/data/theme/section-back.svg
--- a/data/theme/close.svg
+++ b/data/theme/close.svg
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@ -88,21 +88,6 @@
 	</locale>
      </schema>

-      <schema>
-        <key>/schemas/desktop/gnome/shell/disabled_extensions</key>
-        <applyto>/desktop/gnome/shell/disabled_extensions</applyto>
-        <owner>gnome-shell</owner>
-        <type>list</type>
-        <list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-          <short>Uuids of extensions to disable</short>
-          <long>
-            GNOME Shell extensions have a uuid property; this key lists extensions which should not be loaded.
-         </long>
-        </locale>
-      </schema>
-
  </schemalist>

 </gconfschemafile>
--- a/data/info.svg
+++ b/data/info.svg
@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Foreground"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="info_16.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+   id="metadata2389"><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><defs
+   id="defs2387"><linearGradient
+     id="linearGradient3710"><stop
+       style="stop-color:#c4c4c4;stop-opacity:1;"
+       offset="0"
+       id="stop3712" /><stop
+       style="stop-color:#ffffff;stop-opacity:1;"
+       offset="1"
+       id="stop3714" /></linearGradient><inkscape:perspective
+     sodipodi:type="inkscape:persp3d"
+     inkscape:vp_x="0 : 8 : 1"
+     inkscape:vp_y="0 : 1000 : 0"
+     inkscape:vp_z="16 : 8 : 1"
+     inkscape:persp3d-origin="8 : 5.3333333 : 1"
+     id="perspective2391" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient3710"
+     id="linearGradient3716"
+     x1="7.9066148"
+     y1="15.937743"
+     x2="7.9377432"
+     y2="0.031128405"
+     gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+   inkscape:window-height="713"
+   inkscape:window-width="722"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   showgrid="false"
+   inkscape:zoom="32.125"
+   inkscape:cx="8"
+   inkscape:cy="8.154146"
+   inkscape:window-x="20"
+   inkscape:window-y="20"
+   inkscape:current-layer="Foreground" />
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   d="M7,3h2v2H7V3z M5.5,12H7V8H5.5V7H9v5h1.5v1h-5V12z M0,8c0-4.418,3.582-8,8-8  s8,3.582,8,8s-3.582,8-8,8S0,12.418,0,8z"
+   id="path2384"
+   style="fill-opacity:1;fill:url(#linearGradient3716)" />
+</svg>
--- a/data/theme/close-window.svg
+++ b/data/theme/close-window.svg
@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="22"
-   height="22"
-   viewBox="0 0 16 16"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="close-window.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata2399"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-   id="defs2397"><linearGradient
-     id="linearGradient3173"><stop
-       style="stop-color:#c4c4c4;stop-opacity:1;"
-       offset="0"
-       id="stop3175" /><stop
-       style="stop-color:#ffffff;stop-opacity:1;"
-       offset="1"
-       id="stop3177" /></linearGradient><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 8 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="16 : 8 : 1"
-     inkscape:persp3d-origin="8 : 5.3333333 : 1"
-     id="perspective2401" /></defs><sodipodi:namedview
-   inkscape:window-height="999"
-   inkscape:window-width="1680"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#000000"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="25.648691"
-   inkscape:cx="8.8097603"
-   inkscape:cy="9.0472789"
-   inkscape:window-x="0"
-   inkscape:window-y="26"
-   inkscape:current-layer="Foreground"
-   showguides="true"
-   inkscape:guide-bbox="true" />
-
-<g
-   id="g3175"><path
-     sodipodi:nodetypes="csssc"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.59217799;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path2394"
-     d="M 0.83987936,8.0425327 C 0.83987936,4.0805265 4.0712155,0.86823453 8.0567103,0.86823453 C 12.042205,0.86823453 15.273542,4.0805265 15.273542,8.0425327 C 15.273542,12.004539 12.042205,15.216831 8.0567103,15.216831 C 4.0712155,15.216831 0.83987936,12.004539 0.83987936,8.0425327 z"
-     clip-rule="evenodd" /><g
-     id="g3172"><path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.67127273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 5.4242673,5.3313047 L 10.515414,10.421272 L 10.714004,10.646491"
-       id="path3152" /></g></g><path
-   style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.67127273;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   d="M 5.4402527,10.650392 L 10.688082,5.3573033"
-   id="path3154"
-   sodipodi:nodetypes="cc" /></svg>
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@ -1,6 +1,6 @@
 /* Copyright 2009, Red Hat, Inc.
 *
- * Portions adapted from Mx's data/style/default.css
+ * Portions adapted from NBTK's data/style/default.css
 *   Copyright 2009 Intel Corporation
 *
 * This program is free software; you can redistribute it and/or modify it
@ -17,343 +17,50 @@
 * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 */

-.shell-link {
-    color: #0000ff;
-    text-decoration: underline;
-}
-
-.shell-link:hover {
-    color: #0000e0;
-}
-
-StScrollBar
+NbtkScrollBar
 {
+  background-color: #354761;
  padding: 0px;
 }

-StScrollView
+NbtkScrollView
 {
  scrollbar-width: 16px;
  scrollbar-height: 16px;
 }

-StButton#up-stepper
+NbtkButton#up-stepper
 {
  border-image: url("scroll-button-up.png") 5;
 }

-StButton#up-stepper:hover,
-StButton#up-stepper:active
+NbtkButton#up-stepper:hover,
+NbtkButton#up-stepper:active
 {
  border-image: url("scroll-button-up-hover.png") 5;
 }

-StButton#down-stepper
+NbtkButton#down-stepper
 {
  border-image: url("scroll-button-down.png") 5;
 }

-StButton#down-stepper:hover,
-StButton#down-stepper:active
+NbtkButton#down-stepper:hover,
+NbtkButton#down-stepper:active
 {
  border-image: url("scroll-button-down-hover.png") 5;
 }

-StScrollBar StButton#vhandle
+NbtkScrollBar NbtkButton#vhandle
 {
  border-image: url("scroll-vhandle.png") 5;
 }

-StScrollBar StButton#vhandle:hover
+NbtkScrollBar NbtkButton#vhandle:hover
 {
  border-image: url("scroll-vhandle.png") 5;
 }

-StTooltip {
-    border: 1px solid rgba(79,111,173,0.9);
-    border-radius: 5px;
-    padding: 4px;
-    background-color: rgba(79,111,173,0.9);
-    color: #ffffff;
-}
-
-/* Panel */
-
-#panel {
-    color: #ffffff;
-    font-size: 16px;
-    background-gradient-direction: vertical;
-    background-gradient-start: #161616;
-    background-gradient-end: #000000;
-}
-
-#panelLeft, #panelCenter, #panelRight {
-    spacing: 4px;
-}
-
-#panelLeft {
-    padding-right: 4px;
-}
-
-#panelRight {
-    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;
-    font: 16px sans-serif;
-}
-
-.panel-button:active, .panel-button:checked {
-    background-color: #314a6c;
-}
-
-#panelStatus {
-    spacing: 4px;
-}
-
-/* Overlay */
-
-.workspaces {
-    color: white;
-}
-
-.window-caption {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 10px;
-    font-size: 12px;
-    padding: 2px 8px;
-    -shell-caption-spacing: 4px;
-}
-
-.window-close {
-    background-image: url("close-window.svg");
-    height: 24px;
-    width: 24px;
-    -shell-close-overlap: 16px;
-}
-
-/* Dash */
-
-#dash {
-    color: #5f5f5f;
-    background-color: rgba(0,0,0,0.75);
-    padding: 0px 14px;
-}
-
-#dashSections {
-    spacing: 12px;
-}
-
-#searchEntry {
-    padding: 4px;
-    border-bottom: 1px solid #262626;
-}
-
-#searchEntry:active {
-    background-color: #c4c4c4;
-}
-
-.dash-section {
-    spacing: 8px;
-}
-
-.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;
-}
-
-.section-text-content {
-    padding: 4px 0px;
-}
-
-.section-header-back {
-    padding: 0px 4px 0px 0px;
-    border-right: 1px solid #262626;
-}
-
-.section-header-back-image {
-    background-image: url("section-back.svg");
-    width: 12px;
-    height: 16px;
-}
-
-.section-count {
-}
-
-.dash-section-content {
-    font-size: 14px;
-    color: #ffffff;
-    spacing: 8px;
-}
-
-.more-link {
-}
-
-.more-link-expander {
-    background-image: url("section-more.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-close {
-    background-image: url("close.svg");
-    width: 16px;
-    height: 16px;
-}
-
-.dash-search-section-header {
-    padding: 6px 0px;
-    spacing: 4px;
-}
-
-.dash-search-section-results {
-    color: #ffffff;
-    padding-left: 4px;
-}
-
-.dash-search-section-list-results {
-    spacing: 4px;
-}
-
-.dash-search-result-content {
-    padding: 2px;
-}
-
-.dash-search-result-content:selected {
-    padding: 1px;
-    border: 1px solid #262626;
-}
-
-/* GenericDisplay */
-
-.generic-display-container {
-    spacing: 4px;
-}
-
-.generic-display-item {
-    height: 50px;
-    border-radius: 4px;
-    color: #ffffff;
-    font-size: 14px;
-    spacing: 4px;
-}
-
-.generic-display-item:selected {
-    background-color: rgba(79,111,173,0.66);
-}
-
-.generic-display-item-text {
-    spacing: 4px;
-}
-
-.generic-display-item-description {
-    font-size: 12px;
-    color: #bababa;
-}
-
-.generic-display-details {
-    font-size: 14px;
-    color: #ffffff;
-}
-
-.generic-display-details-name {
-    font-weight: bold;
-}
-
-/* Apps */
-
-#dashAppWell {
-    spacing: 2px;
-    -shell-grid-item-size: 74px;
-}
-
-.app-well-app {
-    border: 1px solid #080808;
-    border-radius: 2px;
-    padding: 2px;
-    width: 74px;
-    height: 74px;
-    font-size: 12px;
-}
-
-.app-well-app:hover {
-    border: 1px solid #202020;
-}
-
-.app-well-app:active {
-    background-color: #1e1e1e;
-    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;
-    padding: 4px;
-    background-color: rgba(0,0,0,0.9);
-    color: #ffffff;
-    -shell-arrow-width: 12px;
-    -shell-menu-spacing: 4px;
-}
-
-.app-well-menu-item:hover {
-    background-color: #1e1e1e;
-}
-
-.app-well-menu-separator {
-    padding-top: 1px;
-    border-bottom: 1px solid #5f5f5f;
-    height: 1px;
-}
-
-/* Places */
-
-.places-actions {
-    spacing: 4px;
-}
-
-#placesDevices {
-    padding-top: 4px;
-}
-
 /* LookingGlass */

 #LookingGlassDialog
@ -373,166 +80,18 @@ StTooltip {
  border-radius: 4px;
 }

-#LookingGlassDialog .labels {
-  spacing: 4px;
-}
-
-#LookingGlassDialog .notebook-tab {
-  padding: 2px;
-}
-
-#LookingGlassDialog .notebook-tab:selected {
-  border: 1px solid #88ff66;
-  padding: 1px;
-}
-
-#LookingGlassDialog StLabel
+#LookingGlassDialog NbtkLabel
 {
  color: #88ff66;
 }

-#LookingGlassDialog StEntry
+#LookingGlassDialog NbtkEntry
 {
  color: #88ff66;
 }

-#LookingGlassDialog StBoxLayout#EvalBox
+#LookingGlassDialog NbtkBoxLayout#EvalBox
 {
  padding: 4px;
  spacing: 4px;
 }
-
-#lookingGlassExtensions {
-    padding: 4px;
-}
-
-.lg-extension-list {
-    padding: 4px;
-    spacing: 6px;
-}
-
-.lg-extension {
-    border: 1px solid #6f6f6f;
-    border-radius: 4px;
-    padding: 4px;
-}
-
-.lg-extension-name {
-    font-weight: bold;
-}
-
-.lg-extension-actions {
-    spacing: 6px;
-}
-
-/* Calendar popup */
-
-#calendarPopup {
-    border-radius: 5px;
-    background: rgba(0,0,0,0.9);
-    border: 1px solid rgba(128,128,128,0.45);
-    color: white;
-}
-
-#calendarPopup .calendar {
-    padding: 10px;
-}
-
-.calendar {
-    spacing-rows: 5px;
-    spacing-columns: 3px;
-}
-
-.calendar-change-month {
-    padding: 2px;
-}
-
-.calendar-change-month:hover {
-    background: #314a6c;
-    border-radius: 5px;
-}
-
-.calendar-change-month:active {
-    background: #213050;
-    border-radius: 5px;
-}
-
-.calendar-day {
-    padding: 1px 2px;
-}
-
-.calendar-today {
-    font-weight: bold;
-    background: #ffffff;
-    color: black;
-    border-radius: 5px;
-}
-
-.calendar-other-month-day {
-    color: #cccccc;
-}
-
-/* Message Tray */
-#message-tray {
-    background-gradient-direction: vertical;
-    background-gradient-start: rgba(0,0,0,0.01);
-    background-gradient-end: rgba(0,0,0,0.95);
-    height: 28px;
-}
-
-#notification {
-    border-radius: 5px;
-    background: rgba(0,0,0,0.9);
-    color: white;
-    padding: 2px 10px;
-    spacing: 10px;
-}
-
-#summary-mode {
-    spacing: 10px;
-    padding: 2px 4px;
-}
-
-/* App Switcher */
-.switcher-list {
-    background: rgba(0,0,0,0.8);
-    border: 1px solid rgba(128,128,128,0.40);
-    border-radius: 8px;
-    padding: 18px;
-
-    font: 12px sans-serif;
-    color: white;
-}
-
-.switcher-list .item-box {
-    padding: 8px;
-    border-radius: 4px;
-}
-
-.switcher-list .thumbnail-box {
-    padding: 2px;
-    spacing: 4px;
-}
-
-.switcher-list .thumbnail {
-    width:  256px;
-    height: 256px;
-}
-
-.switcher-list .outlined-item-box {
-    padding: 6px;
-    border: 2px solid rgba(85,85,85,1.0);
-    border-radius: 4px;
-}
-
-.switcher-list .selected-item-box {
-    padding: 8px;
-    border-radius: 4px;
-    background: rgba(255,255,255,0.33);
-}
-
-.switcher-list .separator {
-    width: 1px;
-    background: rgba(255,255,255,0.33);
-}
-
--- a/data/theme/section-more.svg
+++ b/data/theme/section-more.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.46+devel"
-   sodipodi:docname="New document 6">
-  <defs
-     id="defs3649">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3655" />
-    <inkscape:perspective
-       id="perspective3603"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="112.21575"
-     inkscape:cy="-32.642856"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="609"
-     inkscape:window-height="501"
-     inkscape:window-x="164"
-     inkscape:window-y="26"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3652">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-262.78425,-490.71933)">
-    <path
-       transform="matrix(0,0.98149546,-0.71467449,0,506.02358,412.28296)"
-       d="M 88.830127,340 80.169873,340 84.5,332.5 88.830127,340 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="true"
-       sodipodi:arg2="1.5707963"
-       sodipodi:arg1="0.52359878"
-       sodipodi:r2="2.5"
-       sodipodi:r1="5"
-       sodipodi:cy="337.5"
-       sodipodi:cx="84.5"
-       sodipodi:sides="3"
-       id="path5497-5"
-       style="fill:#5f5f5f;fill-opacity:1;stroke:#5f5f5f;stroke-width:0.59699643;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:type="star" />
-  </g>
-</svg>
--- a/js/misc/Makefile.am
+++ b/js/misc/Makefile.am
@ -1,6 +1,4 @@
 jsmiscdir = $(pkgdatadir)/js/misc

 dist_jsmisc_DATA =		\
-	docInfo.js		\
-	format.js		\
-	params.js
+	docInfo.js
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@ -7,7 +7,6 @@ const Shell = imports.gi.Shell;

 const Lang = imports.lang;
 const Signals = imports.signals;
-const Search = imports.ui.search;
 const Main = imports.ui.main;

 const THUMBNAIL_ICON_MARGIN = 2;
@ -18,43 +17,69 @@ function DocInfo(recentInfo) {

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

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

    launch : function() {
-        Shell.DocSystem.get_default().open(this.recentInfo);
-    },
+        // While using Gio.app_info_launch_default_for_uri() would be
+        // shorter in terms of lines of code, we are not doing so
+        // because that would duplicate the work of retrieving the
+        // mime type.

-    matchTerms: function(terms) {
-        let mtype = Search.MatchType.NONE;
-        for (let i = 0; i < terms.length; i++) {
-            let term = terms[i];
-            let idx = this._lowerName.indexOf(term);
-            if (idx == 0) {
-                if (mtype != Search.MatchType.NONE)
-                    return Search.MatchType.MULTIPLE;
-                mtype = Search.MatchType.PREFIX;
-            } else if (idx > 0) {
-                if (mtype != Search.MatchType.NONE)
-                    return Search.MatchType.MULTIPLE;
-                mtype = Search.MatchType.SUBSTRING;
+        let appInfo = Gio.app_info_get_default_for_type(this.mimeType, true);
+
+        if (appInfo != null) {
+            appInfo.launch_uris([this.uri], Main.createAppLaunchContext());
+        } else {
+            log("Failed to get default application info for mime type " + this.mimeType +
+                ". Will try to use the last application that registered the document.");
+            let appName = this._recentInfo.last_application();
+            let [success, appExec, count, time] = this._recentInfo.get_application_info(appName);
+            if (success) {
+                log("Will open a document with the following command: " + appExec);
+                // TODO: Change this once better support for creating
+                // GAppInfo is added to GtkRecentInfo, as right now
+                // this relies on the fact that the file uri is
+                // already a part of appExec, so we don't supply any
+                // files to appInfo.launch().
+
+                // The 'command line' passed to
+                // create_from_command_line is allowed to contain
+                // '%<something>' macros that are expanded to file
+                // name / icon name, etc, so we need to escape % as %%
+                appExec = appExec.replace(/%/g, "%%");
+
+                let appInfo = Gio.app_info_create_from_commandline(appExec, null, 0, null);
+
+                // The point of passing an app launch context to
+                // launch() is mostly to get startup notification and
+                // associated benefits like the app appearing on the
+                // right desktop; but it doesn't really work for now
+                // because with the way we create the appInfo we
+                // aren't reading the application's desktop file, and
+                // thus don't find the StartupNotify=true in it. So,
+                // despite passing the app launch context, no startup
+                // notification occurs.
+                appInfo.launch([], Main.createAppLaunchContext());
            } else {
-                continue;
+                log("Failed to get application info for " + this.uri);
            }
        }
-        return mtype;
+    },
+
+    exists : function() {
+        return this._recentInfo.exists();
    }
 };

@ -66,86 +91,50 @@ function getDocManager() {
    return docManagerInstance;
 }

-/**
- * DocManager wraps the DocSystem, primarily to expose DocInfo objects
- * which conform to the GenericDisplay item API.
- */
 function DocManager() {
    this._init();
 }

 DocManager.prototype = {
    _init: function() {
-        this._docSystem = Shell.DocSystem.get_default();
-        this._infosByTimestamp = [];
-        this._infosByUri = {};
-        this._docSystem.connect('changed', Lang.bind(this, this._reload));
+        this._recentManager = Gtk.RecentManager.get_default();
+        this._items = {};
+        this._recentManager.connect('changed', Lang.bind(this, function(recentManager) {
+            this._reload();
+            this.emit('changed');
+        }));
        this._reload();
    },

    _reload: function() {
-        let docs = this._docSystem.get_all();
-        this._infosByTimestamp = [];
-        this._infosByUri = {};
+        let docs = this._recentManager.get_items();
+        let newItems = {};
        for (let i = 0; i < docs.length; i++) {
            let recentInfo = docs[i];
+            if (!recentInfo.exists())
+                continue;

            let docInfo = new DocInfo(recentInfo);
-            this._infosByTimestamp.push(docInfo);
-            this._infosByUri[docInfo.uri] = docInfo;
+
+            // we use GtkRecentInfo URI as an item Id
+            newItems[docInfo.uri] = docInfo;
        }
-        this.emit('changed');
-    },
-
-    getTimestampOrderedInfos: function() {
-        return this._infosByTimestamp;
-    },
-
-    getInfosByUri: function() {
-        return this._infosByUri;
-    },
-
-    lookupByUri: function(uri) {
-        return this._infosByUri[uri];
-    },
-
-    queueExistenceCheck: function(count) {
-        return this._docSystem.queue_existence_check(count);
-    },
-
-    initialSearch: function(terms) {
-        let multipleMatches = [];
-        let prefixMatches = [];
-        let substringMatches = [];
-        for (let i = 0; i < this._infosByTimestamp.length; i++) {
-            let item = this._infosByTimestamp[i];
-            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(item.uri);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixMatches.push(item.uri);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringMatches.push(item.uri);
-         }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
-    },
-
-    subsearch: function(previousResults, terms) {
-        let multipleMatches = [];
-        let prefixMatches = [];
-        let substringMatches = [];
-        for (let i = 0; i < previousResults.length; i++) {
-            let uri = previousResults[i];
-            let item = this._infosByUri[uri];
-            let mtype = item.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleMatches.push(uri);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixMatches.push(uri);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringMatches.push(uri);
+        let deleted = {};
+        for (var uri in this._items) {
+            if (!(uri in newItems))
+                deleted[uri] = this._items[uri];
        }
-        return multipleMatches.concat(prefixMatches.concat(substringMatches));
+        /* If we'd cached any thumbnail references that no longer exist,
+           dump them here */
+        let texCache = Shell.TextureCache.get_default();
+        for (var uri in deleted) {
+            texCache.evict_recent_thumbnail(this._items[uri]);
+        }
+        this._items = newItems;
+    },
+
+    getItems: function() {
+        return this._items;
    }
 }

--- a/js/misc/format.js
+++ b/js/misc/format.js
@ -1,44 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-/*
- * This function is intended to extend the String object and provide
- * an String.format API for string formatting.
- * It has to be set up using String.prototype.format = Format.format;
- * Usage:
- * "somestring %s %d".format('hello', 5);
- * It supports %s, %d and %f, for %f it also support precisions like
- * "%.2f".format(1.526)
- */
-
-function format() {
-    let str = this;
-    let i = 0;
-    let args = arguments;
-
-    return str.replace(/%(?:\.([0-9]+))?(.)/g, function (str, precisionGroup, genericGroup) {
-
-                    if (precisionGroup != '' && genericGroup != 'f')
-                        throw new Error("Precision can only be specified for 'f'");
-
-                    switch (genericGroup) {
-                        case '%':
-                            return '%';
-                            break;
-                        case 's':
-                            return args[i++].toString();
-                            break;
-                        case 'd':
-                            return parseInt(args[i++]);
-                            break;
-                        case 'f':
-                            if (precisionGroup == '')
-                                return parseFloat(args[i++]);
-                            else
-                                return parseFloat(args[i++]).toFixed(parseInt(precisionGroup));
-                            break;
-                        default:
-                            throw new Error('Unsupported conversion character %' + genericGroup);
-                    }
-                    return ""; // Suppress warning
-                });
-}
--- a/js/misc/params.js
+++ b/js/misc/params.js
@ -1,33 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-// parse:
-// @params: caller-provided parameter object, or %null
-// @default: function-provided defaults object
-// @allowExtras: whether or not to allow properties not in @default
-//
-// Examines @params and fills in default values from @defaults for
-// any properties in @defaults that don't appear in @params. If
-// @allowExtras is not %true, it will throw an error if @params
-// contains any properties that aren't in @defaults.
-//
-// If @params is %null, this returns @defaults.
-//
-// Return value: the updated params
-function parse(params, defaults, allowExtras) {
-    if (!params)
-        return defaults;
-
-    if (!allowExtras) {
-	for (let prop in params) {
-	    if (!(prop in defaults))
-		throw new Error('Unrecognized parameter "' + prop + '"');
-	}
-    }
-
-    for (let prop in defaults) {
-	if (!(prop in params))
-	    params[prop] = defaults[prop];
-    }
-
-    return params;
-}
--- a/js/ui/Makefile.am
+++ b/js/ui/Makefile.am
@ -3,29 +3,22 @@ jsuidir = $(pkgdatadir)/js/ui
 dist_jsui_DATA =		\
 	altTab.js		\
 	appDisplay.js		\
-	appFavorites.js		\
-	calendar.js		\
+	appIcon.js		\
+	button.js		\
 	chrome.js		\
 	dash.js			\
 	dnd.js			\
 	docDisplay.js		\
 	environment.js		\
-	extensionSystem.js  \
 	genericDisplay.js	\
-	lightbox.js		\
 	link.js			\
 	lookingGlass.js		\
 	main.js			\
-	messageTray.js          \
-	notificationDaemon.js   \
 	overview.js		\
 	panel.js		\
-	placeDisplay.js		\
+	places.js		\
 	runDialog.js		\
-	search.js           \
-	shellDBus.js		\
 	sidebar.js		\
-	statusMenu.js		\
 	tweener.js		\
 	widget.js		\
 	widgetBox.js		\
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@ -2,37 +2,33 @@

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

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

-const POPUP_ARROW_COLOR = new Clutter.Color();
-POPUP_ARROW_COLOR.from_pixel(0xffffffff);
-const POPUP_UNFOCUSED_ARROW_COLOR = new Clutter.Color();
-POPUP_UNFOCUSED_ARROW_COLOR.from_pixel(0x808080ff);
-const TRANSPARENT_COLOR = new Clutter.Color();
-TRANSPARENT_COLOR.from_pixel(0x00000000);
+const POPUP_BG_COLOR = new Clutter.Color();
+POPUP_BG_COLOR.from_pixel(0x00000080);
+const POPUP_INDICATOR_COLOR = new Clutter.Color();
+POPUP_INDICATOR_COLOR.from_pixel(0xf0f0f0ff);
+const POPUP_TRANSPARENT = new Clutter.Color();
+POPUP_TRANSPARENT.from_pixel(0x00000000);

-const POPUP_APPICON_SIZE = 96;
-const POPUP_LIST_SPACING = 8;
+const POPUP_INDICATOR_WIDTH = 4;
+const POPUP_GRID_SPACING = 8;
+const POPUP_ICON_SIZE = 48;
+const POPUP_NUM_COLUMNS = 5;

-const DISABLE_HOVER_TIMEOUT = 500; // milliseconds
+const POPUP_LABEL_MAX_WIDTH = POPUP_NUM_COLUMNS * (POPUP_ICON_SIZE + POPUP_GRID_SPACING);

-const THUMBNAIL_SIZE = 256;
-const THUMBNAIL_POPUP_TIME = 500; // milliseconds
-const THUMBNAIL_FADE_TIME = 0.2; // seconds
+const OVERLAY_COLOR = new Clutter.Color();
+OVERLAY_COLOR.from_pixel(0x00000044);

-function mod(a, b) {
-    return (a + b) % b;
-}
+const SHOW_TIME = 0.05;
+const SWITCH_TIME = 0.1;

 function AltTabPopup() {
    this._init();
@ -40,735 +36,244 @@ function AltTabPopup() {

 AltTabPopup.prototype = {
    _init : function() {
-        this.actor = new Clutter.Group({ reactive: true,
-                                         x: 0,
-                                         y: 0,
-                                         width: global.screen_width,
-                                         height: global.screen_height });
+        this.actor = new Big.Box({ background_color : POPUP_BG_COLOR,
+                                   corner_radius: POPUP_GRID_SPACING,
+                                   padding: POPUP_GRID_SPACING,
+                                   spacing: POPUP_GRID_SPACING,
+                                   orientation: Big.BoxOrientation.VERTICAL });

-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        // Icon grid.  TODO: Investigate Nbtk.Grid once that lands.  Currently
+        // just implemented using a chain of Big.Box.
+        this._grid = new Big.Box({ spacing: POPUP_GRID_SPACING,
+                                   orientation: Big.BoxOrientation.VERTICAL });
+        let gcenterbox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                       x_align: Big.BoxAlignment.CENTER });
+        gcenterbox.append(this._grid, Big.BoxPackFlags.NONE);
+        this.actor.append(gcenterbox, Big.BoxPackFlags.NONE);

-        this._haveModal = false;
+        // Selected-window label
+        this._label = new Clutter.Text({ font_name: "Sans 16px",
+                                         ellipsize: Pango.EllipsizeMode.END });

-        this._currentApp = 0;
-        this._currentWindow = 0;
-        this._thumbnailTimeoutId = 0;
-        this._motionTimeoutId = 0;
+        let labelbox = new Big.Box({ background_color: POPUP_INDICATOR_COLOR,
+                                     corner_radius: POPUP_GRID_SPACING / 2,
+                                     padding: POPUP_GRID_SPACING / 2 });
+        labelbox.append(this._label, Big.BoxPackFlags.NONE);
+        let lcenterbox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                       x_align: Big.BoxAlignment.CENTER,
+                                       width: POPUP_LABEL_MAX_WIDTH + POPUP_GRID_SPACING });
+        lcenterbox.append(labelbox, Big.BoxPackFlags.NONE);
+        this.actor.append(lcenterbox, Big.BoxPackFlags.NONE);

-        // Initially disable hover so we ignore the enter-event if
-        // the switcher appears underneath the current pointer location
-        this._disableHover();
+        // Indicator around selected icon
+        this._indicator = new Big.Rectangle({ border_width: POPUP_INDICATOR_WIDTH,
+                                              corner_radius: POPUP_INDICATOR_WIDTH / 2,
+                                              border_color: POPUP_INDICATOR_COLOR,
+                                              color: POPUP_TRANSPARENT });
+        this.actor.append(this._indicator, Big.BoxPackFlags.FIXED);
+
+        this._items = [];
+        this._toplevels = global.window_group.get_children();

        global.stage.add_actor(this.actor);
+
+        // Dark translucent window used to cover all but the
+        // currently-selected window while Alt-Tabbing. Actually
+        // contains four actors which can we rearrange to create
+        // a hole in the overlay.
+        this._overlay = new Clutter.Group({ reactive: true });
+        this._overlay_top = new Clutter.Rectangle({ color: OVERLAY_COLOR,
+                                                    border_width: 0 });
+        this._overlay_bottom = new Clutter.Rectangle({ color: OVERLAY_COLOR,
+                                                       border_width: 0 });
+        this._overlay_left = new Clutter.Rectangle({ color: OVERLAY_COLOR,
+                                                     border_width: 0 });
+        this._overlay_right = new Clutter.Rectangle({ color: OVERLAY_COLOR,
+                                                      border_width: 0 });
+        this._overlay.add_actor(this._overlay_top);
+        this._overlay.add_actor(this._overlay_bottom);
+        this._overlay.add_actor(this._overlay_left);
+        this._overlay.add_actor(this._overlay_right);
    },

-    show : function(backward) {
-        let tracker = Shell.WindowTracker.get_default();
-        let apps = tracker.get_running_apps ("");
+    addWindow : function(win) {
+        let item = { window: win,
+                     metaWindow: win.get_meta_window() };

-        if (!apps.length)
-            return false;
+        let pixbuf = item.metaWindow.icon;
+        item.icon = new Clutter.Texture({ width: POPUP_ICON_SIZE,
+                                          height: POPUP_ICON_SIZE,
+                                          keep_aspect_ratio: true });
+        Shell.clutter_texture_set_from_pixbuf(item.icon, pixbuf);

-        if (!Main.pushModal(this.actor))
-            return false;
-        this._haveModal = true;
+        item.box = new Big.Box({ padding: POPUP_INDICATOR_WIDTH * 2 });
+        item.box.append(item.icon, Big.BoxPackFlags.NONE);

-        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-
-        this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
-        this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
-
-        this._appSwitcher = new AppSwitcher(apps);
-        this.actor.add_actor(this._appSwitcher.actor);
-        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
-        if (this._appIcons.length == 1) {
-            if (!backward && this._appIcons[0].cachedWindows.length > 1) {
-                // For compatibility with the multi-app case below
-                this._select(0, 1, true);
-            } else
-                this._select(0);
-        } else if (backward) {
-            this._select(this._appIcons.length - 1);
-        } else {
-            let firstWindows = this._appIcons[0].cachedWindows;
-            if (firstWindows.length > 1) {
-                let curAppNextWindow = firstWindows[1];
-                let nextAppWindow = this._appIcons[1].cachedWindows[0];
-
-                // If the next window of the current app is more-recently-used
-                // than the first window of the next app, then select it.
-                if (curAppNextWindow.get_workspace() == global.screen.get_active_workspace() &&
-                    curAppNextWindow.get_user_time() > nextAppWindow.get_user_time())
-                    this._select(0, 1, true);
-                else
-                    this._select(1);
-            } else
-                this._select(1);
-        }
-
-        // There's a race condition; if the user released Alt before
-        // we got the grab, then we won't be notified. (See
-        // https://bugzilla.gnome.org/show_bug.cgi?id=596695 for
-        // details.) So we check now. (Have to do this after updating
-        // selection.)
-        let mods = global.get_modifier_keys();
-        if (!(mods & Gdk.ModifierType.MOD1_MASK)) {
-            this._finish();
-            return false;
-        }
-
-        return true;
-    },
-
-    _nextApp : function() {
-        return mod(this._currentApp + 1, this._appIcons.length);
-    },
-    _previousApp : function() {
-        return mod(this._currentApp - 1, this._appIcons.length);
-    },
-
-    _nextWindow : function() {
-        return mod(this._currentWindow + 1,
-                   this._appIcons[this._currentApp].cachedWindows.length);
-    },
-    _previousWindow : function() {
-        return mod(this._currentWindow - 1,
-                   this._appIcons[this._currentApp].cachedWindows.length);
-    },
-
-    _keyPressEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
-        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
-
-        this._disableHover();
-
-        // The WASD stuff is for debugging in Xephyr, where the arrow
-        // keys aren't mapped correctly
-
-        if (keysym == Clutter.grave)
-            this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
-        else if (keysym == Clutter.Escape)
-            this.destroy();
-        else if (this._thumbnailsFocused) {
-            if (keysym == Clutter.Tab) {
-                if (shift && this._currentWindow == 0)
-                    this._select(this._previousApp());
-                else if (!shift && this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
-                    this._select(this._nextApp());
-                else
-                    this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow());
-            } else if (keysym == Clutter.Left || keysym == Clutter.a)
-                this._select(this._currentApp, this._previousWindow());
-            else if (keysym == Clutter.Right || keysym == Clutter.d)
-                this._select(this._currentApp, this._nextWindow());
-            else if (keysym == Clutter.Up || keysym == Clutter.w)
-                this._select(this._currentApp, null, true);
-        } else {
-            if (keysym == Clutter.Tab)
-                this._select(shift ? this._previousApp() : this._nextApp());
-            else if (keysym == Clutter.Left || keysym == Clutter.a)
-                this._select(this._previousApp());
-            else if (keysym == Clutter.Right || keysym == Clutter.d)
-                this._select(this._nextApp());
-            else if (keysym == Clutter.Down || keysym == Clutter.s)
-                this._select(this._currentApp, this._currentWindow);
-        }
-
-        return true;
-    },
-
-    _keyReleaseEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
-
-        if (keysym == Clutter.Alt_L || keysym == Clutter.Alt_R)
-            this._finish();
-
-        return true;
-    },
-
-    _onScroll : function(actor, event) {
-        let direction = event.get_scroll_direction();
-        if (direction == Clutter.ScrollDirection.UP) {
-            if (this._thumbnailsFocused) {
-                if (this._currentWindow == 0)
-                    this._select(this._previousApp());
-                else
-                    this._select(this._currentApp, this._previousWindow());
-            } else {
-                let nwindows = this._appIcons[this._currentApp].cachedWindows.length;
-                if (nwindows > 1)
-                    this._select(this._currentApp, nwindows - 1);
-                else
-                    this._select(this._previousApp());
-            }
-        } else if (direction == Clutter.ScrollDirection.DOWN) {
-            if (this._thumbnailsFocused) {
-                if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
-                    this._select(this._nextApp());
-                else
-                    this._select(this._currentApp, this._nextWindow());
-            } else {
-                let nwindows = this._appIcons[this._currentApp].cachedWindows.length;
-                if (nwindows > 1)
-                    this._select(this._currentApp, 0);
-                else
-                    this._select(this._nextApp());
+        item.above = null;
+        for (let i = 1; i < this._toplevels.length; i++) {
+            if (this._toplevels[i] == win) {
+                item.above = this._toplevels[i - 1];
+                break;
            }
        }
+
+        item.visible = item.metaWindow.showing_on_its_workspace();
+
+        if (!item.visible) {
+            let rect = new Meta.Rectangle();
+            if (item.metaWindow.get_icon_geometry(rect))
+                item.icon_rect = rect;
+        }
+
+        item.n = this._items.length;
+        this._items.push(item);
+
+        // Add it to the grid
+        if (!this._gridRow || this._gridRow.get_children().length == POPUP_NUM_COLUMNS) {
+            this._gridRow = new Big.Box({ spacing: POPUP_GRID_SPACING,
+                                          orientation: Big.BoxOrientation.HORIZONTAL });
+            this._grid.append(this._gridRow, Big.BoxPackFlags.NONE);
+        }
+        this._gridRow.append(item.box, Big.BoxPackFlags.NONE);
    },

-    _clickedOutside : function(actor, event) {
-        this.destroy();
-    },
+    show : function(initialSelection) {
+        global.window_group.add_actor(this._overlay);
+        this._overlay.raise_top();
+        this._overlay.show();
+        this.actor.opacity = 0;
+        Tweener.addTween(this.actor, { opacity: 255,
+                                       time: SHOW_TIME,
+                                       transition: "easeOutQuad" });

-    _appActivated : function(appSwitcher, n) {
-        // If the user clicks on the selected app, activate the
-        // selected window; otherwise (eg, they click on an app while
-        // !mouseActive) activate the first window of the clicked-on
-        // app.
-        let window = (n == this._currentApp) ? this._currentWindow : 0;
-        Main.activateWindow(this._appIcons[n].cachedWindows[window]);
-        this.destroy();
-    },
+        this.actor.show_all();
+        this.actor.x = Math.floor((global.screen_width - this.actor.width) / 2);
+        this.actor.y = Math.floor((global.screen_height - this.actor.height) / 2);

-    _appEntered : function(appSwitcher, n) {
-        if (!this._mouseActive)
-            return;
-
-        this._select(n);
-    },
-
-    _windowActivated : function(thumbnailList, n) {
-        Main.activateWindow(this._appIcons[this._currentApp].cachedWindows[n]);
-        this.destroy();
-    },
-
-    _windowEntered : function(thumbnailList, n) {
-        if (!this._mouseActive)
-            return;
-
-        this._select(this._currentApp, n);
-    },
-
-    _disableHover : function() {
-        this._mouseActive = false;
-
-        if (this._motionTimeoutId != 0)
-            Mainloop.source_remove(this._motionTimeoutId);
-
-        this._motionTimeoutId = Mainloop.timeout_add(DISABLE_HOVER_TIMEOUT, Lang.bind(this, this._mouseTimedOut));
-    },
-
-    _mouseTimedOut : function() {
-        this._motionTimeoutId = 0;
-        this._mouseActive = true;
-    },
-
-    _finish : function() {
-        let app = this._appIcons[this._currentApp];
-        let window = app.cachedWindows[this._currentWindow];
-        Main.activateWindow(window);
-        this.destroy();
+        this.select(initialSelection);
    },

    destroy : function() {
        this.actor.destroy();
+        this._overlay.destroy();
    },

-    _onDestroy : function() {
-        if (this._haveModal)
-            Main.popModal(this.actor);
+    select : function(n) {
+        if (this._selected) {
+            // Unselect previous

-        if (this._keyPressEventId)
-            global.stage.disconnect(this._keyPressEventId);
-        if (this._keyReleaseEventId)
-            global.stage.disconnect(this._keyReleaseEventId);
-
-        if (this._motionTimeoutId != 0)
-            Mainloop.source_remove(this._motionTimeoutId);
-        if (this._thumbnailTimeoutId != 0)
-            Mainloop.source_remove(this._thumbnailTimeoutId);
-    },
-
-    /**
-     * _select:
-     * @app: index of the app to select
-     * @window: (optional) index of which of @app's windows to select
-     * @forceAppFocus: optional flag, see below
-     *
-     * Selects the indicated @app, and optional @window, and sets
-     * this._thumbnailsFocused appropriately to indicate whether the
-     * arrow keys should act on the app list or the thumbnail list.
-     *
-     * If @app is specified and @window is unspecified or %null, then
-     * the app is highlighted (ie, given a light background), and the
-     * current thumbnail list, if any, is destroyed. If @app has
-     * multiple windows, and @forceAppFocus is not %true, then a
-     * timeout is started to open a thumbnail list.
-     *
-     * If @app and @window are specified (and @forceAppFocus is not),
-     * then @app will be outlined, a thumbnail list will be created
-     * and focused (if it hasn't been already), and the @window'th
-     * window in it will be highlighted.
-     *
-     * If @app and @window are specified and @forceAppFocus is %true,
-     * then @app will be highlighted, and @window outlined, and the
-     * app list will have the keyboard focus.
-     */
-    _select : function(app, window, forceAppFocus) {
-        if (app != this._currentApp || window == null) {
-            if (this._thumbnails)
-                this._destroyThumbnails();
-        }
-
-        if (this._thumbnailTimeoutId != 0) {
-            Mainloop.source_remove(this._thumbnailTimeoutId);
-            this._thumbnailTimeoutId = 0;
-        }
-
-        this._thumbnailsFocused = (window != null) && !forceAppFocus;
-
-        this._currentApp = app;
-        this._currentWindow = window ? window : 0;
-        this._appSwitcher.highlight(app, this._thumbnailsFocused);
-
-        if (window != null) {
-            if (!this._thumbnails)
-                this._createThumbnails();
-            this._currentWindow = window;
-            this._thumbnails.highlight(window, forceAppFocus);
-        } else if (this._appIcons[this._currentApp].cachedWindows.length > 1 &&
-                   !forceAppFocus) {
-            this._thumbnailTimeoutId = Mainloop.timeout_add (
-                THUMBNAIL_POPUP_TIME,
-                Lang.bind(this, function () {
-                              this._select(this._currentApp, 0, true);
-                              return false;
-                          }));
-        }
-    },
-
-    _destroyThumbnails : function() {
-        Tweener.addTween(this._thumbnails.actor,
-                         { opacity: 0,
-                           time: THUMBNAIL_FADE_TIME,
-                           transition: "easeOutQuad",
-                           onComplete: function() { this.destroy(); }
-                         });
-        this._thumbnails = null;
-    },
-
-    _createThumbnails : function() {
-        this._thumbnails = new ThumbnailList (this._appIcons[this._currentApp].cachedWindows);
-        this._thumbnails.connect('item-activated', Lang.bind(this, this._windowActivated));
-        this._thumbnails.connect('item-entered', Lang.bind(this, this._windowEntered));
-
-        this.actor.add_actor(this._thumbnails.actor);
-
-        let thumbnailCenter;
-        if (this._thumbnails.actor.width < this._appSwitcher.actor.width) {
-            // Center the thumbnails under the corresponding AppIcon.
-            // If this is being called when the switcher is first
-            // being brought up, then nothing will have been assigned
-            // an allocation yet, and the get_transformed_position()
-            // call will return 0,0.
-            // (http://bugzilla.openedhand.com/show_bug.cgi?id=1115).
-            // Calling clutter_actor_get_allocation_box() would force
-            // it to properly allocate itself, but we can't call that
-            // because it has an out-caller-allocates arg. So we use
-            // clutter_stage_get_actor_at_pos(), which will force a
-            // reallocation as a side effect.
-            global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, 0, 0);
-
-            let icon = this._appIcons[this._currentApp].actor;
-            let [stageX, stageY] = icon.get_transformed_position();
-            thumbnailCenter = stageX + icon.width / 2;
-        } else {
-            // Center the thumbnails on the monitor
-            let primary = global.get_primary_monitor();
-            thumbnailCenter = primary.x + primary.width / 2;
-        }
-
-        this._thumbnails.actor.x = Math.floor(thumbnailCenter - this._thumbnails.actor.width / 2);
-        this._thumbnails.actor.y = this._appSwitcher.actor.y + this._appSwitcher.actor.height + POPUP_LIST_SPACING;
-
-        this._thumbnails.actor.opacity = 0;
-        Tweener.addTween(this._thumbnails.actor,
-                         { opacity: 255,
-                           time: THUMBNAIL_FADE_TIME,
-                           transition: "easeOutQuad"
-                         });
-    }
-};
-
-function SwitcherList(squareItems) {
-    this._init(squareItems);
-}
-
-SwitcherList.prototype = {
-    _init : function(squareItems) {
-        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.
-        this._list = new Shell.GenericContainer();
-        this._list.spacing = POPUP_LIST_SPACING;
-
-        this._list.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this._list.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this._list.connect('allocate', Lang.bind(this, this._allocate));
-
-        this.actor.add_actor(this._list);
-
-        this._items = [];
-        this._highlighted = -1;
-        this._separator = null;
-        this._squareItems = squareItems;
-    },
-
-    addItem : function(item) {
-        let bbox = new St.Clickable({ style_class: 'item-box',
-                                      reactive: true });
-
-        bbox.set_child(item);
-        this._list.add_actor(bbox);
-
-        let n = this._items.length;
-        bbox.connect('clicked', Lang.bind(this, function () {
-                                               this._itemActivated(n);
-                                          }));
-        bbox.connect('enter-event', Lang.bind(this, function () {
-                                                  this._itemEntered(n);
-                                              }));
-
-        this._items.push(bbox);
-    },
-
-    addSeparator: function () {
-        let box = new St.Bin({ style_class: 'separator' })
-        this._separator = box;
-        this._list.add_actor(box);
-    },
-
-    highlight: function(index, justOutline) {
-        if (this._highlighted != -1)
-            this._items[this._highlighted].style_class = 'item-box';
-
-        this._highlighted = index;
-
-        if (this._highlighted != -1) {
-            if (justOutline)
-                this._items[this._highlighted].style_class = 'outlined-item-box';
-            else
-                this._items[this._highlighted].style_class = 'selected-item-box';
-        }
-    },
-
-    _itemActivated: function(n) {
-        this.emit('item-activated', n);
-    },
-
-    _itemEntered: function(n) {
-        this.emit('item-entered', n);
-    },
-
-    _maxChildWidth: function (forHeight) {
-        let maxChildMin = 0;
-        let maxChildNat = 0;
-
-        for (let i = 0; i < this._items.length; i++) {
-            let [childMin, childNat] = this._items[i].get_preferred_width(forHeight);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-
-            if (this._squareItems) {
-                let [childMin, childNat] = this._items[i].get_preferred_height(-1);
-                maxChildMin = Math.max(childMin, maxChildMin);
-                maxChildNat = Math.max(childNat, maxChildNat);
+            if (this._allocationChangedId) {
+                this._selected.box.disconnect(this._allocationChangedId);
+                delete this._allocationChangedId;
            }
+
+            if (this._selected.above)
+                this._selected.window.raise(this._selected.above);
+            else
+                this._selected.window.lower_bottom();
        }

-        return [maxChildMin, maxChildNat];
-    },
+        let item = this._items[n];
+        let changed = this._selected && item != this._selected;
+        this._selected = item;

-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        let [maxChildMin, maxChildNat] = this._maxChildWidth(forHeight);
+        if (this._selected) {
+            this._label.set_size(-1, -1);
+            this._label.text = this._selected.metaWindow.title;
+            if (this._label.width > POPUP_LABEL_MAX_WIDTH)
+                this._label.width = POPUP_LABEL_MAX_WIDTH;

-        let separatorWidth = 0;
-        if (this._separator) {
-            let [sepMin, sepNat] = this._separator.get_preferred_width(forHeight);
-            separatorWidth = sepNat + this._list.spacing;
-        }
+            // Figure out this._selected.box's coordinates in terms of
+            // this.actor
+            let bx = this._selected.box.x, by = this._selected.box.y;
+            let actor = this._selected.box.get_parent();
+            while (actor != this.actor) {
+                bx += actor.x;
+                by += actor.y;
+                actor = actor.get_parent();
+            }

-        let totalSpacing = this._list.spacing * (this._items.length - 1);
-        alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
-        alloc.nat_size = this._items.length * maxChildNat + separatorWidth + totalSpacing;
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        let maxChildMin = 0;
-        let maxChildNat = 0;
-
-        for (let i = 0; i < this._items.length; i++) {
-            let [childMin, childNat] = this._items[i].get_preferred_height(-1);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-        }
-
-        if (this._squareItems) {
-            let [childMin, childNat] = this._maxChildWidth(-1);
-            maxChildMin = Math.max(childMin, maxChildMin);
-            maxChildNat = Math.max(childNat, maxChildNat);
-        }
-
-        alloc.min_size = maxChildMin;
-        alloc.nat_size = maxChildNat;
-    },
-
-    _allocate: function (actor, box, flags) {
-        let childHeight = box.y2 - box.y1;
-
-        let [maxChildMin, maxChildNat] = this._maxChildWidth(childHeight);
-        let totalSpacing = this._list.spacing * (this._items.length - 1);
-
-        let separatorWidth = 0;
-        if (this._separator) {
-            let [sepMin, sepNat] = this._separator.get_preferred_width(childHeight);
-            separatorWidth = sepNat;
-            totalSpacing += this._list.spacing;
-        }
-
-        let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing - separatorWidth) / this._items.length);
-
-        let x = 0;
-        let children = this._list.get_children();
-        let childBox = new Clutter.ActorBox();
-        for (let i = 0; i < children.length; i++) {
-            if (this._items.indexOf(children[i]) != -1) {
-                let [childMin, childNat] = children[i].get_preferred_height(childWidth);
-                let vSpacing = (childHeight - childNat) / 2;
-                childBox.x1 = x;
-                childBox.y1 = vSpacing;
-                childBox.x2 = x + childWidth;
-                childBox.y2 = childBox.y1 + childNat;
-                children[i].allocate(childBox, flags);
-
-                x += this._list.spacing + childWidth;
-            } else if (children[i] == this._separator) {
-                // We want the separator to be more compact than the rest.
-                childBox.x1 = x;
-                childBox.y1 = 0;
-                childBox.x2 = x + separatorWidth;
-                childBox.y2 = childHeight;
-                children[i].allocate(childBox, flags);
-                x += this._list.spacing + separatorWidth;
+            if (changed) {
+                Tweener.addTween(this._indicator,
+                                 { x: bx,
+                                   y: by,
+                                   width: this._selected.box.width,
+                                   height: this._selected.box.height,
+                                   time: SWITCH_TIME,
+                                   transition: "easeOutQuad" });
            } else {
-                // Something else, eg, AppSwitcher's arrows;
-                // we don't allocate it.
+                Tweener.removeTweens(this.indicator);
+                this._indicator.set_position(bx, by);
+                this._indicator.set_size(this._selected.box.width,
+                                         this._selected.box.height);
            }
-        }
-    }
-};
-
-Signals.addSignalMethods(SwitcherList.prototype);
-
-function AppIcon(app) {
-    this._init(app);
-}
-
-AppIcon.prototype = {
-    _init: function(app) {
-        this.app = app;
-        this.actor = new St.BoxLayout({ style_class: "alt-tab-app",
-                                         vertical: true });
-        this._icon = this.app.create_icon_texture(POPUP_APPICON_SIZE);
-        this.actor.add(this._icon, { x_fill: false, y_fill: false } );
-        this._label = new St.Label({ text: this.app.get_name() });
-        this.actor.add(this._label, { x_fill: false });
-    }
-}
-
-function AppSwitcher(apps) {
-    this._init(apps);
-}
-
-AppSwitcher.prototype = {
-    __proto__ : SwitcherList.prototype,
-
-    _init : function(apps) {
-        SwitcherList.prototype._init.call(this, true);
-
-        // Construct the AppIcons, sort by time, add to the popup
-        let activeWorkspace = global.screen.get_active_workspace();
-        let workspaceIcons = [];
-        let otherIcons = [];
-        for (let i = 0; i < apps.length; i++) {
-            let appIcon = new AppIcon(apps[i]);
-            // Cache the window list now; we don't handle dynamic changes here,
-            // and we don't want to be continually retrieving it
-            appIcon.cachedWindows = appIcon.app.get_windows();
-            if (this._hasWindowsOnWorkspace(appIcon, activeWorkspace))
-              workspaceIcons.push(appIcon);
-            else
-              otherIcons.push(appIcon);
-        }
-
-        workspaceIcons.sort(Lang.bind(this, this._sortAppIcon));
-        otherIcons.sort(Lang.bind(this, this._sortAppIcon));
-
-        this.icons = [];
-        this._arrows = [];
-        for (let i = 0; i < workspaceIcons.length; i++)
-            this._addIcon(workspaceIcons[i]);
-        if (workspaceIcons.length > 0 && otherIcons.length > 0)
-            this.addSeparator();
-        for (let i = 0; i < otherIcons.length; i++)
-            this._addIcon(otherIcons[i]);
-
-        this._curApp = -1;
-    },
-
-    _allocate: function (actor, box, flags) {
-        // Allocate the main list items
-        SwitcherList.prototype._allocate.call(this, actor, box, flags);
-
-        let arrowHeight = Math.floor(this.actor.get_theme_node().get_padding(St.Side.BOTTOM) / 3);
-        let arrowWidth = arrowHeight * 2;
-
-        // Now allocate each arrow underneath its item
-        let childBox = new Clutter.ActorBox();
-        for (let i = 0; i < this._items.length; i++) {
-            let itemBox = this._items[i].allocation;
-            childBox.x1 = Math.floor(itemBox.x1 + (itemBox.x2 - itemBox.x1 - arrowWidth) / 2);
-            childBox.x2 = childBox.x1 + arrowWidth;
-            childBox.y1 = itemBox.y2 + arrowHeight;
-            childBox.y2 = childBox.y1 + arrowHeight;
-            this._arrows[i].allocate(childBox, flags);
-        }
-    },
-
-    // We override SwitcherList's highlight() method to also deal with
-    // the AppSwitcher->ThumbnailList arrows. Apps with only 1 window
-    // will hide their arrows by default, but show them when their
-    // thumbnails are visible (ie, when the app icon is supposed to be
-    // in justOutline mode). Apps with multiple windows will normally
-    // show a dim arrow, but show a bright arrow when they are
-    // highlighted; their redraw handler will use the right color
-    // based on this._curApp; we just need to do a queue_relayout() to
-    // force it to redraw. (queue_redraw() doesn't work because
-    // ShellDrawingArea only redraws on allocate.)
-    highlight : function(n, justOutline) {
-        if (this._curApp != -1) {
-            if (this.icons[this._curApp].cachedWindows.length == 1)
-                this._arrows[this._curApp].hide();
-            else
-                this._arrows[this._curApp].queue_relayout();
-        }
-
-        SwitcherList.prototype.highlight.call(this, n, justOutline);
-        this._curApp = n;
-
-        if (this._curApp != -1) {
-            if (justOutline && this.icons[this._curApp].cachedWindows.length == 1)
-                this._arrows[this._curApp].show();
-            else
-                this._arrows[this._curApp].queue_relayout();
-        }
-    },
-
-    _addIcon : function(appIcon) {
-        this.icons.push(appIcon);
-        this.addItem(appIcon.actor);
-
-        let n = this._arrows.length;
-        let arrow = new St.DrawingArea();
-        arrow.connect('redraw', Lang.bind(this,
-            function (area, texture) {
-                Shell.draw_box_pointer(texture, Shell.PointerDirection.DOWN,
-                                       TRANSPARENT_COLOR,
-                                       this._curApp == n ? POPUP_ARROW_COLOR : POPUP_UNFOCUSED_ARROW_COLOR);
-            }));
-        this._list.add_actor(arrow);
-        this._arrows.push(arrow);
-
-        if (appIcon.cachedWindows.length == 1)
-            arrow.hide();
-    },
-
-    _hasWindowsOnWorkspace: function(appIcon, workspace) {
-        let windows = appIcon.cachedWindows;
-        for (let i = 0; i < windows.length; i++) {
-            if (windows[i].get_workspace() == workspace)
-                return true;
-        }
-        return false;
-    },
-
-    _sortAppIcon : function(appIcon1, appIcon2) {
-        return appIcon1.app.compare(appIcon2.app);
-    }
-};
-
-function ThumbnailList(windows) {
-    this._init(windows);
-}
-
-ThumbnailList.prototype = {
-    __proto__ : SwitcherList.prototype,
-
-    _init : function(windows) {
-        SwitcherList.prototype._init.call(this);
-
-        let activeWorkspace = global.screen.get_active_workspace();
-
-        // We fake the value of "separatorAdded" when the app has no window
-        // on the current workspace, to avoid displaying a useless separator in
-        // that case.
-        let separatorAdded = windows.length == 0 || windows[0].get_workspace() != activeWorkspace;
-
-        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);
-
-            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 });
-                bin.add_actor(name);
-                box.add_actor(bin);
-            }
-
-            this.addItem(box);
+            this._indicator.show();
+
+            if (this._overlay.visible) {
+                if (this._selected.visible)
+                    this._selected.window.raise(this._overlay);
+                this._adjust_overlay();
+            }
+
+            this._allocationChangedId =
+                this._selected.box.connect('notify::allocation',
+                                           Lang.bind(this, this._allocationChanged));
+        } else {
+            this._label.text = "";
+            this._indicator.hide();
+        }
+    },
+
+    _allocationChanged : function() {
+        if (this._selected)
+            this.select(this._selected.n);
+    },
+
+    _adjust_overlay : function() {
+        if (this._selected && this._selected.icon_rect) {
+            // We want to highlight a specific rectangle within the
+            // task bar, so rearrange the pieces of the overlay to
+            // cover the whole screen except that rectangle
+
+            let rect = this._selected.icon_rect;
+
+            this._overlay_top.x = 0;
+            this._overlay_top.y = 0;
+            this._overlay_top.width = global.screen_width;
+            this._overlay_top.height = rect.y;
+
+            this._overlay_left.x = 0;
+            this._overlay_left.y = rect.y;
+            this._overlay_left.width = rect.x;
+            this._overlay_left.height = rect.height;
+            this._overlay_left.show();
+
+            this._overlay_right.x = rect.x + rect.width;
+            this._overlay_right.y = rect.y;
+            this._overlay_right.width = global.screen_width - rect.x - rect.width;
+            this._overlay_right.height = rect.height;
+            this._overlay_right.show();
+
+            this._overlay_bottom.x = 0;
+            this._overlay_bottom.y = rect.y + rect.height;
+            this._overlay_bottom.width = global.screen_width;
+            this._overlay_bottom.height = global.screen_height - rect.y - rect.height;
+            this._overlay_bottom.show();
+        } else {
+            // Either there's no current selection, or the selection
+            // is a visible window. Make the overlay cover the whole
+            // screen. select() will raise the selected window over
+            // the overlay.
+
+            this._overlay_top.x = 0;
+            this._overlay_top.y = 0;
+            this._overlay_top.width = global.screen_width;
+            this._overlay_top.height = global.screen_height;
+            this._overlay_top.show();
+
+            this._overlay_left.hide();
+            this._overlay_right.hide();
+            this._overlay_bottom.hide();
        }
    }
 };
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@ -1,90 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Signals = imports.signals;
-
-
-function AppFavorites() {
-    this._init();
-}
-
-AppFavorites.prototype = {
-    FAVORITE_APPS_KEY: 'favorite_apps',
-
-    _init: function() {
-        this._favorites = {};
-        this._gconf = Shell.GConf.get_default();
-        this._gconf.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
-        this._reload();
-    },
-
-    _onFavsChanged: function() {
-        this._reload();
-        this.emit('changed');
-    },
-
-    _reload: function() {
-        let ids = Shell.GConf.get_default().get_string_list('favorite_apps');
-        let appSys = Shell.AppSystem.get_default();
-        let apps = ids.map(function (id) {
-                return appSys.get_app(id);
-            }).filter(function (app) {
-                return app != null;
-            });
-        this._favorites = {};
-        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            this._favorites[app.get_id()] = app;
-        }
-    },
-
-    _getIds: function() {
-        let ret = [];
-        for (let id in this._favorites)
-            ret.push(id);
-        return ret;
-    },
-
-    getFavoriteMap: function() {
-        return this._favorites;
-    },
-
-    getFavorites: function() {
-        let ret = [];
-        for (let id in this._favorites)
-            ret.push(this._favorites[id]);
-        return ret;
-    },
-
-    isFavorite: function(appId) {
-        return appId in this._favorites;
-    },
-
-    addFavorite: function(appId) {
-        if (appId in this._favorites)
-            return;
-        let app = Shell.AppSystem.get_default().get_app(appId);
-        if (!app)
-            return;
-        let ids = this._getIds();
-        ids.push(appId);
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
-        this._favorites[appId] = app;
-    },
-
-    removeFavorite: function(appId) {
-        if (!appId in this._favorites)
-            return;
-        let ids = this._getIds().filter(function (id) { return id != appId; });
-        this._gconf.set_string_list(this.FAVORITE_APPS_KEY, ids);
-    }
-};
-Signals.addSignalMethods(AppFavorites.prototype);
-
-var appFavoritesInstance = null;
-function getAppFavorites() {
-    if (appFavoritesInstance == null)
-        appFavoritesInstance = new AppFavorites();
-    return appFavoritesInstance;
-}
--- a/js/ui/appIcon.js
+++ b/js/ui/appIcon.js
@ -3,118 +3,70 @@
 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 Lang = imports.lang;

 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 APP_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);
+function AppIcon(appInfo) {
+    this._init(appInfo);
 }

 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;
+    _init : function(appInfo) {
+        this.appInfo = appInfo;
+        this.windows = Shell.AppMonitor.get_default().get_windows_for_app(appInfo.get_id());
+        for (let i = 0; i < this.windows.length; i++) {
+            this.windows[i].connect('notify::user-time', Lang.bind(this, this._resortWindows));
        }
+        this._resortWindows();
+
+        this.actor = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                   corner_radius: 2,
+                                   padding: 1,
+                                   reactive: true });

        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);
+                                    y_align: Big.BoxAlignment.CENTER });
+        this.icon = appInfo.create_icon_texture(APP_ICON_SIZE);
        iconBox.append(this.icon, Big.BoxPackFlags.NONE);

        this.actor.append(iconBox, Big.BoxPackFlags.EXPAND);

+        this._windows = Shell.AppMonitor.get_default().get_windows_for_app(appInfo.get_id());
+
        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;
+        this._name = new Clutter.Text({ color: GenericDisplay.ITEM_DISPLAY_NAME_COLOR,
+                                        font_name: "Sans 12px",
+                                        line_alignment: Pango.Alignment.CENTER,
+                                        ellipsize: Pango.EllipsizeMode.END,
+                                        text: appInfo.get_name() });
        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._glowBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
+        let glowPath = GLib.filename_to_uri(global.imagedir + 'app-well-glow.png', '');
+        for (let i = 0; i < this._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);
        }
-
+        this._nameBox.add_actor(this._glowBox);
+        this._glowBox.lower(this._name);
        this.actor.append(nameBox, Big.BoxPackFlags.NONE);
    },

@ -159,433 +111,23 @@ AppIcon.prototype = {
        }
    },

-    _onDestroy: function() {
-        if (this._appWindowChangedId > 0)
-            this.app.disconnect(this._appWindowChangedId);
+    _resortWindows: function() {
+        this.windows.sort(function (a, b) {
+            let timeA = a.get_user_time();
+            let timeB = b.get_user_time();
+            if (timeA == timeB)
+                return 0;
+            else if (timeA > timeB)
+                return -1;
+            return 1;
+        });
    },

-    _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);
-        }
+    getDragActor: function() {
+        return this.appInfo.create_icon_texture(APP_ICON_SIZE);
    },

-    // 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);
+    getDragActorSource: function() {
+        return this.icon;
    }
 };
-
-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/button.js
+++ b/js/ui/button.js
@ -0,0 +1,173 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Big = imports.gi.Big;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Shell = imports.gi.Shell;
+const Signals = imports.signals;
+const Tweener = imports.ui.tweener;
+
+const DEFAULT_BUTTON_COLOR = new Clutter.Color();
+DEFAULT_BUTTON_COLOR.from_pixel(0xeeddcc66);
+
+const DEFAULT_PRESSED_BUTTON_COLOR = new Clutter.Color();
+DEFAULT_PRESSED_BUTTON_COLOR.from_pixel(0xccbbaa66);
+
+const DEFAULT_TEXT_COLOR = new Clutter.Color();
+DEFAULT_TEXT_COLOR.from_pixel(0x000000ff);
+
+const DEFAULT_FONT = 'Sans Bold 16px';
+
+// Padding on the left and right side of the button.
+const SIDE_PADDING = 14;
+
+function Button(widget, buttonColor, pressedButtonColor, textColor, font) {
+    this._init(widget, buttonColor, pressedButtonColor, textColor, font);
+}
+
+Button.prototype = {
+    _init : function(widgetOrText, buttonColor, pressedButtonColor, textColor, font) {
+        this._buttonColor = buttonColor
+        if (buttonColor == null)
+            this._buttonColor = DEFAULT_BUTTON_COLOR;
+
+        this._pressedButtonColor = pressedButtonColor
+        if (pressedButtonColor == null)
+            this._pressedButtonColor = DEFAULT_PRESSED_BUTTON_COLOR;
+
+        this._textColor = textColor;
+        if (textColor == null)
+            this._textColor = DEFAULT_TEXT_COLOR;
+
+        this._font = font;
+        if (font == null)
+            this._font = DEFAULT_FONT;
+
+        this._isBetweenPressAndRelease = false;
+        this._mouseIsOverButton = false;
+
+        this.actor = new Shell.ButtonBox({ reactive: true,
+                                           corner_radius: 5,
+                                           padding_left: SIDE_PADDING,
+                                           padding_right: SIDE_PADDING,
+                                           orientation: Big.BoxOrientation.HORIZONTAL,
+                                           y_align: Big.BoxAlignment.CENTER
+                                         });
+        if (typeof widgetOrText == 'string') {
+            this._widget = new Clutter.Text({ font_name: this._font,
+                                              color: this._textColor,
+                                              text: widgetOrText });
+        } else {
+            this._widget = widgetOrText;
+        }
+
+        this.actor.append(this._widget, Big.BoxPackFlags.EXPAND);
+
+        this.actor.connect('notify::hover', Lang.bind(this, this._updateColors));
+        this.actor.connect('notify::pressed', Lang.bind(this, this._updateColors));
+        this.actor.connect('notify::active', Lang.bind(this, this._updateColors));
+    },
+
+    _updateColors : function() {
+        if (this.actor.active || this.actor.pressed)
+            this.actor.backgroundColor = this._pressedButtonColor;
+        else if (this.actor.hover)
+            this.actor.backgroundColor = this._buttonColor;
+        else
+            this.actor.backgroundColor = null;
+    }
+};
+
+Signals.addSignalMethods(Button.prototype);
+
+/* Delay before the icon should appear, in seconds after the pointer has entered the parent */
+const ANIMATION_TIME = 0.25;
+
+/* This is an icon button that fades in/out when mouse enters/leaves the parent.
+ * A delay is used before the fading starts. You can force it to be shown if needed.
+ *
+ * parent -- used to show/hide the button depending on mouse entering/leaving it
+ * size -- size in pixels of  both the button and the icon it contains
+ * texture -- optional, must be used if the texture for the icon is already created (else, use setIconFromName)
+ */
+function iconButton(parent, size, texture) {
+    this._init(parent, size, texture);
+}
+
+iconButton.prototype = {
+    _init : function(parent, size, texture) {
+        this._size = size;
+        if (texture)
+            this.actor = texture;
+        else
+            this.actor = new Clutter.Texture({ width: this._size, height: this._size });
+        this.actor.set_reactive(true);
+        this.actor.set_opacity(0);
+        parent.connect("enter-event", Lang.bind(this, function(actor, event) {
+            this._shouldHide = false;
+            // Nothing to do if the cursor has come back from a child of the parent actor
+            if (actor.get_children().indexOf(event.get_related()) != -1)
+                return;
+
+            this._fadeIn();
+        }));
+        parent.connect("leave-event", Lang.bind(this, function(actor, event) {
+            // Nothing to do if the cursor has merely entered a child of the parent actor
+            if (actor.get_children().indexOf(event.get_related()) != -1)
+                return;
+
+            // Remember that we should not be visible to hide the button if forceShow is unset
+            if (this._forceShow) {
+                this._shouldHide = true;
+                return;
+            }
+
+            this._fadeOut();
+        }));
+    },
+
+    /// Private methods ///
+
+    setIconFromName : function(iconName) {
+        let iconTheme = Gtk.IconTheme.get_default();
+        let iconInfo = iconTheme.lookup_icon(iconName, this._size, 0);
+        if (!iconInfo)
+            return;
+
+        let iconPath = iconInfo.get_filename();
+        this.actor.set_from_file(iconPath);
+    },
+
+    // Useful if we want to show the button immediately,
+    // e.g. in case the mouse is already in the parent when the button is created
+    show : function() {
+        this.actor.set_opacity(255);
+    },
+
+    // If show is true, prevents the button from fading out
+    forceShow : function(show) {
+        this._forceShow = show;
+        // Hide the button if it should have been hidden under normal conditions
+        if (!this._forceShow && this._shouldHide) {
+           this._fadeOut();
+        }
+    },
+
+    /// Private methods ///
+
+    _fadeIn : function() {
+        Tweener.removeTweens(this.actor);
+        Tweener.addTween(this.actor, { opacity: 255,
+                                       time: ANIMATION_TIME,
+                                       transition :"easeInQuad" });
+    },
+
+    _fadeOut : function() {
+        Tweener.removeTweens(this.actor);
+        Tweener.addTween(this.actor, { opacity: 0,
+                                       time: ANIMATION_TIME,
+                                       transition :"easeOutQuad" });
+    }
+};
+
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -1,177 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-const St = imports.gi.St;
-
-const Gettext_gtk20 = imports.gettext.domain('gtk20');
-
-const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
-
-function _sameDay(dateA, dateB) {
-    return (dateA.getDate() == dateB.getDate() &&
-            dateA.getMonth() == dateB.getMonth() &&
-            dateA.getYear() == dateB.getYear());
-}
-
-function Calendar() {
-    this._init();
-};
-
-Calendar.prototype = {
-    _init: function() {
-        // FIXME: This is actually the fallback method for GTK+ for the week start;
-        // GTK+ by preference uses nl_langinfo (NL_TIME_FIRST_WEEKDAY). We probably
-        // should add a C function so we can do the full handling.
-        this._weekStart = NaN;
-        let weekStartString = Gettext_gtk20.gettext("calendar:week_start:0");
-        if (weekStartString.indexOf("calendar:week_start:") == 0) {
-            this._weekStart = parseInt(weekStartString.substring(20));
-        }
-
-        if (isNaN(this._weekStart) || this._weekStart < 0 || this._weekStart > 6) {
-            log("Translation of 'calendar:week_start:0' in GTK+ is not correct");
-            this.weekStart = 0;
-        }
-
-        // Find the ordering for month/year in the calendar heading
-        switch (Gettext_gtk20.gettext("calendar:MY")) {
-        case "calendar:MY":
-            this._headerFormat = "%B %Y";
-            break;
-        case "calendar:YM":
-            this._headerFormat = "%Y %B";
-            break;
-        default:
-            log("Translation of 'calendar:MY' in GTK+ is not correct");
-            this._headerFormat = "%B %Y";
-            break;
-        }
-
-        // Start off with the current date
-        this.date = new Date();
-
-        this.actor = new St.Table({ homogeneous: false,
-                                    style_class: "calendar",
-                                    reactive: true });
-
-        this.actor.connect('scroll-event',
-                           Lang.bind(this, this._onScroll));
-
-        // Top line of the calendar '<| September 2009 |>'
-        this._topBox = new St.BoxLayout();
-        this.actor.add(this._topBox,
-                       { row: 0, col: 0, col_span: 7 });
-
-        let back = new St.Button({ label: "&lt;", style_class: 'calendar-change-month'  });
-        this._topBox.add(back);
-        back.connect("clicked", Lang.bind(this, this._prevMonth));
-
-        this._dateLabel = new St.Label();
-        this._topBox.add(this._dateLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
-
-        let forward = new St.Button({ label: "&gt;", style_class: 'calendar-change-month' });
-        this._topBox.add(forward);
-        forward.connect("clicked", Lang.bind(this, this._nextMonth));
-
-        // We need to figure out the abbreviated localized names for the days of the week;
-        // we do this by just getting the next 7 days starting from right now and then putting
-        // them in the right cell in the table. It doesn't matter if we add them in order
-        let iter = new Date(this.date);
-        iter.setSeconds(0); // Leap second protection. Hah!
-        iter.setHours(12);
-        for (let i = 0; i < 7; i++) {
-            this.actor.add(new St.Label({ text: iter.toLocaleFormat("%a") }),
-                           { row: 1,
-                             col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: 1.0 });
-            iter.setTime(iter.getTime() + MSECS_IN_DAY);
-        }
-
-        // All the children after this are days, and get removed when we update the calendar
-        this._firstDayIndex = this.actor.get_children().length;
-
-        this._update();
-    },
-
-    // Sets the calendar to show a specific date
-    setDate: function(date) {
-        if (!_sameDay(date, this.date)) {
-            this.date = date;
-            this._update();
-        }
-    },
-
-    _onScroll : function(actor, event) {
-        switch (event.get_scroll_direction()) {
-        case Clutter.ScrollDirection.UP:
-        case Clutter.ScrollDirection.LEFT:
-            this._prevMonth();
-            break;
-        case Clutter.ScrollDirection.DOWN:
-        case Clutter.ScrollDirection.RIGHT:
-            this._nextMonth();
-            break;
-        }
-    },
-
-    _prevMonth: function() {
-        if (this.date.getMonth() == 0) {
-            this.date.setMonth(11);
-            this.date.setFullYear(this.date.getFullYear() - 1);
-        } else {
-            this.date.setMonth(this.date.getMonth() - 1);
-        }
-        this._update();
-   },
-
-    _nextMonth: function() {
-        if (this.date.getMonth() == 11) {
-            this.date.setMonth(0);
-            this.date.setFullYear(this.date.getFullYear() + 1);
-        } else {
-            this.date.setMonth(this.date.getMonth() + 1);
-        }
-        this._update();
-    },
-
-    _update: function() {
-        this._dateLabel.text = this.date.toLocaleFormat(this._headerFormat);
-
-        // Remove everything but the topBox and the weekday labels
-        let children = this.actor.get_children();
-        for (let i = this._firstDayIndex; i < children.length; i++)
-            children[i].destroy();
-
-        // Start at the beginning of the week before the start of the month
-        let iter = new Date(this.date);
-        iter.setDate(1);
-        iter.setSeconds(0);
-        iter.setHours(12);
-        iter.setTime(iter.getTime() - (iter.getDay() - this._weekStart) * MSECS_IN_DAY);
-
-        let now = new Date();
-
-        let row = 2;
-        while (true) {
-            let label = new St.Label({ text: iter.getDate().toString() });
-            if (_sameDay(now, iter))
-                label.style_class = "calendar-day calendar-today";
-            else if (iter.getMonth() != this.date.getMonth())
-                label.style_class = "calendar-day calendar-other-month-day";
-            else
-                label.style_class = "calendar-day";
-            this.actor.add(label,
-                           { row: row, col: (7 + iter.getDay() - this._weekStart) % 7,
-                             x_fill: false, x_align: 1.0 });
-
-            iter.setTime(iter.getTime() + MSECS_IN_DAY);
-            if (iter.getDay() == this._weekStart) {
-                // We stop on the first "first day of the week" after the month we are displaying
-                if (iter.getMonth() > this.date.getMonth() || iter.getYear() > this.date.getYear())
-                    break;
-                row++;
-            }
-        }
-    }
-};
--- a/js/ui/chrome.js
+++ b/js/ui/chrome.js
@ -7,7 +7,6 @@ const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;

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

 // This manages the shell "chrome"; the UI that's visible in the
 // normal mode (ie, outside the Overview), that surrounds the main
@ -55,7 +54,7 @@ Chrome.prototype = {

    // addActor:
    // @actor: an actor to add to the chrome layer
-    // @params: (optional) additional params
+    // @shapeActor: optional "shape actor".
    //
    // Adds @actor to the chrome layer and extends the input region
    // and window manager struts to include it. (Window manager struts
@ -65,45 +64,59 @@ Chrome.prototype = {
    // in its visibility will affect the input region, but NOT the
    // struts.
    //
-    // If %visibleInOverview is %true in @params, @actor will remain
-    // visible when the overview is brought up. Otherwise it will
-    // automatically be hidden. If %affectsStruts or %affectsInputRegion
-    // is %false, the actor will not have the indicated effect.
-    addActor: function(actor, params) {
-        params = Params.parse(params, { visibleInOverview: false,
-                                        affectsStruts: true,
-                                        affectsInputRegion: true });
+    // If @shapeActor is provided, it will be used instead of @actor
+    // for the input region/strut shape. (This lets you have things like
+    // drop shadows in @actor that don't affect the struts.) It must
+    // be a child of @actor. Alternatively, you can pass %null for
+    // @shapeActor to indicate that @actor should not affect the input
+    // region or struts at all.
+    addActor: function(actor, shapeActor) {
+        if (shapeActor === undefined)
+            shapeActor = actor;
+        else if (shapeActor && !this._verifyAncestry(shapeActor, actor))
+            throw new Error('shapeActor is not a descendent of actor');

-        if (params.visibleInOverview)
-            this.actor.add_actor(actor);
-        else
-            this.nonOverviewActor.add_actor(actor);
+        this.nonOverviewActor.add_actor(actor);

-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        if (shapeActor)
+            this._trackActor(shapeActor, true, true);
    },

-    // trackActor:
-    // @actor: a descendant of the chrome to begin tracking
-    // @params: parameters describing how to track @actor
+    // setVisibleInOverview:
+    // @actor: an actor in the chrome layer
+    // @visible: Overview visibility
    //
-    // Tells the chrome to track @actor, which must be a descendant
-    // of an actor added via addActor(). This can be used to extend the
-    // struts or input region to cover specific children.
-    trackActor: function(actor, params) {
+    // By default, actors in the chrome layer are automatically hidden
+    // when the Overview is shown. This can be used to override that
+    // behavior
+    setVisibleInOverview: function(actor, visible) {
        if (!this._verifyAncestry(actor, this.actor))
            throw new Error('actor is not a descendent of the chrome layer');

-        params = Params.parse(params, { affectsStruts: true,
-                                        affectsInputRegion: true });
-        this._trackActor(actor, params.affectsInputRegion, params.affectsStruts);
+        if (visible)
+            actor.reparent(this.actor);
+        else
+            actor.reparent(this.nonOverviewActor);
    },

-    // untrackActor:
-    // @actor: an actor previously tracked via trackActor()
+    // addInputRegionActor:
+    // @actor: an actor to add to the stage input region
    //
-    // Undoes the effect of trackActor()
-    untrackActor: function(actor) {
-        this._untrackActor(actor);
+    // Adds @actor to the stage input region, as with addActor(), but
+    // for actors that are already descendants of the chrome layer.
+    addInputRegionActor: function(actor) {
+        if (!this._verifyAncestry(actor, this.actor))
+            throw new Error('actor is not a descendent of the chrome layer');
+
+        this._trackActor(actor, true, false);
+    },
+
+    // removeInputRegionActor:
+    // @actor: an actor previously added to the stage input region
+    //
+    // Undoes the effect of addInputRegionActor()
+    removeInputRegionActor: function(actor) {
+        this._untrackActor(actor, true, false);
    },

    // removeActor:
@ -115,7 +128,7 @@ Chrome.prototype = {
            this.nonOverviewActor.remove_actor(actor);
        else
            this.actor.remove_actor(actor);
-        this._untrackActor(actor);
+        this._untrackActor(actor, true, true);
    },

    _findActor: function(actor) {
@ -129,13 +142,23 @@ Chrome.prototype = {

    _trackActor: function(actor, inputRegion, strut) {
        let actorData;
+        let i = this._findActor(actor);

-        if (this._findActor(actor) != -1)
-            throw new Error('trying to re-track existing chrome actor');
+        if (i != -1) {
+            actorData = this._trackedActors[i];
+            if (inputRegion)
+                actorData.inputRegion++;
+            if (strut)
+                actorData.strut++;
+            if (!inputRegion && !strut)
+                actorData.children++;
+            return;
+        }

        actorData = { actor: actor,
-                      inputRegion: inputRegion,
-                      strut: strut };
+                      inputRegion: inputRegion ? 1 : 0,
+                      strut: strut ? 1 : 0,
+                      children: 0 };

        actorData.visibleId = actor.connect('notify::visible',
                                            Lang.bind(this, this._queueUpdateRegions));
@ -143,31 +166,54 @@ Chrome.prototype = {
                                               Lang.bind(this, this._queueUpdateRegions));
        actorData.parentSetId = actor.connect('parent-set',
                                              Lang.bind(this, this._actorReparented));
-        // Note that destroying actor will unset its parent, so we don't
-        // need to connect to 'destroy' too.

        this._trackedActors.push(actorData);
-        this._queueUpdateRegions();
+
+        actor = actor.get_parent();
+        if (actor != this.actor && actor != this.nonOverviewActor)
+            this._trackActor(actor, false, false);
+
+        if (inputRegion || strut)
+            this._queueUpdateRegions();
    },

-    _untrackActor: function(actor) {
+    _untrackActor: function(actor, inputRegion, strut) {
        let i = this._findActor(actor);

        if (i == -1)
            return;
        let actorData = this._trackedActors[i];

-        this._trackedActors.splice(i, 1);
-        actor.disconnect(actorData.visibleId);
-        actor.disconnect(actorData.allocationId);
-        actor.disconnect(actorData.parentSetId);
+        if (inputRegion)
+            actorData.inputRegion--;
+        if (strut)
+            actorData.strut--;
+        if (!inputRegion && !strut)
+            actorData.children--;

-        this._queueUpdateRegions();
+        if (actorData.inputRegion <= 0 && actorData.strut <= 0 && actorData.children <= 0) {
+            this._trackedActors.splice(i, 1);
+            actor.disconnect(actorData.visibleId);
+            actor.disconnect(actorData.allocationId);
+            actor.disconnect(actorData.parentSetId);
+
+            actor = actor.get_parent();
+            if (actor && actor != this.actor && actor != this.nonOverviewActor)
+                this._untrackActor(actor, false, false);
+        }
+
+        if (inputRegion || strut)
+            this._queueUpdateRegions();
    },

    _actorReparented: function(actor, oldParent) {
-        if (!this._verifyAncestry(actor, this.actor))
-            this._untrackActor(actor);
+        if (this._verifyAncestry(actor, this.actor)) {
+            let newParent = actor.get_parent();
+            if (newParent != this.actor && newParent != this.nonOverviewActor)
+                this._trackActor(newParent, false, false);
+        }
+        if (oldParent != this.actor && oldParent != this.nonOverviewActor)
+            this._untrackActor(oldParent, false, false);
    },

    _overviewShowing: function() {
@ -191,7 +237,6 @@ Chrome.prototype = {

    _windowsRestacked: function() {
        let windows = global.get_windows();
-        let primary = global.get_primary_monitor();

        // The chrome layer should be visible unless there is a window
        // with layer FULLSCREEN, or a window with layer
@ -209,15 +254,17 @@ Chrome.prototype = {
        for (let i = windows.length - 1; i > -1; i--) {
            let layer = windows[i].get_meta_window().get_layer();

-            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT ||
-                layer == Meta.StackLayer.FULLSCREEN) {
-                if (windows[i].x <= primary.x &&
-                    windows[i].x + windows[i].width >= primary.x + primary.width &&
-                    windows[i].y <= primary.y &&
-                    windows[i].y + windows[i].height >= primary.y + primary.height) {
+            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
+                if (windows[i].x <= 0 &&
+                    windows[i].x + windows[i].width >= global.screen_width &&
+                    windows[i].y <= 0 &&
+                    windows[i].y + windows[i].height >= global.screen_height) {
                    this._obscuredByFullscreen = true;
                    break;
                }
+            } else if (layer == Meta.StackLayer.FULLSCREEN) {
+                this._obscuredByFullscreen = true;
+                break;
            } else
                break;
        }
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@ -8,25 +8,6 @@ const Tweener = imports.ui.tweener;

 const SNAP_BACK_ANIMATION_TIME = 0.25;

-let eventHandlerActor = null;
-let currentDraggable = null;
-
-function _getEventHandlerActor() {
-    if (!eventHandlerActor) {
-        eventHandlerActor = new Clutter.Rectangle();
-        eventHandlerActor.width = 0;
-        eventHandlerActor.height = 0;
-        global.stage.add_actor(eventHandlerActor);
-        // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
-        // when you've grabbed the pointer.
-        eventHandlerActor.connect('event',
-                                  function(actor, event) {
-                                      return currentDraggable._onEvent(actor, event);
-                                  });
-    }
-    return eventHandlerActor;
-}
-
 function _Draggable(actor, manualMode) {
    this._init(actor, manualMode);
 }
@ -37,11 +18,7 @@ _Draggable.prototype = {
        if (!manualMode)
            this.actor.connect('button-press-event',
                               Lang.bind(this, this._onButtonPress));
-        this._onEventId = null;
-
-        this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
-        this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
-        this._snapBackInProgress = false; // The drag has been cancelled and the item is in the process of snapping back.
+        this._haveSourceGrab = false;
    },

    _onButtonPress : function (actor, event) {
@ -50,8 +27,8 @@ _Draggable.prototype = {
        if (Tweener.getTweenCount(actor))
            return false;

-        this._buttonDown = true;
-        this._grabActor();
+        this._haveSourceGrab = true;
+        this._grabActor(actor);

        let [stageX, stageY] = event.get_coords();
        this._dragStartX = stageX;
@ -60,69 +37,41 @@ _Draggable.prototype = {
        return false;
    },
    
-    _grabActor: function() {
-        Clutter.grab_pointer(this.actor);
-        this._onEventId = this.actor.connect('event',
-                                             Lang.bind(this, this._onEvent));
+    _grabActor : function (actor) {
+        Clutter.grab_pointer(actor);
+
+        // We intercept motion and button-release events so that when
+        // you release after dragging, the app doesn't see that and
+        // think you just clicked. We connect to 'event' rather than
+        // 'captured-event' because the capturing phase doesn't happen
+        // when you've grabbed the pointer.
+        this._onEventId = actor.connect('event',
+                                        Lang.bind(this, this._onEvent));
    },

-    _ungrabActor: function() {
+    _ungrabActor : function (actor) {
        Clutter.ungrab_pointer();
-        this.actor.disconnect(this._onEventId);
-        this._onEventId = null;
+        actor.disconnect(this._onEventId);
    },

-    _grabEvents: function() {
-        Clutter.grab_pointer(_getEventHandlerActor());
-        Clutter.grab_keyboard(_getEventHandlerActor());
-    },
-
-    _ungrabEvents: function() {
-        Clutter.ungrab_pointer();
-        Clutter.ungrab_keyboard();
-    },
-
-    _onEvent: function(actor, event) {
-        // We intercept BUTTON_RELEASE event to know that the button was released in case we
-        // didn't start the drag, to drop the draggable in case the drag was in progress, and
-        // to complete the drag and ensure that whatever happens to be under the pointer does
-        // not get triggered if the drag was cancelled with Esc.
-        if (event.type() == Clutter.EventType.BUTTON_RELEASE) {
-            this._buttonDown = false;
-            if (this._dragInProgress) {
-                return this._dragActorDropped(event);
-            } else if (this._dragActor != null && !this._snapBackInProgress) {
-                // Drag must have been cancelled with Esc.
-                this._dragComplete();
-                return true;
-            } else {
-                // Drag has never started.
-                this._ungrabActor();
+    _onEvent : function (actor, event) {
+        if (this._dragActor) {
+            if (actor != this._dragActor )
                return false;
-            }
-        // We intercept MOTION event to figure out if the drag has started and to draw
-        // this._dragActor under the pointer when dragging is in progress
-        } else if (event.type() == Clutter.EventType.MOTION) {
-            if (this._dragInProgress) {
-                return this._updateDragPosition(event);
-            } else if (this._dragActor == null) {
-                return this._maybeStartDrag(event);
-            }
-        // We intercept KEY_PRESS event so that we can process Esc key press to cancel
-        // dragging and ignore all other key presses.
-        } else if (event.type() == Clutter.EventType.KEY_PRESS && this._dragInProgress) {
-            let symbol = event.get_key_symbol();
-            if (symbol == Clutter.Escape) {
-                this._cancelDrag(event.get_time());
-                return true;
-            }
-        }
+        } else if (actor != this.actor)
+            return false;

-        return false;
+        if (event.type() == Clutter.EventType.BUTTON_RELEASE)
+            return this._onButtonRelease(actor, event);
+        else if (event.type() == Clutter.EventType.MOTION)
+            return this._onMotion(actor, event);
+        else
+            return false;
    },

    /**
     * startDrag:
+     * @actor: Origin actor for drag and drop
     * @stageX: X coordinate of event
     * @stageY: Y coordinate of event
     * @time: Event timestamp
@ -131,14 +80,8 @@ _Draggable.prototype = {
     * This function is useful to call if you've specified manualMode
     * for the draggable.
     */
-    startDrag: function (stageX, stageY, time) {
-        currentDraggable = this;
-        this._dragInProgress = true;
-
+    startDrag: function (actor, stageX, stageY, time) {
        this.emit('drag-begin', time);
-        if (this._onEventId)
-            this._ungrabActor();
-        this._grabEvents();

        this._dragStartX = stageX;
        this._dragStartY = stageY;
@ -169,59 +112,59 @@ _Draggable.prototype = {
                this._dragActorSource = this.actor;
            }
            this._dragOrigParent = undefined;
+            if (this._haveSourceGrab) {
+                this._haveSourceGrab = false;
+                this._ungrabActor(actor);
+            }
+            this._grabActor(this._dragActor);

            this._dragOffsetX = this._dragActor.x - this._dragStartX;
            this._dragOffsetY = this._dragActor.y - this._dragStartY;
        } else {
-            this._dragActor = this.actor;
+            this._dragActor = actor;
            this._dragActorSource = undefined;
-            this._dragOrigParent = this.actor.get_parent();
+            this._dragOrigParent = actor.get_parent();
            this._dragOrigX = this._dragActor.x;
            this._dragOrigY = this._dragActor.y;
            this._dragOrigScale = this._dragActor.scale_x;

-            let [actorStageX, actorStageY] = this.actor.get_transformed_position();
+            let [actorStageX, actorStageY] = actor.get_transformed_position();
            this._dragOffsetX = actorStageX - this._dragStartX;
            this._dragOffsetY = actorStageY - this._dragStartY;

            // Set the actor's scale such that it will keep the same
            // transformed size when it's reparented to the stage
-            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
-            this.actor.set_scale(scaledWidth / this.actor.width,
-                                 scaledHeight / this.actor.height);
+            let [scaledWidth, scaledHeight] = actor.get_transformed_size();
+            actor.set_scale(scaledWidth / actor.width,
+                           scaledHeight / actor.height);
        }

-        this._dragActor.reparent(this.actor.get_stage());
+        this._dragActor.reparent(actor.get_stage());
        this._dragActor.raise_top();
    },

-    _maybeStartDrag:  function(event) {
+    _onMotion : function (actor, event) {
        let [stageX, stageY] = event.get_coords();

-        // See if the user has moved the mouse enough to trigger a drag
+        // If we haven't begun a drag, see if the user has moved the
+        // mouse enough to trigger a drag
        let threshold = Gtk.Settings.get_default().gtk_dnd_drag_threshold;
-        if ((Math.abs(stageX - this._dragStartX) > threshold ||
+        if (!this._dragActor &&
+            (Math.abs(stageX - this._dragStartX) > threshold ||
             Math.abs(stageY - this._dragStartY) > threshold)) {
-                this.startDrag(stageX, stageY, event.get_time());
-                this._updateDragPosition(event);
+                this.startDrag(actor, stageX, stageY, event.get_time());
        }

-        return true;
-    },
-
-    _updateDragPosition : function (event) {
-        let [stageX, stageY] = event.get_coords();
-
        // If we are dragging, update the position
        if (this._dragActor) {
            this._dragActor.set_position(stageX + this._dragOffsetX,
                                         stageY + this._dragOffsetY);
            // Because we want to find out what other actor is located at the current position of this._dragActor,
            // we have to temporarily hide this._dragActor.
-            this._dragActor.hide();
-            let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                      stageX + this._dragOffsetX,
-                                                                      stageY + this._dragOffsetY);
+            this._dragActor.hide(); 
+            let target = actor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                            stageX + this._dragOffsetX,
+                                                            stageY + this._dragOffsetY);
            this._dragActor.show();
            while (target) {
                if (target._delegate && target._delegate.handleDragOver) {
@ -229,7 +172,7 @@ _Draggable.prototype = {
                    // We currently loop through all parents on drag-over even if one of the children has handled it.
                    // We can check the return value of the function and break the loop if it's true if we don't want
                    // to continue checking the parents.
-                    target._delegate.handleDragOver(this.actor._delegate, this._dragActor,
+                    target._delegate.handleDragOver(this.actor._delegate, actor,
                                                    (stageX + this._dragOffsetX - targX) / target.scale_x,
                                                    (stageY + this._dragOffsetY - targY) / target.scale_y,
                                                    event.get_time());
@ -241,42 +184,40 @@ _Draggable.prototype = {
        return true;
    },

-    _dragActorDropped: function(event) {
-        // Find a drop target. Because we want to find out what other actor is located at
-        // the current position of this._dragActor, we have to temporarily hide this._dragActor.
-        this._dragActor.hide();
+    _onButtonRelease : function (actor, event) {
+        this._ungrabActor(actor);
+
+        let dragging = (actor == this._dragActor);
+        this._dragActor = undefined;
+
+        if (!dragging)
+            return false;
+
+        // Find a drop target
+        actor.hide();
        let [dropX, dropY] = event.get_coords();
-        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                  dropX, dropY);
-        this._dragActor.show();
+        let target = actor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                        dropX, dropY);
+        actor.show();
        while (target) {
            if (target._delegate && target._delegate.acceptDrop) {
                let [targX, targY] = target.get_transformed_position();
-                if (target._delegate.acceptDrop(this.actor._delegate, this._dragActor,
+                if (target._delegate.acceptDrop(this.actor._delegate, actor,
                                                (dropX - targX) / target.scale_x,
                                                (dropY - targY) / target.scale_y,
                                                event.get_time())) {
                    // If it accepted the drop without taking the actor,
                    // destroy it.
-                    if (this._dragActor.get_parent() == this._dragActor.get_stage())
-                        this._dragActor.destroy();
+                    if (actor.get_parent() == actor.get_stage())
+                        actor.destroy();

-                    this._dragInProgress = false;
                    this.emit('drag-end', event.get_time(), true);
-                    this._dragComplete();
                    return true;
                }
            }
            target = target.get_parent();
        }

-        this._cancelDrag(event.get_time());
-
-        return true;
-    },
-
-    _cancelDrag: function(eventTime) {
-        this._dragInProgress = false;
        // Snap back to the actor source if the source is still around, snap back 
        // to the original location if the actor itself was being dragged or the
        // source is no longer around.
@ -286,17 +227,17 @@ _Draggable.prototype = {
            [snapBackX, snapBackY] = this._dragActorSource.get_transformed_position();
        }

-        this._snapBackInProgress = true;
        // No target, so snap back
-        Tweener.addTween(this._dragActor,
+        Tweener.addTween(actor,
                         { x: snapBackX,
                           y: snapBackY,
                           time: SNAP_BACK_ANIMATION_TIME,
                           transition: "easeOutQuad",
                           onComplete: this._onSnapBackComplete,
                           onCompleteScope: this,
-                           onCompleteParams: [this._dragActor, eventTime]
+                           onCompleteParams: [actor, event.get_time()]
                         });
+        return true;
    },

    _onSnapBackComplete : function (dragActor, eventTime) {
@ -308,16 +249,6 @@ _Draggable.prototype = {
            dragActor.destroy();
        }
        this.emit('drag-end', eventTime, false);
-
-        this._snapBackInProgress = false;
-        if (!this._buttonDown)
-            this._dragComplete();
-    },
-
-    _dragComplete: function() {
-        this._dragActor = undefined;
-        currentDraggable = null;
-        this._ungrabEvents();
    }
 };

--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@ -8,18 +8,13 @@ const Lang = imports.lang;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 const Mainloop = imports.mainloop;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;

 const DocInfo = imports.misc.docInfo;
 const DND = imports.ui.dnd;
 const GenericDisplay = imports.ui.genericDisplay;
 const Main = imports.ui.main;
-const Search = imports.ui.search;

-const MAX_DASH_DOCS = 50;
 const DASH_DOCS_ICON_SIZE = 16;

 const DEFAULT_SPACING = 4;
@ -116,19 +111,19 @@ DocDisplayItem.prototype = {
 /* This class represents a display containing a collection of document items.
 * The documents are sorted by how recently they were last visited.
 */
-function DocDisplay(flags) {
-    this._init(flags);
+function DocDisplay() {
+    this._init();
 }

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

-    _init : function(flags) {
-        GenericDisplay.GenericDisplay.prototype._init.call(this, flags);
+    _init : function() {
+        GenericDisplay.GenericDisplay.prototype._init.call(this);
        // We keep a single timeout callback for updating last visited times
        // for all the items in the display. This avoids creating individual
        // callbacks for each item in the display. So proper time updates
-        // for individual items and item details depend on the item being
+        // for individual items and item details depend on the item being 
        // associated with one of the displays.
        this._updateTimeoutTargetTime = -1;
        this._updateTimeoutId = 0;
@ -141,7 +136,7 @@ DocDisplay.prototype = {
            // but redisplaying right away is cool when we use Zephyr.
            // Also, we might be displaying remote documents, like Google Docs, in the future
            // which might be edited by someone else.
-            this._redisplay(GenericDisplay.RedisplayFlags.NONE);
+            this._redisplay(false);
        }));

        this.connect('destroy', Lang.bind(this, function (o) {
@ -155,11 +150,9 @@ DocDisplay.prototype = {
    // Gets the list of recent items from the recent items manager.
    _refreshCache : function() {
        if (!this._docsStale)
-            return true;
-        this._allItems = {};
-        Lang.copyProperties(this._docManager.getInfosByUri(), this._allItems);
+            return;
+        this._allItems = this._docManager.getItems();
        this._docsStale = false;
-        return false;
    },

    // Sets the list of the displayed items based on how recently they were last visited.
@ -178,19 +171,21 @@ DocDisplay.prototype = {
        // them once when they are returned by this._recentManager.get_items() to avoid having to do 
        // this sorting each time, but the sorting seems to be very fast anyway, so there is no need
        // to introduce an additional class variable.
-        this._matchedItems = {};
-        this._matchedItemKeys = [];
+        this._matchedItems = [];
        let docIdsToRemove = [];
        for (docId in this._allItems) {
-            this._matchedItems[docId] = 1;
-            this._matchedItemKeys.push(docId);
+            // this._allItems[docId].exists() checks if the resource still exists
+            if (this._allItems[docId].exists()) 
+                this._matchedItems.push(docId);
+            else 
+                docIdsToRemove.push(docId);
        }

        for (docId in docIdsToRemove) {
            delete this._allItems[docId];
        }

-        this._matchedItemKeys.sort(Lang.bind(this, this._compareItems));
+        this._matchedItems.sort(Lang.bind(this, function (a,b) { return this._compareItems(a,b); }));
    },

    // Compares items associated with the item ids based on how recently the items
@ -275,21 +270,18 @@ DashDocDisplayItem.prototype = {
            Main.overview.hide();
        }));

-        this.actor._delegate = this;
-
        this._icon = docInfo.createIcon(DASH_DOCS_ICON_SIZE);
        let iconBox = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
        iconBox.append(this._icon, Big.BoxPackFlags.NONE);
        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
-        let name = new St.Label({ style_class: 'dash-recent-docs-item',
-                                   text: docInfo.name });
+        let name = new Clutter.Text({ font_name: "Sans 14px",
+                                      color: GenericDisplay.ITEM_DISPLAY_NAME_COLOR,
+                                      ellipsize: Pango.EllipsizeMode.END,
+                                      text: docInfo.name });
        this.actor.append(name, Big.BoxPackFlags.EXPAND);

        let draggable = DND.makeDraggable(this.actor);
-    },
-
-    getUri: function() {
-        return this._info.uri;
+        this.actor._delegate = this;
    },

    getDragActorSource: function() {
@ -306,7 +298,7 @@ DashDocDisplayItem.prototype = {
    shellWorkspaceLaunch: function () {
        this._info.launch();
    }
-};
+}

 /**
 * Class used to display two column recent documents in the dash
@ -321,14 +313,12 @@ DashDocDisplay.prototype = {
        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
        this.actor.connect('allocate', Lang.bind(this, this._allocate));
-        this._workId = Main.initializeDeferredWork(this.actor, Lang.bind(this, this._redisplay));
-
-        this._actorsByUri = {};

        this._docManager = DocInfo.getDocManager();
-        this._docManager.connect('changed', Lang.bind(this, this._onDocsChanged));
-        this._pendingDocsChange = true;
-        this._checkDocExistence = false;
+        this._docManager.connect('changed', Lang.bind(this, function(mgr) {
+            this._redisplay();
+        }));
+        this._redisplay();
    },

    _getPreferredWidth: function(actor, forHeight, alloc) {
@ -360,19 +350,19 @@ DashDocDisplay.prototype = {
        // 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);
+        let firstColumnChildren = children.length / 2;

-        let natural = 0;
+        alloc.min_size = 0;
        for (let i = 0; i < firstColumnChildren; i++) {
            let child = children[i];
-            let [minSize, naturalSize] = child.get_preferred_height(-1);
-            natural += naturalSize;
+            let [minSize, naturalSize] = child.get_preferred_height(forWidth);
+            alloc.natural_size += naturalSize;

            if (i > 0 && i < children.length - 1) {
-                natural += DEFAULT_SPACING;
+                alloc.min_size += DEFAULT_SPACING;
+                alloc.natural_size += DEFAULT_SPACING;
            }
        }
-        alloc.natural_size = natural;
    },

    _allocate: function(actor, box, flags) {
@ -390,16 +380,14 @@ DashDocDisplay.prototype = {
        // Loop over the children, going vertically down first.  When we run
        // out of vertical space (our y variable is bigger than box.y2), switch
        // to the second column.
-        while (i < children.length) {
+        for (; i < children.length; i++) {
            let child = children[i];

            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.
-                if (columnIndex == 1 || i == 0) {
+                // Is this the second column?  Ok, break.
+                if (columnIndex == 1) {
                    break;
                }
                // Set x to the halfway point.
@ -407,10 +395,6 @@ DashDocDisplay.prototype = {
                x = x + itemWidth + DEFAULT_SPACING;
                // And y is back to the top.
                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.
-                continue;
            }

            let childBox = new Clutter.ActorBox();
@ -423,95 +407,30 @@ DashDocDisplay.prototype = {

            child.show();
            child.allocate(childBox, flags);
-
-            i++;
        }

-        if (this._checkDocExistence) {
-            // Now we know how many docs we are displaying, queue a check to see if any of them
-            // have been deleted. If they are deleted, then we'll get a 'changed' signal; since
-            // we'll now be displaying items we weren't previously, we'll check again to see
-            // if they were deleted, and so forth and so on.
-            // TODO: We should change this to ask for as many as we can fit in the given space:
-            // https://bugzilla.gnome.org/show_bug.cgi?id=603522#c23
-            this._docManager.queueExistenceCheck(i);
-            this._checkDocExistence = false;
+        // Everything else didn't fit, just hide it.
+        for (; i < children.length; i++) {
+            children[i].hide();
        }
-
-        let skipPaint = [];
-        for (; i < children.length; i++)
-            this.actor.set_skip_paint(children[i], true);
-    },
-
-    _onDocsChanged: function() {
-        this._checkDocExistence = true;
-        Main.queueDeferredWork(this._workId);
    },

    _redisplay: function() {
-        // Should be kept alive by the _actorsByUri
        this.actor.remove_all();
-        let docs = this._docManager.getTimestampOrderedInfos();
-        for (let i = 0; i < docs.length && i < MAX_DASH_DOCS; i++) {
-            let doc = docs[i];
-            let display = this._actorsByUri[doc.uri];
-            if (display) {
-                this.actor.add_actor(display.actor);
-            } else {
-                let display = new DashDocDisplayItem(doc);
-                this.actor.add_actor(display.actor);
-                this._actorsByUri[doc.uri] = display;
-            }
+
+        let docs = this._docManager.getItems();
+        let docUrls = [];
+        for (let url in docs) {
+            docUrls.push(url);
        }
-        // Any unparented actors must have been deleted
-        for (let uri in this._actorsByUri) {
-            let display = this._actorsByUri[uri];
-            if (display.actor.get_parent() == null) {
-                display.actor.destroy();
-                delete this._actorsByUri[uri];
-            }
+        docUrls.sort(function (urlA, urlB) { return docs[urlB].timestamp - docs[urlA].timestamp; });
+        let textureCache = Shell.TextureCache.get_default();
+
+        for (let i = 0; i < docUrls.length; i++) {
+            let url = docUrls[i];
+            let docInfo = docs[url];
+            let display = new DashDocDisplayItem(docInfo);
+            this.actor.add_actor(display.actor);
        }
-        this.emit('changed');
    }
-};
-
-Signals.addSignalMethods(DashDocDisplay.prototype);
-
-function DocSearchProvider() {
-    this._init();
 }
-
-DocSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
-
-    _init: function(name) {
-        Search.SearchProvider.prototype._init.call(this, _("DOCUMENTS"));
-        this._docManager = DocInfo.getDocManager();
-    },
-
-    getResultMeta: function(resultId) {
-        let docInfo = this._docManager.lookupByUri(resultId);
-        if (!docInfo)
-            return null;
-        return { 'id': resultId,
-                 'name': docInfo.name,
-                 'icon': docInfo.createIcon(Search.RESULT_ICON_SIZE)};
-    },
-
-    activateResult: function(id) {
-        let docInfo = this._docManager.lookupByUri(id);
-        docInfo.launch();
-    },
-
-    getInitialResultSet: function(terms) {
-        return this._docManager.initialSearch(terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        return this._docManager.subsearch(previousResults, terms);
-    },
-
-    expandSearch: function(terms) {
-        log("TODO expand docs search");
-    }
-};
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@ -1,12 +1,9 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

-const St = imports.gi.St;
-const Gettext_gtk20 = imports.gettext.domain('gtk20');
+const Nbtk = imports.gi.Nbtk;

 const Tweener = imports.ui.tweener;

-const Format = imports.misc.format;
-
 // "monkey patch" in some varargs ClutterContainer methods; we need
 // to do this per-container class since there is no representation
 // of interfaces in Javascript
@ -28,15 +25,8 @@ function _patchContainerClass(containerClass) {
    };
 }

-_patchContainerClass(St.BoxLayout);
-_patchContainerClass(St.Table);
+_patchContainerClass(Nbtk.BoxLayout);

 function init() {
    Tweener.init();
-    String.prototype.format = Format.format;
-
-    // Set the default direction for St widgets (this needs to be done before any use of St)
-    if (Gettext_gtk20.gettext("default:LTR") == "default:RTL") {
-        St.Widget.set_default_direction(St.TextDirection.RTL);
-    }
 }
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@ -1,158 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const St = imports.gi.St;
-const Shell = imports.gi.Shell;
-
-const ExtensionState = {
-    ENABLED: 1,
-    DISABLED: 2,
-    ERROR: 3,
-    OUT_OF_DATE: 4
-};
-
-const ExtensionType = {
-    SYSTEM: 1,
-    PER_USER: 2
-};
-
-// Maps uuid -> metadata object
-const extensionMeta = {};
-// Maps uuid -> importer object (extension directory tree)
-const extensions = {};
-// Array of uuids
-var disabledExtensions;
-// GFile for user extensions
-var userExtensionsDir = null;
-
-function loadExtension(dir, enabled, type) {
-    let info;
-    let baseErrorString = 'While loading extension from "' + dir.get_parse_name() + '": ';
-
-    let metadataFile = dir.get_child('metadata.json');
-    if (!metadataFile.query_exists(null)) {
-        global.logError(baseErrorString + 'Missing metadata.json');
-        return;
-    }
-
-    let [success, metadataContents, len, etag] = metadataFile.load_contents(null);
-    let meta;
-    try {
-        meta = JSON.parse(metadataContents);
-    } catch (e) {
-        global.logError(baseErrorString + 'Failed to parse metadata.json: ' + e);
-        return;
-    }
-    let requiredProperties = ['uuid', 'name', 'description'];
-    for (let i = 0; i < requiredProperties; i++) {
-        let prop = requiredProperties[i];
-        if (!meta[prop]) {
-            global.logError(baseErrorString + 'missing "' + prop + '" property in metadata.json');
-            return;
-        }
-    }
-    // Encourage people to add this
-    if (!meta['url']) {
-        global.log(baseErrorString + 'Warning: Missing "url" property in metadata.json');
-    }
-
-    let base = dir.get_basename();
-    if (base != meta.uuid) {
-        global.logError(baseErrorString + 'uuid "' + meta.uuid + '" from metadata.json does not match directory name "' + base + '"');
-        return;
-    }
-
-    extensionMeta[meta.uuid] = meta;
-    extensionMeta[meta.uuid].type = type;
-    extensionMeta[meta.uuid].path = dir.get_path();
-    if (!enabled) {
-        extensionMeta[meta.uuid].state = ExtensionState.DISABLED;
-        return;
-    }
-
-    // Default to error, we set success as the last step
-    extensionMeta[meta.uuid].state = ExtensionState.ERROR;
-
-    let extensionJs = dir.get_child('extension.js');
-    if (!extensionJs.query_exists(null)) {
-        global.logError(baseErrorString + 'Missing extension.js');
-        return;
-    }
-    let stylesheetPath = null;
-    let themeContext = St.ThemeContext.get_for_stage(global.stage);
-    let theme = themeContext.get_theme();
-    let stylesheetFile = dir.get_child('stylesheet.css');
-    if (stylesheetFile.query_exists(null)) {
-        try {
-            theme.load_stylesheet(stylesheetFile.get_path());
-        } catch (e) {
-            global.logError(baseErrorString + 'Stylesheet parse error: ' + e);
-            return;
-        }
-    }
-
-    let extensionModule;
-    try {
-        global.add_extension_importer('imports.ui.extensionSystem.extensions', meta.uuid, dir.get_path());
-        extensionModule = extensions[meta.uuid].extension;
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        global.logError(baseErrorString + e);
-        return;
-    }
-    if (!extensionModule.main) {
-        global.logError(baseErrorString + 'missing \'main\' function');
-        return;
-    }
-    try {
-        extensionModule.main();
-    } catch (e) {
-        if (stylesheetPath != null)
-            theme.unload_stylesheet(stylesheetPath);
-        global.logError(baseErrorString + 'Failed to evaluate main function:' + e);
-        return;
-    }
-    extensionMeta[meta.uuid].state = ExtensionState.ENABLED;
-    global.log('Loaded extension ' + meta.uuid);
-}
-
-function init() {
-    let userConfigPath = GLib.get_user_config_dir();
-    let userExtensionsPath = GLib.build_filenamev([userConfigPath, 'gnome-shell', 'extensions']);
-    userExtensionsDir = Gio.file_new_for_path(userExtensionsPath);
-    try {
-        userExtensionsDir.make_directory_with_parents(null);
-    } catch (e) {
-        global.logError(""+e);
-    }
-
-    disabledExtensions = Shell.GConf.get_default().get_string_list('disabled_extensions');
-}
-
-function _loadExtensionsIn(dir, type) {
-    let fileEnum = dir.enumerate_children('standard::*', Gio.FileQueryInfoFlags.NONE, null);
-    let file, info;
-    while ((info = fileEnum.next_file(null)) != null) {
-        let fileType = info.get_file_type();
-        if (fileType != Gio.FileType.DIRECTORY)
-            continue;
-        let name = info.get_name();
-        let enabled = disabledExtensions.indexOf(name) < 0;
-        let child = dir.get_child(name);
-        loadExtension(child, enabled, type);
-    }
-    fileEnum.close(null);
-}
-
-function loadExtensions() {
-    _loadExtensionsIn(userExtensionsDir, ExtensionType.PER_USER);
-    let systemDataDirs = GLib.get_system_data_dirs();
-    for (let i = 0; i < systemDataDirs.length; i++) {
-        let dirPath = systemDataDirs[i] + '/gnome-shell/extensions';
-        let dir = Gio.file_new_for_path(dirPath);
-        if (dir.query_exists(null))
-            _loadExtensionsIn(dir, ExtensionType.SYSTEM);
-    }
-}
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@ -11,18 +11,20 @@ const Meta = imports.gi.Meta;
 const Pango = imports.gi.Pango;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
-const St = imports.gi.St;

+const Button = imports.ui.button;
 const DND = imports.ui.dnd;
+const Link = imports.ui.link;
 const Main = imports.ui.main;

-const RedisplayFlags = { NONE: 0,
-                         FULL: 1 << 1,
-                         SUBSEARCH: 1 << 2,
-                         IMMEDIATE: 1 << 3 };
-
+const ITEM_DISPLAY_NAME_COLOR = new Clutter.Color();
+ITEM_DISPLAY_NAME_COLOR.from_pixel(0xffffffff);
 const ITEM_DISPLAY_DESCRIPTION_COLOR = new Clutter.Color();
 ITEM_DISPLAY_DESCRIPTION_COLOR.from_pixel(0xffffffbb);
+const ITEM_DISPLAY_BACKGROUND_COLOR = new Clutter.Color();
+ITEM_DISPLAY_BACKGROUND_COLOR.from_pixel(0x00000000);
+const ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR = new Clutter.Color();
+ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR.from_pixel(0x4f6fadaa);
 const DISPLAY_CONTROL_SELECTED_COLOR = new Clutter.Color();
 DISPLAY_CONTROL_SELECTED_COLOR.from_pixel(0x112288ff);
 const PREVIEW_BOX_BACKGROUND_COLOR = new Clutter.Color();
@ -30,7 +32,10 @@ PREVIEW_BOX_BACKGROUND_COLOR.from_pixel(0xADADADf0);

 const DEFAULT_PADDING = 4;

+const ITEM_DISPLAY_HEIGHT = 50;
 const ITEM_DISPLAY_ICON_SIZE = 48;
+const ITEM_DISPLAY_PADDING = 1;
+const ITEM_DISPLAY_PADDING_RIGHT = 2;
 const DEFAULT_COLUMN_GAP = 6;

 const PREVIEW_ICON_SIZE = 96;
@ -41,6 +46,8 @@ const PREVIEW_BOX_CORNER_RADIUS = 10;
 const PREVIEW_PLACING = 3/4;
 const PREVIEW_DETAILS_MIN_WIDTH = PREVIEW_ICON_SIZE * 2;

+const INFORMATION_BUTTON_SIZE = 16;
+
 /* This is a virtual class that represents a single display item containing
 * a name, a description, and an icon. It allows selecting an item and represents
 * it by highlighting it with a different background color than the default.
@ -51,8 +58,12 @@ function GenericDisplayItem() {

 GenericDisplayItem.prototype = {
    _init: function() {
-        this.actor = new St.BoxLayout({ style_class: "generic-display-item",
-                                         reactive: true });
+        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                   spacing: ITEM_DISPLAY_PADDING,
+                                   reactive: true,
+                                   background_color: ITEM_DISPLAY_BACKGROUND_COLOR,
+                                   corner_radius: 4,
+                                   height: ITEM_DISPLAY_HEIGHT });

        this.actor._delegate = this;
        this.actor.connect('button-release-event',
@ -64,20 +75,52 @@ GenericDisplayItem.prototype = {
                                     }));

        let draggable = DND.makeDraggable(this.actor);
+        draggable.connect('drag-begin', Lang.bind(this, this._onDragBegin));

-        this._iconBin = new St.Bin();
-        this.actor.add(this._iconBin);
+        this._infoContent = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                          spacing: DEFAULT_PADDING });
+        this.actor.append(this._infoContent, Big.BoxPackFlags.EXPAND);

-        this._infoText = new St.BoxLayout({ style_class: 'generic-display-item-text',
-                                             vertical: true });
-        this.actor.add(this._infoText, { expand: true, y_fill: false });
+        this._iconBox = new Big.Box();
+        this._infoContent.append(this._iconBox, Big.BoxPackFlags.NONE);
+
+        this._infoText = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                       spacing: DEFAULT_PADDING });
+        this._infoContent.append(this._infoText, Big.BoxPackFlags.EXPAND);
+
+        let infoIconUri = "file://" + global.imagedir + "info.svg";
+        let infoIcon = Shell.TextureCache.get_default().load_uri_sync(Shell.TextureCachePolicy.FOREVER,
+                                                                      infoIconUri,
+                                                                      INFORMATION_BUTTON_SIZE,
+                                                                      INFORMATION_BUTTON_SIZE);
+        this._informationButton = new Button.iconButton(this.actor, INFORMATION_BUTTON_SIZE, infoIcon);
+        let buttonBox = new Big.Box({ width: INFORMATION_BUTTON_SIZE + 2 * DEFAULT_PADDING,
+                                      height: INFORMATION_BUTTON_SIZE,
+                                      padding_left: DEFAULT_PADDING, padding_right: DEFAULT_PADDING,
+                                      y_align: Big.BoxAlignment.CENTER });
+        buttonBox.append(this._informationButton.actor, Big.BoxPackFlags.NONE);
+        this.actor.append(buttonBox, Big.BoxPackFlags.END);
+
+        // Connecting to the button-press-event for the information button ensures that the actor,
+        // which is a draggable actor, does not get the button-press-event and doesn't initiate
+        // the dragging, which then prevents us from getting the button-release-event for the button.
+        this._informationButton.actor.connect('button-press-event',
+                                              Lang.bind(this,
+                                                        function() {
+                                                            return true;
+                                                        }));
+        this._informationButton.actor.connect('button-release-event',
+                                              Lang.bind(this,
+                                                        function() {
+                                                            // Selects the item by highlighting it and displaying its details
+                                                            this.emit('show-details');
+                                                            return true;
+                                                        }));

        this._name = null;
        this._description = null;
        this._icon = null;

-        this._initialLoadComplete = false;
-
        // An array of details description actors that we create over time for the item.
        // It is used for updating the description text inside the details actor when
        // the description text for the item is updated.
@ -102,10 +145,24 @@ GenericDisplayItem.prototype = {

    //// Public methods ////

+    // Shows the information button when the item was drawn under the mouse pointer.
+    onDrawnUnderPointer: function() {
+        this._informationButton.show();
+    },
+
    // Highlights the item by setting a different background color than the default 
    // if isSelected is true, removes the highlighting otherwise.
    markSelected: function(isSelected) {
-        this.actor.set_style_pseudo_class(isSelected ? "selected" : null);
+       let color;
+       if (isSelected) {
+           color = ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR;
+           this._informationButton.forceShow(true);
+       }
+       else {
+           color = ITEM_DISPLAY_BACKGROUND_COLOR;
+           this._informationButton.forceShow(false);
+       }
+       this.actor.background_color = color;
    },

    /*
@ -121,14 +178,19 @@ GenericDisplayItem.prototype = {
                                        spacing: PREVIEW_BOX_SPACING });

        // Inner box with name and description
-        let textDetails = new St.BoxLayout({ style_class: 'generic-display-details',
-                                             vertical: true });
-        let detailsName = new St.Label({ style_class: 'generic-display-details-name',
-                                          text: this._name.text });
-        textDetails.add(detailsName);
+        let textDetails = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                        spacing: PREVIEW_BOX_SPACING });
+        let detailsName = new Clutter.Text({ color: ITEM_DISPLAY_NAME_COLOR,
+                                             font_name: "Sans bold 14px",
+                                             line_wrap: true,
+                                             text: this._name.text });
+        textDetails.append(detailsName, Big.BoxPackFlags.NONE);

-        let detailsDescription = new St.Label({ text: this._description.text });
-        textDetails.add(detailsDescription);
+        let detailsDescription = new Clutter.Text({ color: ITEM_DISPLAY_NAME_COLOR,
+                                                    font_name: "Sans 14px",
+                                                    line_wrap: true,
+                                                    text: this._description.text });
+        textDetails.append(detailsDescription, Big.BoxPackFlags.NONE);

        this._detailsDescriptions.push(detailsDescription);

@ -154,7 +216,7 @@ GenericDisplayItem.prototype = {

    // Destroys the item.
    destroy: function() {
-        this.actor.destroy();
+      this.actor.destroy();
    },

    //// Pure virtual public methods ////
@ -191,15 +253,20 @@ GenericDisplayItem.prototype = {
        }

        this._icon = this._createIcon();
-        this._iconBin.set_child(this._icon);
+        this._iconBox.append(this._icon, Big.BoxPackFlags.NONE);

-        this._name = new St.Label({ style_class: "generic-display-item-name",
-                                     text: nameText });
-        this._infoText.add(this._name);
+        this._name = new Clutter.Text({ color: ITEM_DISPLAY_NAME_COLOR,
+                                        font_name: "Sans 14px",
+                                        ellipsize: Pango.EllipsizeMode.END,
+                                        text: nameText });
+        this._infoText.append(this._name, Big.BoxPackFlags.EXPAND);

-        this._description = new St.Label({ style_class: "generic-display-item-description",
-                                            text: descriptionText ? descriptionText : "" });
-        this._infoText.add(this._description);
+        this._description = new Clutter.Text({ color: ITEM_DISPLAY_DESCRIPTION_COLOR,
+                                               font_name: "Sans 12px",
+                                               ellipsize: Pango.EllipsizeMode.END,
+                                               text: descriptionText ? descriptionText : ""
+                                            });
+        this._infoText.append(this._description, Big.BoxPackFlags.EXPAND);
    },

    // Sets the description text for the item, including the description text
@ -231,76 +298,67 @@ GenericDisplayItem.prototype = {
    // Returns a preview icon for the item.
    _createPreviewIcon: function() {
        throw new Error("Not implemented");
-    }
+    },

    //// Private methods ////
+
+    // Hides the information button once the item starts being dragged.
+    _onDragBegin : function (draggable, time) {
+        // For some reason, we are not getting leave-event signal when we are dragging an item,
+        // so we should remove the link manually.
+        this._informationButton.actor.hide();
+    } 
 };

 Signals.addSignalMethods(GenericDisplayItem.prototype);

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

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

-        if (disableVScrolling) {
-            this.actor = this._list = new Shell.OverflowList({ spacing: 6,
-                                                                 item_height: 50 });
-        } else {
-            this.actor = new St.ScrollView({ x_fill: true, y_fill: true });
-            this.actor.get_hscroll_bar().hide();
-            this._list = new St.BoxLayout({ style_class: 'generic-display-container',
-                                             vertical: true });
-            this.actor.add_actor(this._list);
-        }
+        this._maxItemsPerPage = null;
+        this._list = new Shell.OverflowList({ spacing: 6.0,
+                                              item_height: ITEM_DISPLAY_HEIGHT });

-        this._pendingRedisplay = RedisplayFlags.NONE;
-        this.actor.connect('notify::mapped', Lang.bind(this, this._onMappedNotify));
+        this._list.connect('notify::n-pages', Lang.bind(this, function () {
+            this._updateDisplayControl(true);
+        }));
+        this._list.connect('notify::page', Lang.bind(this, function () {
+            this._updateDisplayControl(false);
+        }));

        // map<itemId, Object> where Object represents the item info
        this._allItems = {};
-        // set<itemId>
-        this._matchedItems = {};
-        // sorted array of items matched by search
-        this._matchedItemKeys = [];
+        // an array of itemIds of items that match the current request
+        // in the order in which the items should be displayed
+        this._matchedItems = [];
        // map<itemId, GenericDisplayItem>
        this._displayedItems = {};
        this._openDetailIndex = -1;
        this._selectedIndex = -1;
+        // These two are public - .actor is the normal "actor subclass" property,
+        // but we also expose a .displayControl actor which is separate.
+        // See also getNavigationArea.
+        this.actor = this._list;
+        this.displayControl = new Big.Box({ background_color: ITEM_DISPLAY_BACKGROUND_COLOR,
+                                            spacing: 12,
+                                            orientation: Big.BoxOrientation.HORIZONTAL});
    },

    //// Public methods ////

    // Sets the search string and displays the matching items.
    setSearch: function(text) {
-        let lowertext = text.toLowerCase();
-        if (lowertext == this._search) {
-            return;
-        }
-        let flags = RedisplayFlags.IMMEDIATE;
-        if (this._search != '') {
-            // Because we combine search terms with OR, we have to be sure that no new term
-            // was introduced before deciding that the new search results will be a subset of
-            // the existing search results.
-            if (lowertext.indexOf(this._search) == 0 &&
-                lowertext.split(/\s+/).length == this._search.split(/\s+/).length) {
-                flags |= RedisplayFlags.SUBSEARCH;
-            }
-        }
-        this._search = lowertext;
-        this._redisplay(flags);
+        this._search = text.toLowerCase();
+        this._redisplay(true);
    },

    // Launches the item that is currently selected, closing the Overview
@ -317,7 +375,7 @@ GenericDisplay.prototype = {
    // to the bottom one. Returns true if the selection actually moved up, false if it wrapped 
    // around to the bottom.
    selectUp: function() {
-        let count = this._getVisibleCount();
+        let count = this._list.displayedCount;
        let selectedUp = true;
        let prev = this._selectedIndex - 1;
        if (this._selectedIndex <= 0) {
@ -332,7 +390,7 @@ GenericDisplay.prototype = {
    // to the top one. Returns true if the selection actually moved down, false if it wrapped 
    // around to the top.
    selectDown: function() {
-        let count = this._getVisibleCount();
+        let count = this._list.displayedCount;
        let selectedDown = true;
        let next = this._selectedIndex + 1;
        if (this._selectedIndex == count - 1) {
@ -351,7 +409,7 @@ GenericDisplay.prototype = {

    // Selects the last item among the displayed items.
    selectLastItem: function() {
-        let count = this._getVisibleCount();
+        let count = this._list.displayedCount;
        if (this.hasItems())
            this._selectIndex(count - 1);
    },
@ -372,24 +430,22 @@ GenericDisplay.prototype = {
        // positive number when this._mathedItems.length is 0
        // This can be triggered if a search string is entered for which there are no matches.
        // log("this._mathedItems.length: " + this._matchedItems.length + " this._list.displayedCount " + this._list.displayedCount);
-        return this._matchedItemKeys.length > 0;
+        return this._matchedItems.length > 0;
    },

    getMatchedItemsCount: function() {
-        return this._matchedItemKeys.length;
+        return this._matchedItems.length;
    },

    // Load the initial state
    load: function() {
-        this._redisplay(RedisplayFlags.FULL);
+        this._redisplay(true);
    },

    // Should be called when the display is closed
    resetState: function() {
        this._filterReset();
        this._openDetailIndex = -1;
-        if (!(this.actor instanceof Shell.OverflowList))
-            this.actor.get_vscroll_bar().get_adjustment().value = 0;
    },

    // Returns an actor which acts as a sidebar; this is used for
@ -403,18 +459,63 @@ GenericDisplay.prototype = {
        return item.createDetailsActor();
    },

-    //// Protected methods ////
-
-    _recreateDisplayItems: function() {
-        this._removeAllDisplayItems();
-        this._setDefaultList();
-        for (let itemId in this._allItems) {
-            this._addDisplayItem(itemId);
+    // Displays the page specified by the pageNumber argument.
+    displayPage: function(pageNumber) {
+        // Cleanup from the previous selection, but don't unset this._selectedIndex
+        if (this.hasSelected()) {
+            this._findDisplayedByIndex(this._selectedIndex).markSelected(false);
        }
+        this._list.page = pageNumber;
    },

-    // Creates a display item based on the information associated with itemId
-    // and adds it to the list of displayed items, but does not yet display it.
+    //// Protected methods ////
+
+    /*
+     * Displays items that match the current request and should show up on the current page.
+     * Updates the display control to reflect the matched items set and the page selected.
+     *
+     * resetDisplayControl - indicates if the display control should be re-created because 
+     *                       the results or the space allocated for them changed. If it's false,
+     *                       the existing display control is used and only the page links are
+     *                       updated to reflect the current page selection.
+     */
+    _displayMatchedItems: function(resetDisplayControl) {
+        // When generating a new list to display, we first remove all the old
+        // displayed items which will unset the selection. So we need 
+        // to keep a flag which indicates if this display had the selection.
+        let hadSelected = this.hasSelected();
+
+        this._removeAllDisplayItems();
+        for (let i = 0; i < this._matchedItems.length; i++) {
+            this._addDisplayItem(this._matchedItems[i]);
+        }
+
+        if (hadSelected) {
+            this._selectedIndex = -1;
+            this.selectFirstItem();
+        }
+
+        // Check if the pointer is over one of the items and display the information button if it is.
+        // We want to do this between finishing our changes to the display and the point where
+        // the display is redrawn.
+        Mainloop.idle_add(Lang.bind(this,
+                                    function() {
+                                        let [child, x, y, mask] = Gdk.Screen.get_default().get_root_window().get_pointer();
+                                        let actor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE,
+                                                                                  x, y);
+                                        if (actor != null) {
+                                            let item = this._findDisplayedByActor(actor);
+                                            if (item != null) {
+                                                item.onDrawnUnderPointer();
+                                            }
+                                        }
+                                        return false;
+                                    }),
+                          Meta.PRIORITY_BEFORE_REDRAW);
+    },
+
+    // Creates a display item based on the information associated with itemId 
+    // and adds it to the displayed items.
    _addDisplayItem : function(itemId) {
        if (this._displayedItems.hasOwnProperty(itemId)) {
            log("Tried adding a display item for " + itemId + ", but an item with this item id is already among displayed items.");
@ -428,14 +529,14 @@ GenericDisplay.prototype = {
                            Lang.bind(this,
                                      function() {
                                          // update the selection
-                                          this._selectIndex(this._list.get_children().indexOf(displayItem.actor));
+                                          this._selectIndex(this._list.get_actor_index(displayItem.actor));
                                          this.activateSelected();
                                      }));

        displayItem.connect('show-details',
                            Lang.bind(this,
                                      function() {
-                                          let index = this._list.get_children().indexOf(displayItem.actor);
+                                          let index = this._list.get_actor_index(displayItem.actor);
                                          /* Close the details pane if already open */
                                          if (index == this._openDetailIndex) {
                                              this._openDetailIndex = -1;
@ -445,15 +546,15 @@ GenericDisplay.prototype = {
                                              this.emit('show-details', index);
                                          }
                                      }));
+        this._list.add_actor(displayItem.actor);
        this._displayedItems[itemId] = displayItem;
    },

    // Removes an item identifed by the itemId from the displayed items.
    _removeDisplayItem: function(itemId) {
-        let children = this._list.get_children();
-        let count = children.length;
+        let count = this._list.displayedCount;
        let displayItem = this._displayedItems[itemId];
-        let displayItemIndex = children.indexOf(displayItem.actor);
+        let displayItemIndex = this._list.get_actor_index(displayItem.actor);

        if (this.hasSelected() && count == 1) {
            this.unsetSelected();
@ -484,120 +585,33 @@ GenericDisplay.prototype = {
        this.unsetSelected();
    },

-    _compareSearchMatch: function(a, b) {
-        let countA = this._matchedItems[a];
-        let countB = this._matchedItems[b];
-        if (countA > countB)
-            return -1;
-        else if (countA < countB)
-            return 1;
-        else
-            return this._compareItems(a, b);
-    },
-
-    _setMatches: function(matches) {
-        this._matchedItems = matches;
-        this._matchedItemKeys = [];
-        for (let itemId in this._matchedItems) {
-            this._matchedItemKeys.push(itemId);
-        }
-        this._matchedItemKeys.sort(Lang.bind(this, this._compareSearchMatch));
-    },
-
-    /**
-     * _redisplaySubSearch:
-     * A somewhat more optimized function called when we know
-     * that we're going to be displaying a subset of the items
-     * we already had, in the same order.  In that case, we can
-     * just hide the actors that shouldn't be shown.
-     */
-    _redisplaySubSearch: function() {
-        let matches = this._getSearchMatchedItems(true);
-
-        // Just hide all from the old set,
-        // we'll show the ones we want below
-        for (let itemId in this._displayedItems) {
-            let item = this._displayedItems[itemId];
-            item.actor.hide();
-        }
-
-        this._setMatches(matches);
-
-        for (let itemId in matches) {
-            let item = this._displayedItems[itemId];
-            item.actor.show();
-        }
-        this._list.queue_relayout();
-    },
-
-    _redisplayReordering: function() {
-        if (!this._filterActive()) {
-            this._setDefaultList();
-        } else {
-            this._setMatches(this._getSearchMatchedItems(false));
-        }
-        this._list.remove_all();
-        for (let i = 0; i < this._matchedItemKeys.length; i++) {
-            let itemId = this._matchedItemKeys[i];
-            let item = this._displayedItems[itemId];
-            item.actor.show();
-            this._list.add_actor(item.actor);
-       }
-    },
-
    /*
     * Updates the displayed items, applying the search string if one exists.
-     * @flags: Flags controlling redisplay behavior as follows:
-     *  SUBSEARCH - Indicates that the current _search is a superstring of the previous
-     *  one, which implies we only need to re-search through previous results.
-     *  FULL - Indicates that we need recreate all displayed items.
-     *  IMMEDIATE - Do the full redisplay even if we're not mapped.  This is useful
-     *  if you want to get the number of matched items and show/hide a section based on
-     *  that number.
+     *
+     * resetPage - indicates if the page selection should be reset when displaying the matching results.
+     *             We reset the page selection when the change in results was initiated by the user by  
+     *             entering a different search criteria or by viewing the results list in a different
+     *             size mode, but we keep the page selection the same if the results got updated on
+     *             their own while the user was browsing through the result pages.
     */
-    _redisplay: function(flags) {
-        let immediate = (flags & RedisplayFlags.IMMEDIATE) != 0;
-        if (!immediate && !this.actor.mapped) {
-            this._pendingRedisplay |= flags;
-            return;
-        }
+    _redisplay: function(resetPage) {
+        this._refreshCache();
+        if (!this._filterActive())
+            this._setDefaultList();
+        else
+            this._doSearchFilter();

-        let isSubSearch = (flags & RedisplayFlags.SUBSEARCH) != 0;
-        let fullReload = (flags & RedisplayFlags.FULL) != 0;
+        if (resetPage)
+            this._list.page = 0;

-        let hadSelected = this.hasSelected();
-        this.unsetSelected();
-
-        if (!this._initialLoadComplete)
-            fullReload = true;
-
-        if (!this._refreshCache())
-            fullReload = true;
-
-        if (fullReload) {
-            this._recreateDisplayItems();
-            this._initialLoadComplete = true;
-        }
-
-        if (isSubSearch) {
-            this._redisplaySubSearch();
-        } else {
-            this._redisplayReordering();
-        }
-
-        if (hadSelected) {
-            this._selectedIndex = -1;
-            this.selectFirstItem();
-        }
+        this._displayMatchedItems(true);

        this.emit('redisplayed');
    },

    //// Pure virtual protected methods ////
-
+ 
    // Performs the steps needed to have the latest information about the items.
-    // Implementation should return %true if we are up to date, and %false
-    // if a full reload occurred.
    _refreshCache: function() {
        throw new Error("Not implemented");
    },
@ -629,50 +643,111 @@ GenericDisplay.prototype = {

    //// Private methods ////

-    _getItemSearchScore: function(itemId, terms) {
-        let item = this._allItems[itemId];
-        let score = 0;
-        for (let i = 0; i < terms.length; i++) {
-            let term = terms[i];
-            if (this._isInfoMatching(item, term)) {
-                score++;
-            }
-        }
-        return score;
-    },
-
-    _getSearchMatchedItems: function(isSubSearch) {
+    _getSearchMatchedItems: function() {
+        let matchedItemsForSearch = {};
        // Break the search up into terms, and search for each
        // individual term.  Keep track of the number of terms
        // each item matched.
        let terms = this._search.split(/\s+/);
-        let matchScores = {};
-
-        if (isSubSearch) {
-            for (let i = 0; i < this._matchedItemKeys.length; i++) {
-                let itemId = this._matchedItemKeys[i];
-                let score = this._getItemSearchScore(itemId, terms);
-                if (score > 0)
-                    matchScores[itemId] = score;
-            }
-        } else {
-            for (let itemId in this._displayedItems) {
-                let score = this._getItemSearchScore(itemId, terms);
-                if (score > 0)
-                    matchScores[itemId] = score;
+        for (let i = 0; i < terms.length; i++) {
+            let term = terms[i];
+            for (itemId in this._allItems) {
+                let item = this._allItems[itemId];
+                if (this._isInfoMatching(item, term)) {
+                    let count = matchedItemsForSearch[itemId];
+                    if (!count)
+                        count = 0;
+                    count += 1;
+                    matchedItemsForSearch[itemId] = count;
+                }
            }
        }
-        return matchScores;
+        return matchedItemsForSearch;
+    },
+
+    // Applies the search string to the list of items to find matches,
+    // and displays the matching items.
+    _doSearchFilter: function() {
+        let matchedItemsForSearch;
+
+        if (this._filterActive()) {
+            matchedItemsForSearch = this._getSearchMatchedItems();
+        } else {
+            matchedItemsForSearch = {};
+            for (let itemId in this._allItems) {
+                matchedItemsForSearch[itemId] = 1;
+            }
+        }
+
+        this._matchedItems = [];
+        for (itemId in matchedItemsForSearch) {
+            this._matchedItems.push(itemId);
+        }
+        this._matchedItems.sort(Lang.bind(this, function (a, b) {
+            let countA = matchedItemsForSearch[a];
+            let countB = matchedItemsForSearch[b];
+            if (countA > countB)
+                return -1;
+            else if (countA < countB)
+                return 1;
+            else
+                return this._compareItems(a, b);
+        }));
+    },
+
+    /*
+     * Updates the display control to reflect the matched items set and the page selected.
+     *
+     * resetDisplayControl - indicates if the display control should be re-created because 
+     *                       the results or the space allocated for them changed. If it's false,
+     *                       the existing display control is used and only the page links are
+     *                       updated to reflect the current page selection.
+     */
+    _updateDisplayControl: function(resetDisplayControl) {
+        if (resetDisplayControl) {
+            this.displayControl.remove_all();
+            let nPages = this._list.n_pages;
+            // Don't show the page indicator if there is only one page.
+            if (nPages == 1)
+                return;
+            let pageNumber = this._list.page;
+            for (let i = 0; i < nPages; i++) {
+                let pageControl = new Link.Link({ color: (i == pageNumber) ? DISPLAY_CONTROL_SELECTED_COLOR : ITEM_DISPLAY_DESCRIPTION_COLOR,
+                                                  font_name: "Sans Bold 16px",
+                                                  text: (i+1) + "",
+                                                  reactive: (i == pageNumber) ? false : true});
+                this.displayControl.append(pageControl.actor, Big.BoxPackFlags.NONE);
+
+                // we use pageNumberLocalScope to get the page number right in the callback function
+                let pageNumberLocalScope = i;
+                pageControl.connect('clicked',
+                                    Lang.bind(this,
+                                              function(o, event) {
+                                                  this.displayPage(pageNumberLocalScope);
+                                              }));
+            }
+        } else {
+            let pageControlActors = this.displayControl.get_children();
+            for (let i = 0; i < pageControlActors.length; i++) {
+                let pageControlActor = pageControlActors[i];
+                if (i == this._list.page) {
+                    pageControlActor.color =  DISPLAY_CONTROL_SELECTED_COLOR;
+                    pageControlActor.reactive = false;
+                } else {
+                    pageControlActor.color =  ITEM_DISPLAY_DESCRIPTION_COLOR;
+                    pageControlActor.reactive = true;
+                }
+            } 
+        }
+        if (this.hasSelected()) {
+            this.selectFirstItem();
+        }
    },

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

@ -704,20 +779,6 @@ GenericDisplay.prototype = {
        let item = this._findDisplayedByIndex(index);
        item.markSelected(true);
        this.emit('selected');
-    },
-
-    _getVisibleCount: function() {
-        if (this.actor instanceof Shell.OverflowList)
-            return this._list.displayed_count;
-        return this._list.get_n_children();
-    },
-
-    _onMappedNotify: function () {
-        let mapped = this.actor.mapped;
-        if (mapped && this._pendingRedisplay > RedisplayFlags.NONE)
-            this._redisplay(this._pendingRedisplay);
-
-        this._pendingRedisplay = RedisplayFlags.NONE;
    }
 };

--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@ -1,151 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Clutter = imports.gi.Clutter;
-const Lang = imports.lang;
-
-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
- * @width: (optional) shade actor width
- * @height: (optional) shade actor height
- *
- * Lightbox creates a dark translucent "shade" actor to hide the
- * contents of @container, and allows you to specify particular actors
- * in @container to highlight by bringing them above the shade. It
- * tracks added and removed actors in @container while the lightboxing
- * is active, and ensures that all actors are returned to their
- * original stacking order when the lightboxing is removed. (However,
- * if actors are restacked by outside code while the lightboxing is
- * active, the lightbox may later revert them back to their original
- * order.)
- *
- * By default, the shade window will have the height and width of
- * @container and will track any changes in its size. You can override
- * this by passing an explicit width and height
- */
-function Lightbox(container, width, height) {
-    this._init(container, width, height);
-}
-
-Lightbox.prototype = {
-    _init : function(container, width, height) {
-        this._container = container;
-        this._children = container.get_children();
-        this.actor = new Clutter.Rectangle({ color: SHADE_COLOR,
-                                             x: 0,
-                                             y: 0,
-                                             border_width: 0,
-                                             reactive: true });
-
-        container.add_actor(this.actor);
-        this.actor.raise_top();
-
-        this._destroySignalId = this.actor.connect('destroy', Lang.bind(this, this.destroy));
-
-        if (width && height) {
-            this.actor.width = width;
-            this.actor.height = height;
-            this._allocationChangedSignalId = 0;
-        } else {
-            this.actor.width = container.width;
-            this.actor.height = container.height;
-            this._allocationChangedSignalId = container.connect('allocation-changed', Lang.bind(this, this._allocationChanged));
-        }
-
-        this._actorAddedSignalId = container.connect('actor-added', Lang.bind(this, this._actorAdded));
-        this._actorRemovedSignalId = container.connect('actor-removed', Lang.bind(this, this._actorRemoved));
-
-        this._highlighted = null;
-    },
-
-    _allocationChanged : function(container, box, flags) {
-        this.actor.width = this._container.width;
-        this.actor.height = this._container.height;
-    },
-
-    _actorAdded : function(container, newChild) {
-        let children = this._container.get_children();
-        let myIndex = children.indexOf(this.actor);
-        let newChildIndex = children.indexOf(newChild);
-
-        if (newChildIndex > myIndex) {
-            // The child was added above the shade (presumably it was
-            // made the new top-most child). Move it below the shade,
-            // and add it to this._children as the new topmost actor.
-            newChild.lower(this.actor);
-            this._children.push(newChild);
-        } else if (newChildIndex == 0) {
-            // Bottom of stack
-            this._children.unshift(newChild);
-        } else {
-            // Somewhere else; insert it into the correct spot
-            let prevChild = this._children.indexOf(children[newChildIndex - 1]);
-            if (prevChild != -1) // paranoia
-                this._children.splice(prevChild + 1, 0, newChild);
-        }
-    },
-
-    _actorRemoved : function(container, child) {
-        let index = this._children.indexOf(child);
-        if (index != -1) // paranoia
-            this._children.splice(index, 1);
-
-        if (child == this._highlighted)
-            this._highlighted = null;
-    },
-
-    /**
-     * highlight:
-     * @window: actor to highlight
-     *
-     * Highlights the indicated actor and unhighlights any other
-     * currently-highlighted actor. With no arguments or a false/null
-     * argument, all actors will be unhighlighted.
-     */
-    highlight : function(window) {
-        if (this._highlighted == window)
-            return;
-
-        // Walk this._children raising and lowering actors as needed.
-        // Things get a little tricky if the to-be-raised and
-        // to-be-lowered actors were originally adjacent, in which
-        // case we may need to indicate some *other* actor as the new
-        // sibling of the to-be-lowered one.
-
-        let below = this.actor;
-        for (let i = this._children.length - 1; i >= 0; i--) {
-            if (this._children[i] == window)
-                this._children[i].raise_top();
-            else if (this._children[i] == this._highlighted)
-                this._children[i].lower(below);
-            else
-                below = this._children[i];
-        }
-
-        this._highlighted = window;
-    },
-
-    /**
-     * destroy:
-     *
-     * Destroys the lightbox. This is called automatically if the
-     * lightbox's container is destroyed.
-     */
-    destroy : function() {
-        if (this._allocationChangedSignalId != 0)
-            this._container.disconnect(this._allocationChangedSignalId);
-        this._container.disconnect(this._actorAddedSignalId);
-        this._container.disconnect(this._actorRemovedSignalId);
-
-        this.actor.disconnect(this._destroySignalId);
-
-        this.highlight(null);
-        this.actor.destroy();
-    }
-};
--- a/js/ui/link.js
+++ b/js/ui/link.js
@ -3,21 +3,78 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
-const St = imports.gi.St;

+// Link is a clickable link. Right now it just handles properly capturing
+// press and release events and short-circuiting the button handling in
+// ClutterText, but more features like different colors for hover/pressed states
+// or a different mouse cursor could be implemented.
+//
+// The properties passed in are forwarded to the Clutter.Text() constructor,
+// so can include, 'text', 'font_name', etc.
 function Link(props) {
    this._init(props);
 }

 Link.prototype = {
    _init : function(props) {
-        let realProps = { reactive: true,
-                          style_class: 'shell-link' };
+	let realProps = { reactive: true };
        // The user can pass in reactive: false to override the above and get
        // a non-reactive link (a link to the current page, perhaps)
-        Lang.copyProperties(props, realProps);
+	Lang.copyProperties(props, realProps);

-        this.actor = new St.Button(realProps);
+	this.actor = new Clutter.Text(realProps);
+	this.actor._delegate = this;
+	this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+	this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
+	this.actor.connect('enter-event', Lang.bind(this, this._onEnter));
+	this.actor.connect('leave-event', Lang.bind(this, this._onLeave));
+
+	this._buttonDown = false;
+	this._havePointer = false;
+    },
+
+    // Update the text of the link
+    setText : function(text) {
+	this.actor.text = text;
+    },
+
+    // We want to react on buttonDown, but if we override button-release-event for
+    // ClutterText, but not button-press-event, we get a stuck grab. Tracking
+    // buttonDown and doing the grab isn't really necessary, but doing it makes
+    // the behavior perfectly correct if the user clicks on one actor, drags
+    // to another and releases - that should not trigger either actor.
+    _onButtonPress : function(actor, event) {
+	this._buttonDown = true;
+	this._havePointer = true; // Hack to work around poor enter/leave tracking in Clutter
+	Clutter.grab_pointer(actor);
+
+	return true;
+    },
+
+    _onButtonRelease : function(actor, event) {
+	if (this._buttonDown) {
+	    this._buttonDown = false;
+	    Clutter.ungrab_pointer(actor);
+
+	    if (this._havePointer)
+		this.emit('clicked');
+	}
+
+	return true;
+    },
+
+    _onEnter : function(actor, event) {
+	if (event.get_source() == actor)
+	    this._havePointer = true;
+
+        return false;
+    },
+
+    _onLeave : function(actor, event) {
+	if (event.get_source() == actor)
+	    this._havePointer = false;
+
+        return false;
    }
 };

--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@ -4,16 +4,12 @@ const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Pango = imports.gi.Pango;
-const St = imports.gi.St;
+const Nbtk = imports.gi.Nbtk;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;

-const ExtensionSystem = imports.ui.extensionSystem;
-const Link = imports.ui.link;
 const Tweener = imports.ui.tweener;
 const Main = imports.ui.main;

@ -41,41 +37,35 @@ function Notebook() {

 Notebook.prototype = {
    _init: function() {
-        this.actor = new St.BoxLayout({ vertical: true });
+        this.actor = new Nbtk.BoxLayout({ vertical: true });

-        this.tabControls = new St.BoxLayout({ style_class: "labels" });
+        this.tabControls = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                         spacing: 4, padding: 2 });

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

    appendPage: function(name, child) {
-        let labelBox = new St.BoxLayout({ style_class: "notebook-tab" });
-        let label = new St.Button({ label: name });
-        label.connect('clicked', Lang.bind(this, function () {
+        let labelOuterBox = new Big.Box({ padding: 2 });
+        let labelBox = new Nbtk.BoxLayout({ reactive: true });
+        labelOuterBox.append(labelBox, Big.BoxPackFlags.NONE);
+        let label = new Nbtk.Label({ text: name });
+        labelBox.connect('button-press-event', Lang.bind(this, function () {
            this.selectChild(child);
            return true;
        }));
        labelBox.add(label, { expand: true });
-        this.tabControls.add(labelBox);
+        this.tabControls.append(labelOuterBox, Big.BoxPackFlags.NONE);

-        let scrollview = new St.ScrollView({ x_fill: true, y_fill: true });
+        let scrollview = new Nbtk.ScrollView({ x_fill: true, y_fill: true });
        scrollview.get_hscroll_bar().hide();
        scrollview.add_actor(child);

-        let tabData = { child: child,
-                        labelBox: labelBox,
-                        label: label,
-                        scrollView: scrollview,
-                        _scrollToBottom: false };
-        this._tabs.push(tabData);
+        this._tabs.push([child, labelBox, scrollview]);
        scrollview.hide();
        this.actor.add(scrollview, { expand: true });

-        let vAdjust = scrollview.vscroll.adjustment;
-        vAdjust.connect('changed', Lang.bind(this, function () { this._onAdjustScopeChanged(tabData); }));
-        vAdjust.connect('notify::value', Lang.bind(this, function() { this._onAdjustValueChanged(tabData); }));
-
        if (this._selectedIndex == -1)
            this.selectIndex(0);
    },
@ -83,9 +73,10 @@ Notebook.prototype = {
    _unselect: function() {
        if (this._selectedIndex < 0)
            return;
-        let tabData = this._tabs[this._selectedIndex];
-        tabData.labelBox.set_style_pseudo_class(null);
-        tabData.scrollView.hide();
+        let [child, labelBox, scrollview] = this._tabs[this._selectedIndex];
+        labelBox.padding = 2;
+        labelBox.border = 0;
+        scrollview.hide();
        this._selectedIndex = -1;
    },

@ -97,11 +88,12 @@ Notebook.prototype = {
            this.emit('selection', null);
            return;
        }
-        let tabData = this._tabs[index];
-        tabData.labelBox.set_style_pseudo_class('selected');
-        tabData.scrollView.show();
+        let [child, labelBox, scrollview] = this._tabs[index];
+        labelBox.padding = 1;
+        labelBox.border = 1;
+        scrollview.show();
        this._selectedIndex = index;
-        this.emit('selection', tabData.child);
+        this.emit('selection', child);
    },

    selectChild: function(child) {
@ -109,32 +101,13 @@ Notebook.prototype = {
            this.selectIndex(-1);
        else {
            for (let i = 0; i < this._tabs.length; i++) {
-                let tabData = this._tabs[i];
-                if (tabData.child == child) {
+                let [tabChild, labelBox, scrollview] = this._tabs[i];
+                if (tabChild == child) {
                    this.selectIndex(i);
                    return;
                }
            }
        }
-    },
-
-    scrollToBottom: function(index) {
-        let tabData = this._tabs[index];
-        tabData._scrollToBottom = true;
-
-    },
-
-    _onAdjustValueChanged: function (tabData) {
-        let vAdjust = tabData.scrollView.vscroll.adjustment;
-        if (vAdjust.value < (vAdjust.upper - vAdjust.lower - 0.5))
-            tabData._scrolltoBottom = false;
-    },
-
-    _onAdjustScopeChanged: function (tabData) {
-        if (!tabData._scrollToBottom)
-            return;
-        let vAdjust = tabData.scrollView.vscroll.adjustment;
-        vAdjust.value = vAdjust.upper - vAdjust.page_size;
    }
 }
 Signals.addSignalMethods(Notebook.prototype);
@ -150,17 +123,17 @@ Result.prototype = {

        this.actor = new Big.Box();

-        let cmdTxt = new St.Label({ text: command });
+        let cmdTxt = new Nbtk.Label({ text: command });
        cmdTxt.ellipsize = Pango.EllipsizeMode.END;

        this.actor.append(cmdTxt, Big.BoxPackFlags.NONE);
-        let resultTxt = new St.Label({ text: "r(" + index + ") = " + o });
+        let resultTxt = new Nbtk.Label({ text: "r(" + index + ") = " + o });
        resultTxt.ellipsize = Pango.EllipsizeMode.END;

        this.actor.append(resultTxt, Big.BoxPackFlags.NONE);
        let line = new Clutter.Rectangle({ name: "Separator",
                                           height: 1 });
-        let padBin = new St.Bin({ name: "Separator", x_fill: true, y_fill: true });
+        let padBin = new Nbtk.Bin({ name: "Separator", x_fill: true, y_fill: true });
        padBin.add_actor(line);
        this.actor.append(padBin, Big.BoxPackFlags.NONE);
    }
@ -177,7 +150,7 @@ ActorHierarchy.prototype = {

        this._parentList = [];

-        this.actor = new St.BoxLayout({ name: "ActorHierarchy", vertical: true });
+        this.actor = new Nbtk.BoxLayout({ name: "ActorHierarchy", vertical: true });
    },

    setTarget: function(actor) {
@ -197,8 +170,8 @@ ActorHierarchy.prototype = {
        while ((parent = parent.get_parent()) != null) {
            this._parentList.push(parent);

-            let link = new St.Label({ reactive: true,
-                                      text: "" + parent });
+            let link = new Nbtk.Label({ reactive: true,
+                                        text: "" + parent });
            this.actor.add_actor(link);
            let parentTarget = parent;
            link.connect('button-press-event', Lang.bind(this, function () {
@ -228,7 +201,7 @@ PropertyInspector.prototype = {

        this._parentList = [];

-        this.actor = new St.BoxLayout({ name: "PropertyInspector", vertical: true });
+        this.actor = new Nbtk.BoxLayout({ name: "PropertyInspector", vertical: true });
    },

    setTarget: function(actor) {
@ -244,8 +217,8 @@ PropertyInspector.prototype = {
                valueStr = '<error>';
            }
            let propText = propName + ": " + valueStr;
-            let propDisplay = new St.Label({ reactive: true,
-                                             text: propText });
+            let propDisplay = new Nbtk.Label({ reactive: true,
+                                               text: propText });
            this.actor.add_actor(propDisplay);
        }
    }
@ -258,16 +231,15 @@ function Inspector() {
 Inspector.prototype = {
    _init: function() {
        let width = 150;
-        let primary = global.get_primary_monitor();
-        let eventHandler = new St.BoxLayout({ name: "LookingGlassDialog",
-                                              vertical: false,
-                                              y: primary.y + Math.floor(primary.height / 2),
-                                              reactive: true });
+        let eventHandler = new Nbtk.BoxLayout({ name: "LookingGlassDialog",
+                                                vertical: false,
+                                                y: Math.floor(global.stage.height/2),
+                                                reactive: true });
        eventHandler.connect('notify::allocation', Lang.bind(this, function () {
-            eventHandler.x = primary.x + Math.floor((primary.width - eventHandler.width) / 2);
+            eventHandler.x = Math.floor((global.stage.width)/2 - (eventHandler.width)/2);
        }));
        global.stage.add_actor(eventHandler);
-        let displayText = new St.Label();
+        let displayText = new Nbtk.Label();
        eventHandler.add(displayText, { expand: true });

        let borderPaintTarget = null;
@ -308,135 +280,6 @@ Inspector.prototype = {

 Signals.addSignalMethods(Inspector.prototype);

-function ErrorLog() {
-    this._init();
-}
-
-ErrorLog.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout();
-        this.text = new St.Label();
-        this.actor.add(this.text);
-        this.text.clutter_text.line_wrap = true;
-        this.actor.connect('notify::mapped', Lang.bind(this, this._renderText));
-    },
-
-    _formatTime: function(d){
-        function pad(n) { return n < 10 ? '0' + n : n };
-        return d.getUTCFullYear()+'-'
-            + pad(d.getUTCMonth()+1)+'-'
-            + pad(d.getUTCDate())+'T'
-            + pad(d.getUTCHours())+':'
-            + pad(d.getUTCMinutes())+':'
-            + pad(d.getUTCSeconds())+'Z'
-    },
-
-    _renderText: function() {
-        if (!this.actor.mapped)
-            return;
-        let text = this.text.text;
-        let stack = Main._getAndClearErrorStack();
-        for (let i = 0; i < stack.length; i++) {
-            let logItem = stack[i];
-            text += logItem.category + " t=" + this._formatTime(new Date(logItem.timestamp)) + " " + logItem.message + "\n";
-        }
-        this.text.text = text;
-    }
-}
-
-function Extensions() {
-    this._init();
-}
-
-Extensions.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ vertical: true,
-                                        name: 'lookingGlassExtensions' });
-        this._noExtensions = new St.Label({ style_class: 'lg-extensions-none',
-                                             text: _("No extensions installed") });
-        this._extensionsList = new St.BoxLayout({ vertical: true,
-                                                  style_class: 'lg-extensions-list' });
-        this.actor.add(this._extensionsList);
-        this._loadExtensionList();
-    },
-
-    _loadExtensionList: function() {
-        let extensions = ExtensionSystem.extensionMeta;
-        let totalExtensions = 0;
-        for (let uuid in extensions) {
-            let extensionDisplay = this._createExtensionDisplay(extensions[uuid]);
-            this._extensionsList.add(extensionDisplay);
-            totalExtensions++;
-        }
-        if (totalExtensions == 0) {
-            this._extensionsList.add(this._noExtensions);
-        }
-    },
-
-    _onViewSource: function (actor) {
-        let meta = actor._extensionMeta;
-        let file = Gio.file_new_for_path(meta.path);
-        let uri = file.get_uri();
-        Gio.app_info_launch_default_for_uri(uri, global.create_app_launch_context());
-        Main.lookingGlass.close();
-    },
-
-    _onWebPage: function (actor) {
-        let meta = actor._extensionMeta;
-        Gio.app_info_launch_default_for_uri(meta.url, global.create_app_launch_context());
-        Main.lookingGlass.close();
-    },
-
-    _stateToString: function(extensionState) {
-        switch (extensionState) {
-            case ExtensionSystem.ExtensionState.ENABLED:
-                return _("Enabled");
-            case ExtensionSystem.ExtensionState.DISABLED:
-                return _("Disabled");
-            case ExtensionSystem.ExtensionState.ERROR:
-                return _("Error");
-            case ExtensionSystem.ExtensionState.OUT_OF_DATE:
-                return _("Out of date");
-        }
-        return "Unknown"; // Not translated, shouldn't appear
-    },
-
-    _createExtensionDisplay: function(meta) {
-        let box = new St.BoxLayout({ style_class: 'lg-extension', vertical: true });
-        let name = new St.Label({ style_class: 'lg-extension-name',
-                                   text: meta.name });
-        box.add(name, { expand: true });
-        let description = new St.Label({ style_class: 'lg-extension-description',
-                                         text: meta.description });
-        box.add(description, { expand: true });
-
-        let metaBox = new St.BoxLayout();
-        box.add(metaBox);
-        let stateString = this._stateToString(meta.state);
-        let state = new St.Label({ style_class: 'lg-extension-state',
-                                   text: this._stateToString(meta.state) });
-
-        let actionsContainer = new St.Bin({ x_align: St.Align.END });
-        metaBox.add(actionsContainer);
-        let actionsBox = new St.BoxLayout({ style_class: 'lg-extension-actions' });
-        actionsContainer.set_child(actionsBox);
-
-        let viewsource = new Link.Link({ label: _("View Source") });
-        viewsource.actor._extensionMeta = meta;
-        viewsource.actor.connect('clicked', Lang.bind(this, this._onViewSource));
-        actionsBox.add(viewsource.actor);
-
-        if (meta.url) {
-            let webpage = new Link.Link({ label: _("Web Page") });
-            webpage.actor._extensionMeta = meta;
-            webpage.actor.connect('clicked', Lang.bind(this, this._onWebPage));
-            actionsBox.add(webpage.actor);
-        }
-
-        return box;
-    }
-};
-
 function LookingGlass() {
    this._init();
 }
@ -449,10 +292,6 @@ LookingGlass.prototype = {
        this._savedText = null;
        this._historyNavIndex = -1;
        this._history = [];
-        this._borderPaintTarget = null;
-        this._borderPaintId = 0;
-        this._borderDestroyId = 0;
-
        this._readHistory();

        this._open = false;
@ -463,9 +302,9 @@ LookingGlass.prototype = {
        // Sort of magic, but...eh.
        this._maxItems = 150;

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

        let gconf = Shell.GConf.get_default();
        gconf.watch_directory("/desktop/gnome/interface");
@ -475,7 +314,7 @@ LookingGlass.prototype = {

        global.stage.add_actor(this.actor);

-        let toolbar = new St.BoxLayout({ name: "Toolbar" });
+        let toolbar = new Nbtk.BoxLayout({ name: "Toolbar" });
        this.actor.add_actor(toolbar);
        let inspectIcon = Shell.TextureCache.get_default().load_gicon(new Gio.ThemedIcon({ name: 'gtk-color-picker' }),
                                                                      24);
@ -497,14 +336,13 @@ LookingGlass.prototype = {
        }));

        let notebook = new Notebook();
-        this._notebook = notebook;
        this.actor.add(notebook.actor, { expand: true });

-        let emptyBox = new St.Bin();
+        let emptyBox = new Nbtk.Bin();
        toolbar.add(emptyBox, { expand: true });
        toolbar.add_actor(notebook.tabControls);

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

        this._resultsArea = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
@ -514,10 +352,10 @@ LookingGlass.prototype = {
        let entryArea = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL });
        this._evalBox.add_actor(entryArea);

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

-        this._entry = new St.Entry();
+        this._entry = new Nbtk.Entry();
        /* unmapping the edit box will un-focus it, undo that */
        notebook.connect('selection', Lang.bind(this, function (nb, child) {
            if (child == this._evalBox)
@ -535,12 +373,6 @@ LookingGlass.prototype = {
            notebook.selectIndex(0);
        }));

-        this._errorLog = new ErrorLog();
-        notebook.appendPage('Errors', this._errorLog.actor);
-
-        this._extensions = new Extensions();
-        notebook.appendPage('Extensions', this._extensions.actor);
-
        this._entry.clutter_text.connect('activate', Lang.bind(this, function (o, e) {
            let text = o.get_text();
            // Ensure we don't get newlines in the command; the history file is
@ -556,7 +388,10 @@ LookingGlass.prototype = {
        }));
        this._entry.clutter_text.connect('key-press-event', Lang.bind(this, function(o, e) {
            let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Up) {
+            if (symbol == Clutter.Escape) {
+                this.close();
+                return true;
+            } else if (symbol == Clutter.Up) {
                if (this._historyNavIndex >= this._history.length - 1)
                    return true;
                this._historyNavIndex++;
@ -623,18 +458,6 @@ LookingGlass.prototype = {
        this._results.push(result);
        this._resultsArea.append(result.actor, Big.BoxPackFlags.NONE);
        this._propInspector.setTarget(obj);
-        if (this._borderPaintTarget != null) {
-            this._borderPaintTarget.disconnect(this._borderPaintId);
-            this._borderPaintTarget = null;
-        }
-        if (obj instanceof Clutter.Actor) {
-            this._borderPaintTarget = obj;
-            this._borderPaintId = Shell.add_hook_paint_red_border(obj);
-            this._borderDestroyId = obj.connect('destroy', Lang.bind(this, function () {
-                this._borderDestroyId = 0;
-                this._borderPaintTarget = null;
-            }));
-        }
        let children = this._resultsArea.get_children();
        if (children.length > this._maxItems) {
            this._results.shift();
@ -642,9 +465,6 @@ LookingGlass.prototype = {
            this._offset++;
        }
        this._it = obj;
-
-        // Scroll to bottom
-        this._notebook.scrollToBottom(0);
    },

    _evaluate : function(command) {
@ -681,11 +501,11 @@ LookingGlass.prototype = {
    },

    _resizeTo: function(actor) {
-        let primary = global.get_primary_monitor();
-        let myWidth = primary.width * 0.7;
-        let myHeight = primary.height * 0.7;
+        let stage = global.stage;
+        let myWidth = stage.width * 0.7;
+        let myHeight = stage.height * 0.7;
        let [srcX, srcY] = actor.get_transformed_position();
-        this.actor.x = srcX + (primary.width - myWidth) / 2;
+        this.actor.x = srcX + (stage.width-myWidth)/2;
        this._hiddenY = srcY + actor.height - myHeight - 4; // -4 to hide the top corners
        this._targetY = this._hiddenY + myHeight;
        this.actor.y = this._hiddenY;
@ -701,32 +521,17 @@ LookingGlass.prototype = {
        this._resizeTo(actor);
    },

-    // Handle key events which are relevant for all tabs of the LookingGlass
-    _globalKeyPressEvent : function(actor, event) {
-        let symbol = event.get_key_symbol();
-        if (symbol == Clutter.Escape) {
-            this.close();
-            return true;
-        }
-        return false;
-    },
-
    open : function() {
        if (this._open)
            return;

-        if (!Main.pushModal(this.actor))
-            return;
-
-        this._keyPressEventId = global.stage.connect('key-press-event',
-            Lang.bind(this, this._globalKeyPressEvent));
-
        this.actor.show();
        this.actor.lower(Main.chrome.actor);
        this._open = true;

        Tweener.removeTweens(this.actor);

+        Main.pushModal(this.actor);
        global.stage.set_key_focus(this._entry);

        Tweener.addTween(this.actor, { time: 0.5,
@ -739,19 +544,10 @@ LookingGlass.prototype = {
        if (!this._open)
            return;

-        if (this._keyPressEventId)
-            global.stage.disconnect(this._keyPressEventId);
-
        this._historyNavIndex = -1;
        this._open = false;
        Tweener.removeTweens(this.actor);

-        if (this._borderPaintTarget != null) {
-            this._borderPaintTarget.disconnect(this._borderPaintId);
-            this._borderPaintTarget.disconnect(this._borderDestroyId);
-            this._borderPaintTarget = null;
-        }
-
        Main.popModal(this.actor);

        Tweener.addTween(this.actor, { time: 0.5,
--- a/js/ui/main.js
+++ b/js/ui/main.js
@ -1,28 +1,22 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */

 const Clutter = imports.gi.Clutter;
-const DBus = imports.dbus;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
+const Nbtk = imports.gi.Nbtk;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;

 const Chrome = imports.ui.chrome;
 const Environment = imports.ui.environment;
-const ExtensionSystem = imports.ui.extensionSystem;
-const MessageTray = imports.ui.messageTray;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
-const PlaceDisplay = imports.ui.placeDisplay;
 const RunDialog = imports.ui.runDialog;
 const LookingGlass = imports.ui.lookingGlass;
-const NotificationDaemon = imports.ui.notificationDaemon;
-const ShellDBus = imports.ui.shellDBus;
 const Sidebar = imports.ui.sidebar;
 const WindowManager = imports.ui.windowManager;

@ -32,20 +26,13 @@ DEFAULT_BACKGROUND_COLOR.from_pixel(0x2266bbff);
 let chrome = null;
 let panel = null;
 let sidebar = null;
-let placesManager = null;
 let overview = null;
 let runDialog = null;
 let lookingGlass = null;
 let wm = null;
-let notificationDaemon = null;
-let notificationPopup = null;
-let messageTray = null;
 let recorder = null;
-let shellDBusService = null;
 let modalCount = 0;
 let modalActorFocusStack = [];
-let _errorLogStack = [];
-let _startDate;

 function start() {
    // Add a binding for "global" in the global JS namespace; (gjs
@ -53,34 +40,21 @@ function start() {
    // called "window".)
    window.global = Shell.Global.get();

-    // Now monkey patch utility functions into the global proxy;
-    // This is easier and faster than indirecting down into global
-    // if we want to call back up into JS.
-    global.logError = _logError;
-    global.log = _logDebug;
-
    Gio.DesktopAppInfo.set_desktop_env("GNOME");

    global.grab_dbus_service();
-    shellDBusService = new ShellDBus.GnomeShell();
-    // Force a connection now; dbus.js will do this internally
-    // if we use its name acquisition stuff but we aren't right
-    // now; to do so we'd need to convert from its async calls
-    // back into sync ones.
-    DBus.session.flush();

    Environment.init();

-    // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
+    // Ensure ShellAppMonitor is initialized; this will
    // also initialize ShellAppSystem first.  ShellAppSystem
-    // needs to load all the .desktop files, and ShellWindowTracker
+    // needs to load all the .desktop files, and ShellAppMonitor
    // will use those to associate with windows.  Right now
    // the Monitor doesn't listen for installed app changes
    // and recalculate application associations, so to avoid
    // races for now we initialize it here.  It's better to
    // be predictable anyways.
-    Shell.WindowTracker.get_default();
-    Shell.AppUsage.get_default();
+    Shell.AppMonitor.get_default();

    // The background color really only matters if there is no desktop
    // window (say, nautilus) running. We set it mostly so things look good
@ -93,36 +67,21 @@ function start() {
    for (let i = 0; i < children.length; i++)
        children[i].destroy();

-    let themeContext = St.ThemeContext.get_for_stage (global.stage);
+    let themeContext = Shell.ThemeContext.get_for_stage (global.stage);
    let stylesheetPath = global.datadir + "/theme/gnome-shell.css";
-    let theme = new St.Theme ({ application_stylesheet: stylesheetPath });
+    let theme = new Shell.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 () {
-        overview.toggle();
-    });
-    shellwm.takeover_keybinding("panel_run_dialog");
-    shellwm.connect("keybinding::panel_run_dialog", function () {
-       getRunDialog().open();
-    });

-    placesManager = new PlaceDisplay.PlacesManager();
    overview = new Overview.Overview();
    chrome = new Chrome.Chrome();
    panel = new Panel.Panel();
    sidebar = new Sidebar.Sidebar();
    wm = new WindowManager.WindowManager();
-    notificationDaemon = new NotificationDaemon.NotificationDaemon();
-    notificationPopup = new MessageTray.Notification();
-    messageTray = new MessageTray.MessageTray();
-
-    _startDate = new Date();

    global.screen.connect('toggle-recording', function() {
        if (recorder == null) {
@ -138,9 +97,6 @@ function start() {

    _relayout();

-    ExtensionSystem.init();
-    ExtensionSystem.loadExtensions();
-
    panel.startupAnimation();

    let display = global.screen.get_display();
@ -149,56 +105,11 @@ function start() {

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

-    _log('info', 'loaded at ' + _startDate);
-
    Mainloop.idle_add(_removeUnusedWorkspaces);
 }

-/**
- * _log:
- * @category: string message type ('info', 'error')
- * @msg: A message string
- * ...: Any further arguments are converted into JSON notation,
- *      and appended to the log message, separated by spaces.
- *
- * Log a message into the LookingGlass error
- * stream.  This is primarily intended for use by the
- * extension system as well as debugging.
- */
-function _log(category, msg) {
-    let text = msg;
-    if (arguments.length > 2) {
-        text += ': ';
-        for (let i = 2; i < arguments.length; i++) {
-            text += JSON.stringify(arguments[i]);
-            if (i < arguments.length - 1)
-                text += " ";
-        }
-    }
-    _errorLogStack.push({timestamp: new Date().getTime(),
-                         category: category,
-                         message: text });
-}
-
-function _logError(msg) {
-    return _log('error', msg);
-}
-
-function _logDebug(msg) {
-    return _log('debug', msg);
-}
-
-// Used by the error display in lookingGlass.js
-function _getAndClearErrorStack() {
-    let errors = _errorLogStack;
-    _errorLogStack = [];
-    return errors;
-}
-
 function _relayout() {
-    let primary = global.get_primary_monitor();
-    panel.actor.set_position(primary.x, primary.y);
-    panel.actor.set_size(primary.width, Panel.PANEL_HEIGHT);
+    panel.actor.set_size(global.screen_width, Panel.PANEL_HEIGHT);
    overview.relayout();
 }

@ -270,7 +181,7 @@ function _globalKeyPressHandler(actor, event) {
                overview.hide();

            return true;
-        } else if (symbol == Clutter.F2 && (Shell.get_event_state(event) & Clutter.ModifierType.MOD1_MASK)) {
+        } else if (symbol == Clutter.F2 && (event.get_state() & Clutter.ModifierType.MOD1_MASK)) {
            getRunDialog().open();
        }
    }
@ -300,18 +211,9 @@ function _findModal(actor) {
 * Next, record the current Clutter keyboard focus on a stack.  If the modal stack
 * returns to this actor, reset the focus to the actor which was focused
 * at the time pushModal() was invoked.
- *
- * Returns: true iff we successfully acquired a grab or already had one
 */
 function pushModal(actor) {
-    if (modalCount == 0) {
-        if (!global.begin_modal(global.get_current_time())) {
-            log("pushModal: invocation of begin_modal failed");
-            return false;
-        }
-    }
-
-    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
+    let timestamp = global.screen.get_display().get_current_time();

    modalCount += 1;
    actor.connect('destroy', function() {
@ -329,7 +231,14 @@ function pushModal(actor) {
    }
    modalActorFocusStack.push([actor, curFocus]);

-    return true;
+    if (modalCount > 1)
+        return;
+
+    if (!global.begin_modal(timestamp)) {
+        log("pushModal: invocation of begin_modal failed");
+        return;
+    }
+    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
 }

 /**
@ -341,6 +250,8 @@ function pushModal(actor) {
 * previous focus at the time when pushModal() was invoked.
 */
 function popModal(actor) {
+    let timestamp = global.screen.get_display().get_current_time();
+
    modalCount -= 1;
    let focusIndex = _findModal(actor);
    if (focusIndex >= 0) {
@ -358,7 +269,7 @@ function popModal(actor) {
    if (modalCount > 0)
        return;

-    global.end_modal(global.get_current_time());
+    global.end_modal(timestamp);
    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
 }

@ -377,141 +288,16 @@ function getRunDialog() {
    return runDialog;
 }

-/**
- * activateWindow:
- * @window: the Meta.Window to activate
- * @time: (optional) current event time
- *
- * Activates @window, switching to its workspace first if necessary
- */
-function activateWindow(window, time) {
-    let activeWorkspaceNum = global.screen.get_active_workspace_index();
-    let windowWorkspaceNum = window.get_workspace().index();
+function createAppLaunchContext() {
+    let screen = global.screen;
+    let display = screen.get_display();

-    if (!time)
-        time = global.get_current_time();
+    let context = new Gdk.AppLaunchContext();
+    context.set_timestamp(display.get_current_time());

-    if (windowWorkspaceNum != activeWorkspaceNum) {
-        let workspace = global.screen.get_workspace_by_index(windowWorkspaceNum);
-        workspace.activate_with_focus(window, time);
-    } else {
-        window.activate(time);
-    }
-}
-
-// TODO - replace this timeout with some system to guess when the user might
-// be e.g. just reading the screen and not likely to interact.
-const DEFERRED_TIMEOUT_SECONDS = 20;
-var _deferredWorkData = {};
-// Work scheduled for some point in the future
-var _deferredWorkQueue = [];
-// Work we need to process before the next redraw
-var _beforeRedrawQueue = [];
-// Counter to assign work ids
-var _deferredWorkSequence = 0;
-var _deferredTimeoutId = 0;
-
-function _runDeferredWork(workId) {
-    if (!_deferredWorkData[workId])
-        return;
-    let index = _deferredWorkQueue.indexOf(workId);
-    if (index < 0)
-        return;
-
-    _deferredWorkQueue.splice(index, 1);
-    _deferredWorkData[workId].callback();
-    if (_deferredWorkQueue.length == 0 && _deferredTimeoutId > 0) {
-        Mainloop.source_remove(_deferredTimeoutId);
-        _deferredTimeoutId = 0;
-    }
-}
-
-function _runAllDeferredWork() {
-    while (_deferredWorkQueue.length > 0)
-        _runDeferredWork(_deferredWorkQueue[0]);
-}
-
-function _runBeforeRedrawQueue() {
-    for (let i = 0; i < _beforeRedrawQueue.length; i++) {
-        let workId = _beforeRedrawQueue[i];
-        _runDeferredWork(workId);
-    }
-    _beforeRedrawQueue = [];
-}
-
-function _queueBeforeRedraw(workId) {
-    _beforeRedrawQueue.push(workId);
-    if (_beforeRedrawQueue.length == 1) {
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, function () {
-            _runBeforeRedrawQueue();
-            return false;
-        }, null);
-    }
-}
-
-/**
- * initializeDeferredWork:
- * @actor: A #ClutterActor
- * @callback: Function to invoke to perform work
- *
- * This function sets up a callback to be invoked when either the
- * given actor is mapped, or after some period of time when the machine
- * is idle.  This is useful if your actor isn't always visible on the
- * screen (for example, all actors in the overview), and you don't want
- * to consume resources updating if the actor isn't actually going to be
- * displaying to the user.
- *
- * Note that queueDeferredWork is called by default immediately on
- * initialization as well, under the assumption that new actors
- * will need it.
- *
- * Returns: A string work identifer
- */
-function initializeDeferredWork(actor, callback, props) {
-    // Turn into a string so we can use as an object property
-    let workId = "" + (++_deferredWorkSequence);
-    _deferredWorkData[workId] = { 'actor': actor,
-                                  'callback': callback };
-    actor.connect('notify::mapped', function () {
-        if (!(actor.mapped && _deferredWorkQueue.indexOf(workId) >= 0))
-            return;
-        _queueBeforeRedraw(workId);
-    });
-    actor.connect('destroy', function() {
-        let index = _deferredWorkQueue.indexOf(workId);
-        if (index >= 0)
-            _deferredWorkQueue.splice(index, 1);
-        delete _deferredWorkData[workId];
-    });
-    queueDeferredWork(workId);
-    return workId;
-}
-
-/**
- * queueDeferredWork:
- * @workId: work identifier
- *
- * Ensure that the work identified by @workId will be
- * run on map or timeout.  You should call this function
- * for example when data being displayed by the actor has
- * changed.
- */
-function queueDeferredWork(workId) {
-    let data = _deferredWorkData[workId];
-    if (!data) {
-        global.logError("invalid work id ", workId);
-        return;
-    }
-    if (_deferredWorkQueue.indexOf(workId) < 0)
-        _deferredWorkQueue.push(workId);
-    if (data.actor.mapped) {
-        _queueBeforeRedraw(workId);
-        return;
-    } else if (_deferredTimeoutId == 0) {
-        _deferredTimeoutId = Mainloop.timeout_add_seconds(DEFERRED_TIMEOUT_SECONDS, function () {
-            _runAllDeferredWork();
-            _deferredTimeoutId = 0;
-            return false;
-        });
-    }
+    // Make sure that the app is opened on the current workspace even if
+    // the user switches before it starts
+    context.set_desktop(screen.get_active_workspace_index());
+
+    return context;
 }
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -1,271 +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 Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-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 MESSAGE_TRAY_TIMEOUT = 0.2;
-
-const ICON_SIZE = 24;
-
-function Notification(icon, text) {
-    this._init(icon, text);
-}
-
-Notification.prototype = {
-    _init: function(icon, text) {
-        this.icon = icon;
-        this.text = text;
-    }
-}
-
-function NotificationBox() {
-    this._init();
-}
-
-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);
-    },
-
-    _textBoxGetPreferredWidth: function (actor, forHeight, alloc) {
-        let [min, nat] = this._text.get_preferred_width(forHeight);
-
-        alloc.min_size = alloc.nat_size = Math.min(nat, global.screen_width / 2);
-    },
-
-    _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);
-    },
-
-    _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);
-    },
-
-    setContent: function(notification) {
-        this._iconBox.child = notification.icon;
-
-        // 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);
-    }
-};
-
-function Source(id, createIcon) {
-    this._init(id, createIcon);
-}
-
-Source.prototype = {
-    _init: function(id, createIcon) {
-        this.id = id;
-        if (createIcon)
-            this.createIcon = createIcon;
-    },
-
-    // This can be overridden by a subclass, or by the createIcon
-    // parameter to _init()
-    createIcon: function(size) {
-        throw new Error('no implementation of createIcon in ' + this);
-    },
-
-    notify: function(text) {
-        Main.messageTray.showNotification(new Notification(this.createIcon(ICON_SIZE), text));
-    },
-
-    clicked: function() {
-        this.emit('clicked');
-    },
-
-    destroy: function() {
-        this.emit('destroy');
-    }
-};
-Signals.addSignalMethods(Source.prototype);
-
-function MessageTray() {
-    this._init();
-}
-
-MessageTray.prototype = {
-    _init: function() {
-        this.actor = new St.BoxLayout({ name: 'message-tray',
-                                        reactive: true });
-
-        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.actor.add(this._notificationBox.actor);
-        this._notificationBox.actor.hide();
-
-        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();
-
-        this._summary = new St.BoxLayout({ name: 'summary-mode' });
-        this._summaryBin.child = this._summary;
-
-        this._sources = {};
-        this._icons = {};
-    },
-
-    contains: function(source) {
-        return this._sources.hasOwnProperty(source.id);
-    },
-
-    add: function(source) {
-        if (this.contains(source)) {
-            log('Trying to re-add source ' + source.id);
-            return;
-        }
-
-        let iconBox = new St.Bin({ reactive: true });
-        iconBox.child = source.createIcon(ICON_SIZE);
-        this._summary.insert_actor(iconBox, 0);
-        this._icons[source.id] = iconBox;
-        this._sources[source.id] = source;
-
-        iconBox.connect('button-release-event', Lang.bind(this,
-            function () {
-                source.clicked();
-            }));
-
-        source.connect('destroy', Lang.bind(this,
-            function () {
-                this.remove(source);
-            }));
-    },
-
-    remove: function(source) {
-        if (!this.contains(source))
-            return;
-
-        this._summary.remove_actor(this._icons[source.id]);
-        delete this._icons[source.id];
-        delete this._sources[source.id];
-    },
-
-    getSource: function(id) {
-        return this._sources[id];
-    },
-
-    _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);
-
-        if (this._isShowing)
-            return;
-
-        // If the message tray was not already showing, we'll show it in the summary mode.
-        this._summaryBin.show();
-        this._show();
-    },
-
-    _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);
-            return;
-        }
-
-        this._notificationBox.setContent(notification);
-
-        this._notificationBox.actor.x = Math.round((this.actor.width - this._notificationBox.actor.width) / 2);
-        this._notificationBox.actor.show();
-
-        // 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));
-
-        this._show();
-     }
-};
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -1,218 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const DBus = imports.dbus;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
-
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
-const Params = imports.misc.params;
-
-let nextNotificationId = 1;
-
-const NotificationDaemonIface = {
-    name: 'org.freedesktop.Notifications',
-    methods: [{ name: 'Notify',
-                inSignature: 'susssasa{sv}i',
-                outSignature: 'u'
-              },
-              { name: 'CloseNotification',
-                inSignature: 'u',
-                outSignature: ''
-              },
-              { name: 'GetCapabilities',
-                inSignature: '',
-                outSignature: 'as'
-              },
-              { name: 'GetServerInformation',
-                inSignature: '',
-                outSignature: 'ssss'
-              }],
-    signals: [{ name: 'NotificationClosed',
-                inSignature: 'uu' },
-              { name: 'ActionInvoked',
-                inSignature: 'us' }]
-};
-
-const NotificationClosedReason = {
-    EXPIRED: 1,
-    DISMISSED: 2,
-    APP_CLOSED: 3,
-    UNDEFINED: 4
-};
-
-const Urgency = {
-    LOW: 0,
-    NORMAL: 1,
-    CRITICAL: 2
-};
-
-function NotificationDaemon() {
-    this._init();
-}
-
-NotificationDaemon.prototype = {
-    _init: function() {
-        DBus.session.exportObject('/org/freedesktop/Notifications', this);
-
-        this._everAcquiredName = false;
-        DBus.session.acquire_name('org.freedesktop.Notifications',
-                                  // We pass MANY_INSTANCES so that if
-                                  // notification-daemon is running, we'll
-                                  // get queued behind it and then get the
-                                  // name after killing it below
-                                  DBus.MANY_INSTANCES,
-                                  Lang.bind(this, this._acquiredName),
-                                  Lang.bind(this, this._lostName));
-    },
-
-    _acquiredName: function() {
-        this._everAcquiredName = true;
-    },
-
-    _lostName: function() {
-        if (this._everAcquiredName)
-            log('Lost name org.freedesktop.Notifications!');
-        else if (GLib.getenv('GNOME_SHELL_NO_REPLACE'))
-            log('Failed to acquire org.freedesktop.Notifications');
-        else {
-            log('Failed to acquire org.freedesktop.Notifications; trying again');
-
-            // kill the notification-daemon. pkill is more portable
-            // than killall, but on Linux at least it won't match if
-            // you pass more than 15 characters of the process name...
-            // However, if you use the "-f" flag to match the entire
-            // command line, it will work, but we have to be careful
-            // in that case that we don't match "gedit
-            // notification-daemon.c" or whatever...
-            let p = new Shell.Process({ args: ['pkill', '-f',
-                                               '^([^ ]*/)?(notification-daemon|notify-osd)$']});
-            p.run();
-        }
-    },
-
-    _sourceId: function(id) {
-        return 'notification-' + id;
-    },
-
-    Notify: function(appName, replacesId, icon, summary, body,
-                     actions, hints, timeout) {
-        let id, source = null;
-
-        if (replacesId != 0) {
-            id = replacesId;
-            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
-        }
-
-        if (source == null) {
-            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);
-                }));
-        }
-
-        summary = GLib.markup_escape_text(summary, -1);
-        if (body)
-            source.notify('<b>' + summary + '</b>: ' + body);
-        else
-            source.notify('<b>' + summary + '</b>');
-        return id;
-    },
-
-    CloseNotification: function(id) {
-        let source = Main.messageTray.getSource(this._sourceId(id));
-        if (source)
-            source.destroy();
-        this._emitNotificationClosed(id, NotificationClosedReason.APP_CLOSED);
-    },
-
-    GetCapabilities: function() {
-        return [
-            // 'actions',
-            'body',
-            // 'body-hyperlinks',
-            // 'body-images',
-            'body-markup',
-            // 'icon-multi',
-            'icon-static'
-            // 'sound',
-        ];
-    },
-
-    GetServerInformation: function() {
-        return [
-            'GNOME Shell',
-            'GNOME',
-            '0.1', // FIXME, get this from somewhere
-            '1.0'
-        ];
-    },
-
-    _emitNotificationClosed: function(id, reason) {
-        DBus.session.emit_signal('/org/freedesktop/Notifications',
-                                 'org.freedesktop.Notifications',
-                                 'NotificationClosed', 'uu',
-                                 [id, reason]);
-    }
-};
-
-DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface);
-
-function Source(sourceId, icon, hints) {
-    this._init(sourceId, icon, hints);
-}
-
-Source.prototype = {
-    __proto__:  MessageTray.Source.prototype,
-
-    _init: function(sourceId, icon, hints) {
-        MessageTray.Source.prototype._init.call(this, sourceId);
-
-        hints = Params.parse(hints, { urgency: Urgency.NORMAL }, true);
-
-        this._icon = icon;
-        this._iconData = hints.icon_data;
-        this._urgency = hints.urgency;
-    },
-
-    createIcon: function(size) {
-        let textureCache = Shell.TextureCache.get_default();
-
-        if (this._icon) {
-            if (this._icon.substr(0, 7) == 'file://')
-                return textureCache.load_uri_async(this._icon, size, size);
-            else if (this._icon[0] == '/') {
-                let uri = GLib.filename_to_uri(this._icon, null);
-                return textureCache.load_uri_async(uri, size, size);
-            } else
-                return textureCache.load_icon_name(this._icon, size);
-        } else if (this._iconData) {
-            let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = this._iconData;
-            return textureCache.load_from_raw(data, data.length, hasAlpha,
-                                              width, height, rowStride, size);
-        } else {
-            let stockIcon;
-            switch (this._urgency) {
-                case Urgency.LOW:
-                case Urgency.NORMAL:
-                    stockIcon = 'gtk-dialog-info';
-                    break;
-                case Urgency.CRITICAL:
-                    stockIcon = 'gtk-dialog-error';
-                    break;
-            }
-            return textureCache.load_icon_name(stockIcon, size);
-        }
-    }
-};
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@ -12,6 +12,7 @@ const Lang = imports.lang;
 const AppDisplay = imports.ui.appDisplay;
 const DocDisplay = imports.ui.docDisplay;
 const GenericDisplay = imports.ui.genericDisplay;
+const Link = imports.ui.link;
 const Main = imports.ui.main;
 const Panel = imports.ui.panel;
 const Dash = imports.ui.dash;
@ -38,10 +39,6 @@ const ANIMATION_TIME = 0.25;
 // will take up the remaining sections of the display.

 const WIDE_SCREEN_CUT_OFF_RATIO = 1.4;
-// A common netbook resolution is 1024x600, which trips the widescreen
-// ratio.  However that leaves way too few pixels for the dash.  So
-// just treat this as a regular screen.
-const WIDE_SCREEN_MINIMUM_HEIGHT = 768;

 const COLUMNS_REGULAR_SCREEN = 4;
 const ROWS_REGULAR_SCREEN = 8;
@ -122,7 +119,8 @@ Overview.prototype = {

        // Container to hold popup pane chrome.
        this._paneContainer = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                             spacing: 6 });
+                                            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) {
@ -140,68 +138,62 @@ Overview.prototype = {
    },

    _recalculateGridSizes: function () {
-        let primary = global.get_primary_monitor();
-        wideScreen = (primary.width/primary.height > WIDE_SCREEN_CUT_OFF_RATIO) &&
-                     (primary.height >= WIDE_SCREEN_MINIMUM_HEIGHT);
+        wideScreen = (global.screen_width/global.screen_height > WIDE_SCREEN_CUT_OFF_RATIO);

        // We divide the screen into an imaginary grid which helps us determine the layout of
        // different visual components.
        if (wideScreen) {
-            displayGridColumnWidth = Math.floor(primary.width / COLUMNS_WIDE_SCREEN);
-            displayGridRowHeight = Math.floor(primary.height / ROWS_WIDE_SCREEN);
+            displayGridColumnWidth = global.screen_width / COLUMNS_WIDE_SCREEN;
+            displayGridRowHeight = global.screen_height / ROWS_WIDE_SCREEN;
        } else {
-            displayGridColumnWidth = Math.floor(primary.width / COLUMNS_REGULAR_SCREEN);
-            displayGridRowHeight = Math.floor(primary.height / ROWS_REGULAR_SCREEN);
+            displayGridColumnWidth = global.screen_width / COLUMNS_REGULAR_SCREEN;
+            displayGridRowHeight = global.screen_height / ROWS_REGULAR_SCREEN;
        }
    },

    relayout: function () {
-        let primary = global.get_primary_monitor();
-
-        this._group.set_position(primary.x, primary.y);
+        let screenHeight = global.screen_height;
+        let screenWidth = global.screen_width;

        let contentY = Panel.PANEL_HEIGHT;
-        let contentHeight = primary.height - contentY;
+        let contentHeight = screenHeight - contentY;

        this._coverPane.set_position(0, contentY);
-        this._coverPane.set_size(primary.width, contentHeight);
+        this._coverPane.set_size(screenWidth, contentHeight);

        let workspaceColumnsUsed = wideScreen ? COLUMNS_FOR_WORKSPACES_WIDE_SCREEN : COLUMNS_FOR_WORKSPACES_REGULAR_SCREEN;
        let workspaceRowsUsed = wideScreen ? ROWS_FOR_WORKSPACES_WIDE_SCREEN : ROWS_FOR_WORKSPACES_REGULAR_SCREEN;

        this._workspacesWidth = displayGridColumnWidth * workspaceColumnsUsed
                                  - WORKSPACE_GRID_PADDING * 2;
-        // We scale the vertical padding by (primary.height / primary.width)
+        // We scale the vertical padding by (screenHeight / screenWidth)
        // so that the workspace preserves its aspect ratio.
-        this._workspacesHeight = Math.floor(displayGridRowHeight * workspaceRowsUsed
-                                   - WORKSPACE_GRID_PADDING * (primary.height / primary.width) * 2);
+        this._workspacesHeight = displayGridRowHeight * workspaceRowsUsed
+                                   - WORKSPACE_GRID_PADDING * (screenHeight / screenWidth) * 2;

        this._workspacesX = displayGridColumnWidth + WORKSPACE_GRID_PADDING;
-        this._workspacesY = Math.floor(displayGridRowHeight + WORKSPACE_GRID_PADDING * (primary.height / primary.width));
+        this._workspacesY = displayGridRowHeight + WORKSPACE_GRID_PADDING * (screenHeight / screenWidth);

        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;

        // place the 'Add Workspace' button in the bottom row of the grid
        addRemoveButtonSize = Math.floor(displayGridRowHeight * 3/5);
        this._addButtonX = this._workspacesX + this._workspacesWidth - addRemoveButtonSize;
-        this._addButtonY = primary.height - Math.floor(displayGridRowHeight * 4/5);
+        this._addButtonY = screenHeight - 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.
-        this._backOver.set_position(- primary.x, - primary.y);
-        this._backOver.set_size(global.screen_width, global.screen_height);
+        this._backOver.set_position(0, contentY);
+        this._backOver.set_size(global.screen_width, contentHeight);

        this._paneContainer.set_position(this._dash.actor.x + this._dash.actor.width + DEFAULT_PADDING,
-                                         this._workspacesY);
+                                         contentY);
        // Dynamic width
-        this._paneContainer.height = this._workspacesHeight;
+        this._paneContainer.height = contentHeight;

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

        if (this._activeDisplayPane != null)
@ -227,7 +219,6 @@ Overview.prototype = {
                    this._activeDisplayPane.close();
                    return true;
                }));
-                this._workspaces.actor.opacity = 64;
            } else if (pane == this._activeDisplayPane) {
                this._activeDisplayPane = null;
                if (backgroundEventId != null) {
@ -236,7 +227,6 @@ Overview.prototype = {
                }
                this._transparentBackground.lower_bottom();
                this._paneContainer.lower_bottom();
-                this._workspaces.actor.opacity = 255;
            }
        }));
    },
@ -248,7 +238,7 @@ Overview.prototype = {
    // This allows the user to place the item on any workspace.
    handleDragOver : function(source, actor, x, y, time) {
        if (source instanceof GenericDisplay.GenericDisplayItem
-            || source instanceof AppDisplay.AppIcon) {
+            || source instanceof AppDisplay.BaseWellItem) {
            if (this._activeDisplayPane != null)
                this._activeDisplayPane.close();
            return true;
@ -287,8 +277,7 @@ Overview.prototype = {
    show : function() {
        if (this.visible)
            return;
-        if (!Main.pushModal(this._dash.actor))
-            return;
+        Main.pushModal(this._dash.actor);

        this.visible = true;
        this.animationInProgress = true;
@ -327,10 +316,9 @@ Overview.prototype = {
        // The opposite transition is used in hide().
        this._group.scaleX = this._group.scaleY = this.getZoomedInScale();
        [this._group.x, this._group.y] = this.getZoomedInPosition();
-        let primary = global.get_primary_monitor();
        Tweener.addTween(this._group,
-                         { x: primary.x,
-                           y: primary.y,
+                         { x: 0,
+                           y: 0,
                           scaleX: 1,
                           scaleY: 1,
                           transition: 'easeOutQuad',
@ -361,10 +349,6 @@ 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().
@ -457,7 +441,7 @@ Overview.prototype = {
    },

    _addNewWorkspace: function() {
-        global.screen.append_new_workspace(false, global.get_current_time());
+        global.screen.append_new_workspace(false, global.screen.get_display().get_current_time());
    },

    _acceptNewWorkspaceDrop: function(source, dropActor, x, y, time) {
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@ -7,22 +7,45 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 const Tweener = imports.ui.tweener;
 const Signals = imports.signals;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const Calendar = imports.ui.calendar;
+const Button = imports.ui.button;
 const Main = imports.ui.main;
-const StatusMenu = imports.ui.statusMenu;

 const PANEL_HEIGHT = 26;
+const TRAY_HEIGHT = PANEL_HEIGHT - 1;

 const DEFAULT_PADDING = 4;

 const PANEL_ICON_SIZE = 24;

+const BACKGROUND_TOP = new Clutter.Color();
+BACKGROUND_TOP.from_pixel(0x161616ff);
+const BACKGROUND_BOTTOM = new Clutter.Color();
+BACKGROUND_BOTTOM.from_pixel(0x000000ff);
+
+const PANEL_FOREGROUND_COLOR = new Clutter.Color();
+PANEL_FOREGROUND_COLOR.from_pixel(0xffffffff);
+const SN_BACKGROUND_COLOR = new Clutter.Color();
+SN_BACKGROUND_COLOR.from_pixel(0xffff00a0);
+
+const TRANSPARENT_COLOR = new Clutter.Color();
+TRANSPARENT_COLOR.from_pixel(0x00000000);
+
+// Don't make the mouse hover effect visible to the user for a menu feel.
+const PANEL_BUTTON_COLOR = new Clutter.Color();
+PANEL_BUTTON_COLOR.from_pixel(0x00000000);
+
+// Lighten pressed buttons; darkening has no effect on a black background.
+const PRESSED_BUTTON_BACKGROUND_COLOR = new Clutter.Color();
+PRESSED_BUTTON_BACKGROUND_COLOR.from_pixel(0x324c6ffa);
+
+const DEFAULT_FONT = 'Sans 16px';
+
+const TRAY_PADDING = 0;
 // See comments around _recomputeTraySize
 const TRAY_SPACING = 14;
 const TRAY_SPACING_MIN = 8;
@ -30,21 +53,12 @@ const TRAY_SPACING_MIN = 8;
 // Used for the tray icon container with gtk pre-2.16, which doesn't
 // fully support tray icon transparency
 const TRAY_BACKGROUND_COLOR = new Clutter.Color();
-TRAY_BACKGROUND_COLOR.from_pixel(0x0b0b0bff);
+TRAY_BACKGROUND_COLOR.from_pixel(0xefefefff);
 const TRAY_BORDER_COLOR = new Clutter.Color();
 TRAY_BORDER_COLOR.from_pixel(0x00000033);
 const TRAY_CORNER_RADIUS = 5;
 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_IMPLEMENTATIONS = {
-    'bluetooth-applet': 'bluetooth',
-    'gnome-volume-control-applet': 'volume',
-    'nm-applet': 'network',
-    'gnome-power-manager': 'battery'
-};

 function AppPanelMenu() {
    this._init();
@ -58,14 +72,24 @@ AppPanelMenu.prototype = {
        this._activeSequence = null;
        this._startupSequences = {};

-        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.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                   spacing: DEFAULT_PADDING,
+                                   y_align: Big.BoxAlignment.CENTER });
+        this._iconBox = new Big.Box({ width: PANEL_ICON_SIZE, height: PANEL_ICON_SIZE,
+                                      x_align: Big.BoxAlignment.CENTER,
+                                      y_align: Big.BoxAlignment.CENTER });
+        this.actor.append(this._iconBox, Big.BoxPackFlags.NONE);
+        let labelBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                     y_align: Big.BoxAlignment.CENTER });
+        this._label = new Clutter.Text({ font_name: DEFAULT_FONT,
+                                         color: PANEL_FOREGROUND_COLOR,
+                                         text: "" });
+        labelBox.append(this._label, Big.BoxPackFlags.EXPAND);
+        this.actor.append(labelBox, Big.BoxPackFlags.NONE);

-        this._startupBox = new St.BoxLayout();
-        this.actor.add(this._startupBox);
+        this._startupBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                         y_align: Big.BoxAlignment.CENTER });
+        this.actor.append(this._startupBox, Big.BoxPackFlags.NONE);

        Main.overview.connect('hiding', Lang.bind(this, function () {
            this.actor.opacity = 255;
@ -74,26 +98,34 @@ AppPanelMenu.prototype = {
            this.actor.opacity = 192;
        }));

-        let tracker = Shell.WindowTracker.get_default();
-        tracker.connect('notify::focus-app', Lang.bind(this, this._sync));
-        tracker.connect('startup-sequence-changed', Lang.bind(this, this._sync));
-        // For now just resync on all running state changes; this is mainly to handle
+        this._metaDisplay.connect('notify::focus-window', Lang.bind(this, this._sync));
+
+        let appMonitor = Shell.AppMonitor.get_default();
+        appMonitor.connect('startup-sequence-changed', Lang.bind(this, this._sync));
+        // For now just resync on application add/remove; this is mainly to handle
        // cases where the focused window's application changes without the focus
        // changing.  An example case is how we map Firefox based on the window
        // title which is a dynamic property.
-        tracker.connect('app-running-changed', Lang.bind(this, this._sync));
+        appMonitor.connect('app-added', Lang.bind(this, this._sync));
+        appMonitor.connect('app-removed', Lang.bind(this, this._sync));

        this._sync();
    },

    _sync: function() {
-        let tracker = Shell.WindowTracker.get_default();
+        let appMonitor = Shell.AppMonitor.get_default();

-        let focusedApp = tracker.focus_app;
+        let focusWindow = this._metaDisplay.get_focus_window();
+        let focusedApp;
+        if (focusWindow == null) {
+           focusedApp = null;
+        } else {
+           focusedApp = appMonitor.get_window_app(focusWindow);
+        }

        let lastSequence = null;
        if (focusedApp == null) {
-            let sequences = tracker.get_startup_sequences();
+            let sequences = appMonitor.get_startup_sequences();
            if (sequences.length > 0)
                lastSequence = sequences[sequences.length - 1];
        }
@ -109,22 +141,19 @@ AppPanelMenu.prototype = {
        this._focusedApp = focusedApp;
        this._activeSequence = lastSequence;

-        if (this._iconBox.child != null)
-            this._iconBox.child.destroy();
+        this._iconBox.remove_all();
        this._iconBox.hide();
-        this._label.set_text('');
+        this._label.text = '';
        if (this._focusedApp != null) {
-            let icon = this._focusedApp.create_icon_texture(PANEL_ICON_SIZE);
-            this._iconBox.set_child(icon);
+            let icon = focusedApp.create_icon_texture(PANEL_ICON_SIZE);
+            this._iconBox.append(icon, Big.BoxPackFlags.NONE);
            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);
+            this._label.text = focusedApp.get_name();
        } else if (this._activeSequence != null) {
            let icon = this._activeSequence.create_icon(PANEL_ICON_SIZE);
-            this._iconBox.set_child(icon);
+            this._iconBox.append(icon, Big.BoxPackFlags.NONE);
            this._iconBox.show();
-            this._label.set_text(this._activeSequence.get_name());
+            this._label.text = this._activeSequence.get_name();
        }

        this.emit('changed');
@ -140,17 +169,30 @@ function Panel() {
 Panel.prototype = {
    _init : function() {

-        this.actor = new St.BoxLayout({ name: 'panel' });
-        this.actor._delegate = this;
+        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL
+                                 });
+        let backgroundGradient = Shell.create_vertical_gradient(BACKGROUND_TOP,
+                                                                BACKGROUND_BOTTOM);
+        this.actor.connect('notify::allocation', Lang.bind(this, function () {
+            let [width, height] = this.actor.get_size();
+            backgroundGradient.set_size(width, height);
+        }));
+        this.actor.add_actor(backgroundGradient);

-        this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
-        this._centerBox = new St.BoxLayout({ name: 'panelCenter' });
-        this._rightBox = new St.BoxLayout({ name: 'panelRight' });
+        this._leftBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                      y_align: Big.BoxAlignment.CENTER,
+                                      spacing: DEFAULT_PADDING,
+                                      padding_right: DEFAULT_PADDING });
+        this._centerBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                        y_align: Big.BoxAlignment.CENTER });
+        this._rightBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                       y_align: Big.BoxAlignment.CENTER,
+                                       padding_left: DEFAULT_PADDING });

        /* This box container ensures that the centerBox is positioned in the *absolute*
         * center, but can be pushed aside if necessary. */
        this._boxContainer = new Shell.GenericContainer();
-        this.actor.add(this._boxContainer, { expand: true });
+        this.actor.append(this._boxContainer, Big.BoxPackFlags.EXPAND);
        this._boxContainer.add_actor(this._leftBox);
        this._boxContainer.add_actor(this._centerBox);
        this._boxContainer.add_actor(this._rightBox);
@ -222,16 +264,13 @@ Panel.prototype = {
            this._rightBox.allocate(childBox, flags);
        }));

-        /* 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". */
-        let label = new St.Label({ text: _("Activities") });
-        this.button = new St.Clickable({ name: 'panelActivities',
-                                          style_class: 'panel-button',
-                                          reactive: true });
-        this.button.set_child(label);
-        this.button.height = PANEL_HEIGHT;
+        /* left side */

-        this._leftBox.add(this.button);
+        this.button = new Button.Button(_("Activities"), PANEL_BUTTON_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR,
+                                        PANEL_FOREGROUND_COLOR, DEFAULT_FONT);
+        this.button.actor.height = PANEL_HEIGHT;
+
+        this._leftBox.append(this.button.actor, Big.BoxPackFlags.NONE);

        // We use this flag to mark the case where the user has entered the
        // hot corner and has not left both the hot corner and a surrounding
@ -239,22 +278,16 @@ Panel.prototype = {
        // multiple times due to an accidental jitter.
        this._hotCornerEntered = false;

-        this._hotCornerEnvirons = new Clutter.Rectangle({ x: 0,
-                                                          y: 0,
-                                                          width: 3,
+        this._hotCornerEnvirons = new Clutter.Rectangle({ width: 3,
                                                          height: 3,
                                                          opacity: 0,
                                                          reactive: true });

-        this._hotCorner = new Clutter.Rectangle({ x: 0,
-                                                  y: 0,
-                                                  width: 1,
+        this._hotCorner = new Clutter.Rectangle({ width: 1,
                                                  height: 1,
                                                  opacity: 0,
                                                  reactive: true });

-        this._hotCornerActivationTime = 0;
-
        this._hotCornerEnvirons.connect('leave-event',
                                        Lang.bind(this, this._onHotCornerEnvironsLeft));
        // Clicking on the hot corner environs should result in the same bahavior
@ -272,35 +305,29 @@ Panel.prototype = {
        this._hotCorner.connect('leave-event',
                                Lang.bind(this, this._onHotCornerLeft));

-        this._leftBox.add(this._hotCornerEnvirons);
-        this._leftBox.add(this._hotCorner);
+        this._leftBox.append(this._hotCornerEnvirons, Big.BoxPackFlags.FIXED);
+        this._leftBox.append(this._hotCorner, Big.BoxPackFlags.FIXED);

        let appMenu = new AppPanelMenu();
-        this._leftBox.add(appMenu.actor);
+        this._leftBox.append(appMenu.actor, Big.BoxPackFlags.NONE);

        /* center */

-        let clockButton = new St.Button({ style_class: "panel-button",
-                                          toggle_mode: true,
-                                          x_fill: true,
-                                          y_fill: true });
-        this._centerBox.add(clockButton, { y_fill: false });
-        clockButton.connect('clicked', Lang.bind(this, this._toggleCalendar));
-
-        this._clock = new St.Label();
-        clockButton.set_child(this._clock);
-
-        this._calendarPopup = null;
+        this._clock = new Clutter.Text({ font_name: DEFAULT_FONT,
+                                         color: PANEL_FOREGROUND_COLOR,
+                                         text: "" });
+        this._centerBox.append(this._clock, Big.BoxPackFlags.NONE);

        /* right */

        // The tray icons live in trayBox within trayContainer.
        // The trayBox is hidden when there are no tray icons.
        let trayContainer = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
-                                          y_align: Big.BoxAlignment.CENTER });
-        this._rightBox.add(trayContainer);
+                                          y_align: Big.BoxAlignment.START });
+        this._rightBox.append(trayContainer, Big.BoxPackFlags.NONE);
        let trayBox = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                    height: PANEL_ICON_SIZE,
+                                    height: TRAY_HEIGHT,
+                                    padding: TRAY_PADDING,
                                    spacing: TRAY_SPACING });
        this._trayBox = trayBox;

@ -318,7 +345,14 @@ Panel.prototype = {
        trayContainer.append(trayBox, Big.BoxPackFlags.NONE);

        this._traymanager = new Shell.TrayManager({ bg_color: TRAY_BACKGROUND_COLOR });
-        this._traymanager.connect('tray-icon-added', Lang.bind(this, this._onTrayIconAdded));
+        this._traymanager.connect('tray-icon-added',
+            Lang.bind(this, function(o, icon) {
+                trayBox.append(icon, Big.BoxPackFlags.NONE);
+
+                // Make sure the trayBox is shown.
+                trayBox.show();
+                this._recomputeTraySize();
+            }));
        this._traymanager.connect('tray-icon-removed',
            Lang.bind(this, function(o, icon) {
                trayBox.remove_actor(icon);
@ -329,48 +363,58 @@ Panel.prototype = {
            }));
        this._traymanager.manage_stage(global.stage);

-        let statusmenu = this._statusmenu = new StatusMenu.StatusMenu();
-        let statusbutton = new St.Clickable({ name: 'panelStatus',
-                                               style_class: 'panel-button',
-                                               reactive: true });
-        statusbutton.set_child(statusmenu.actor);
-        statusbutton.height = PANEL_HEIGHT;
-        statusbutton.connect('clicked', function (b, event) {
-            statusmenu.toggle(event);
-            // The statusmenu might not pop up if it couldn't get a pointer grab
-            if (statusmenu.isActive())
-                statusbutton.active = true;
-            return true;
+        let statusbox = new Big.Box();
+        let statusmenu = this._statusmenu = new Shell.StatusMenu();
+        statusmenu.get_icon().hide();
+        statusmenu.get_name().fontName = DEFAULT_FONT;
+        statusmenu.get_name().color = PANEL_FOREGROUND_COLOR;
+        statusbox.append(this._statusmenu, Big.BoxPackFlags.NONE);
+        let statusbutton = new Button.Button(statusbox,
+                                             PANEL_BUTTON_COLOR,
+                                             PRESSED_BUTTON_BACKGROUND_COLOR,
+                                             PANEL_FOREGROUND_COLOR);
+        statusbutton.actor.height = PANEL_HEIGHT;
+        statusbutton.actor.connect('button-press-event', function (b, e) {
+            if (e.get_button() == 1 && e.get_click_count() == 1) {
+                statusmenu.toggle(e);
+                // The statusmenu might not pop up if it couldn't get a pointer grab
+                if (statusmenu.is_active())
+                    statusbutton.actor.active = true;
+                return true;
+            } else {
+                return false;
+            }
        });
-        this._rightBox.add(statusbutton);
+        this._rightBox.append(statusbutton.actor, Big.BoxPackFlags.NONE);
        // We get a deactivated event when the popup disappears
        this._statusmenu.connect('deactivated', function (sm) {
-            statusbutton.active = false;
+            statusbutton.actor.active = false;
        });

        // TODO: decide what to do with the rest of the panel in the Overview mode (make it fade-out, become non-reactive, etc.)
        // We get into the Overview mode on button-press-event as opposed to button-release-event because eventually we'll probably
        // have the Overview act like a menu that allows the user to release the mouse on the activity the user wants
        // to switch to.
-        this.button.connect('clicked', Lang.bind(this, function(b, event) {
-            if (!Main.overview.animationInProgress) {
-                this._maybeToggleOverviewOnClick();
+        this.button.actor.connect('button-press-event', function(b, e) {
+            if (e.get_button() == 1 && e.get_click_count() == 1) {
+                Main.overview.toggle();
                return true;
            } else {
                return false;
            }
-        }));
+        });
        // In addition to pressing the button, the Overview can be entered and exited by other means, such as
        // pressing the System key, Alt+F1 or Esc. We want the button to be pressed in when the Overview is entered
        // and to be released when it is exited regardless of how it was triggered.
        Main.overview.connect('showing', Lang.bind(this, function() {
-            this.button.active = true;
+            this.button.actor.active = true;
        }));
        Main.overview.connect('hiding', Lang.bind(this, function() {
-            this.button.active = false;
+            this.button.actor.active = false;
        }));

-        Main.chrome.addActor(this.actor, { visibleInOverview: true });
+        Main.chrome.addActor(this.actor);
+        Main.chrome.setVisibleInOverview(this.actor, true);

        // Start the clock
        this._updateClock();
@ -385,38 +429,6 @@ Panel.prototype = {
                         });
    },

-    _onTrayIconAdded: function(o, icon, wmClass) {
-        let role = STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass];
-        if (!role) {
-            // Unknown icons go first in undefined order
-            this._trayBox.prepend(icon, Big.BoxPackFlags.NONE);
-        } else {
-            icon._role = role;
-            // Figure out the index in our well-known order for this icon
-            let position = STANDARD_TRAY_ICON_ORDER.indexOf(role);
-            icon._rolePosition = position;
-            let children = this._trayBox.get_children();
-            let i;
-            // Walk children backwards, until we find one that isn't
-            // well-known, or one where we should follow
-            for (i = children.length - 1; i >= 0; i--) {
-                let rolePosition = children[i]._rolePosition;
-                if (!rolePosition || position > rolePosition) {
-                    this._trayBox.insert_after(icon, children[i], Big.BoxPackFlags.NONE);
-                    break;
-                }
-            }
-            if (i == -1) {
-                // If we didn't find a position, we must be first
-                this._trayBox.prepend(icon, Big.BoxPackFlags.NONE);
-            }
-        }
-
-        // Make sure the trayBox is shown.
-        this._trayBox.show();
-        this._recomputeTraySize();
-    },
-
    // By default, tray icons have a spacing of TRAY_SPACING.  However this
    // starts to fail if we have too many as can sadly happen; just jump down
    // to a spacing of 8 if we're over 6.
@ -442,21 +454,10 @@ Panel.prototype = {
        return false;
    },

-    _toggleCalendar: function(clockButton) {
-        if (clockButton.checked) {
-            if (this._calendarPopup == null)
-                this._calendarPopup = new CalendarPopup();
-            this._calendarPopup.show();
-        } else {
-            this._calendarPopup.hide();
-        }
-    },
-
    _onHotCornerEntered : function() {
        if (!this._hotCornerEntered) {
            this._hotCornerEntered = true;
            if (!Main.overview.animationInProgress) {
-                this._hotCornerActivationTime = Date.now() / 1000;
                Main.overview.toggle();
            }
        }
@ -465,7 +466,7 @@ Panel.prototype = {

    _onHotCornerClicked : function() {
         if (!Main.overview.animationInProgress) {
-             this._maybeToggleOverviewOnClick();
+             Main.overview.toggle();
         }
         return false;
    },
@ -482,61 +483,5 @@ Panel.prototype = {
            this._hotCornerEntered = false;
        }
        return false;
-    },
-
-    // Toggles the overview unless this is the first click on the Activities button within the HOT_CORNER_ACTIVATION_TIMEOUT time
-    // of the hot corner being triggered. This check avoids opening and closing the overview if the user both triggered the hot corner
-    // and clicked the Activities button.
-    _maybeToggleOverviewOnClick: function() {
-        if (this._hotCornerActivationTime == 0 || Date.now() / 1000 - this._hotCornerActivationTime > HOT_CORNER_ACTIVATION_TIMEOUT)
-            Main.overview.toggle();
-        this._hotCornerActivationTime = 0;
-    }
-};
-
-function CalendarPopup() {
-    this._init();
-}
-
-CalendarPopup.prototype = {
-    _init: function() {
-        let panelActor = Main.panel.actor;
-
-        this.actor = new St.BoxLayout({ name: 'calendarPopup' });
-
-        this.calendar = new Calendar.Calendar();
-        this.actor.add(this.calendar.actor);
-
-        Main.chrome.addActor(this.actor, { visibleInOverview: true,
-                                           affectsStruts: false });
-        this.actor.y = (panelActor.y + panelActor.height - this.actor.height);
-    },
-
-    show: function() {
-        let panelActor = Main.panel.actor;
-
-        // Reset the calendar to today's date
-        this.calendar.setDate(new Date());
-
-        this.actor.x = Math.round(panelActor.x + (panelActor.width - this.actor.width) / 2);
-        this.actor.lower(panelActor);
-        this.actor.show();
-        Tweener.addTween(this.actor,
-                         { y: panelActor.y + panelActor.height,
-                           time: 0.2,
-                           transition: "easeOutQuad"
-                         });
-    },
-
-    hide: function() {
-        let panelActor = Main.panel.actor;
-
-        Tweener.addTween(this.actor,
-                         { y: panelActor.y + panelActor.height - this.actor.height,
-                           time: 0.2,
-                           transition: "easeOutQuad",
-                           onComplete: function() { this.actor.hide(); },
-                           onCompleteScope: this
-                         });
    }
 };
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@ -1,574 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Big = imports.gi.Big;
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Signals = imports.signals;
-const St = imports.gi.St;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const DND = imports.ui.dnd;
-const Main = imports.ui.main;
-const Search = imports.ui.search;
-
-const NAUTILUS_PREFS_DIR = '/apps/nautilus/preferences';
-const DESKTOP_IS_HOME_KEY = NAUTILUS_PREFS_DIR + '/desktop_is_home_dir';
-
-const PLACES_ICON_SIZE = 16;
-
-/**
- * Represents a place object, which is most normally a bookmark entry,
- * a mount/volume, or a special place like the Home Folder, Computer, and Network.
- *
- * @name: String title
- * @iconFactory: A JavaScript callback which will create an icon texture given a size parameter
- * @launch: A JavaScript callback to launch the entry
- */
-function PlaceInfo(id, name, iconFactory, launch) {
-    this._init(id, name, iconFactory, launch);
-}
-
-PlaceInfo.prototype = {
-    _init: function(id, name, iconFactory, launch) {
-        this.id = id;
-        this.name = name;
-        this._lowerName = name.toLowerCase();
-        this.iconFactory = iconFactory;
-        this.launch = launch;
-    },
-
-    matchTerms: function(terms) {
-        let mtype = Search.MatchType.NONE;
-        for (let i = 0; i < terms.length; i++) {
-            let term = terms[i];
-            let idx = this._lowerName.indexOf(term);
-            if (idx == 0)
-                return Search.MatchType.PREFIX;
-            else if (idx > 0)
-                mtype = Search.MatchType.SUBSTRING;
-        }
-        return mtype;
-    },
-
-    isRemovable: function() {
-        return false;
-    }
-}
-
-function PlaceDeviceInfo(mount) {
-    this._init(mount);
-}
-
-PlaceDeviceInfo.prototype = {
-    __proto__: PlaceInfo.prototype,
-
-    _init: function(mount) {
-        this._mount = mount;
-        this.name = mount.get_name();
-        this._lowerName = this.name.toLowerCase();
-        this.id = "mount:" + mount.get_root().get_uri();
-    },
-
-    iconFactory: function(size) {
-        let icon = this._mount.get_icon();
-        return Shell.TextureCache.get_default().load_gicon(icon, size);
-    },
-
-    launch: function() {
-        Gio.app_info_launch_default_for_uri(this._mount.get_root().get_uri(),
-                                            global.create_app_launch_context());
-    },
-
-    isRemovable: function() {
-        return this._mount.can_unmount();
-    },
-
-    remove: function() {
-        if (!this.isRemovable())
-            return;
-
-        this._mount.unmount(0, null, Lang.bind(this, this._removeFinish), null);
-    },
-
-    _removeFinish: function(o, res, data) {
-        this._mount.unmount_finish(res);
-    }
-}
-
-
-function PlacesManager() {
-    this._init();
-}
-
-PlacesManager.prototype = {
-    _init: function() {
-        let gconf = Shell.GConf.get_default();
-        gconf.watch_directory(NAUTILUS_PREFS_DIR);
-
-        this._defaultPlaces = [];
-        this._mounts = [];
-        this._bookmarks = [];
-        this._isDesktopHome = false;
-
-        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
-        let homeUri = homeFile.get_uri();
-        let homeLabel = Shell.util_get_label_for_uri (homeUri);
-        let homeIcon = Shell.util_get_icon_for_uri (homeUri);
-        this._home = new PlaceInfo('special:home', homeLabel,
-            function(size) {
-                return Shell.TextureCache.get_default().load_gicon(homeIcon, size);
-            },
-            function() {
-                Gio.app_info_launch_default_for_uri(homeUri, global.create_app_launch_context());
-            });
-
-        let desktopPath = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DESKTOP);
-        let desktopFile = Gio.file_new_for_path (desktopPath);
-        let desktopUri = desktopFile.get_uri();
-        let desktopLabel = Shell.util_get_label_for_uri (desktopUri);
-        let desktopIcon = Shell.util_get_icon_for_uri (desktopUri);
-        this._desktopMenu = new PlaceInfo('special:desktop', desktopLabel,
-            function(size) {
-                return Shell.TextureCache.get_default().load_gicon(desktopIcon, size);
-            },
-            function() {
-                Gio.app_info_launch_default_for_uri(desktopUri, global.create_app_launch_context());
-            });
-
-        this._connect = new PlaceInfo('special:connect', _("Connect to..."),
-            function (size) {
-                return Shell.TextureCache.get_default().load_icon_name("applications-internet", size);
-            },
-            function () {
-                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
-            });
-
-        let networkApp = null;
-        try {
-            networkApp = Shell.AppSystem.get_default().load_from_desktop_file('gnome-network-scheme.desktop');
-        } catch(e) {
-            try {
-                networkApp = Shell.AppSystem.get_default().load_from_desktop_file('network-scheme.desktop');
-            } catch(e) {
-                log("Cannot create \"Network\" item, .desktop file not found or corrupt.");
-            }
-        }
-
-        if (networkApp != null) {
-            this._network = new PlaceInfo('special:network', networkApp.get_name(),
-                function(size) {
-                    return networkApp.create_icon_texture(size);
-                },
-                function () {
-                    networkApp.launch();
-                });
-        }
-
-        this._defaultPlaces.push(this._home);
-
-        if (!this._isDesktopHome)
-            this._defaultPlaces.push(this._desktopMenu);
-
-        if (this._network)
-            this._defaultPlaces.push(this._network);
-
-        this._defaultPlaces.push(this._connect);
-
-        /*
-        * Show devices, code more or less ported from nautilus-places-sidebar.c
-        */
-        this._volumeMonitor = Gio.VolumeMonitor.get();
-        this._volumeMonitor.connect('volume-added', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('volume-removed',Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('volume-changed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-added', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('mount-changed', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-connected', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-disconnected', Lang.bind(this, this._updateDevices));
-        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
-        this._updateDevices();
-
-        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), ".gtk-bookmarks"]);
-        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
-        let monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
-        this._bookmarkTimeoutId = 0;
-        monitor.connect('changed', Lang.bind(this, function () {
-            if (this._bookmarkTimeoutId > 0)
-                return;
-            /* Defensive event compression */
-            this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
-                this._bookmarkTimeoutId = 0;
-                this._reloadBookmarks();
-                return false;
-            }));
-        }));
-
-        this._reloadBookmarks();
-        this._updateDesktopMenuVisibility();
-
-        gconf.connect('changed::' + DESKTOP_IS_HOME_KEY, Lang.bind(this, this._updateDesktopMenuVisibility));
-
-    },
-
-    _updateDevices: function() {
-        this._mounts = [];
-
-        /* first go through all connected drives */
-        let drives = this._volumeMonitor.get_connected_drives();
-        for (let i = 0; i < drives.length; i++) {
-            let volumes = drives[i].get_volumes();
-            for(let j = 0; j < volumes.length; j++) {
-                let mount = volumes[j].get_mount();
-                if(mount != null) {
-                    this._addMount(mount);
-                }
-            }
-        }
-
-        /* add all volumes that is not associated with a drive */
-        let volumes = this._volumeMonitor.get_volumes();
-        for(let i = 0; i < volumes.length; i++) {
-            if(volumes[i].get_drive() != null)
-                continue;
-
-            let mount = volumes[i].get_mount();
-            if(mount != null) {
-                this._addMount(mount);
-            }
-        }
-
-        /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
-        let mounts = this._volumeMonitor.get_mounts();
-        for(let i = 0; i < mounts.length; i++) {
-            if(mounts[i].is_shadowed())
-                continue;
-
-            if(mounts[i].get_volume())
-                continue;
-
-            this._addMount(mounts[i]);
-        }
-
-        /* We emit two signals, one for a generic 'all places' update
-         * and the other for one specific to mounts. We do this because
-         * clients like PlaceDisplay may only care about places in general
-         * being updated while clients like DashPlaceDisplay care which
-         * specific type of place got updated.
-         */
-        this.emit('mounts-updated');
-        this.emit('places-updated');
-
-    },
-
-    _reloadBookmarks: function() {
-
-        this._bookmarks = [];
-
-        if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
-            return;
-
-        let [success, bookmarksContent, len] = GLib.file_get_contents(this._bookmarksPath);
-
-        if (!success)
-            return;
-
-        let bookmarks = bookmarksContent.split('\n');
-
-        let bookmarksToLabel = {};
-        let bookmarksOrder = [];
-        for (let i = 0; i < bookmarks.length; i++) {
-            let bookmarkLine = bookmarks[i];
-            let components = bookmarkLine.split(' ');
-            let bookmark = components[0];
-            if (bookmark in bookmarksToLabel)
-                continue;
-            let label = null;
-            if (components.length > 1)
-                label = components.slice(1).join(' ');
-            bookmarksToLabel[bookmark] = label;
-            bookmarksOrder.push(bookmark);
-        }
-
-        for (let i = 0; i < bookmarksOrder.length; i++) {
-            let bookmark = bookmarksOrder[i];
-            let label = bookmarksToLabel[bookmark];
-            let file = Gio.file_new_for_uri(bookmark);
-            if (!file.query_exists(null))
-                continue;
-            if (label == null)
-                label = Shell.util_get_label_for_uri(bookmark);
-            if (label == null)
-                continue;
-            let icon = Shell.util_get_icon_for_uri(bookmark);
-
-            let item = new PlaceInfo('bookmark:' + bookmark, label,
-                function(size) {
-                    return Shell.TextureCache.get_default().load_gicon(icon, size);
-                },
-                function() {
-                    Gio.app_info_launch_default_for_uri(bookmark, global.create_app_launch_context());
-                });
-            this._bookmarks.push(item);
-        }
-
-        /* See comment in _updateDevices for explanation why there are two signals. */
-        this.emit('bookmarks-updated');
-        this.emit('places-updated');
-    },
-
-    _updateDesktopMenuVisibility: function() {
-        let gconf = Shell.GConf.get_default();
-        this._isDesktopHome = gconf.get_boolean(DESKTOP_IS_HOME_KEY);
-
-        /* See comment in _updateDevices for explanation why there are two signals. */
-        this.emit('defaults-updated');
-        this.emit('places-updated');
-    },
-
-    _addMount: function(mount) {
-        let devItem = new PlaceDeviceInfo(mount);
-        this._mounts.push(devItem);
-    },
-
-    getAllPlaces: function () {
-        return this.getDefaultPlaces().concat(this.getBookmarks(), this.getMounts());
-    },
-
-    getDefaultPlaces: function () {
-        return this._defaultPlaces;
-    },
-
-    getBookmarks: function () {
-        return this._bookmarks;
-    },
-
-    getMounts: function () {
-        return this._mounts;
-    },
-
-    _lookupById: function(sourceArray, id) {
-        for (let i = 0; i < sourceArray.length; i++) {
-            let place = sourceArray[i];
-            if (place.id == id)
-                return place;
-        }
-        return null;
-    },
-
-    lookupPlaceById: function(id) {
-        let colonIdx = id.indexOf(':');
-        let type = id.substring(0, colonIdx);
-        let sourceArray = null;
-        if (type == 'special')
-            sourceArray = this._defaultPlaces;
-        else if (type == 'mount')
-            sourceArray = this._mounts;
-        else if (type == 'bookmark')
-            sourceArray = this._bookmarks;
-        return this._lookupById(sourceArray, id);
-    }
-};
-
-Signals.addSignalMethods(PlacesManager.prototype);
-
-/**
- * An entry in the places menu.
- * @info The corresponding PlaceInfo to populate this entry.
- */
-function DashPlaceDisplayItem(info) {
-    this._init(info);
-}
-
-DashPlaceDisplayItem.prototype = {
-    _init: function(info) {
-        this.name = info.name;
-        this._info = info;
-        this._icon = info.iconFactory(PLACES_ICON_SIZE);
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: 4 });
-        let text = new St.Button({ style_class: 'places-item',
-                                   label: info.name,
-                                   x_align: St.Align.START });
-        text.connect('clicked', Lang.bind(this, this._onClicked));
-        let iconBox = new St.Bin({ child: this._icon, reactive: true });
-        iconBox.connect('button-release-event',
-                        Lang.bind(this, this._onClicked));
-        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
-        this.actor.append(text, Big.BoxPackFlags.EXPAND);
-
-        if (info.isRemovable()) {
-            let removeIcon = Shell.TextureCache.get_default().load_icon_name ('media-eject', PLACES_ICON_SIZE);
-            let removeIconBox = new St.Button({ child: removeIcon,
-                                                reactive: true });
-            this.actor.append(removeIconBox, Big.BoxPackFlags.NONE);
-            removeIconBox.connect('clicked',
-                                  Lang.bind(this, function() {
-                                                  this._info.remove();
-                                            }));
-        }
-
-        this.actor._delegate = this;
-        let draggable = DND.makeDraggable(this.actor);
-    },
-
-    _onClicked: function(b) {
-        this._info.launch();
-        Main.overview.hide();
-    },
-
-    getDragActorSource: function() {
-        return this._icon;
-    },
-
-    getDragActor: function(stageX, stageY) {
-        return this._info.iconFactory(PLACES_ICON_SIZE);
-    },
-
-    //// Drag and drop methods ////
-
-    shellWorkspaceLaunch: function() {
-        this._info.launch();
-    }
-};
-
-function DashPlaceDisplay() {
-    this._init();
-}
-
-DashPlaceDisplay.prototype = {
-    _init: function() {
-
-        // Places is divided semi-arbitrarily into left and right; a grid would
-        // look better in that there would be an even number of items left+right,
-        // but it seems like we want some sort of differentiation between actions
-        // like "Connect to server..." and regular folders
-        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   spacing: 4 });
-        this._leftBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.actor.append(this._leftBox, Big.BoxPackFlags.EXPAND);
-        this._rightBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL });
-        this.actor.append(this._rightBox, Big.BoxPackFlags.EXPAND);
-
-        // Subdivide left into actions and devices
-        this._actionsBox = new St.BoxLayout({ style_class: 'places-actions',
-                                               vertical: true });
-
-        this._devBox = new St.BoxLayout({ style_class: 'places-actions',
-                                           name: 'placesDevices',
-                                           vertical: true });
-
-        this._dirsBox = new St.BoxLayout({ style_class: 'places-actions',
-                                            vertical: true });
-
-        this._leftBox.append(this._actionsBox, Big.BoxPackFlags.NONE);
-        this._leftBox.append(this._devBox, Big.BoxPackFlags.NONE);
-
-        this._rightBox.append(this._dirsBox, Big.BoxPackFlags.NONE);
-
-        Main.placesManager.connect('defaults-updated', Lang.bind(this, this._updateDefaults));
-        Main.placesManager.connect('bookmarks-updated', Lang.bind(this, this._updateBookmarks));
-        Main.placesManager.connect('mounts-updated', Lang.bind(this, this._updateMounts));
-
-        this._updateDefaults();
-        this._updateMounts();
-        this._updateBookmarks();
-    },
-
-    _updateDefaults: function() {
-        this._actionsBox.destroy_children();
-
-        let places = Main.placesManager.getDefaultPlaces();
-        for (let i = 0; i < places.length; i++)
-            this._actionsBox.add(new DashPlaceDisplayItem(places[i]).actor);
-    },
-
-    _updateMounts: function() {
-        this._devBox.destroy_children();
-
-        let places = Main.placesManager.getMounts();
-        for (let i = 0; i < places.length; i++)
-            this._devBox.add(new DashPlaceDisplayItem(places[i]).actor);
-    },
-
-    _updateBookmarks: function() {
-        this._dirsBox.destroy_children();
-
-        let places = Main.placesManager.getBookmarks();
-        for (let i = 0; i < places.length; i ++)
-            this._dirsBox.add(new DashPlaceDisplayItem(places[i]).actor);
-    }
-};
-
-Signals.addSignalMethods(DashPlaceDisplay.prototype);
-
-function PlaceSearchProvider() {
-    this._init();
-}
-
-PlaceSearchProvider.prototype = {
-    __proto__: Search.SearchProvider.prototype,
-
-    _init: function() {
-        Search.SearchProvider.prototype._init.call(this, _("PLACES"));
-    },
-
-    getResultMeta: function(resultId) {
-        let placeInfo = Main.placesManager.lookupPlaceById(resultId);
-        if (!placeInfo)
-            return null;
-        return { 'id': resultId,
-                 'name': placeInfo.name,
-                 'icon': placeInfo.iconFactory(Search.RESULT_ICON_SIZE) };
-    },
-
-    activateResult: function(id) {
-        let placeInfo = Main.placesManager.lookupPlaceById(id);
-        placeInfo.launch();
-    },
-
-    _compareResultMeta: function (idA, idB) {
-        let infoA = Main.placesManager.lookupPlaceById(idA);
-        let infoB = Main.placesManager.lookupPlaceById(idB);
-        return infoA.name.localeCompare(infoB.name);
-    },
-
-    _searchPlaces: function(places, terms) {
-        let multipleResults = [];
-        let prefixResults = [];
-        let substringResults = [];
-
-        terms = terms.map(String.toLowerCase);
-
-        for (let i = 0; i < places.length; i++) {
-            let place = places[i];
-            let mtype = place.matchTerms(terms);
-            if (mtype == Search.MatchType.MULTIPLE)
-                multipleResults.push(place.id);
-            else if (mtype == Search.MatchType.PREFIX)
-                prefixResults.push(place.id);
-            else if (mtype == Search.MatchType.SUBSTRING)
-                substringResults.push(place.id);
-        }
-        multipleResults.sort(this._compareResultMeta);
-        prefixResults.sort(this._compareResultMeta);
-        substringResults.sort(this._compareResultMeta);
-        return multipleResults.concat(prefixResults.concat(substringResults));
-    },
-
-    getInitialResultSet: function(terms) {
-        let places = Main.placesManager.getAllPlaces();
-        return this._searchPlaces(places, terms);
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        let places = previousResults.map(function (id) { return Main.placesManager.lookupPlaceById(id); });
-        return this._searchPlaces(places, terms);
-    }
-}
--- a/js/ui/places.js
+++ b/js/ui/places.js
@ -0,0 +1,278 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Big = imports.gi.Big;
+const Clutter = imports.gi.Clutter;
+const Pango = imports.gi.Pango;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Shell = imports.gi.Shell;
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const Signals = imports.signals;
+
+const DND = imports.ui.dnd;
+const Main = imports.ui.main;
+const GenericDisplay = imports.ui.genericDisplay;
+
+const PLACES_VSPACING = 8;
+const PLACES_ICON_SIZE = 16;
+
+/**
+ * An entry in the places menu.
+ * @name: String title
+ * @iconFactory: A JavaScript callback which will create an icon texture
+ * @onActivate: A JavaScript callback to launch the entry
+ */
+function PlaceDisplay(name, iconFactory, onActivate) {
+    this._init(name, iconFactory, onActivate);
+}
+
+PlaceDisplay.prototype = {
+    _init : function(name, iconFactory, onActivate) {
+        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                   reactive: true,
+                                   spacing: 4 });
+        this.actor.connect('button-release-event', Lang.bind(this, function (b, e) {
+            onActivate(this);
+            Main.overview.hide();
+        }));
+        let text = new Clutter.Text({ font_name: "Sans 14px",
+                                      ellipsize: Pango.EllipsizeMode.END,
+                                      color: GenericDisplay.ITEM_DISPLAY_NAME_COLOR,
+                                      text: name });
+        let iconBox = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
+        this._icon = iconFactory();
+        iconBox.append(this._icon, Big.BoxPackFlags.NONE);
+        this.actor.append(iconBox, Big.BoxPackFlags.NONE);
+        this.actor.append(text, Big.BoxPackFlags.EXPAND);
+
+        this._iconFactory = iconFactory;
+        this._onActivate = onActivate;
+
+        this.actor._delegate = this;
+        let draggable = DND.makeDraggable(this.actor);
+    },
+
+    getDragActorSource: function() {
+        return this._icon;
+    },
+
+    getDragActor: function(stageX, stageY) {
+        return this._iconFactory();
+    },
+
+    //// Drag and drop methods ////
+
+    shellWorkspaceLaunch : function() {
+        this._onActivate();
+    }
+};
+Signals.addSignalMethods(PlaceDisplay.prototype);
+
+function Places() {
+    this._init();
+}
+
+Places.prototype = {
+    _init : function() {
+        this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                   spacing: 4 });
+        this._menuBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                      spacing: PLACES_VSPACING });
+        this.actor.append(this._menuBox, Big.BoxPackFlags.EXPAND);
+        this._devBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                      spacing: PLACES_VSPACING });
+
+        this._dirsBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
+                                      spacing: PLACES_VSPACING });
+        this.actor.append(this._dirsBox, Big.BoxPackFlags.EXPAND);
+
+        let homeFile = Gio.file_new_for_path (GLib.get_home_dir());
+        let homeUri = homeFile.get_uri();
+        let homeLabel = Shell.util_get_label_for_uri (homeUri);
+        let homeIcon = Shell.util_get_icon_for_uri (homeUri);
+        let home = new PlaceDisplay(homeLabel,
+            function() {
+                return Shell.TextureCache.get_default().load_gicon(homeIcon, PLACES_ICON_SIZE);
+            },
+            function() {
+                Gio.app_info_launch_default_for_uri(homeUri, Main.createAppLaunchContext());
+            });
+
+        this._menuBox.append(home.actor, Big.BoxPackFlags.NONE);
+
+        /*
+        * Show devices, code more or less ported from nautilus-places-sidebar.c
+        */
+
+        this._menuBox.append(this._devBox, Big.BoxPackFlags.NONE);
+        this._volumeMonitor = Gio.VolumeMonitor.get();
+        this._volumeMonitor.connect('volume-added', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('volume-removed',Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('volume-changed', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('mount-added', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('mount-removed', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('mount-changed', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('drive-connected', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('drive-disconnected', Lang.bind(this, this._updateDevices));
+        this._volumeMonitor.connect('drive-changed', Lang.bind(this, this._updateDevices));
+        this._updateDevices();
+
+        let networkApp = null;
+        try {
+            networkApp = Shell.AppSystem.get_default().load_from_desktop_file('gnome-network-scheme.desktop');
+        } catch(e) {
+            try {
+                networkApp = Shell.AppSystem.get_default().load_from_desktop_file('network-scheme.desktop');
+            } catch(e) {
+                log("Cannot create \"Network\" item, .desktop file not found or corrupt.");
+            }
+        }
+
+        if (networkApp != null) {
+            let network = new PlaceDisplay(networkApp.get_name(),
+                function() {
+                    return networkApp.create_icon_texture(PLACES_ICON_SIZE);
+                },
+                function () {
+                    networkApp.launch();
+                });
+            this._menuBox.append(network.actor, Big.BoxPackFlags.NONE);
+        }
+
+        let connect = new PlaceDisplay('Connect to...',
+            function () {
+                return Shell.TextureCache.get_default().load_icon_name("applications-internet", PLACES_ICON_SIZE);
+            },
+            function () {
+                new Shell.Process({ args: ['nautilus-connect-server'] }).run();
+            });
+        this._menuBox.append(connect.actor, Big.BoxPackFlags.NONE);
+
+        this._bookmarksPath = GLib.build_filenamev([GLib.get_home_dir(), ".gtk-bookmarks"]);
+        this._bookmarksFile = Gio.file_new_for_path(this._bookmarksPath);
+        let monitor = this._bookmarksFile.monitor_file(Gio.FileMonitorFlags.NONE, null);
+        this._bookmarkTimeoutId = 0;
+        monitor.connect('changed', Lang.bind(this, function () {
+            if (this._bookmarkTimeoutId > 0)
+                return;
+            /* Defensive event compression */
+            this._bookmarkTimeoutId = Mainloop.timeout_add(100, Lang.bind(this, function () {
+                this._bookmarkTimeoutId = 0;
+                this._reloadBookmarks();
+                return false;
+            }));
+        }));
+
+        this._reloadBookmarks();
+    },
+
+    _reloadBookmarks: function() {
+
+        this._dirsBox.remove_all();
+
+        if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS))
+          return;
+
+        let [success, bookmarksContent, len] = GLib.file_get_contents(this._bookmarksPath);
+
+        if (!success)
+            return;
+
+        let bookmarks = bookmarksContent.split('\n');
+
+        let bookmarksToLabel = {};
+        let bookmarksOrder = [];
+        for (let i = 0; i < bookmarks.length; i++) {
+            let bookmarkLine = bookmarks[i];
+            let components = bookmarkLine.split(' ');
+            let bookmark = components[0];
+            if (bookmark in bookmarksToLabel)
+                continue;
+            let label = null;
+            if (components.length > 1)
+                label = components.slice(1).join(' ');
+            bookmarksToLabel[bookmark] = label;
+            bookmarksOrder.push(bookmark);
+        }
+
+        for (let i = 0; i < bookmarksOrder.length; i++) {
+            let bookmark = bookmarksOrder[i];
+            let label = bookmarksToLabel[bookmark];
+            let file = Gio.file_new_for_uri(bookmark);
+            if (!file.query_exists(null))
+                continue;
+            if (label == null)
+                label = Shell.util_get_label_for_uri(bookmark);
+            if (label == null)
+                continue;
+            let icon = Shell.util_get_icon_for_uri(bookmark);
+
+            let item = new PlaceDisplay(label,
+                function() {
+                    return Shell.TextureCache.get_default().load_gicon(icon, PLACES_ICON_SIZE);
+                },
+                function() {
+                    Gio.app_info_launch_default_for_uri(bookmark, Main.createAppLaunchContext());
+                });
+            this._dirsBox.append(item.actor, Big.BoxPackFlags.NONE);
+        }
+    },
+
+    _updateDevices: function() {
+        this._devBox.remove_all();
+
+        /* first go through all connected drives */
+        let drives = this._volumeMonitor.get_connected_drives();
+        for (let i = 0; i < drives.length; i++) {
+                let volumes = drives[i].get_volumes();
+                for(let j = 0; j < volumes.length; j++) {
+                        let mount = volumes[j].get_mount();
+                        if(mount != null) {
+                                this._addMount(mount);
+                        }
+                }
+        }
+
+        /* add all volumes that is not associated with a drive */
+        let volumes = this._volumeMonitor.get_volumes();
+        for(let i = 0; i < volumes.length; i++) {
+                if(volumes[i].get_drive() != null)
+                        continue;
+
+                let mount = volumes[i].get_mount();
+                if(mount != null) {
+                        this._addMount(mount);
+                }
+        }
+
+        /* add mounts that have no volume (/etc/mtab mounts, ftp, sftp,...) */
+        let mounts = this._volumeMonitor.get_mounts();
+        for(let i = 0; i < mounts.length; i++) {
+                if(mounts[i].is_shadowed())
+                        continue;
+
+                if(mounts[i].get_volume())
+                        continue;
+
+                this._addMount(mounts[i]);
+        }
+    },
+
+    _addMount: function(mount) {
+        let mountLabel = mount.get_name();
+        let mountIcon = mount.get_icon();
+        let root = mount.get_root();
+        let mountUri = root.get_uri();
+        let devItem = new PlaceDisplay(mountLabel,
+               function() {
+                        return Shell.TextureCache.get_default().load_gicon(mountIcon, PLACES_ICON_SIZE);
+               },
+               function() {
+                        Gio.app_info_launch_default_for_uri(mountUri, Main.createAppLaunchContext());
+               });
+        this._devBox.append(devItem.actor, Big.BoxPackFlags.NONE);
+    }
+
+};
+Signals.addSignalMethods(Places.prototype);
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -2,7 +2,6 @@

 const Big = imports.gi.Big;
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
@ -12,9 +11,11 @@ const Signals = imports.signals;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;

+const OVERLAY_COLOR = new Clutter.Color();
+OVERLAY_COLOR.from_pixel(0x00000044);
+
 const BOX_BACKGROUND_COLOR = new Clutter.Color();
 BOX_BACKGROUND_COLOR.from_pixel(0x000000cc);

@ -25,144 +26,6 @@ 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();
-}
-
-CommandCompleter.prototype = {
-    _init : function() {
-        this._changedCount = 0;
-        this._paths = GLib.getenv('PATH').split(':');
-        this._valid = false;
-        this._updateInProgress = false;
-        this._childs = new Array(this._paths.length);
-        this._monitors = new Array(this._paths.length);
-        for (let i = 0; i < this._paths.length; i++) {
-            this._childs[i] = [];
-            let file = Gio.file_new_for_path(this._paths[i]);
-            let info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
-
-            if (info.get_attribute_uint32(Gio.FILE_ATTRIBUTE_STANDARD_TYPE) != Gio.FileType.DIRECTORY)
-                continue;
-
-            this._paths[i] = file.get_path();
-            this._monitors[i] = file.monitor_directory(Gio.FileMonitorFlags.NONE, null);
-            if (this._monitors[i] != null) {
-                this._monitors[i].connect("changed", Lang.bind(this, this._onChanged));
-            }
-        }
-        this._update(0);
-    },
-
-    _onGetEnumerateComplete : function(obj, res) {
-        this._enumerator = obj.enumerate_children_finish(res);
-        this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete), null);
-    },
-
-    _onNextFileComplete : function(obj, res) {
-        let files = obj.next_files_finish(res);
-        for (let i = 0; i < files.length; i++) {
-            this._childs[this._i].push(files[i].get_name());
-        }
-        if (files.length) {
-            this._enumerator.next_files_async(100, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onNextFileComplete), null);
-        } else {
-            this._enumerator.close(null);
-            this._enumerator = null;
-            this._update(this._i + 1);
-        }
-    },
-
-    update : function() {
-        if (this._valid)
-            return;
-        this._update(0);
-    },
-
-    _update : function(i) {
-        if (i == 0 && this._updateInProgress)
-            return;
-        this._updateInProgress = true;
-        this._changedCount = 0;
-        this._i = i;
-        if (i >= this._paths.length) {
-            this._valid = true;
-            this._updateInProgress = false;
-            return;
-        }
-        let file = Gio.file_new_for_path(this._paths[i]);
-        this._childs[this._i] = [];
-        file.enumerate_children_async(Gio.FILE_ATTRIBUTE_STANDARD_NAME, Gio.FileQueryInfoFlags.NONE, GLib.PRIORITY_LOW, null, Lang.bind(this, this._onGetEnumerateComplete), null);
-    },
-
-    _onChanged : function(m, f, of, type) {
-        if (!this._valid)
-            return;
-        let path = f.get_parent().get_path();
-        let k = undefined;
-        for (let i = 0; i < this._paths.length; i++) {
-            if (this._paths[i] == path)
-                k = i;
-        }
-        if (k === undefined) {
-            return;
-        }
-        if (type == Gio.FileMonitorEvent.CREATED) {
-            this._childs[k].push(f.get_basename());
-        }
-        if (type == Gio.FileMonitorEvent.DELETED) {
-            this._changedCount++;
-            if (this._changedCount > MAX_FILE_DELETED_BEFORE_INVALID) {
-                this._valid = false;
-            }
-            let name = f.get_basename();
-            this._childs[k] = this._childs[k].filter(function(e) {
-                return e != name;
-            });
-        }
-        if (type == Gio.FileMonitorEvent.UNMOUNTED) {
-            this._childs[k] = [];
-        }
-    },
-
-    getCompletion: function(text) {
-        let common = "";
-        let notInit = true;
-        if (!this._valid) {
-            this._update(0);
-            return common;
-        }
-        function _getCommon(s1, s2) {
-            let k = 0;
-            for (; k < s1.length && k < s2.length; k++) {
-                if (s1[k] != s2[k])
-                    break;
-            }
-            if (k == 0)
-                return "";
-            return s1.substr(0, k);
-        }
-        function _hasPrefix(s1, prefix) {
-            return s1.indexOf(prefix) == 0;
-        }
-        for (let i = 0; i < this._childs.length; i++) {
-            for (let k = 0; k < this._childs[i].length; k++) {
-                if (!_hasPrefix(this._childs[i][k], text))
-                    continue;
-                if (notInit) {
-                    common = this._childs[i][k];
-                    notInit = false;
-                }
-                common = _getCommon(common, this._childs[i][k]);
-            }
-        }
-        if (common.length)
-            return common.substr(text.length);
-        return common;
-    }
-};

 function RunDialog() {
    this._init();
@ -173,8 +36,9 @@ RunDialog.prototype = {
        this._isOpen = false;

        let gconf = Shell.GConf.get_default();
-        gconf.connect('changed::development_tools', Lang.bind(this, function () {
-            this._enableInternalCommands = gconf.get_boolean('development_tools');
+        gconf.connect('changed', Lang.bind(this, function (gconf, key) {
+            if (key == 'development_tools')
+                this._enableInternalCommands = gconf.get_bool('development_tools');
        }));
        this._enableInternalCommands = gconf.get_boolean('development_tools');

@ -199,26 +63,28 @@ RunDialog.prototype = {

        // All actors are inside _group. We create it initially
        // hidden then show it in show()
-        this._group = new Clutter.Group({ visible: false,
-                                          x: 0,
-                                          y: 0,
-                                          width: global.screen_width,
-                                          height: global.screen_height });
+        this._group = new Clutter.Group({ visible: false });
        global.stage.add_actor(this._group);

-        let lightbox = new Lightbox.Lightbox(this._group);
+        this._overlay = new Clutter.Rectangle({ color: OVERLAY_COLOR,
+                                                width: global.screen_width,
+                                                height: global.screen_height,
+                                                border_width: 0,
+                                                reactive: true });
+        this._group.add_actor(this._overlay);

-        this._boxH = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
-                                   x_align: Big.BoxAlignment.CENTER,
-                                   y_align: Big.BoxAlignment.CENTER });
+        let boxH = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
+                                 x_align: Big.BoxAlignment.CENTER,
+                                 y_align: Big.BoxAlignment.CENTER,
+                                 width: global.screen_width,
+                                 height: global.screen_height });

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

        let boxV = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
                                 y_align: Big.BoxAlignment.CENTER });

-        this._boxH.append(boxV, Big.BoxPackFlags.NONE);
+        boxH.append(boxV, Big.BoxPackFlags.NONE);


        let dialogBox = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
@ -228,7 +94,7 @@ RunDialog.prototype = {
                                      padding: DIALOG_PADDING,
                                      width: DIALOG_WIDTH });

-        this._boxH.append(dialogBox, Big.BoxPackFlags.NONE);
+        boxH.append(dialogBox, Big.BoxPackFlags.NONE);

        let label = new Clutter.Text({ color: BOX_TEXT_COLOR,
                                       font_name: '18px Sans',
@ -276,57 +142,17 @@ RunDialog.prototype = {
                this.close();
        }));

-        this._pathCompleter = new Gio.FilenameCompleter();
-        this._commandCompleter = new CommandCompleter();
-        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
        this._entry.connect('key-press-event', Lang.bind(this, function(o, e) {
            let symbol = e.get_key_symbol();
            if (symbol == Clutter.Escape) {
                this.close();
                return true;
            }
-            if (symbol == Clutter.slash) {
-                // Need preload data before get completion. GFilenameCompleter load content of parent directory.
-                // Parent directory for /usr/include/ is /usr/. So need to add fake name('a').
-                let text = o.get_text().concat('/a');
-                let prefix;
-                if (text.lastIndexOf(' ') == -1)
-                    prefix = text;
-                else
-                    prefix = text.substr(text.lastIndexOf(' ') + 1);
-                this._getCompletion(prefix);
-                return false;
-            }
-            if (symbol == Clutter.Tab) {
-                let text = o.get_text();
-                let prefix;
-                if (text.lastIndexOf(' ') == -1)
-                    prefix = text;
-                else
-                    prefix = text.substr(text.lastIndexOf(' ') + 1);
-                let postfix = this._getCompletion(prefix);
-                if (postfix != null && postfix.length > 0) {
-                    o.insert_text(postfix, -1);
-                    o.set_cursor_position(text.length + postfix.length);
-                    if (postfix[postfix.length - 1] == '/')
-                        this._getCompletion(text + postfix + 'a');
-                }
-                return true;
-            }
            return false;
        }));
    },

-    _getCompletion : function(text) {
-        if (text.indexOf('/') != -1) {
-            return this._pathCompleter.get_completion_suffix(text);
-        } else {
-            return this._commandCompleter.getCompletion(text);
-        }
-    },
-
    _run : function(command) {
-        this._commandError = false;
        let f;
        if (this._enableInternalCommands)
            f = this._internalCommands[command];
@ -336,6 +162,7 @@ RunDialog.prototype = {
            f();
        } else if (command) {
            try {
+                this._commandError = false;
                let [ok, len, args] = GLib.shell_parse_argv(command);
                let p = new Shell.Process({'args' : args});
                p.run();
@ -348,7 +175,7 @@ RunDialog.prototype = {
                 * 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];
+                let errorStr = "Execution of '" + command + "' failed:\n" + m[1];
                this._errorMessage.set_text(errorStr);
                this._errorBox.show();
            }
@ -359,18 +186,10 @@ RunDialog.prototype = {
        if (this._isOpen) // Already shown
            return;

-        if (!Main.pushModal(this._group))
-            return;
-
-        // Position the dialog on the current monitor
-        let monitor = global.get_focus_monitor();
-
-        this._boxH.set_position(monitor.x, monitor.y);
-        this._boxH.set_size(monitor.width, monitor.height);
-
        this._isOpen = true;
        this._group.show();

+        Main.pushModal(this._group);
        global.stage.set_key_focus(this._entry);
    },

@ -384,7 +203,7 @@ RunDialog.prototype = {
        this._commandError = false;

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

        Main.popModal(this._group);
    }
--- a/js/ui/search.js
+++ b/js/ui/search.js
@ -1,272 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const Signals = imports.signals;
-const St = imports.gi.St;
-
-const RESULT_ICON_SIZE = 24;
-
-// Not currently referenced by the search API, but
-// this enumeration can be useful for provider
-// implementations.
-const MatchType = {
-    NONE: 0,
-    MULTIPLE: 1,
-    PREFIX: 2,
-    SUBSTRING: 3
-};
-
-function SearchResultDisplay(provider) {
-    this._init(provider);
-}
-
-SearchResultDisplay.prototype = {
-    _init: function(provider) {
-        this.provider = provider;
-        this.actor = null;
-        this.selectionIndex = -1;
-    },
-
-    /**
-     * renderResults:
-     * @results: List of identifier strings
-     * @terms: List of search term strings
-     *
-     * Display the given search matches which resulted
-     * from the given terms.  It's expected that not
-     * all results will fit in the space for the container
-     * actor; in this case, show as many as makes sense
-     * for your result type.
-     *
-     * The terms are useful for search match highlighting.
-     */
-    renderResults: function(results, terms) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * clear:
-     * Remove all results from this display and reset the selection index.
-     */
-    clear: function() {
-        this.actor.get_children().forEach(function (actor) { actor.destroy(); });
-        this.selectionIndex = -1;
-    },
-
-    /**
-     * getSelectionIndex:
-     *
-     * Returns the index of the selected actor, or -1 if none.
-     */
-    getSelectionIndex: function() {
-        return this.selectionIndex;
-    },
-
-    /**
-     * getVisibleResultCount:
-     *
-     * Returns: The number of actors visible.
-     */
-    getVisibleResultCount: function() {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * selectIndex:
-     * @index: Integer index
-     *
-     * Move selection to the given index.
-     * Return true if successful, false if no more results
-     * available.
-     */
-    selectIndex: function() {
-        throw new Error("not implemented");
-    }
-};
-
-/**
- * SearchProvider:
- *
- * Subclass this object to add a new result type
- * to the search system, then call registerProvider()
- * in SearchSystem with an instance.
- */
-function SearchProvider(title) {
-    this._init(title);
-}
-
-SearchProvider.prototype = {
-    _init: function(title) {
-        this.title = title;
-    },
-
-    /**
-     * getInitialResultSet:
-     * @terms: Array of search terms, treated as logical OR
-     *
-     * Called when the user first begins a search (most likely
-     * therefore a single term of length one or two), or when
-     * a new term is added.
-     *
-     * Should return an array of result identifier strings representing
-     * items which match the given search terms.  This
-     * is expected to be a substring match on the metadata for a given
-     * item.  Ordering of returned results is up to the discretion of the provider,
-     * but you should follow these heruistics:
-     *
-     *  * Put items which match multiple search terms before single matches
-     *  * Put items which match on a prefix before non-prefix substring matches
-     *
-     * This function should be fast; do not perform unindexed full-text searches
-     * or network queries.
-     */
-    getInitialResultSet: function(terms) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * getSubsearchResultSet:
-     * @previousResults: Array of item identifiers
-     * @newTerms: Updated search terms
-     *
-     * Called when a search is performed which is a "subsearch" of
-     * the previous search; i.e. when every search term has exactly
-     * one corresponding term in the previous search which is a prefix
-     * of the new term.
-     *
-     * This allows search providers to only search through the previous
-     * result set, rather than possibly performing a full re-query.
-     */
-    getSubsearchResultSet: function(previousResults, newTerms) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * getResultInfo:
-     * @id: Result identifier string
-     *
-     * Return an object with 'id', 'name', (both strings) and 'icon' (Clutter.Texture)
-     * properties which describe the given search result.
-     */
-    getResultMeta: function(id) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * createResultContainer:
-     *
-     * Search providers may optionally override this to render their
-     * results in a custom fashion.  The default implementation
-     * will create a vertical list.
-     *
-     * Returns: An instance of SearchResultDisplay.
-     */
-    createResultContainerActor: function() {
-        return null;
-    },
-
-    /**
-     * createResultActor:
-     * @resultMeta: Object with result metadata
-     * @terms: Array of search terms, should be used for highlighting
-     *
-     * Search providers may optionally override this to render a
-     * particular serch result in a custom fashion.  The default
-     * implementation will show the icon next to the name.
-     *
-     * The actor should be an instance of St.Widget, with the style class
-     * 'dash-search-result-content'.
-     */
-    createResultActor: function(resultMeta, terms) {
-        return null;
-    },
-
-    /**
-     * activateResult:
-     * @id: Result identifier string
-     *
-     * Called when the user chooses a given result.
-     */
-    activateResult: function(id) {
-        throw new Error("not implemented");
-    },
-
-    /**
-     * expandSearch:
-     *
-     * Called when the user clicks on the header for this
-     * search section.  Should typically launch an external program
-     * displaying search results for that item type.
-     */
-    expandSearch: function(terms) {
-        throw new Error("not implemented");
-    }
-}
-Signals.addSignalMethods(SearchProvider.prototype);
-
-function SearchSystem() {
-    this._init();
-}
-
-SearchSystem.prototype = {
-    _init: function() {
-        this._providers = [];
-        this.reset();
-    },
-
-    registerProvider: function (provider) {
-        this._providers.push(provider);
-    },
-
-    getProviders: function() {
-        return this._providers;
-    },
-
-    getTerms: function() {
-        return this._previousTerms;
-    },
-
-    reset: function() {
-        this._previousTerms = [];
-        this._previousResults = [];
-    },
-
-    updateSearch: function(searchString) {
-        searchString = searchString.replace(/^\s+/g, "").replace(/\s+$/g, "");
-        if (searchString == '')
-            return null;
-
-        let terms = searchString.split(/\s+/);
-        let isSubSearch = terms.length == this._previousTerms.length;
-        if (isSubSearch) {
-            for (let i = 0; i < terms.length; i++) {
-                if (terms[i].indexOf(this._previousTerms[i]) != 0) {
-                    isSubSearch = false;
-                    break;
-                }
-            }
-        }
-
-        let results = [];
-        if (isSubSearch) {
-            for (let i = 0; i < this._previousResults.length; i++) {
-                let [provider, previousResults] = this._previousResults[i];
-                let providerResults = provider.getSubsearchResultSet(previousResults, terms);
-                if (providerResults.length > 0)
-                    results.push([provider, providerResults]);
-            }
-        } else {
-            for (let i = 0; i < this._providers.length; i++) {
-                let provider = this._providers[i];
-                let providerResults = provider.getInitialResultSet(terms);
-                if (providerResults.length > 0)
-                    results.push([provider, providerResults]);
-            }
-        }
-
-        this._previousTerms = terms;
-        this._previousResults = results;
-
-        return results;
-    }
-}
-Signals.addSignalMethods(SearchSystem.prototype);
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@ -1,75 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const DBus = imports.dbus;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
-
-const Main = imports.ui.main;
-
-const GnomeShellIface = {
-    name: "org.gnome.Shell",
-    methods: [{ name: "Eval",
-                inSignature: "s",
-                outSignature: "bs"
-              }
-             ],
-    signals: [],
-    properties: [{ name: "OverviewActive",
-                   signature: "b",
-                   access: "readwrite" }]
-};
-
-function GnomeShell() {
-    this._init();
-}
-
-GnomeShell.prototype = {
-    _init: function() {
-        DBus.session.exportObject('/org/gnome/Shell', this);
-    },
-
-    /**
-     * Eval:
-     * @code: A string containing JavaScript code
-     *
-     * This function executes arbitrary code in the main
-     * loop, and returns a boolean success and
-     * JSON representation of the object as a string.
-     *
-     * If evaluation completes without throwing an exception,
-     * then the return value will be [true, JSON.stringify(result)].
-     * If evaluation fails, then the return value will be
-     * [false, JSON.stringify(exception)];
-     *
-     */
-    Eval: function(code) {
-        let returnValue;
-        let success;
-        try {
-            returnValue = JSON.stringify(eval(code));
-            // A hack; DBus doesn't have null/undefined
-            if (returnValue == undefined)
-                returnValue = "";
-            success = true;
-        } catch (e) {
-            returnValue = JSON.stringify(e);
-            success = false;
-        }
-        return [success, returnValue];
-    },
-
-    get OverviewActive() {
-        return Main.overview.visible;
-    },
-
-    set OverviewActive(visible) {
-        if (visible)
-            Main.overview.show();
-        else
-            Main.overview.hide();
-    }
-};
-
-DBus.conformExport(GnomeShell.prototype, GnomeShellIface);
-
--- a/js/ui/sidebar.js
+++ b/js/ui/sidebar.js
@ -69,8 +69,6 @@ Sidebar.prototype = {
                            Lang.bind(this, this._expandedChanged));
        this._gconf.connect('changed::sidebar/visible',
                            Lang.bind(this, this._visibleChanged));
-
-        this._adjustPosition();
    },

    addWidget: function(widget) {
@ -84,14 +82,6 @@ Sidebar.prototype = {

        this.box.append(widgetBox.actor, Big.BoxPackFlags.NONE);
        this._widgets.push(widgetBox);
-        this._adjustPosition();
-    },
-
-    _adjustPosition: function() {
-        let primary=global.get_primary_monitor();
-
-        this.actor.y = Math.max(primary.y + Panel.PANEL_HEIGHT,primary.height/2 - this.actor.height/2);
-        this.actor.x = primary.x;
    },

    _visibleChanged: function() {
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@ -1,297 +0,0 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
-
-const DBus = imports.dbus;
-const Gdm = imports.gi.Gdm;
-const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Signals = imports.signals;
-const Gettext = imports.gettext.domain('gnome-shell');
-const _ = Gettext.gettext;
-
-const Panel = imports.ui.panel;
-
-// Adapted from gdm/gui/user-switch-applet/applet.c
-//
-// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
-// Copyright (C) 2008,2009 Red Hat, Inc.
-
-const SIDEBAR_VISIBLE_KEY = 'sidebar/visible';
-
-function StatusMenu() {
-    this._init();
-}
-
-StatusMenu.prototype = {
-    _init: function() {
-        this._gdm = Gdm.UserManager.ref_default();
-        this._user = this._gdm.get_user(GLib.get_user_name());
-        this._presence = new GnomeSessionPresence();
-
-        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 = Shell.TextureCache.get_default();
-        // FIXME: these icons are all wrong (likewise in createSubMenu)
-        this._availableIcon = textureCache.load_icon_name('gtk-yes', 16);
-        this._busyIcon = textureCache.load_icon_name('gtk-no', 16);
-        this._invisibleIcon = textureCache.load_icon_name('gtk-close', 16);
-        this._idleIcon = textureCache.load_icon_name('gtk-media-pause', 16);
-
-        this._presence.connect('StatusChanged', Lang.bind(this, this._updatePresenceIcon));
-        this._presence.getStatus(Lang.bind(this, this._updatePresenceIcon));
-
-        this._name = new St.Label({ text: this._user.get_real_name() });
-        this.actor.add(this._name, { expand: true, y_align: St.Align.MIDDLE });
-        this._userNameChangedId = this._user.connect('notify::display-name', Lang.bind(this, this._updateUserName));
-
-        this._createSubMenu();
-        this._gdm.connect('users-loaded', Lang.bind(this, this._updateSwitchUser));
-        this._gdm.connect('user-added', Lang.bind(this, this._updateSwitchUser));
-        this._gdm.connect('user-removed', Lang.bind(this, this._updateSwitchUser));
-    },
-
-    _onDestroy: function() {
-        this._user.disconnect(this._userNameChangedId);
-    },
-
-    _updateUserName: function() {
-        this._name.set_text(this._user.get_real_name());
-    },
-
-    _updateSwitchUser: function() {
-        let users = this._gdm.list_users();
-        if (users.length > 1)
-            this._loginScreenItem.show();
-        else
-            this._loginScreenItem.hide();
-    },
-
-    _updatePresenceIcon: function(presence, status) {
-        if (status == GnomeSessionPresenceStatus.AVAILABLE)
-            this._iconBox.child = this._availableIcon;
-        else if (status == GnomeSessionPresenceStatus.BUSY)
-            this._iconBox.child = this._busyIcon;
-        else if (status == GnomeSessionPresenceStatus.INVISIBLE)
-            this._iconBox.child = this._invisibleIcon;
-        else
-            this._iconBox.child = this._idleIcon;
-    },
-
-    // The menu
-
-    _createImageMenuItem: function(label, iconName, forceIcon) {
-        let image = new Gtk.Image();
-        let item = new Gtk.ImageMenuItem({ label: label,
-                                           image: image,
-                                           always_show_image: forceIcon == true });
-        item.connect('style-set', Lang.bind(this,
-            function() {
-                image.set_from_icon_name(iconName, Gtk.IconSize.MENU);
-            }));
-
-        return item;
-    },
-
-    _createSubMenu: function() {
-        this._menu = new Gtk.Menu();
-        this._menu.connect('deactivate', Lang.bind(this, function() { this.emit('deactivated'); }));
-
-        let item;
-
-        item = this._createImageMenuItem(_('Available'), 'gtk-yes', true);
-        item.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.AVAILABLE));
-        this._menu.append(item);
-        item.show();
-
-        item = 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.connect('activate', Lang.bind(this, this._setPresenceStatus, GnomeSessionPresenceStatus.INVISIBLE));
-        this._menu.append(item);
-        item.show();
-
-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
-
-        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'),
-                                       active: gconf.get_boolean(SIDEBAR_VISIBLE_KEY) });
-        item.connect('activate', Lang.bind(this,
-            function() {
-                gconf.set_boolean(SIDEBAR_VISIBLE_KEY, this._sidebarItem.active);
-            }));
-        this._menu.append(item);
-        item.show();
-        this._sidebarItem = item;
-
-        item = this._createImageMenuItem(_('System Preferences...'), 'preferences-desktop');
-        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this._menu.append(item);
-        item.show();
-
-        item = new Gtk.SeparatorMenuItem();
-        this._menu.append(item);
-        item.show();
-
-        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.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.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
-        this._menu.append(item);
-        item.show();
-
-        item = this._createImageMenuItem(_('Shut Down...'), 'system-shutdown');
-        item.connect('activate', Lang.bind(this, this._onShutDownActivate));
-        this._menu.append(item);
-        item.show();
-    },
-
-    _setPresenceStatus: function(item, status) {
-        this._presence.setStatus(status);
-    },
-
-    _onAccountInformationActivate: function() {
-        this._spawn(['gnome-about-me']);
-    },
-
-    _onPreferencesActivate: function() {
-        this._spawn(['gnome-control-center']);
-    },
-
-    _onLockScreenActivate: function() {
-        this._spawn(['gnome-screensaver-command', '--lock']);
-    },
-
-    _onLoginScreenActivate: function() {
-        this._gdm.goto_login_session();
-        this._onLockScreenActivate();
-    },
-
-    _onQuitSessionActivate: function() {
-        this._spawn(['gnome-session-save', '--logout-dialog']);
-    },
-
-    _onShutDownActivate: function() {
-        this._spawn(['gnome-session-save', '--shutdown-dialog']);
-    },
-
-    _spawn: function(args) {
-        // FIXME: once Shell.Process gets support for signalling
-        // errors we should pop up an error dialog or something here
-        // on failure
-        let p = new Shell.Process({'args' : args});
-        p.run();
-    },
-
-    // shell_status_menu_toggle:
-    // @event: event causing the toggle
-    //
-    // If the menu is not currently up, pops it up. Otherwise, hides it.
-    // Popping up may fail if another grab is already active; check with
-    // isActive().
-    toggle: function(event) {
-        if (this._menu.visible)
-            this._menu.popdown();
-        else {
-            // We don't want to overgrab a Mutter grab with the grab
-            // that GTK+ uses on menus.
-            if (global.display_is_grabbed())
-                return;
-
-            let [menuWidth, menuHeight] = this._menu.get_size_request ();
-
-            let panel;
-            for (panel = this.actor; panel; panel = panel.get_parent()) {
-                if (panel._delegate instanceof Panel.Panel)
-                    break;
-            }
-
-            let [panelX, panelY] = panel.get_transformed_position();
-            let [panelWidth, panelHeight] = panel.get_transformed_size();
-
-            let menuX = Math.round(panelX + panelWidth - menuWidth);
-            let menuY = Math.round(panelY + panelHeight);
-
-            Shell.popup_menu(this._menu, event.get_button(), event.get_time(),
-                             menuX, menuY);
-        }
-    },
-    
-    //  isActive:
-    //  
-    //  Gets whether the menu is currently popped up
-    //  
-    //  Return value: %true if the menu is currently popped up
-    isActive: function() {
-        return this._menu.visible;
-    }
-};
-Signals.addSignalMethods(StatusMenu.prototype);
-
-
-const GnomeSessionPresenceIface = {
-    name: 'org.gnome.SessionManager.Presence',
-    methods: [{ name: 'SetStatus',
-                inSignature: 'u' }],
-    properties: [{ name: 'status',
-                   signature: 'u',
-                   access: 'readwrite' }],
-    signals: [{ name: 'StatusChanged',
-                inSignature: 'u' }]
-};
-
-const GnomeSessionPresenceStatus = {
-    AVAILABLE: 0,
-    INVISIBLE: 1,
-    BUSY: 2,
-    IDLE: 3
-};
-
-function GnomeSessionPresence() {
-    this._init();
-}
-
-GnomeSessionPresence.prototype = {
-    _init: function() {
-        DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this);
-        this.connect('StatusChanged', Lang.bind(this, function (proxy, status) { this.status = status; }));
-    },
-
-    getStatus: function(callback) {
-        this.GetRemote('status', Lang.bind(this,
-            function(status, ex) {
-                if (!ex)
-                    callback(this, status);
-            }));
-    },
-
-    setStatus: function(status) {
-        this.SetStatusRemote(status);
-    }
-};
-DBus.proxifyPrototype(GnomeSessionPresence.prototype, GnomeSessionPresenceIface);
-
--- a/js/ui/widget.js
+++ b/js/ui/widget.js
@ -12,7 +12,6 @@ const Signals = imports.signals;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;

-const AppFavorites = imports.ui.appFavorites;
 const DocInfo = imports.misc.docInfo;

 const COLLAPSED_WIDTH = 24;
@ -319,9 +318,12 @@ AppsWidget.prototype = {
        this.collapsedActor = new Big.Box({ spacing: 2});

        let appSystem = Shell.AppSystem.get_default();
-        let apps = AppFavorites.getAppFavorites().getFavorites();
+        let apps = appSystem.get_favorites();
        for (let i = 0; i < apps.length; i++) {
-            this.addItem(new AppsWidgetInfo(apps[i]));
+            let app = appSystem.lookup_cached_app(apps[i]);
+            if (!app)
+                continue;
+            this.addItem(new AppsWidgetInfo(app));
        }
    }
 };
@ -354,7 +356,8 @@ RecentDocsWidget.prototype = {
        for (i = 0; i < docs.length; i++) {
            let docInfo = new DocInfo.DocInfo (docs[i]);

-            items.push(docInfo);
+            if (docInfo.exists())
+                items.push(docInfo);
        }

        items.sort(function (a,b) { return b.timestamp - a.timestamp; });
--- a/js/ui/widgetBox.js
+++ b/js/ui/widgetBox.js
@ -331,7 +331,7 @@ WidgetBox.prototype = {
                                       onCompleteScope: this });
        this.state = this._widget.state = Widget.STATE_POPPING_OUT;

-        Main.chrome.trackActor(this._hbox, { affectsStruts: false });
+        Main.chrome.addInputRegionActor(this._hbox);
    },

    _popOutComplete: function() {
@ -370,7 +370,7 @@ WidgetBox.prototype = {
        this._egroup.hide();
        this._ebox.x = 0;

-        Main.chrome.untrackActor(this._hbox);
+        Main.chrome.removeInputRegionActor(this._hbox);
    },

    destroy: function() {
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;

 const AltTab = imports.ui.altTab;
 const Main = imports.ui.main;
@ -40,8 +39,7 @@ WindowManager.prototype = {
        shellwm.connect('destroy', Lang.bind(this, this._destroyWindow));
        shellwm.connect('kill-destroy', Lang.bind(this, this._destroyWindowDone));

-        shellwm.takeover_keybinding('switch_windows');
-        shellwm.connect('keybinding::switch_windows', Lang.bind(this, this._startAppSwitcher));
+        shellwm.connect('begin-alt-tab', Lang.bind(this, this._beginAltTab));
    },

    _shouldAnimate : function(actor) {
@ -163,10 +161,41 @@ WindowManager.prototype = {
    },

    _destroyWindow : function(shellwm, actor) {
-        shellwm.completed_destroy(actor);
+        if (!this._shouldAnimate(actor)) {
+            shellwm.completed_destroy(actor);
+            return;
+        }
+
+        actor.move_anchor_point_from_gravity(Clutter.Gravity.CENTER);
+        
+        /* anachronistic 'tv-like' effect - squash on y axis, leave x alone */
+        this._destroying.push(actor);
+        Tweener.addTween(actor,
+                         { scale_x: 1.0,
+                           scale_y: 0.0,
+                           time: WINDOW_ANIMATION_TIME,
+                           transition: "easeOutQuad",
+                           onComplete: this._destroyWindowDone,
+                           onCompleteScope: this,
+                           onCompleteParams: [shellwm, actor],
+                           onOverwrite: this._destroyWindowOverwrite,
+                           onOverwriteScope: this,
+                           onOverwriteParams: [shellwm, actor]
+                         });
    },
    
    _destroyWindowDone : function(shellwm, actor) {
+        if (this._removeEffect(this._destroying, actor)) {
+            shellwm.completed_destroy(actor);
+            Tweener.removeTweens(actor);
+            actor.set_scale(1.0, 1.0);
+        }
+    },
+
+    _destroyWindowOverwrite : function(shellwm, actor) {
+        if (this._removeEffect(this._destroying, actor)) {
+            shellwm.completed_destroy(actor);
+        }
    },

    _switchWorkspace : function(shellwm, from, to, direction) {
@ -271,10 +300,12 @@ WindowManager.prototype = {
        shellwm.completed_switch_workspace();
    },

-    _startAppSwitcher : function(shellwm, binding, window, backwards) {
-        let tabPopup = new AltTab.AltTabPopup();
+    _beginAltTab : function(shellwm, handler) {
+        let popup = new AltTab.AltTabPopup();

-        if (!tabPopup.show(backwards))
-            tabPopup.destroy();
-    }
+        handler.connect('window-added', function(handler, window) { popup.addWindow(window); });
+        handler.connect('show', function(handler, initialSelection) { popup.show(initialSelection); });
+        handler.connect('destroy', function() { popup.destroy(); });
+        handler.connect('notify::selected', function() { popup.select(handler.selected); });
+    }  
 };
--- a/js/ui/workspaces.js
+++ b/js/ui/workspaces.js
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1,16 +1,12 @@
-ar
 ca
 cs
 da
 de
-el
 en_GB
 es
-fi
 fr
 ga
 gl
-he
 hu
 it
 ko
@ -19,9 +15,6 @@ nl
 pa
 pl
 pt_BR
-ro
-ru
-sl
 sv
 tr
 zh_CN
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -1,12 +1,9 @@
 data/gnome-shell.desktop.in.in
-js/ui/appDisplay.js
-js/ui/appIcon.js
+js/ui/panel.js
 js/ui/dash.js
 js/ui/overview.js
-js/ui/panel.js
-js/ui/placeDisplay.js
 js/ui/runDialog.js
-js/ui/widget.js
 src/gdmuser/gdm-user.c
 src/shell-global.c
+src/shell-status-menu.c
 src/shell-uri-util.c
--- a/po/ar.po
+++ b/po/ar.po
@ -1,247 +0,0 @@
-# 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.
-msgid ""
-msgstr ""
-"Project-Id-Version: HEAD\n"
-"Report-Msgid-Bugs-To: \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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"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.4.1\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 "إدارة النوافذ وإطلاق التطبيقات"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "متكرر"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "اسحب إلى هنا ليضاف إلى المفضّلة"
-
-#: ../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:376
-msgid "More"
-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:731
-msgid "PLACES"
-msgstr "الأماكن"
-
-#. **** Documents ****
-#: ../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:274
-msgid "Activities"
-msgstr "الأنشطة"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%A %Ol:%OM %p"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "اتّصل ب‍..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "من فضلك اكتب أمرا:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "فشل تنفيذ '%s':‏"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%OH:%OM"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "التطبيقات"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "المستندات الحديثة"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "منذ أقل من دقيقة"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "منذ أقل من دقيقة"
-msgstr[1] "منذ دقيقة"
-msgstr[2] "منذ دقيقتين"
-msgstr[3] "منذ %d دقائق"
-msgstr[4] "منذ %d دقيقة"
-msgstr[5] "منذ %d دقيقة"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "منذ أقل من ساعة"
-msgstr[1] "منذ ساعة"
-msgstr[2] "منذ ساعتين"
-msgstr[3] "منذ %d ساعات"
-msgstr[4] "منذ %d ساعة"
-msgstr[5] "منذ %d ساعة"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "منذ أقل من يوم"
-msgstr[1] "منذ يوم"
-msgstr[2] "منذ يومين"
-msgstr[3] "منذ %d أيام"
-msgstr[4] "منذ %d يوما"
-msgstr[5] "منذ %d يوم"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "منذ أقل من أسبوع"
-msgstr[1] "منذ أسبوع"
-msgstr[2] "منذ أسبوعين"
-msgstr[3] "منذ %d أسابيع"
-msgstr[4] "منذ %d أسبوعا"
-msgstr[5] "منذ %d أسبوع"
-
-#: ../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:102
-msgid "File System"
-msgstr "نظام الملفات"
-
-#: ../src/shell-uri-util.c:248
-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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "‏%1$s:‏ %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "استعرض"
--- a/po/ca.po
+++ b/po/ca.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-10 20:19+0200\n"
-"PO-Revision-Date: 2009-10-10 20:22+0100\n"
+"POT-Creation-Date: 2009-08-30 18:53+0200\n"
+"PO-Revision-Date: 2009-08-30 18:57+0100\n"
 "Last-Translator: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -24,126 +24,82 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Gestió de finestres i execució d'aplicacions"

-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "Freqüent"
+#. left side
+#: ../js/ui/panel.js:271
+msgid "Activities"
+msgstr "Activitats"

-#: ../js/ui/appIcon.js:462
-msgid "New Window"
-msgstr "Finestra nova"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:454
+msgid "%a %l:%M %p"
+msgstr "%a %H:%M"

-#: ../js/ui/appIcon.js:475
-msgid "Remove from Favorites"
-msgstr "Elimina dels preferits"
-
-#: ../js/ui/appIcon.js:476
-msgid "Add to Favorites"
-msgstr "Afegeix als preferits"
-
-#: ../js/ui/dash.js:283
+#: ../js/ui/dash.js:256
 msgid "Find..."
 msgstr "Cerca..."

-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Més"
+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "Navega"

-#: ../js/ui/dash.js:543
+#: ../js/ui/dash.js:451
 msgid "(see all)"
 msgstr "(mostra tot)"

 #. **** Applications ****
-#: ../js/ui/dash.js:763
-#: ../js/ui/dash.js:825
+#: ../js/ui/dash.js:633
+#: ../js/ui/dash.js:681
 msgid "APPLICATIONS"
 msgstr "APLICACIONS"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:783
+#: ../js/ui/dash.js:653
 msgid "PLACES"
 msgstr "LLOCS"

 #. **** Documents ****
-#: ../js/ui/dash.js:790
-#: ../js/ui/dash.js:835
+#: ../js/ui/dash.js:660
+#: ../js/ui/dash.js:692
 msgid "RECENT DOCUMENTS"
 msgstr "DOCUMENTS RECENTS"

 #. **** Search Results ****
-#: ../js/ui/dash.js:815
-#: ../js/ui/dash.js:955
+#: ../js/ui/dash.js:679
 msgid "SEARCH RESULTS"
 msgstr "RESULTATS DE LA CERCA"

-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "PREFERÈNCIES"
-
-#. 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:272
-msgid "Activities"
-msgstr "Activitats"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:464
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Connecta a..."
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "Introduïu una ordre:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "No s'ha pogut executar «%s»:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "Aplicacions"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "Documents recents"
-
-#: ../src/shell-global.c:812
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "Fa menys d'un minut"

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

-#: ../src/shell-global.c:818
+#: ../src/shell-global.c:846
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Fa %d hora"
 msgstr[1] "Fa %d hores"

-#: ../src/shell-global.c:821
+#: ../src/shell-global.c:849
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Fa %d dia"
 msgstr[1] "Fa %d dies"

-#: ../src/shell-global.c:824
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -224,3 +180,10 @@ msgstr "Cerca"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

+#~ msgid "Find apps or documents"
+#~ msgstr "Cerca aplicacions o documents"
+#~ msgid "Manager"
+#~ msgstr "Gestor"
+#~ msgid "The user manager object this user is controlled by."
+#~ msgstr "L'objecte gestor d'usuaris que controla a aquest usuari."
+
--- a/po/cs.po
+++ b/po/cs.po
@ -7,15 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-05 18:03+0100\n"
-"PO-Revision-Date: 2009-11-05 18:03+0100\n"
+"POT-Creation-Date: 2009-08-30 17:37+0200\n"
+"PO-Revision-Date: 2009-08-30 17:33+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -25,106 +24,59 @@ msgstr "Prostředí GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Správa oken a spouštění aplikací"

-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Časté"
+#. left side
+#: ../js/ui/panel.js:271
+msgid "Activities"
+msgstr "Činnosti"

-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "Oblíbené přidáte přetažením sem"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:454
+msgid "%a %l:%M %p"
+msgstr "%a, %H:%M"

-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "Nové okno"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "Odstranit z oblíbených"
-
-#: ../js/ui/appIcon.js:431
-msgid "Add to Favorites"
-msgstr "Přidat mezi oblíbené"
-
-#: ../js/ui/dash.js:267
+#: ../js/ui/dash.js:256
 msgid "Find..."
 msgstr "Najít..."

-#: ../js/ui/dash.js:376
-msgid "More"
-msgstr "Více"
+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "Procházet"

-#: ../js/ui/dash.js:532
+#: ../js/ui/dash.js:451
 msgid "(see all)"
 msgstr "(zobrazit vše)"

 #. **** Applications ****
-#: ../js/ui/dash.js:711 ../js/ui/dash.js:773
+#: ../js/ui/dash.js:633 ../js/ui/dash.js:681
 msgid "APPLICATIONS"
 msgstr "APLIKACE"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:731
+#: ../js/ui/dash.js:653
 msgid "PLACES"
 msgstr "MÍSTA"

 #. **** Documents ****
-#: ../js/ui/dash.js:738 ../js/ui/dash.js:783
+#: ../js/ui/dash.js:660 ../js/ui/dash.js:692
 msgid "RECENT DOCUMENTS"
 msgstr "NEDÁVNÉ DOKUMENTY"

 #. **** Search Results ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:947
+#: ../js/ui/dash.js:679
 msgid "SEARCH RESULTS"
 msgstr "VÝSLEDKY HLEDÁNÍ"

-#: ../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:274
-msgid "Activities"
-msgstr "Činnosti"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Připojit se k..."
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "Zadejte prosím příkaz:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Vykonání \"%s\" selhalo:"
-
-#. 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 "Aplikace"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Nedávné dokumenty"
-
-#: ../src/shell-global.c:821
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "Před méně než minutou"

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

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

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

-#: ../src/shell-global.c:833
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -230,9 +182,6 @@ msgstr "Hledat"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Browse"
-#~ msgstr "Procházet"
-
 #~ msgid "Manager"
 #~ msgstr "Správce"

--- a/po/da.po
+++ b/po/da.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-21 22:51+0200\n"
-"PO-Revision-Date: 2009-10-18 17:32+0200\n"
+"POT-Creation-Date: 2009-09-04 01:26+0200\n"
+"PO-Revision-Date: 2009-09-01 21:48+0200\n"
 "Last-Translator: Kris Thomsen <lakristho@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@ -24,123 +24,80 @@ msgstr "Skal til GNOME"
 msgid "Window management and application launching"
 msgstr "Vinduehåndtering og åbning af programmer"

-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Ofte"
+#. left side
+#: ../js/ui/panel.js:271
+msgid "Activities"
+msgstr "Aktiviteter"

-#: ../js/ui/appIcon.js:410
-msgid "New Window"
-msgstr "Nyt vindue"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:454
+msgid "%a %l:%M %p"
+msgstr "%a %H:%M"

-#: ../js/ui/appIcon.js:414
-msgid "Remove from Favorites"
-msgstr "Fjern fra favoritter"
-
-#: ../js/ui/appIcon.js:415
-msgid "Add to Favorites"
-msgstr "Tilføj til favoritter"
-
-#: ../js/ui/dash.js:283
+#: ../js/ui/dash.js:256
 msgid "Find..."
 msgstr "Find..."

-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mere"
+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "Gennemse"

-#: ../js/ui/dash.js:543
+#: ../js/ui/dash.js:511
 msgid "(see all)"
 msgstr "(se alle)"

 #. **** Applications ****
-#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
+#: ../js/ui/dash.js:705 ../js/ui/dash.js:761 ../js/ui/dash.js:893
 msgid "APPLICATIONS"
 msgstr "PROGRAMMER"

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

 #. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
+#: ../js/ui/dash.js:732 ../js/ui/dash.js:773 ../js/ui/dash.js:867
 msgid "RECENT DOCUMENTS"
 msgstr "SENESTE DOKUMENTER"

 #. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
+#: ../js/ui/dash.js:751 ../js/ui/dash.js:856 ../js/ui/dash.js:882
 msgid "SEARCH RESULTS"
 msgstr "SØGERESULTATER"

-#: ../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:274
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Forbind til..."
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "Indtast en kommando:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Kørsel af \"%s\" mislykkedes:"
-
-#. 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 "Seneste dokumenter"
-
-#: ../src/shell-global.c:812
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "Mindre end et minut siden"

-#: ../src/shell-global.c:815
+#: ../src/shell-global.c:843
 #, 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:818
+#: ../src/shell-global.c:846
 #, 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:821
+#: ../src/shell-global.c:849
 #, 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:824
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -221,9 +178,6 @@ msgstr "Søg"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Browse"
-#~ msgstr "Gennemse"
-
 #~ msgid "Find apps or documents"
 #~ msgstr "Find programmer eller dokumenter"

--- a/po/de.po
+++ b/po/de.po
@ -4,21 +4,18 @@
 #
 # 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.
 #
 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: 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"
+"Project-Id-Version: HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-20 16:47+0200\n"
+"PO-Revision-Date: 2009-08-20 16:49+0200\n"
+"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
+"Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

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

-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "Häufig"
-
-#: ../js/ui/appIcon.js:407
-msgid "New Window"
-msgstr "Neues Fenster"
-
-#: ../js/ui/appIcon.js:420
-msgid "Remove from Favorites"
-msgstr "Aus Favoriten entfernen"
-
-#: ../js/ui/appIcon.js:421
-msgid "Add to Favorites"
-msgstr "Zu Favoriten hinzufügen"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Suchen …"
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mehr"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(alle sehen)"
-
-#. **** 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:745
-msgid "PLACES"
-msgstr "ORTE"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "ZULETZT GEÖFFNETE DOKUMENTE"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "SUCHERGEBNISSE"
-
-#: ../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:273
+#. left side
+#: ../js/ui/panel.js:266
 msgid "Activities"
 msgstr "Aktivitäten"

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

-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Verbinden mit …"
+#: ../js/ui/dash.js:251
+msgid "Find apps or documents"
+msgstr "Anwendungen oder Dokumente suchen"

-#: ../js/ui/runDialog.js:96
+#: ../js/ui/dash.js:369
+msgid "Browse"
+msgstr "Durchsuchen"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:505 ../js/ui/dash.js:578
+msgid "APPLICATIONS"
+msgstr "ANWENDUNGEN"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:510 ../js/ui/dash.js:605
+msgid "RECENT DOCUMENTS"
+msgstr "ZULETZT GEÖFFNETE DOKUMENTE"
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:598
+msgid "PLACES"
+msgstr "ORTE"
+
+#: ../js/ui/runDialog.js:75
 msgid "Please enter a command:"
 msgstr "Bitte geben Sie einen Befehl ein:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Ausführung von »%s« ist gescheitert:"
+#: ../src/gdmuser/gdm-user.c:243
+msgid "Manager"
+msgstr "Verwaltung"

-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../src/gdmuser/gdm-user.c:244
+msgid "The user manager object this user is controlled by."
+msgstr "Das Benutzerverwaltungsobjekt welches diesen Benutzer überwacht."

-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "Anwendungen"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "Zuletzt geöffnete Dokumente"
-
-#: ../src/shell-global.c:812
+#: ../src/shell-global.c:841
 msgid "Less than a minute ago"
 msgstr "Vor weniger als einer Minute"

-#: ../src/shell-global.c:815
+#: ../src/shell-global.c:844
 #, 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:818
+#: ../src/shell-global.c:847
 #, 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:821
+#: ../src/shell-global.c:850
 #, 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:824
+#: ../src/shell-global.c:853
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -227,15 +180,3 @@ msgstr "Suchen"
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Anwendungen oder Dokumente suchen"
-
-#~ msgid "Browse"
-#~ msgstr "Durchsuchen"
-
-#~ msgid "Manager"
-#~ msgstr "Verwaltung"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "Das Benutzerverwaltungsobjekt welches diesen Benutzer überwacht."
--- a/po/el.po
+++ b/po/el.po
@ -1,186 +0,0 @@
-# translation of gnome-shell.po.master.po to Greek
-# Greek translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Jennie Petoumenou <epetoumenou@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell.po.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2009-10-04 08:03+0000\n"
-"PO-Revision-Date: 2009-10-04 10:25+0200\n"
-"Last-Translator: Jennie Petoumenou <epetoumenou@gmail.com>\n"
-"Language-Team: Greek <<team AT BLOCKSPAM gnome DOT gr>>\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: KBabel 1.11.4\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 "Διαχείριση παραθύρων και εκκίνηση εφαρμογών"
-
-#. left side
-#: ../js/ui/panel.js:271
-msgid "Activities"
-msgstr "Δραστηριότητες"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:461
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Εύρεση..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Περισσότερα"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(εμφάνιση όλων)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "ΕΦΑΡΜΟΓΕΣ"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "ΤΟΠΟΘΕΣΙΕΣ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "ΠΡΟΣΦΑΤΑ ΕΓΓΡΑΦΑ"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "ΑΠΟΤΕΛΕΣΜΑΤΑ ΑΝΑΖΗΤΗΣΗΣ"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "ΠΡΟΤΙΜΗΣΕΙΣ"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Παρακαλώ εισάγετε μία εντολή:"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Λιγότερο από ένα λεπτό πριν"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d λεπτό πριν"
-msgstr[1] "%d λεπτά πριν"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ώρα πριν"
-msgstr[1] "%d ώρες πριν"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ημέρα πριν"
-msgstr[1] "%d ημέρες πριν"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d εβδομάδα πριν"
-msgstr[1] "%d εβδομάδες πριν"
-
-#: ../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:102
-msgid "File System"
-msgstr "Σύστημα αρχείων"
-
-#: ../src/shell-uri-util.c:248
-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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
--- a/po/es.po
+++ b/po/es.po
@ -8,13 +8,13 @@ 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: 2009-12-18 15:06+0000\n"
-"PO-Revision-Date: 2009-12-19 14:41+0100\n"
+"POT-Creation-Date: 2009-09-11 21:48+0000\n"
+"PO-Revision-Date: 2009-09-12 14:40+0200\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"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
@ -25,132 +25,153 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Gestión de ventanas e inicio de aplicaciones"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:852
-msgid "APPLICATIONS"
-msgstr "APLICACIONES"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "PREFERENCIAS"
-
-#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Ventana nueva"
-
-#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Quitar de los favoritos"
-
-#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Añadir a los favoritos"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "Arrastrar aquí para añadir a los favoritos"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Buscar…"
-
-#: ../js/ui/dash.js:437
-#| msgid "Search"
-msgid "Searching..."
-msgstr "Buscando…"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:872 ../js/ui/placeDisplay.js:471
-msgid "PLACES"
-msgstr "LUGARES"
-
-#. **** Documents ****
-#: ../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:227
+#. left side
+#: ../js/ui/panel.js:269
 msgid "Activities"
 msgstr "Actividades"

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

-#: ../js/ui/placeDisplay.js:99
-msgid "Connect to..."
-msgstr "Conectar a…"
+#: ../js/ui/dash.js:283
+msgid "Find..."
+msgstr "Buscar…"

-#: ../js/ui/runDialog.js:96
+#: ../js/ui/dash.js:400
+msgid "Browse"
+msgstr "Examine"
+
+#: ../js/ui/dash.js:536
+msgid "(see all)"
+msgstr "(ver todo)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:736 ../js/ui/dash.js:792
+msgid "APPLICATIONS"
+msgstr "APLICACIONES"
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:756
+msgid "PLACES"
+msgstr "LUGARES"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:763 ../js/ui/dash.js:802
+msgid "RECENT DOCUMENTS"
+msgstr "DOCUMENTOS RECIENTES"
+
+#. **** Search Results ****
+#: ../js/ui/dash.js:782 ../js/ui/dash.js:907
+msgid "SEARCH RESULTS"
+msgstr "RESULTADOS DE LA BÚSQUEDA"
+
+#: ../js/ui/dash.js:797
+msgid "PREFERENCES"
+msgstr "PREFERENCIAS"
+
+#: ../js/ui/runDialog.js:90
 msgid "Please enter a command:"
 msgstr "Introduzca un comando:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Falló la ejecución de «%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 "Aplicaciones"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documentos recientes"
-
-#: ../src/shell-global.c:826
+#: ../src/shell-global.c:799
 msgid "Less than a minute ago"
 msgstr "Hace menos de un minuto"

-#: ../src/shell-global.c:829
+#: ../src/shell-global.c:802
 #, 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:832
+#: ../src/shell-global.c:805
 #, 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:835
+#: ../src/shell-global.c:808
 #, 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:838
+#: ../src/shell-global.c:811
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Hace %d semana"
 msgstr[1] "Hace %d semanas"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "No se puede bloquear la pantalla: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"No se puede establecer temporalmente el salvapantallas a oscurecer pantalla: "
+"%s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "No se puede salir de la sesión: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Información de la cuenta…"
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Barra lateral"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Preferencias del sistema…"
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Bloquear la pantalla"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Cambiar de usuario"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Salir…"
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Apagar…"
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Carpeta personal"

 #. 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 "Sistema de archivos"

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

@ -159,61 +180,11 @@ msgstr "Buscar"
 #. * 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 "Frecuentes"
-
-#~ msgid "More"
-#~ msgstr "Más"
-
-#~ msgid "(see all)"
-#~ msgstr "(ver todo)"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "RESULTADOS DE LA BÚSQUEDA"
-
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "No se puede bloquear la pantalla: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "No se puede establecer temporalmente el salvapantallas a oscurecer "
-#~ "pantalla: %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"
-
 #~ msgid "Find apps or documents"
 #~ msgstr "Encuentre aplicaciones o documentos"

--- a/po/fi.po
+++ b/po/fi.po
@ -1,226 +0,0 @@
-# gnome-shell Finnish translation
-# 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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \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"
-"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 ""
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Ikkunanhallinta ja sovelluksien käynnistäminen"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Usein käytetyt"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "Raahaa tähän lisätäksesi suosikkeihin"
-
-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "Uusi ikkuna"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "Poista suosikeista"
-
-#: ../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:400
-msgid "More"
-msgstr "Lisää"
-
-#: ../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:745
-msgid "PLACES"
-msgstr "SIJAINNIT"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "VIIMEISIMMÄT ASIAKIRJAT"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "HAKUTULOKSET"
-
-#: ../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:274
-msgid "Activities"
-msgstr "Toiminnot"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %I.%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Yhdistä..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Syötä komento:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr ""
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%I.%M"
-
-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Sovellukset"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Viimeisimmät asiakirjat"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "Alle minuutti sitten"
-
-#: ../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: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: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:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d viikko sitten"
-msgstr[1] "%d viikkoa sitten"
-
-#: ../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:102
-msgid "File System"
-msgstr "Tiedostojärjestelmä"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Haku"
-
-#. 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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/fr.po
+++ b/po/fr.po
@ -6,13 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell master fr\n"
+"Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\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"
+"POT-Creation-Date: 2009-09-09 21:30+0000\n"
+"PO-Revision-Date: 2009-09-11 21:40+0200\n"
+"Last-Translator: Mathieu Bridon <bochecha@fedoraproject.org>\n"
+"Language-Team: GNOME French Team\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -26,115 +26,80 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Gestion des fenêtres et lancement des applications"

-#: ../js/ui/appDisplay.js:696
-msgid "Drag here to add favorites"
-msgstr "Glisser ici pour ajouter aux favoris"
+#. left side
+#: ../js/ui/panel.js:269
+msgid "Activities"
+msgstr "Activités"

-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nouvelle fenêtre"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:452
+msgid "%a %l:%M %p"
+msgstr "%a %H:%M"

-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Enlever des favoris"
-
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Ajouter aux favoris"
-
-#: ../js/ui/dash.js:237
+#: ../js/ui/dash.js:255
 msgid "Find..."
 msgstr "Rechercher..."

+#: ../js/ui/dash.js:372
+msgid "Browse"
+msgstr "Parcourir"
+
+#: ../js/ui/dash.js:508
+msgid "(see all)"
+msgstr "(tout afficher)"
+
 #. **** Applications ****
-#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
+#: ../js/ui/dash.js:700 ../js/ui/dash.js:756 ../js/ui/dash.js:887
 msgid "APPLICATIONS"
 msgstr "APPLICATIONS"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
+#: ../js/ui/dash.js:720
 msgid "PLACES"
 msgstr "RACCOURCIS"

 #. **** Documents ****
-#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
+#: ../js/ui/dash.js:727 ../js/ui/dash.js:768 ../js/ui/dash.js:861
 msgid "RECENT DOCUMENTS"
 msgstr "DOCUMENTS RÉCENTS"

 #. **** Search Results ****
-#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
+#: ../js/ui/dash.js:746 ../js/ui/dash.js:850 ../js/ui/dash.js:876
 msgid "SEARCH RESULTS"
 msgstr "RÉSULTATS DE LA RECHERCHE"

-#: ../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:274
-msgid "Activities"
-msgstr "Activités"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "Connexion à..."
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:90
 msgid "Please enter a command:"
 msgstr "Veuillez saisir une commande :"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Exécution de « %s » impossible :"
-
-#. 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 "Documents récents"
-
-#: ../src/shell-global.c:821
+#: ../src/shell-global.c:799
 msgid "Less than a minute ago"
 msgstr "Il y a moins d'une minute"

-#: ../src/shell-global.c:824
+#: ../src/shell-global.c:802
 #, 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:827
+#: ../src/shell-global.c:805
 #, 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:830
+#: ../src/shell-global.c:808
 #, 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:833
+#: ../src/shell-global.c:811
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -215,6 +180,3 @@ msgstr "Recherche"
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s : %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Parcourir"
--- a/po/gl.po
+++ b/po/gl.po
@ -2,22 +2,19 @@
 # Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 # Fran Diéguez <fran.dieguez@mabishu.com>, 2009.
-# Anton Meixome <certima@certima.net>, 2009.
-# Antón Méixome <meixome@certima.net>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-28 17:07+0100\n"
-"PO-Revision-Date: 2009-12-28 08:11+0100\n"
-"Last-Translator: Antón Méixome <meixome@certima.net>\n"
-"Language-Team: Galician Proxecto Trasno <proxecto@trasno.net>\n"
+"POT-Creation-Date: 2009-09-15 23:06+0200\n"
+"PO-Revision-Date: 2009-09-10 22:32+0100\n"
+"Last-Translator: Fran Diéguez <fran.dieguez@glug.es>\n"
+"Language-Team: Galician <gnome@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.4.0\n"

 #: ../data/gnome-shell.desktop.in.in.h:1
 msgid "GNOME Shell"
@ -25,133 +22,154 @@ msgstr "GNOME Shell"

 #: ../data/gnome-shell.desktop.in.in.h:2
 msgid "Window management and application launching"
-msgstr "Xestor de xanelas e lanzamento de aplicativos"
+msgstr "Xestor de xanelas e lanzado de aplicativos"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:858
-msgid "APPLICATIONS"
-msgstr "APLICATIVOS"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "PREFERENCIAS"
-
-#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Xanela nova"
-
-#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Eliminar de Favoritos"
-
-#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Engadir a Favoritos"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "Arrastra aquí para engadir favoritos"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Buscar..."
-
-#: ../js/ui/dash.js:437
-msgid "Searching..."
-msgstr "Buscando..."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:878 ../js/ui/placeDisplay.js:519
-msgid "PLACES"
-msgstr "LUGARES"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:885
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTOS RECENTES"
-
-#. 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:227
+#. left side
+#: ../js/ui/panel.js:269
 msgid "Activities"
 msgstr "Actividades"

 #. Translators: This is a time format.
-#: ../js/ui/panel.js:440
+#: ../js/ui/panel.js:452
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"

-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Conectar con..."
+#: ../js/ui/dash.js:283
+msgid "Find..."
+msgstr "Buscar..."

-#: ../js/ui/runDialog.js:235
+#: ../js/ui/dash.js:400
+msgid "Browse"
+msgstr "Explorar"
+
+#: ../js/ui/dash.js:536
+msgid "(see all)"
+msgstr "(ver todos)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:753 ../js/ui/dash.js:809
+msgid "APPLICATIONS"
+msgstr "APLICATIVOS"
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:773
+msgid "PLACES"
+msgstr "LUGARES"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:780 ../js/ui/dash.js:819
+msgid "RECENT DOCUMENTS"
+msgstr "DOCUMENTOS RECENTES"
+
+#. **** Search Results ****
+#: ../js/ui/dash.js:799 ../js/ui/dash.js:931
+msgid "SEARCH RESULTS"
+msgstr "RESULTADOS DA BÚSQUEDA"
+
+#: ../js/ui/dash.js:814
+msgid "PREFERENCES"
+msgstr ""
+
+#: ../js/ui/runDialog.js:96
 msgid "Please enter a command:"
 msgstr "Insira unha orde:"

-#: ../js/ui/runDialog.js:351
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Fallou a execución de %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 "Aplicativos"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documentos recentes"
-
-#: ../src/shell-global.c:890
+#: ../src/shell-global.c:799
 msgid "Less than a minute ago"
-msgstr "Hai menos dun minuto"
+msgstr "Menos de un minuto"

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

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

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

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

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Non foi posíbel bloquear a pantalla: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"Non foi posíbel establecer o salvapantallas a unha pantalla en branco: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Non foi posíbel pechar a sesión: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Información da conta..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Barra lateral"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Preferenzas do sistema..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Bloquear pantalla"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Cambiar de usuario"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Pechar sesión..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Apagar..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Cartafol persoal"

 #. 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 "Sistema de ficheiros"

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

@ -160,55 +178,11 @@ msgstr "Buscar"
 #. * 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 "SEARCH RESULTS"
-#~ msgstr "RESULTADOS DA BUSCA"
-
-#~ msgid "Unknown"
-#~ msgstr "Descoñecido"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Non foi posíbel bloquear a pantalla: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "Non foi posíbel estabelecer temporalmente o salvapantallas a unha "
-#~ "pantalla en branco: %s"
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Non foi posíbel pechar a sesión: %s"
-
-#~ msgid "Account Information..."
-#~ msgstr "Información da conta..."
-
-#~ msgid "Sidebar"
-#~ msgstr "Barra lateral"
-
-#~ msgid "System Preferences..."
-#~ msgstr "Preferencias do sistema..."
-
-#~ msgid "Lock Screen"
-#~ msgstr "Bloquear pantalla"
-
-#~ msgid "Switch User"
-#~ msgstr "Cambiar de usuario"
-
-#~ msgid "Log Out..."
-#~ msgstr "Saír da sesión..."
-
-#~ msgid "Shut Down..."
-#~ msgstr "Apagar..."
-
-#~ msgid "Browse"
-#~ msgstr "Explorar"
-
-#~ msgid "(see all)"
-#~ msgstr "(ver todos)"
-
 #~ msgid "Find apps or documents"
 #~ msgstr "Atopar aplicativos ou documentos"

--- a/po/he.po
+++ b/po/he.po
@ -1,215 +0,0 @@
-# Hebrew translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# liel <lielft@gmail.com>, 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: 2009-11-13 17:44+0000\n"
-"PO-Revision-Date: 2009-11-28 17:33+0200\n"
-"Last-Translator: Liel Fridman <lielft@gmail.com>\n"
-"Language-Team: Hebrew <he@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"
-
-#: ../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 "ניהול חלונות והרצת יישומים"
-
-#: ../js/ui/appDisplay.js:696
-msgid "Drag here to add favorites"
-msgstr "יש לגרור פריטים לכאן כדי להוסיף מועדפים"
-
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "חלון חדש"
-
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "הסר מהמועדפים"
-
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "הוסף למועדפים"
-
-#: ../js/ui/dash.js:237
-msgid "Find..."
-msgstr "חפש..."
-
-#. **** Applications ****
-#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
-msgid "APPLICATIONS"
-msgstr "יישומים"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
-msgid "PLACES"
-msgstr "מקומות"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
-msgid "RECENT DOCUMENTS"
-msgstr "מסמכים אחרונים"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
-msgid "SEARCH RESULTS"
-msgstr "תוצאות חיפוש"
-
-#: ../js/ui/dash.js:723
-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:274
-msgid "Activities"
-msgstr "פעילויות"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "התחבר אל..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "נא להזין פקודה:"
-
-#: ../js/ui/runDialog.js:173
-#, 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:821
-msgid "Less than a minute ago"
-msgstr "לפני פחות מדקה"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "לפני דקה"
-msgstr[1] "לפני %d דקות"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "לפני שעה"
-msgstr[1] "לפני %d שעות"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "לפני יום"
-msgstr[1] "לפני %d ימים"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "לפני שבוע"
-msgstr[1] "לפני %d שבועות"
-
-#: ../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:102
-msgid "File System"
-msgstr "מערכת הקבצים"
-
-#: ../src/shell-uri-util.c:248
-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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/hu.po
+++ b/po/hu.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-28 13:41+0200\n"
-"PO-Revision-Date: 2009-09-28 13:42+0200\n"
+"POT-Creation-Date: 2009-08-15 11:35+0200\n"
+"PO-Revision-Date: 2009-08-15 11:35+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"
@ -17,92 +17,77 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\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 "Ablakkezelés és alkalmazásindítás"
-
 #. left side
-#: ../js/ui/panel.js:269
+#: ../js/ui/panel.js:266
 msgid "Activities"
 msgstr "Tevékenységek"

 #. Translators: This is a time format.
-#: ../js/ui/panel.js:452
+#: ../js/ui/panel.js:412
 msgid "%a %l:%M %p"
 msgstr "%a., %k.%M"

-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Keresés…"
+#: ../js/ui/dash.js:235
+msgid "Find apps or documents"
+msgstr "Alkalmazások vagy dokumentumok keresése"

-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Több"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(összes megjelenítése)"
+#: ../js/ui/dash.js:336
+msgid "Browse"
+msgstr "Tallózás"

 #. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
+#: ../js/ui/dash.js:472 ../js/ui/dash.js:545
 msgid "APPLICATIONS"
 msgstr "ALKALMAZÁSOK"

-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "HELYEK"
-
 #. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
+#: ../js/ui/dash.js:477 ../js/ui/dash.js:570
 msgid "RECENT DOCUMENTS"
 msgstr "LEGUTÓBBI DOKUMENTUMOK"

-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:958
-msgid "SEARCH RESULTS"
-msgstr "TALÁLATOK"
+#. **** Places ****
+#: ../js/ui/dash.js:563
+msgid "PLACES"
+msgstr "HELYEK"

-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "BEÁLLÍTÁSOK"
-
-#: ../js/ui/runDialog.js:94
+#: ../js/ui/runDialog.js:74
 msgid "Please enter a command:"
 msgstr "Adjon meg egy parancsot:"

-#: ../src/shell-global.c:799
+#: ../src/gdmuser/gdm-user.c:242
+msgid "Manager"
+msgstr "Kezelő"
+
+#: ../src/gdmuser/gdm-user.c:243
+msgid "The user manager object this user is controlled by."
+msgstr "A felhasználót kezelő felhasználókezelő objektum."
+
+#: ../src/shell-global.c:841
 msgid "Less than a minute ago"
 msgstr "Kevesebb, mint egy perce"

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

-#: ../src/shell-global.c:805
+#: ../src/shell-global.c:847
 #, 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:808
+#: ../src/shell-global.c:850
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d napja"
 msgstr[1] "%d napja"

-#: ../src/shell-global.c:811
+#: ../src/shell-global.c:853
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -161,6 +146,14 @@ msgstr "Kijelentkezés…"
 msgid "Shut Down..."
 msgstr "Leállítás…"

+#: ../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 "Ablakkezelés és alkalmazásindítás"
+
 #: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Saját mappa"
--- a/po/it.po
+++ b/po/it.po
@ -6,9 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-28 21:58+0100\n"
-"PO-Revision-Date: 2009-12-28 21:59+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"shell&component=general\n"
+"POT-Creation-Date: 2009-09-05 00:19+0000\n"
+"PO-Revision-Date: 2009-09-06 18:31+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@ -24,132 +25,151 @@ msgstr "GNOME Shell"
 msgid "Window management and application launching"
 msgstr "Gestione finestre e avvio applicazioni"

-#. **** Applications ****
-#: ../js/ui/appDisplay.js:252 ../js/ui/dash.js:858
-msgid "APPLICATIONS"
-msgstr "Applicazioni"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "Preferenze"
-
-#: ../js/ui/appDisplay.js:707 ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nuova finestra"
-
-#: ../js/ui/appDisplay.js:711 ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Rimuovi dai preferiti"
-
-#: ../js/ui/appDisplay.js:712 ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Aggiungi ai preferiti"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "Trascinare qui per aggiungere ai preferiti"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Trova..."
-
-#: ../js/ui/dash.js:437
-msgid "Searching..."
-msgstr "Ricerca..."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:878 ../js/ui/placeDisplay.js:519
-msgid "PLACES"
-msgstr "Risorse"
-
-#. **** Documents ****
-#: ../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:227
+#. left side
+#: ../js/ui/panel.js:271
 msgid "Activities"
 msgstr "Attività"

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

-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Connetti a..."
+#: ../js/ui/dash.js:256
+msgid "Find..."
+msgstr "Trova..."

-#: ../js/ui/runDialog.js:235
+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "Esplora"
+
+#: ../js/ui/dash.js:511
+msgid "(see all)"
+msgstr "(vedi tutto)"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:705 ../js/ui/dash.js:761 ../js/ui/dash.js:893
+msgid "APPLICATIONS"
+msgstr "Applicazioni"
+
+#. **** Places ****
+#. Translators: This is in the sense of locations for documents,
+#. network locations, etc.
+#: ../js/ui/dash.js:725
+msgid "PLACES"
+msgstr "Risorse"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:732 ../js/ui/dash.js:773 ../js/ui/dash.js:867
+msgid "RECENT DOCUMENTS"
+msgstr "Documenti recenti"
+
+#. **** Search Results ****
+#: ../js/ui/dash.js:751 ../js/ui/dash.js:856 ../js/ui/dash.js:882
+msgid "SEARCH RESULTS"
+msgstr "Risultati ricerca"
+
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "Inserire un comando:"

-#: ../js/ui/runDialog.js:351
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Esecuzione di «%s» non riuscita:"
-
-#. 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 "Applicazioni"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documenti recenti"
-
-#: ../src/shell-global.c:890
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "Meno di un minuto fa"

-#: ../src/shell-global.c:893
+#: ../src/shell-global.c:843
 #, 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:896
+#: ../src/shell-global.c:846
 #, 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:899
+#: ../src/shell-global.c:849
 #, 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:902
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d settimana fa"
 msgstr[1] "%d settimane fa"

-#: ../src/shell-uri-util.c:89
+# (ndt) valutare se vada al femminile
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Impossibile bloccare lo schermo: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr ""
+"Impossibile impostare temporaneamente il salva schermo a schermo nero: %s "
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Impossibile terminare la sessione: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Informazioni account..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Barra laterale"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Preferenze di sistema..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Blocca schermo"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Cambia utente"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Termina sessione..."
+
+# (ndt) da valutare... pare che ora anche Windows usi 'Arresta...'...
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Spegni..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Cartella home"

 #. 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 "Cerca"

@ -159,55 +179,19 @@ msgstr "Cerca"
 #. * 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 "Frequente"
+# (ndt) è da valutare se è troppo lunga, è in una casella di ricerca
+#~ msgid "Find apps or documents"
+#~ msgstr "Trova programmi e documenti"

-#~ msgid "More"
-#~ msgstr "Altro"
+# (ndt) no idea...
+#~ msgid "Manager"
+#~ msgstr "Manager"

-#~ msgid "(see all)"
-#~ msgstr "(vedi tutto)"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "Risultati ricerca"
-
-# (ndt) valutare se vada al femminile
-#~ msgid "Unknown"
-#~ msgstr "Sconosciuto"
-
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Impossibile bloccare lo schermo: %s"
-
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "Impossibile impostare temporaneamente il salva schermo a schermo nero: %s "
-
-#~ msgid "Can't logout: %s"
-#~ msgstr "Impossibile terminare la sessione: %s"
-
-#~ msgid "Account Information..."
-#~ msgstr "Informazioni account..."
-
-#~ msgid "Sidebar"
-#~ msgstr "Barra laterale"
-
-#~ msgid "System Preferences..."
-#~ msgstr "Preferenze di sistema..."
-
-#~ msgid "Lock Screen"
-#~ msgstr "Blocca schermo"
-
-#~ msgid "Switch User"
-#~ msgstr "Cambia utente"
-
-#~ msgid "Log Out..."
-#~ msgstr "Termina sessione..."
-
-# (ndt) da valutare... pare che ora anche Windows usi 'Arresta...'...
-#~ msgid "Shut Down..."
-#~ msgstr "Spegni..."
+# (ndt) no idea...
+#~ msgid "The user manager object this user is controlled by."
+#~ msgstr "L'oggetto user manager che controlla questo utente."
--- a/po/nb.po
+++ b/po/nb.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-03 10:47+0200\n"
-"PO-Revision-Date: 2009-10-03 10:48+0200\n"
+"POT-Creation-Date: 2009-08-21 12:36+0200\n"
+"PO-Revision-Date: 2009-08-21 12:44+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"
@ -25,83 +25,70 @@ msgid "Window management and application launching"
 msgstr "Vindushåndtering og oppstart av programmer"

 #. left side
-#: ../js/ui/panel.js:271
+#: ../js/ui/panel.js:266
 msgid "Activities"
 msgstr "Aktiviteter"

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

-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Finn..."
+#: ../js/ui/dash.js:250
+msgid "Find apps or documents"
+msgstr "Finn programmer eller dokumenter"

-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mer"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(se alle)"
+#: ../js/ui/dash.js:368
+msgid "Browse"
+msgstr "Bla gjennom"

 #. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
+#: ../js/ui/dash.js:504 ../js/ui/dash.js:577
 msgid "APPLICATIONS"
 msgstr "PROGRAMMER"

+#. **** Documents ****
+#: ../js/ui/dash.js:509 ../js/ui/dash.js:604
+msgid "RECENT DOCUMENTS"
+msgstr "SISTE DOKUMENTER"
+
 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:783
+#: ../js/ui/dash.js:597
 msgid "PLACES"
 msgstr "STEDER"

-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "SISTE DOKUMENTER"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "SØKERESULTATER"
-
-#: ../js/ui/dash.js:830
-msgid "PREFERENCES"
-msgstr "BRUKERVALG"
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:75
 msgid "Please enter a command:"
 msgstr "Oppgi en kommando:"

-#: ../src/shell-global.c:812
+#: ../src/shell-global.c:841
 msgid "Less than a minute ago"
 msgstr "Mindre enn ett minutt siden"

-#: ../src/shell-global.c:815
+#: ../src/shell-global.c:844
 #, 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:818
+#: ../src/shell-global.c:847
 #, 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:821
+#: ../src/shell-global.c:850
 #, 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:824
+#: ../src/shell-global.c:853
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
--- a/po/pa.po
+++ b/po/pa.po
@ -8,8 +8,8 @@ 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: 2009-10-09 22:10+0000\n"
-"PO-Revision-Date: 2009-10-15 06:18+0530\n"
+"POT-Creation-Date: 2009-08-31 22:31+0000\n"
+"PO-Revision-Date: 2009-09-01 06:51+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@ -26,123 +26,80 @@ msgstr "ਗਨੋਮ ਸ਼ੈਲ"
 msgid "Window management and application launching"
 msgstr "ਵਿੰਡੋ ਪਰਬੰਧ ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਓ"

-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "ਅਕਸਰ"
+#. left side
+#: ../js/ui/panel.js:271
+msgid "Activities"
+msgstr "ਸਰਗਰਮੀਆਂ"

-#: ../js/ui/appIcon.js:462
-msgid "New Window"
-msgstr "ਨਵੀਂ ਵਿੰਡੋ"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:454
+msgid "%a %l:%M %p"
+msgstr "%a %l:%M %p"

-#: ../js/ui/appIcon.js:475
-msgid "Remove from Favorites"
-msgstr "ਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ"
-
-#: ../js/ui/appIcon.js:476
-msgid "Add to Favorites"
-msgstr "ਪਸੰਦ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"
-
-#: ../js/ui/dash.js:283
+#: ../js/ui/dash.js:256
 msgid "Find..."
 msgstr "ਖੋਜ..."

-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "ਹੋਰ"
+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "ਝਲਕ"

-#: ../js/ui/dash.js:543
+#: ../js/ui/dash.js:451
 msgid "(see all)"
 msgstr "(ਸਭ ਵੇਖੋ)"

 #. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
+#: ../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:783
+#: ../js/ui/dash.js:653
 msgid "PLACES"
 msgstr "ਥਾਵਾਂ"

 #. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
+#: ../js/ui/dash.js:660 ../js/ui/dash.js:692
 msgid "RECENT DOCUMENTS"
 msgstr "ਤਾਜ਼ਾ ਡੌਕੂਮੈਂਟ"

 #. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
+#: ../js/ui/dash.js:679
 msgid "SEARCH RESULTS"
 msgstr "ਖੋਜ ਨਤੀਜੇ"

-#: ../js/ui/dash.js:830
-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:272
-msgid "Activities"
-msgstr "ਸਰਗਰਮੀਆਂ"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:464
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "...ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "ਕਮਾਂਡ ਦਿਓ ਜੀ:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "'%s' ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "ਤਾਜ਼ਾ ਡੌਕੂਮੈਂਟ"
-
-#: ../src/shell-global.c:812
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ ਚਿਰ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:815
+#: ../src/shell-global.c:843
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:818
+#: ../src/shell-global.c:846
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:821
+#: ../src/shell-global.c:849
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"

-#: ../src/shell-global.c:824
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -223,5 +180,3 @@ msgstr "ਖੋਜ"
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"

-#~ msgid "Browse"
-#~ msgstr "ਝਲਕ"
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@ -2,139 +2,91 @@
 # Copyright (C) 2009 THE gnome-shell'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell package.
 # Og Maciel <ogmaciel@gnome.org>, 2009.
-# Rodrigo Flores <mail@rodrigoflores.org>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&component=general\n"
-"POT-Creation-Date: 2009-11-12 21:33+0000\n"
-"PO-Revision-Date: 2009-11-14 11:53-0200\n"
-"Last-Translator: Amanda Magalhães <amandinhakee@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-14 17:53-0400\n"
+"PO-Revision-Date: 2009-08-14 17:53-0400\n"
+"Last-Translator: Og Maciel <ogmaciel@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@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"

-#: ../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 "Gerenciamento de janelas e lançador de aplicações"
-
-#: ../js/ui/appDisplay.js:696
-msgid "Drag here to add favorites"
-msgstr "Arraste até aqui para adicionar aos favoritos"
-
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nova janela"
-
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Remover dos Favoritos"
-
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Adicionar aos Favoritos"
-
-#: ../js/ui/dash.js:237
-msgid "Find..."
-msgstr "Procurar..."
-
-#. **** Applications ****
-#: ../js/ui/dash.js:656 ../js/ui/dash.js:718
-msgid "APPLICATIONS"
-msgstr "APLICATIVOS"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:676 ../js/ui/dash.js:733
-msgid "PLACES"
-msgstr "LOCAIS"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:683 ../js/ui/dash.js:728
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTOS RECENTES"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:708 ../js/ui/dash.js:898
-msgid "SEARCH RESULTS"
-msgstr "RESULTADOS DA BUSCA"
-
-#: ../js/ui/dash.js:723
-msgid "PREFERENCES"
-msgstr "PREFERÊNCIAS"
-
-#. 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:274
+#. left side
+#: ../js/ui/panel.js:266
 msgid "Activities"
 msgstr "Atividades"

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

-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "Conectar ao..."
+#: ../js/ui/dash.js:235
+msgid "Find apps or documents"
+msgstr "Localizar aplicativos ou documentos"

-#: ../js/ui/runDialog.js:96
+#: ../js/ui/dash.js:336
+msgid "Browse"
+msgstr "Navegar"
+
+#. **** Applications ****
+#: ../js/ui/dash.js:472 ../js/ui/dash.js:545
+msgid "APPLICATIONS"
+msgstr "APLICATIVOS"
+
+#. **** Documents ****
+#: ../js/ui/dash.js:477 ../js/ui/dash.js:570
+msgid "RECENT DOCUMENTS"
+msgstr "DOCUMENTOS RECENTES"
+
+#. **** Places ****
+#: ../js/ui/dash.js:563
+msgid "PLACES"
+msgstr "LOCAIS"
+
+#: ../js/ui/runDialog.js:74
 msgid "Please enter a command:"
 msgstr "Por favor digite um comando:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "A execução de \"%s\" falhou:"
+#: ../src/gdmuser/gdm-user.c:242
+msgid "Manager"
+msgstr "Gerenciador"

-#. Translators: This is a time format.
-#: ../js/ui/widget.js:163
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../src/gdmuser/gdm-user.c:243
+msgid "The user manager object this user is controlled by."
+msgstr "O objeto gerenciador de usuários que controla este usuário."

-#: ../js/ui/widget.js:317
-msgid "Applications"
-msgstr "Aplicações"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documentos Recentes"
-
-#: ../src/shell-global.c:821
+#: ../src/shell-global.c:841
 msgid "Less than a minute ago"
 msgstr "Menos de um minuto atrás"

-#: ../src/shell-global.c:824
+#: ../src/shell-global.c:844
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"

-#: ../src/shell-global.c:827
+#: ../src/shell-global.c:847
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"

-#: ../src/shell-global.c:830
+#: ../src/shell-global.c:850
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"

-#: ../src/shell-global.c:833
+#: ../src/shell-global.c:853
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@ -190,42 +142,3 @@ msgstr "Encerrar sessão..."
 #: ../src/shell-status-menu.c:557
 msgid "Shut Down..."
 msgstr "Desligar..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Pasta home"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Sistema de arquivos"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Procurar"
-
-#. 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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
-#~ msgid "Browse"
-#~ msgstr "Navegar"
-
-#~ msgid "(see all)"
-#~ msgstr "(veja todos)"
-
-#~ msgid "Find apps or documents"
-#~ msgstr "Localizar aplicativos ou documentos"
-
-#~ msgid "Manager"
-#~ msgstr "Gerenciador"
-
-#~ msgid "The user manager object this user is controlled by."
-#~ msgstr "O objeto gerenciador de usuários que controla este usuário."
--- a/po/ro.po
+++ b/po/ro.po
@ -1,232 +0,0 @@
-# Romanian translation for gnome-shell.
-# Copyright (C) 2009 gnome-shell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell package.
-# Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:25+0200\n"
-"PO-Revision-Date: 2009-10-28 22:33+0200\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
-"Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\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 "Administrare de ferestre și lansare de aplicații"
-
-#: ../js/ui/appDisplay.js:332
-msgid "Frequent"
-msgstr "Frecvent"
-
-#: ../js/ui/appDisplay.js:867
-msgid "Drag here to add favorites"
-msgstr "Adăugați aici favorite cu mausul"
-
-#: ../js/ui/appIcon.js:426
-msgid "New Window"
-msgstr "Fereastră nouă"
-
-#: ../js/ui/appIcon.js:430
-msgid "Remove from Favorites"
-msgstr "Șterge din favorite"
-
-#: ../js/ui/appIcon.js:431
-msgid "Add to Favorites"
-msgstr "Adaugă la favorite"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Caută..."
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Mai multe"
-
-#: ../js/ui/dash.js:543
-msgid "(see all)"
-msgstr "(arată tot)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:725 ../js/ui/dash.js:787
-msgid "APPLICATIONS"
-msgstr "APPLICAȚII"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:745
-msgid "PLACES"
-msgstr "LOCAȚII"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:752 ../js/ui/dash.js:797
-msgid "RECENT DOCUMENTS"
-msgstr "DOCUMENTE RECENTE"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:777 ../js/ui/dash.js:961
-msgid "SEARCH RESULTS"
-msgstr "REZULTATELE CĂUTĂRII"
-
-#: ../js/ui/dash.js:792
-msgid "PREFERENCES"
-msgstr "PREFERINȚE"
-
-#. 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:274
-msgid "Activities"
-msgstr "Activități"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:491
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Conectare la..."
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Introduceți o comandă:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Execuția comenzii „%s” a eșuat:"
-
-#. 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 "Aplicații"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Documente recente"
-
-#: ../src/shell-global.c:821
-msgid "Less than a minute ago"
-msgstr "În ultimul minut"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "acum un minut"
-msgstr[1] "acum %d minute"
-msgstr[2] "acum %d de minute"
-
-#: ../src/shell-global.c:827
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "acum o oră"
-msgstr[1] "acum %d ore"
-msgstr[2] "acum %d de ore"
-
-#: ../src/shell-global.c:830
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "acum o zi"
-msgstr[1] "acum %d zile"
-msgstr[2] "acum %d de zile"
-
-#: ../src/shell-global.c:833
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "acum o săptămână"
-msgstr[1] "acum %d săptămâni"
-msgstr[2] "acum %d de săptămâni"
-
-#: ../src/shell-status-menu.c:156
-msgid "Unknown"
-msgstr "Necunoscut"
-
-#: ../src/shell-status-menu.c:212
-#, c-format
-msgid "Can't lock screen: %s"
-msgstr "Nu s-a putut bloca ecranul: %s"
-
-#: ../src/shell-status-menu.c:227
-#, c-format
-msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "Nu s-a putut folosi temporar un ecran gol pentru economizorul de "
-"ecran: %s"
-
-#: ../src/shell-status-menu.c:351
-#, c-format
-msgid "Can't logout: %s"
-msgstr "Nu se poate ieși din sesiune: %s"
-
-#: ../src/shell-status-menu.c:492
-msgid "Account Information..."
-msgstr "Informații despre cont..."
-
-#: ../src/shell-status-menu.c:502
-msgid "Sidebar"
-msgstr "Bară laterală"
-
-#: ../src/shell-status-menu.c:510
-msgid "System Preferences..."
-msgstr "Preferințe de sistem..."
-
-#: ../src/shell-status-menu.c:525
-msgid "Lock Screen"
-msgstr "Blocare ecran"
-
-#: ../src/shell-status-menu.c:535
-msgid "Switch User"
-msgstr "Alt utilizator"
-
-#. Only show switch user if there are other users
-#. Log Out
-#: ../src/shell-status-menu.c:546
-msgid "Log Out..."
-msgstr "Ieșire..."
-
-#. Shut down
-#: ../src/shell-status-menu.c:557
-msgid "Shut Down..."
-msgstr "Oprire..."
-
-#: ../src/shell-uri-util.c:87
-msgid "Home Folder"
-msgstr "Dosar personal"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:102
-msgid "File System"
-msgstr "Sistem de fișiere"
-
-#: ../src/shell-uri-util.c:248
-msgid "Search"
-msgstr "Caută"
-
-#. 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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
-
--- a/po/ru.po
+++ b/po/ru.po
@ -1,233 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Andrey Korzinev <fellrond@gmail.com>, 2009.
-# Sergey V. Kovylov <serejka@gmail.com>, 2009.
-# Marina Zhurakhinskaya <marinaz@redhat.com>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=general\n"
-"POT-Creation-Date: 2009-10-09 00:27-0400\n"
-"PO-Revision-Date: 2009-10-09 00:27-0400\n"
-"Last-Translator: Marina Zhurakhinskaya <marinaz@redhat.com>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(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 "GNOME Shell"
-
-#: ../data/gnome-shell.desktop.in.in.h:2
-msgid "Window management and application launching"
-msgstr "Управление окнами и запуск приложений"
-
-#: ../js/ui/appDisplay.js:335
-msgid "Frequent"
-msgstr "Часто используемые"
-
-#: ../js/ui/appIcon.js:462
-msgid "New Window"
-msgstr "Новое окно"
-
-#: ../js/ui/appIcon.js:475
-msgid "Remove from Favorites"
-msgstr "Удалить из избранного"
-
-#: ../js/ui/appIcon.js:476
-msgid "Add to Favorites"
-msgstr "Добавить в избранное"
-
-#: ../js/ui/dash.js:283
-msgid "Find..."
-msgstr "Найти…"
-
-#: ../js/ui/dash.js:400
-msgid "More"
-msgstr "Ещё"
-
-#: ../js/ui/dash.js:543
-#: "(увидеть все)" does not fit when it is next to "НЕДАВНИЕ ДОКУМЕНТЫ", so I'm just using "(все)"
-msgid "(see all)"
-msgstr "(все)"
-
-#. **** Applications ****
-#: ../js/ui/dash.js:763 ../js/ui/dash.js:825
-msgid "APPLICATIONS"
-msgstr "ПРИЛОЖЕНИЯ"
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:783
-msgid "PLACES"
-msgstr "ПАПКИ И РЕСУРСЫ"
-
-#. **** Documents ****
-#: ../js/ui/dash.js:790 ../js/ui/dash.js:835
-msgid "RECENT DOCUMENTS"
-msgstr "НЕДАВНИЕ ДОКУМЕНТЫ"
-
-#. **** Search Results ****
-#: ../js/ui/dash.js:815 ../js/ui/dash.js:955
-msgid "SEARCH RESULTS"
-msgstr "РЕЗУЛЬТАТЫ ПОИСКА"
-
-#: ../js/ui/dash.js:830
-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:272
-#. Another word that was considered was "Обзор", but it was decided that it doesn't give a full sense of the actions
-#. possible when in the overview mode.
-msgid "Activities"
-msgstr "Действия"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:464
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/places.js:178
-msgid "Connect to..."
-msgstr "Соединиться с…"
-
-#: ../js/ui/runDialog.js:96
-msgid "Please enter a command:"
-msgstr "Введите команду:"
-
-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Не удалось выполнить «%s»:"
-
-#. Translators: This is a time format.
-#: ../js/ui/widget.js:162
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#: ../js/ui/widget.js:316
-msgid "Applications"
-msgstr "Приложения"
-
-#: ../js/ui/widget.js:341
-msgid "Recent Documents"
-msgstr "Недавние документы"
-
-#: ../src/shell-global.c:812
-msgid "Less than a minute ago"
-msgstr "Менее минуты назад"
-
-#: ../src/shell-global.c:815
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d минуту назад"
-msgstr[1] "%d минуты назад"
-msgstr[2] "%d минут назад"
-
-#: ../src/shell-global.c:818
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d час назад"
-msgstr[1] "%d часа назад"
-msgstr[2] "%d часов назад"
-
-#: ../src/shell-global.c:821
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d день назад"
-msgstr[1] "%d дня назад"
-msgstr[2] "%d дней назад"
-
-#: ../src/shell-global.c:824
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d неделю назад"
-msgstr[1] "%d недели назад"
-msgstr[2] "%d недель назад"
-
-#: ../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:102
-msgid "File System"
-msgstr "Файловая система"
-
-#: ../src/shell-uri-util.c:248
-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:298
-#, c-format
-msgid "%1$s: %2$s"
-msgstr "%1$s: %2$s"
--- a/po/sl.po
+++ b/po/sl.po
@ -1,216 +0,0 @@
-# Slovenian translation of gnome-shell package.
-# Copyright (C) 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gnome-shell package.
-#
-# Matej Urbančič <mateju@svn.gnome.org>, 2009 - 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-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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: Slovenian\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../data/gnome-shell.desktop.in.in.h:1
-msgid "GNOME Shell"
-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:252
-#: ../js/ui/dash.js:858
-msgid "APPLICATIONS"
-msgstr "Programi"
-
-#: ../js/ui/appDisplay.js:276
-msgid "PREFERENCES"
-msgstr "Možnosti"
-
-#: ../js/ui/appDisplay.js:707
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Novo okno"
-
-#: ../js/ui/appDisplay.js:711
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Odstrani iz priljubljenih"
-
-#: ../js/ui/appDisplay.js:712
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Dodaj med priljubljene"
-
-#: ../js/ui/appDisplay.js:1064
-msgid "Drag here to add favorites"
-msgstr "S potegom na to mesto se izbor doda med priljubljene"
-
-#: ../js/ui/dash.js:240
-msgid "Find..."
-msgstr "Najdi ..."
-
-#: ../js/ui/dash.js:437
-msgid "Searching..."
-msgstr "Iskanje ..."
-
-#. **** Places ****
-#. Translators: This is in the sense of locations for documents,
-#. network locations, etc.
-#: ../js/ui/dash.js:878
-#: ../js/ui/placeDisplay.js:519
-msgid "PLACES"
-msgstr "Mesta"
-
-#. **** Documents ****
-#: ../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:227
-msgid "Activities"
-msgstr "Dejavnosti"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a, %H:%M"
-
-#: ../js/ui/placeDisplay.js:144
-msgid "Connect to..."
-msgstr "Povezava z ..."
-
-#: ../js/ui/runDialog.js:235
-msgid "Please enter a command:"
-msgstr "Vnos ukaza:"
-
-#: ../js/ui/runDialog.js:351
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Izvajanje '%s' je spodletelo:"
-
-#. 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 "Nedavni dokumenti"
-
-#: ../src/shell-global.c:890
-msgid "Less than a minute ago"
-msgstr "Pred manj kot eno minuto"
-
-#: ../src/shell-global.c:893
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Pred %d minutami"
-msgstr[1] "Pred %d minuto"
-msgstr[2] "Pred %d minutama"
-msgstr[3] "Pred %d minutami"
-
-#: ../src/shell-global.c:896
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Pred %d urami"
-msgstr[1] "Pred %d uro"
-msgstr[2] "Pred %d urama"
-msgstr[3] "Pred %d urami"
-
-#: ../src/shell-global.c:899
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Pred %d dnevi"
-msgstr[1] "Pred %d dnevom"
-msgstr[2] "Pred %d dnevoma"
-msgstr[3] "Pred %d dnevi"
-
-#: ../src/shell-global.c:902
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Pred %d tedni"
-msgstr[1] "Pred %d tednom"
-msgstr[2] "Pred %d tednoma"
-msgstr[3] "Pred %d tedni"
-
-#: ../src/shell-uri-util.c:89
-msgid "Home Folder"
-msgstr "Domača mapa"
-
-#. Translators: this is the same string as the one found in
-#. * nautilus
-#: ../src/shell-uri-util.c:104
-msgid "File System"
-msgstr "Datotečni sistem"
-
-#: ../src/shell-uri-util.c:250
-msgid "Search"
-msgstr "Poišč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"
-
-#~ msgid "SEARCH RESULTS"
-#~ msgstr "Rezultati iskanja"
-#~ msgid "Unknown"
-#~ msgstr "Neznano"
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Ni mogoče zakleniti zaslona: %s"
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr ""
-#~ "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"
-#~ msgstr "Več"
-#~ msgid "(see all)"
-#~ msgstr "(poglej vse)"
-#~ msgid "Browse"
-#~ msgstr "Prebrskaj"
-
--- a/po/sv.po
+++ b/po/sv.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:52+0100\n"
-"PO-Revision-Date: 2009-12-01 23:53+0100\n"
+"POT-Creation-Date: 2009-09-01 00:31+0200\n"
+"PO-Revision-Date: 2009-09-01 00:31+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@ -24,139 +24,149 @@ msgstr "GNOME-skal"
 msgid "Window management and application launching"
 msgstr "Fönsterhantering och programstarter"

-#: ../js/ui/appDisplay.js:580
-#: ../js/ui/appIcon.js:425
-msgid "New Window"
-msgstr "Nytt fönster"
+#. left side
+#: ../js/ui/panel.js:271
+msgid "Activities"
+msgstr "Aktiviteter"

-#: ../js/ui/appDisplay.js:584
-#: ../js/ui/appIcon.js:429
-msgid "Remove from Favorites"
-msgstr "Ta bort från favoriter"
+#. Translators: This is a time format.
+#: ../js/ui/panel.js:454
+msgid "%a %l:%M %p"
+msgstr "%a %H.%M"

-#: ../js/ui/appDisplay.js:585
-#: ../js/ui/appIcon.js:430
-msgid "Add to Favorites"
-msgstr "Lägg till som favorit"
-
-#: ../js/ui/appDisplay.js:1029
-msgid "Drag here to add favorites"
-msgstr "Dra hit för att lägga till favorit"
-
-#: ../js/ui/dash.js:236
+#: ../js/ui/dash.js:256
 msgid "Find..."
 msgstr "Sök..."

+#: ../js/ui/dash.js:374
+msgid "Browse"
+msgstr "Bläddra"
+
+#: ../js/ui/dash.js:451
+msgid "(see all)"
+msgstr "(se alla)"
+
 #. **** Applications ****
-#: ../js/ui/dash.js:620
-#: ../js/ui/dash.js:682
+#: ../js/ui/dash.js:633
+#: ../js/ui/dash.js:681
 msgid "APPLICATIONS"
 msgstr "PROGRAM"

 #. **** Places ****
 #. Translators: This is in the sense of locations for documents,
 #. network locations, etc.
-#: ../js/ui/dash.js:640
-#: ../js/ui/dash.js:697
+#: ../js/ui/dash.js:653
 msgid "PLACES"
 msgstr "PLATSER"

 #. **** Documents ****
-#: ../js/ui/dash.js:647
+#: ../js/ui/dash.js:660
 #: ../js/ui/dash.js:692
 msgid "RECENT DOCUMENTS"
 msgstr "SENASTE DOKUMENT"

 #. **** Search Results ****
-#: ../js/ui/dash.js:672
-#: ../js/ui/dash.js:862
+#: ../js/ui/dash.js:679
 msgid "SEARCH RESULTS"
 msgstr "SÖKRESULTAT"

-#: ../js/ui/dash.js:687
-msgid "PREFERENCES"
-msgstr "INSTÄLLNINGAR"
-
-#. 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:227
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#. Translators: This is a time format.
-#: ../js/ui/panel.js:440
-msgid "%a %l:%M %p"
-msgstr "%a %H.%M"
-
-#: ../js/ui/placeDisplay.js:84
-msgid "Connect to..."
-msgstr "Anslut till..."
-
-#: ../js/ui/runDialog.js:96
+#: ../js/ui/runDialog.js:82
 msgid "Please enter a command:"
 msgstr "Ange ett kommando:"

-#: ../js/ui/runDialog.js:173
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "Körning av \"%s\" misslyckades:"
-
-#. 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 "Program"
-
-#: ../js/ui/widget.js:339
-msgid "Recent Documents"
-msgstr "Senaste dokument"
-
-#: ../src/shell-global.c:826
+#: ../src/shell-global.c:840
 msgid "Less than a minute ago"
 msgstr "Mindre än en minut sedan"

-#: ../src/shell-global.c:829
+#: ../src/shell-global.c:843
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut sedan"
 msgstr[1] "%d minuter sedan"

-#: ../src/shell-global.c:832
+#: ../src/shell-global.c:846
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timme sedan"
 msgstr[1] "%d timmar sedan"

-#: ../src/shell-global.c:835
+#: ../src/shell-global.c:849
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag sedan"
 msgstr[1] "%d dagar sedan"

-#: ../src/shell-global.c:838
+#: ../src/shell-global.c:852
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d vecka sedan"
 msgstr[1] "%d veckor sedan"

-#: ../src/shell-uri-util.c:89
+#: ../src/shell-status-menu.c:156
+msgid "Unknown"
+msgstr "Okänt"
+
+#: ../src/shell-status-menu.c:212
+#, c-format
+msgid "Can't lock screen: %s"
+msgstr "Kan inte låsa skärmen: %s"
+
+#: ../src/shell-status-menu.c:227
+#, c-format
+msgid "Can't temporarily set screensaver to blank screen: %s"
+msgstr "Kan inte temporärt ställa in skärmsläckaren till blank skärm: %s"
+
+#: ../src/shell-status-menu.c:351
+#, c-format
+msgid "Can't logout: %s"
+msgstr "Kan inte logga ut: %s"
+
+#: ../src/shell-status-menu.c:492
+msgid "Account Information..."
+msgstr "Kontoinformation..."
+
+#: ../src/shell-status-menu.c:502
+msgid "Sidebar"
+msgstr "Sidopanel"
+
+#: ../src/shell-status-menu.c:510
+msgid "System Preferences..."
+msgstr "Systeminställningar..."
+
+#: ../src/shell-status-menu.c:525
+msgid "Lock Screen"
+msgstr "Lås skärmen"
+
+#: ../src/shell-status-menu.c:535
+msgid "Switch User"
+msgstr "Växla användare"
+
+#. Only show switch user if there are other users
+#. Log Out
+#: ../src/shell-status-menu.c:546
+msgid "Log Out..."
+msgstr "Logga ut..."
+
+#. Shut down
+#: ../src/shell-status-menu.c:557
+msgid "Shut Down..."
+msgstr "Stäng av..."
+
+#: ../src/shell-uri-util.c:87
 msgid "Home Folder"
 msgstr "Hemmapp"

 #. 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"

@ -165,37 +175,11 @@ 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"

-#~ msgid "(see all)"
-#~ msgstr "(se alla)"
-#~ msgid "Unknown"
-#~ msgstr "Okänt"
-#~ msgid "Can't lock screen: %s"
-#~ msgstr "Kan inte låsa skärmen: %s"
-#~ msgid "Can't temporarily set screensaver to blank screen: %s"
-#~ msgstr "Kan inte temporärt ställa in skärmsläckaren till blank skärm: %s"
-#~ msgid "Can't logout: %s"
-#~ msgstr "Kan inte logga ut: %s"
-#~ msgid "Account Information..."
-#~ msgstr "Kontoinformation..."
-#~ msgid "Sidebar"
-#~ msgstr "Sidopanel"
-#~ msgid "System Preferences..."
-#~ msgstr "Systeminställningar..."
-#~ msgid "Lock Screen"
-#~ msgstr "Lås skärmen"
-#~ msgid "Switch User"
-#~ msgstr "Växla användare"
-#~ msgid "Log Out..."
-#~ msgstr "Logga ut..."
-#~ msgid "Shut Down..."
-#~ msgstr "Stäng av..."
-#~ msgid "Browse"
-#~ msgstr "Bläddra"
 #~ msgid "Find apps or documents"
 #~ msgstr "Hitta program eller dokument"
 #~ msgid "DOCUMENTS"
--- a/src/Makefile-nbtk.am
+++ b/src/Makefile-nbtk.am
@ -0,0 +1,117 @@
+nbtk_cflags =                    \
+    -I$(top_srcdir)/src         \
+    -DPREFIX=\""$(prefix)"\"        \
+    -DLIBDIR=\""$(libdir)"\"        \
+    -DG_DISABLE_DEPRECATED          \
+    -DG_LOG_DOMAIN=\"Nbtk\"          \
+    -DNBTK_COMPILATION  \
+    $(NBTK_CFLAGS)           \
+    $(NULL)
+
+nbtk_built_sources = \
+    nbtk-enum-types.h   \
+    nbtk-enum-types.c   \
+    nbtk-marshal.h      \
+    nbtk-marshal.c
+
+BUILT_SOURCES += $(nbtk_built_sources)
+
+EXTRA_DIST += \
+	nbtk/nbtk-marshal.list \
+	nbtk/nbtk-enum-types.h.in \
+	nbtk/nbtk-enum-types.c.in
+
+CLEANFILES += stamp-nbtk-marshal.h stamp-nbtk-enum-types.h
+
+nbtk-marshal.h: stamp-nbtk-marshal.h
+	@true
+stamp-nbtk-marshal.h: Makefile nbtk/nbtk-marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+		--prefix=_nbtk_marshal \
+		--header \
+	$(srcdir)/nbtk/nbtk-marshal.list > $@.tmp && \
+	(cmp -s $@.tmp nbtk-marshal.h || cp -f $@.tmp nbtk-marshal.h) && \
+	rm -f $@.tmp && \
+	echo timestamp > $(@F)
+
+nbtk-marshal.c: Makefile nbtk/nbtk-marshal.list
+	$(AM_V_GEN) (echo "#include \"nbtk-marshal.h\"" ; \
+	 $(GLIB_GENMARSHAL) \
+		--prefix=_nbtk_marshal \
+		--body \
+	 $(srcdir)/nbtk/nbtk-marshal.list ) > $@.tmp && \
+	cp -f $@.tmp nbtk-marshal.c && \
+	rm -f $@.tmp
+
+nbtk-enum-types.h: stamp-nbtk-enum-types.h Makefile
+	@true
+stamp-nbtk-enum-types.h: $(source_h) nbtk/nbtk-enum-types.h.in
+	$(AM_V_GEN) ( cd $(srcdir) && \
+	  $(GLIB_MKENUMS) \
+	    --template nbtk/nbtk-enum-types.h.in \
+	  $(nbtk_source_h) ) >> $@.tmp && \
+	(cmp -s $@.tmp nbtk-enum-types.h || cp $@.tmp nbtk-enum-types.h) && \
+	rm -f $@.tmp && \
+	echo timestamp > $(@F)
+
+nbtk-enum-types.c: stamp-nbtk-enum-types.h nbtk/nbtk-enum-types.c.in
+	$(AM_V_GEN) ( cd $(srcdir) && \
+	  $(GLIB_MKENUMS) \
+	    --template nbtk/nbtk-enum-types.c.in \
+	  $(nbtk_source_h) ) >> $@.tmp && \
+	cp $@.tmp $@ && \
+	rm -f $@.tmp
+
+# please, keep this sorted alphabetically
+nbtk_source_h =                  \
+    nbtk/nbtk-adjustment.h            \
+    nbtk/nbtk-bin.h                   \
+    nbtk/nbtk-box-layout.h            \
+    nbtk/nbtk-box-layout-child.h      \
+    nbtk/nbtk-button.h                \
+    nbtk/nbtk-clipboard.h             \
+    nbtk/nbtk-entry.h                 \
+    nbtk/nbtk-label.h                 \
+    nbtk/nbtk-private.h               \
+    nbtk/nbtk-scrollable.h            \
+    nbtk/nbtk-scroll-bar.h            \
+    nbtk/nbtk-scroll-view.h           \
+    nbtk/nbtk-subtexture.h            \
+    nbtk/nbtk-texture-cache.h         \
+    nbtk/nbtk-texture-frame.h         \
+    nbtk/nbtk-tooltip.h               \
+    nbtk/nbtk-types.h                 \
+    nbtk/nbtk-widget.h                \
+    $(NULL)
+
+# please, keep this sorted alphabetically
+nbtk_source_c =                  \
+    nbtk/nbtk-adjustment.c           \
+    nbtk/nbtk-bin.c                   \
+    nbtk/nbtk-box-layout.c            \
+    nbtk/nbtk-box-layout-child.c      \
+    nbtk/nbtk-button.c                \
+    nbtk/nbtk-clipboard.c             \
+    nbtk/nbtk-entry.c                 \
+    nbtk/nbtk-label.c                 \
+    nbtk/nbtk-private.c               \
+    nbtk/nbtk-scrollable.c            \
+    nbtk/nbtk-scroll-bar.c            \
+    nbtk/nbtk-scroll-view.c           \
+    nbtk/nbtk-subtexture.c            \
+    nbtk/nbtk-texture-cache.c         \
+    nbtk/nbtk-texture-frame.c         \
+    nbtk/nbtk-tooltip.c               \
+    nbtk/nbtk-widget.c                \
+    $(NULL)
+
+noinst_LTLIBRARIES += libnbtk-1.0.la
+
+libnbtk_1_0_la_LIBADD = $(NBTK_LIBS)
+libnbtk_1_0_la_SOURCES = \
+    $(nbtk_source_c) \
+    $(nbtk_source_h) \
+    $(nbtk_built_sources) \
+    $(NULL)
+libnbtk_1_0_la_CPPFLAGS = $(nbtk_cflags)
+libnbtk_1_0_la_LDFLAGS = $(LDADD)
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@ -1,154 +0,0 @@
-st_cflags =					\
-    -I$(top_srcdir)/src				\
-    -DPREFIX=\""$(prefix)"\"			\
-    -DLIBDIR=\""$(libdir)"\"			\
-    -DG_DISABLE_DEPRECATED			\
-    -DG_LOG_DOMAIN=\"St\"			\
-    -DST_COMPILATION				\
-    -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\"	\
-    $(ST_CFLAGS)				\
-    $(NULL)
-
-st_built_sources =				\
-    st-enum-types.h				\
-    st-enum-types.c				\
-    st-marshal.h				\
-    st-marshal.c
-
-BUILT_SOURCES += $(st_built_sources)
-
-EXTRA_DIST +=					\
-	st/test-theme.css			\
-	st/st-marshal.list			\
-	st/st-enum-types.h.in			\
-	st/st-enum-types.c.in
-
-CLEANFILES += stamp-st-marshal.h stamp-st-enum-types.h
-
-st-marshal.h: stamp-st-marshal.h
-	@true
-stamp-st-marshal.h: Makefile st/st-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL)					\
-		--prefix=_st_marshal					\
-		--header						\
-	$(srcdir)/st/st-marshal.list > $@.tmp &&			\
-	(cmp -s $@.tmp st-marshal.h || cp -f $@.tmp st-marshal.h) &&	\
-	rm -f $@.tmp &&							\
-	echo timestamp > $(@F)
-
-st-marshal.c: Makefile st/st-marshal.list
-	$(AM_V_GEN) (echo "#include \"st-marshal.h\"" ;	\
-	 $(GLIB_GENMARSHAL)				\
-		--prefix=_st_marshal			\
-		--body					\
-	 $(srcdir)/st/st-marshal.list ) > $@.tmp &&	\
-	cp -f $@.tmp st-marshal.c &&			\
-	rm -f $@.tmp
-
-st-enum-types.h: stamp-st-enum-types.h Makefile
-	@true
-stamp-st-enum-types.h: $(source_h) st/st-enum-types.h.in
-	$(AM_V_GEN) ( cd $(srcdir) &&					\
-	  $(GLIB_MKENUMS)						\
-	    --template st/st-enum-types.h.in				\
-	  $(st_source_h) ) >> $@.tmp &&					\
-	(cmp -s $@.tmp st-enum-types.h || cp $@.tmp st-enum-types.h) &&	\
-	rm -f $@.tmp &&							\
-	echo timestamp > $(@F)
-
-st-enum-types.c: stamp-st-enum-types.h st/st-enum-types.c.in
-	$(AM_V_GEN) ( cd $(srcdir) &&		\
-	  $(GLIB_MKENUMS)			\
-	    --template st/st-enum-types.c.in	\
-	  $(st_source_h) ) >> $@.tmp &&		\
-	cp $@.tmp $@ &&				\
-	rm -f $@.tmp
-
-# please, keep this sorted alphabetically
-st_source_h =					\
-    st/st-adjustment.h				\
-    st/st-bin.h					\
-    st/st-border-image.h			\
-    st/st-box-layout.h				\
-    st/st-box-layout-child.h			\
-    st/st-button.h				\
-    st/st-clickable.h           \
-    st/st-clipboard.h				\
-    st/st-drawing-area.h        \
-    st/st-entry.h				\
-    st/st-im-text.h				\
-    st/st-label.h				\
-    st/st-overflow-box.h        \
-    st/st-private.h				\
-    st/st-scrollable.h				\
-    st/st-scroll-bar.h				\
-    st/st-scroll-view.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_source_private_h =				\
-    st/st-private.h				\
-    st/st-table-private.h			\
-    st/st-theme-private.h
-
-# please, keep this sorted alphabetically
-st_source_c =					\
-    st/st-adjustment.c				\
-    st/st-bin.c					\
-    st/st-border-image.c			\
-    st/st-box-layout.c				\
-    st/st-box-layout-child.c			\
-    st/st-button.c				\
-    st/st-clickable.c           \
-    st/st-clipboard.c				\
-    st/st-drawing-area.c        \
-    st/st-entry.c				\
-    st/st-im-text.c				\
-    st/st-label.c				\
-    st/st-overflow-box.c        \
-    st/st-private.c				\
-    st/st-scrollable.c				\
-    st/st-scroll-bar.c				\
-    st/st-scroll-view.c				\
-    st/st-subtexture.c				\
-    st/st-table.c				\
-    st/st-table-child.c				\
-    st/st-texture-cache.c			\
-    st/st-texture-frame.c			\
-    st/st-theme.c				\
-    st/st-theme-context.c			\
-    st/st-theme-node.c				\
-    st/st-tooltip.c				\
-    st/st-widget.c				\
-    $(NULL)
-
-noinst_LTLIBRARIES += libst-1.0.la
-
-libst_1_0_la_LIBADD = $(ST_LIBS)
-libst_1_0_la_SOURCES =				\
-    $(st_source_c)				\
-    $(st_source_private_c)			\
-    $(st_source_h)				\
-    $(st_built_sources)				\
-    $(NULL)
-libst_1_0_la_CPPFLAGS = $(st_cflags)
-libst_1_0_la_LDFLAGS = $(LDADD)
-
-noinst_PROGRAMS += test-theme
-
-test_theme_CPPFLAGS = $(st_cflags)
-test_theme_LDADD = libst-1.0.la
-
-test_theme_SOURCES = st/test-theme.c
--- a/src/Makefile-toolkit.am
+++ b/src/Makefile-toolkit.am
@ -0,0 +1,36 @@
+toolkit_cflags =				\
+    -I$(top_srcdir)/src				\
+    -DPREFIX=\""$(prefix)"\"			\
+    -DLIBDIR=\""$(libdir)"\"			\
+    -DG_DISABLE_DEPRECATED			\
+    -DG_LOG_DOMAIN=\"Shell\"			\
+    $(TOOLKIT_CFLAGS)
+
+# please, keep this sorted alphabetically
+toolkit_sources =				\
+	toolkit/shell-border-image.c		\
+	toolkit/shell-border-image.h		\
+	toolkit/shell-theme.c			\
+	toolkit/shell-theme.h			\
+	toolkit/shell-theme-context.c		\
+	toolkit/shell-theme-context.h		\
+	toolkit/shell-theme-node.c		\
+	toolkit/shell-theme-node.h		\
+	toolkit/shell-theme-private.h
+
+non_gir_toolkit_sources =			\
+	toolkit/shell-theme-private.h
+
+noinst_LTLIBRARIES += libshell-toolkit.la
+
+libshell_toolkit_la_LIBADD = $(TOOLKIT_LIBS)
+libshell_toolkit_la_SOURCES = $(toolkit_sources) $(toolkit_built_sources)
+libshell_toolkit_la_CPPFLAGS = $(toolkit_cflags)
+libshell_toolkit_la_LDFLAGS = $(LDADD)
+
+noinst_PROGRAMS += test-theme
+
+test_theme_CPPFLAGS = $(toolkit_cflags)
+test_theme_LDADD = libshell-toolkit.la
+
+test_theme_SOURCES = toolkit/test-theme.c
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -25,7 +25,8 @@ EXTRA_DIST += gnome-shell.in

 include Makefile-big.am
 include Makefile-gdmuser.am
-include Makefile-st.am
+include Makefile-nbtk.am
+include Makefile-toolkit.am
 include Makefile-tray.am

 gnome_shell_cflags =				\
@ -54,19 +55,20 @@ CLEANFILES += $(SHELL_STAMP_FILES)
 libgnome_shell_la_SOURCES =			\
 	$(shell_built_sources)			\
 	gnome-shell-plugin.c			\
-	shell-app.c         \
-	shell-app.h         \
-	shell-app-private.h \
+	shell-alttab.c				\
+	shell-alttab.h				\
+	shell-app-monitor.c			\
+	shell-app-monitor.h			\
 	shell-app-system.c			\
 	shell-app-system.h			\
-	shell-app-usage.c			\
-	shell-app-usage.h			\
 	shell-arrow.c			\
 	shell-arrow.h			\
-	shell-doc-system.c			\
-	shell-doc-system.h			\
+	shell-button-box.c           \
+	shell-button-box.h           \
 	shell-drawing.c            \
 	shell-drawing.h            \
+	shell-drawing-area.c			\
+	shell-drawing-area.h			\
 	shell-embedded-window.c			\
 	shell-embedded-window.h			\
 	shell-embedded-window-private.h		\
@ -84,7 +86,8 @@ libgnome_shell_la_SOURCES =			\
 	shell-process.h				\
 	shell-global.c				\
 	shell-global.h				\
-	shell-global-private.h			\
+	shell-status-menu.c				\
+	shell-status-menu.h				\
 	shell-stack.c				\
 	shell-stack.h				\
 	shell-tray-manager.c			\
@ -93,14 +96,11 @@ libgnome_shell_la_SOURCES =			\
 	shell-texture-cache.h			\
 	shell-uri-util.c           \
 	shell-uri-util.h           \
-	shell-window-tracker.c		\
-	shell-window-tracker.h  \
 	shell-wm.c				\
 	shell-wm.h

 non_gir_sources =				\
-	shell-embedded-window-private.h		\
-	shell-global-private.h
+	shell-embedded-window-private.h

 shell_recorder_sources =        \
 	shell-recorder.c	\
@ -128,7 +128,7 @@ test_recorder_SOURCES =     \
 endif BUILD_RECORDER

 libgnome_shell_la_gir_sources = \
-	$(filter-out $(non_gir_sources), $(libgnome_shell_la_SOURCES))
+	$(filter-out $(non_gir_sources) $(non_gir_toolkit_sources), $(libgnome_shell_la_SOURCES) $(toolkit_sources))

 shell-marshal.h: stamp-shell-marshal.h
 	@true
@ -155,25 +155,26 @@ libgnome_shell_la_LIBADD =	\
 	$(MUTTER_PLUGIN_LIBS)	\
        $(LIBGNOMEUI_LIBS)      \
 	libbig-1.0.la		\
-	libst-1.0.la       	\
+	libnbtk-1.0.la       	\
 	libgdmuser-1.0.la	\
+	libshell-toolkit.la	\
 	libtray.la
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)

 typelibdir = $(pkglibdir)
-typelib_DATA = Shell-0.1.typelib Big-1.0.typelib St-1.0.typelib Gdm-1.0.typelib
+typelib_DATA = Shell-0.1.typelib Big-1.0.typelib Nbtk-1.0.typelib

-Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir St-1.0.gir libgnome-shell.la Makefile
+Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir Nbtk-1.0.gir libgnome-shell.la Makefile
 	$(AM_V_GEN) $(G_IR_SCANNER)			\
 		--namespace=Shell			\
 		--nsversion=0.1				\
 		--add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
 		--include=Clutter-1.0			\
-		--include=Meta-2.28			\
+		--include=Meta-2.27			\
 		--libtool="$(LIBTOOL)"    \
 		--add-include-path=$(builddir)     \
 		--include=Big-1.0     \
-		--include=St-1.0     \
+		--include=Nbtk-1.0     \
 		--program=mutter			\
 	        --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
 		$(addprefix $(srcdir)/,$(libgnome_shell_la_gir_sources)) \
@ -211,44 +212,51 @@ 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) libgnome-shell.la libst-1.0.la Makefile
+toolkit_gir_sources = \
+	$(filter-out $(non_gir_toolkit_sources), $(toolkit_sources))
+
+# Since the Shell namepace includes both the code in toolkit/ that our fork of
+# NBTK depends upon and the code in this directory that depends on NBTK, We have a
+# circular dependency when generating the girs and typelibs. We work around this
+# by generating a Toolkit gir, using it to build the Nbtk gir then sed'ing the
+# reference out of the generated gir.
+Toolkit-0.1.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libshell-toolkit.la Makefile
 	$(AM_V_GEN) $(G_IR_SCANNER)						\
-	        --namespace=St							\
-	        --nsversion=1.0							\
+	        --namespace=Shell						\
+		--nsversion=0.1							\
 	        --include=Clutter-1.0						\
-		--add-include-path=$(builddir)     				\
 	        --libtool="$(LIBTOOL)"						\
 	        --program=mutter						\
 		--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la	\
-	        -DST_COMPILATION						\
-	        $(addprefix $(srcdir)/,$(st_source_h))				\
-	        $(addprefix $(srcdir)/,$(st_source_c))				\
-	        $(srcdir)/st-enum-types.h					\
-	        $(st_cflags)							\
+	        $(addprefix $(srcdir)/,$(toolkit_gir_sources))			\
+	        $(TOOLKIT_CFLAGS)						\
 	        -o $@
-CLEANFILES += St-1.0.gir
+CLEANFILES += Toolkit-1.0.gir

-St-1.0.typelib: St-1.0.gir
+Nbtk-1.0.gir: $(mutter) $(G_IR_SCANNER) Toolkit-0.1.gir libgnome-shell.la libnbtk-1.0.la Makefile
+	$(AM_V_GEN) $(G_IR_SCANNER)						\
+	        --namespace=Nbtk						\
+	        --nsversion=1.0							\
+	        --include=Clutter-1.0						\
+	        --include=Gtk-2.0						\
+		--add-include-path=$(builddir)     				\
+		--include=Toolkit-0.1						\
+	        --libtool="$(LIBTOOL)"						\
+	        --program=mutter						\
+		--program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la	\
+	        -DNBTK_COMPILATION						\
+	        $(addprefix $(srcdir)/,$(nbtk_source_h))			\
+	        $(addprefix $(srcdir)/,$(nbtk_source_c))			\
+	        $(srcdir)/nbtk-enum-types.h					\
+	        $(NBTK_CFLAGS)							\
+	        -o $@.tmp &&							\
+	sed -e '/"Toolkit"/d' < $@.tmp > $@
+CLEANFILES += Nbtk-1.0.gir
+
+Nbtk-1.0.typelib: Nbtk-1.0.gir
 	$(AM_V_GEN) $(G_IR_COMPILER)						\
+		--includedir=.							\
+		--includedir=$(MUTTER_LIB_DIR)/mutter/				\
 		$< -o $@

-CLEANFILES += St-1.0.typelib
-
-Gdm-1.0.gir: $(mutter) $(G_IR_SCANNER) libgdmuser-1.0.la Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER)			\
-		--namespace=Gdm				\
-		--nsversion=1.0				\
-		--include=GObject-2.0			\
-		--include=GdkPixbuf-2.0			\
-		--libtool="$(LIBTOOL)"			\
-		--library=libgdmuser-1.0.la		\
-		$(addprefix $(srcdir)/,$(gdmuser_source_h))	\
-		$(addprefix $(srcdir)/,$(gdmuser_source_c))	\
-		$(gdmuser_cflags)				\
-		-o $@
-CLEANFILES += Gdm-1.0.gir
-
-Gdm-1.0.typelib: libbig-1.0.la Gdm-1.0.gir
-	$(AM_V_GEN) $(G_IR_COMPILER) Gdm-1.0.gir -o $@
-CLEANFILES += Gdm-1.0.typelib
-
+CLEANFILES += Nbtk-1.0.typelib
--- a/src/gdmuser/gdm-user-manager.c
+++ b/src/gdmuser/gdm-user-manager.c
@ -998,7 +998,7 @@ gdm_user_manager_get_user (GdmUserManager *manager,

 GdmUser *
 gdm_user_manager_get_user_by_uid (GdmUserManager *manager,
-                                  gulong          uid)
+                                  uid_t           uid)
 {
        GdmUser       *user;
        struct passwd *pwent;
--- a/src/gdmuser/gdm-user-manager.h
+++ b/src/gdmuser/gdm-user-manager.h
@ -75,7 +75,7 @@ GSList *            gdm_user_manager_list_users            (GdmUserManager *mana
 GdmUser *           gdm_user_manager_get_user              (GdmUserManager *manager,
                                                            const char     *user_name);
 GdmUser *           gdm_user_manager_get_user_by_uid       (GdmUserManager *manager,
-                                                            gulong          uid);
+                                                            uid_t           uid);

 gboolean            gdm_user_manager_activate_user_session (GdmUserManager *manager,
                                                            GdmUser        *user);
--- a/src/gdmuser/gdm-user.c
+++ b/src/gdmuser/gdm-user.c
@ -516,7 +516,7 @@ _gdm_user_icon_changed (GdmUser *user)
 * Since: 1.0
 **/

-gulong
+uid_t
 gdm_user_get_uid (GdmUser *user)
 {
        g_return_val_if_fail (GDM_IS_USER (user), -1);
--- a/src/gdmuser/gdm-user.h
+++ b/src/gdmuser/gdm-user.h
@ -39,7 +39,7 @@ typedef struct _GdmUser GdmUser;

 GType                 gdm_user_get_type            (void) G_GNUC_CONST;

-gulong                gdm_user_get_uid             (GdmUser   *user);
+uid_t                 gdm_user_get_uid             (GdmUser   *user);
 G_CONST_RETURN char  *gdm_user_get_user_name       (GdmUser   *user);
 G_CONST_RETURN char  *gdm_user_get_real_name       (GdmUser   *user);
 G_CONST_RETURN char  *gdm_user_get_home_directory  (GdmUser   *user);
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@ -23,8 +23,6 @@
 * 02111-1307, USA.
 */

-#include "config.h"
-
 #define MUTTER_BUILDING_PLUGIN 1
 #include <mutter-plugin.h>

@ -42,7 +40,7 @@

 #include "display.h"

-#include "shell-global-private.h"
+#include "shell-global.h"
 #include "shell-wm.h"

 static void gnome_shell_plugin_constructed (GObject *object);
@ -194,7 +192,12 @@ gnome_shell_plugin_constructed (GObject *object)
  shell_plugin->gjs_context = gjs_context_new_with_search_path(search_path);
  g_strfreev(search_path);

-  _shell_global_set_gjs_context (shell_global_get (), shell_plugin->gjs_context);
+  shell_plugin->panel_action = XInternAtom (meta_display_get_xdisplay (display),
+                                            "_GNOME_PANEL_ACTION", FALSE);
+  shell_plugin->panel_action_run_dialog = XInternAtom (meta_display_get_xdisplay (display),
+                                                       "_GNOME_PANEL_ACTION_RUN_DIALOG", FALSE);
+  shell_plugin->panel_action_main_menu = XInternAtom (meta_display_get_xdisplay (display),
+                                                      "_GNOME_PANEL_ACTION_MAIN_MENU", FALSE);

  if (!gjs_context_eval (shell_plugin->gjs_context,
                         "const Main = imports.ui.main; Main.start();",
@ -315,10 +318,48 @@ gnome_shell_plugin_kill_effect (MutterPlugin         *plugin,
                         actor, events);
 }

+static gboolean
+handle_panel_event (GnomeShellPlugin *shell_plugin,
+                    XEvent           *xev)
+{
+  MutterPlugin *plugin = MUTTER_PLUGIN (shell_plugin);
+  MetaScreen *screen;
+  MetaDisplay *display;
+  XClientMessageEvent *xev_client;
+  Window root;
+
+  screen = mutter_plugin_get_screen (plugin);
+  display = meta_screen_get_display (screen);
+
+  if (xev->type != ClientMessage)
+    return FALSE;
+
+  root = meta_screen_get_xroot (screen);
+
+  xev_client = (XClientMessageEvent*) xev;
+  if (!(xev_client->window == root &&
+        xev_client->message_type == shell_plugin->panel_action &&
+        xev_client->format == 32))
+    return FALSE;
+
+  if (xev_client->data.l[0] == shell_plugin->panel_action_run_dialog)
+    g_signal_emit_by_name (shell_global_get (), "panel-run-dialog",
+                           (guint32) xev_client->data.l[1]);
+  else if (xev_client->data.l[0] == shell_plugin->panel_action_main_menu)
+    g_signal_emit_by_name (shell_global_get (), "panel-main-menu",
+                           (guint32) xev_client->data.l[1]);
+
+  return TRUE;
+}
+
 static gboolean
 gnome_shell_plugin_xevent_filter (MutterPlugin *plugin,
                                  XEvent       *xev)
 {
+  GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
+
+  if (handle_panel_event (shell_plugin, xev))
+    return TRUE;
  return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
 }

--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@ -53,7 +53,9 @@ def start_xephyr():
    time.sleep(1)

    # Start some windows in our session.
-    subprocess.Popen(["gnome-terminal"])
+    subprocess.Popen(["xterm", "-geometry", "+30+30"])
+    subprocess.Popen(["xlogo", "-geometry", "-0-0"])
+    subprocess.Popen(["xeyes", "-geometry", "-0+30"])

    return xephyr;

@ -210,10 +212,6 @@ parser.add_option("", "--geometry", metavar="GEOMETRY",
                  default="1024x768");
 parser.add_option("-w", "--wide", action="store_true",
                  help="Use widescreen (1280x800) with Xephyr")
-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")

 options, args = parser.parse_args()

@ -221,105 +219,6 @@ if args:
    parser.print_usage()
    sys.exit(1)

-if options.create_extension:
-    import json
-
-    print
-    print '''Name should be a very short (ideally descriptive) string.
-Examples are: "Click To Focus",  "Adblock", "Shell Window Shrinker".
-'''
-    name = raw_input('Name: ').strip()
-    print
-    print '''Description is a single-sentence explanation of what your extension does.
-Examples are: "Make windows visible on click", "Block advertisement popups"
-              "Animate windows shrinking on minimize"
-'''
-    description = raw_input('Description: ').strip()
-    underifier = re.compile('[^A-Za-z]')
-    sample_uuid = underifier.sub('_', name)
-    # TODO use evolution data server
-    hostname = subprocess.Popen(['hostname'], stdout=subprocess.PIPE).communicate()[0].strip()
-    sample_uuid = sample_uuid + '@' + hostname
-
-    print
-    print '''Uuid is a globally-unique identifier for your extension.
-This should be in the format of an email address (foo.bar@extensions.example.com), but
-need not be an actual email address, though it's a good idea to base the uuid on your
-email address.  For example, if your email address is janedoe@example.com, you might
-use an extension title clicktofocus@janedoe.example.com.'''
-    uuid = raw_input('Uuid [%s]: ' % (sample_uuid, )).strip()
-    if uuid == '':
-        uuid = sample_uuid
-
-    extension_path = os.path.join(os.path.expanduser('~/.config'), 'gnome-shell', 'extensions', uuid)
-    if os.path.exists(extension_path):
-        print "Extension path %r already exists" % (extension_path, )
-        sys.exit(0)
-    os.makedirs(extension_path)
-    meta = { 'name': name,
-             'description': description,
-             'uuid': uuid }
-    f = open(os.path.join(extension_path, 'metadata.json'), 'w')
-    try:
-        json.dump(meta, f)
-    except AttributeError:
-        # For Python versions older than 2.6, try using the json-py module
-        f.write(json.write(meta) + '\n')
-    f.close()
-
-    extensionjs_path = os.path.join(extension_path, 'extension.js')
-    f = open(extensionjs_path, 'w')
-    f.write('''// Sample extension code, makes clicking on the panel show a message
-const St = imports.gi.St;
-const Mainloop = imports.mainloop;
-
-const Main = imports.ui.main;
-
-function _showHello() {
-    let text = new St.Label({ style_class: 'helloworld-label', text: "Hello, world!" });
-    let monitor = global.get_primary_monitor();
-    global.stage.add_actor(text);
-    text.set_position(Math.floor (monitor.width / 2 - text.width / 2), Math.floor(monitor.height / 2 - text.height / 2));
-    Mainloop.timeout_add(3000, function () { text.destroy(); });
-}
-
-// Put your extension initialization code here
-function main() {
-    Main.panel.actor.reactive = true;
-    Main.panel.actor.connect('button-release-event', _showHello);
-}
-''')
-    f.close()
-
-    f = open(os.path.join(extension_path, 'stylesheet.css'), 'w')
-    f.write('''/* Example stylesheet */
-.helloworld-label {
-    font-size: 36px;
-    font-weight: bold;
-    color: #ffffff;
-    background-color: rgba(10,10,10,0.7);
-    border-radius: 5px;
-}
-''')
-    f.close()
-
-    subprocess.Popen(['gnome-open', extensionjs_path])
-    sys.exit(0)
-
-if options.eval_file:
-    import dbus
-
-    f = open(options.eval_file)
-    contents = f.read()
-    f.close()
-
-    session = dbus.SessionBus()
-    shell = session.get_object('org.gnome.Shell', '/org/gnome/Shell')
-    shell = dbus.Interface(shell, 'org.gnome.Shell')
-    result = shell.Eval(contents)
-    print result
-    sys.exit(0)
-
 if options.debug_command:
    options.debug = True
 elif options.debug:
@ -357,9 +256,8 @@ try:
    shell = None
    if options.xephyr:
        xephyr = start_xephyr()
-        # This makes us not grab the org.gnome.Panel or
-        # org.freedesktop.Notifications D-Bus names
-        os.environ['GNOME_SHELL_NO_REPLACE'] = '1'
+        # This makes us not grab the org.gnome.Panel name
+        os.environ['GNOME_SHELL_NO_REPLACE_PANEL'] = '1'
        shell = start_shell()
    else:
        xephyr = None
--- a/src/nbtk/nbtk-adjustment.c
+++ b/src/nbtk/nbtk-adjustment.c
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-adjustment.c: Adjustment object
+ * nbtk-adjustment.c: Adjustment object
 *
 * Copyright (C) 2008 OpenedHand
 * Copyright (c) 2009 Intel Corporation.
@ -19,18 +18,10 @@
 * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 *
 * Written by: Chris Lord <chris@openedhand.com>, inspired by GtkAdjustment
- * Port to St by: Robert Staudinger <robsta@openedhand.com>
+ * Port to Nbtk by: Robert Staudinger <robsta@openedhand.com>
 *
 */

-/**
- * SECTION:st-adjustment
- * @short_description: A GObject representing an adjustable bounded value
- *
- * The #StAdjustment object represents a range of values bounded between a
- * minimum and maximum, together with step and page increments and a page size.
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@ -38,31 +29,31 @@
 #include <glib-object.h>
 #include <clutter/clutter.h>

-#include "st-adjustment.h"
-#include "st-marshal.h"
-#include "st-private.h"
+#include "nbtk-adjustment.h"
+#include "nbtk-marshal.h"
+#include "nbtk-private.h"

-G_DEFINE_TYPE (StAdjustment, st_adjustment, G_TYPE_OBJECT)
+G_DEFINE_TYPE (NbtkAdjustment, nbtk_adjustment, G_TYPE_OBJECT)

-#define ADJUSTMENT_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ST_TYPE_ADJUSTMENT, StAdjustmentPrivate))
+#define ADJUSTMENT_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NBTK_TYPE_ADJUSTMENT, NbtkAdjustmentPrivate))

-struct _StAdjustmentPrivate
+struct _NbtkAdjustmentPrivate
 {
  /* Do not sanity-check values while constructing,
   * not all properties may be set yet. */
  gboolean is_constructing : 1;

-  gdouble  lower;
-  gdouble  upper;
-  gdouble  value;
-  gdouble  step_increment;
-  gdouble  page_increment;
-  gdouble  page_size;
+  gdouble lower;
+  gdouble upper;
+  gdouble value;
+  gdouble step_increment;
+  gdouble page_increment;
+  gdouble page_size;

  /* For interpolation */
  ClutterTimeline *interpolation;
-  gdouble          old_position;
-  gdouble          new_position;
+  gdouble old_position;
+  gdouble new_position;

  /* For elasticity */
  gboolean      elastic;
@ -93,43 +84,43 @@ enum

 static guint signals[LAST_SIGNAL] = { 0, };

-static gboolean st_adjustment_set_lower          (StAdjustment *adjustment,
-                                                  gdouble       lower);
-static gboolean st_adjustment_set_upper          (StAdjustment *adjustment,
-                                                  gdouble       upper);
-static gboolean st_adjustment_set_step_increment (StAdjustment *adjustment,
-                                                  gdouble       step);
-static gboolean st_adjustment_set_page_increment (StAdjustment *adjustment,
-                                                  gdouble       page);
-static gboolean st_adjustment_set_page_size      (StAdjustment *adjustment,
-                                                  gdouble       size);
+static gboolean nbtk_adjustment_set_lower          (NbtkAdjustment *adjustment,
+                                                    gdouble         lower);
+static gboolean nbtk_adjustment_set_upper          (NbtkAdjustment *adjustment,
+                                                    gdouble         upper);
+static gboolean nbtk_adjustment_set_step_increment (NbtkAdjustment *adjustment,
+                                                    gdouble         step);
+static gboolean nbtk_adjustment_set_page_increment (NbtkAdjustment *adjustment,
+                                                    gdouble         page);
+static gboolean nbtk_adjustment_set_page_size      (NbtkAdjustment *adjustment,
+                                                    gdouble         size);

 static void
-st_adjustment_constructed (GObject *object)
+nbtk_adjustment_constructed (GObject *object)
 {
  GObjectClass *g_class;
-  StAdjustment *self = ST_ADJUSTMENT (object);
+  NbtkAdjustment *self = NBTK_ADJUSTMENT (object);

-  g_class = G_OBJECT_CLASS (st_adjustment_parent_class);
+  g_class = G_OBJECT_CLASS (nbtk_adjustment_parent_class);
  /* The docs say we're suppose to chain up, but would crash without
   * some extra care. */
  if (g_class && g_class->constructed &&
-      g_class->constructed != st_adjustment_constructed)
+      g_class->constructed != nbtk_adjustment_constructed)
    {
      g_class->constructed (object);
    }

-  ST_ADJUSTMENT (self)->priv->is_constructing = FALSE;
-  st_adjustment_clamp_page (self, self->priv->lower, self->priv->upper);
+  NBTK_ADJUSTMENT (self)->priv->is_constructing = FALSE;
+  nbtk_adjustment_clamp_page (self, self->priv->lower, self->priv->upper);
 }

 static void
-st_adjustment_get_property (GObject    *gobject,
-                            guint       prop_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
+nbtk_adjustment_get_property (GObject    *gobject,
+                              guint       prop_id,
+                              GValue     *value,
+                              GParamSpec *pspec)
 {
-  StAdjustmentPrivate *priv = ST_ADJUSTMENT (gobject)->priv;
+  NbtkAdjustmentPrivate *priv = NBTK_ADJUSTMENT (gobject)->priv;

  switch (prop_id)
    {
@ -168,41 +159,41 @@ st_adjustment_get_property (GObject    *gobject,
 }

 static void
-st_adjustment_set_property (GObject      *gobject,
-                            guint         prop_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
+nbtk_adjustment_set_property (GObject      *gobject,
+                              guint         prop_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
 {
-  StAdjustment *adj = ST_ADJUSTMENT (gobject);
+  NbtkAdjustment *adj = NBTK_ADJUSTMENT (gobject);

  switch (prop_id)
    {
    case PROP_LOWER:
-      st_adjustment_set_lower (adj, g_value_get_double (value));
+      nbtk_adjustment_set_lower (adj, g_value_get_double (value));
      break;

    case PROP_UPPER:
-      st_adjustment_set_upper (adj, g_value_get_double (value));
+      nbtk_adjustment_set_upper (adj, g_value_get_double (value));
      break;

    case PROP_VALUE:
-      st_adjustment_set_value (adj, g_value_get_double (value));
+      nbtk_adjustment_set_value (adj, g_value_get_double (value));
      break;

    case PROP_STEP_INC:
-      st_adjustment_set_step_increment (adj, g_value_get_double (value));
+      nbtk_adjustment_set_step_increment (adj, g_value_get_double (value));
      break;

    case PROP_PAGE_INC:
-      st_adjustment_set_page_increment (adj, g_value_get_double (value));
+      nbtk_adjustment_set_page_increment (adj, g_value_get_double (value));
      break;

    case PROP_PAGE_SIZE:
-      st_adjustment_set_page_size (adj, g_value_get_double (value));
+      nbtk_adjustment_set_page_size (adj, g_value_get_double (value));
      break;

    case PROP_ELASTIC:
-      st_adjustment_set_elastic (adj, g_value_get_boolean (value));
+      nbtk_adjustment_set_elastic (adj, g_value_get_boolean (value));
      break;

    default:
@ -212,9 +203,9 @@ st_adjustment_set_property (GObject      *gobject,
 }

 static void
-stop_interpolation (StAdjustment *adjustment)
+stop_interpolation (NbtkAdjustment *adjustment)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  if (priv->interpolation)
    {
@ -237,24 +228,24 @@ stop_interpolation (StAdjustment *adjustment)
 }

 static void
-st_adjustment_dispose (GObject *object)
+nbtk_adjustment_dispose (GObject *object)
 {
-  stop_interpolation (ST_ADJUSTMENT (object));
+  stop_interpolation (NBTK_ADJUSTMENT (object));

-  G_OBJECT_CLASS (st_adjustment_parent_class)->dispose (object);
+  G_OBJECT_CLASS (nbtk_adjustment_parent_class)->dispose (object);
 }

 static void
-st_adjustment_class_init (StAdjustmentClass *klass)
+nbtk_adjustment_class_init (NbtkAdjustmentClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  g_type_class_add_private (klass, sizeof (StAdjustmentPrivate));
+  g_type_class_add_private (klass, sizeof (NbtkAdjustmentPrivate));

-  object_class->constructed = st_adjustment_constructed;
-  object_class->get_property = st_adjustment_get_property;
-  object_class->set_property = st_adjustment_set_property;
-  object_class->dispose = st_adjustment_dispose;
+  object_class->constructed = nbtk_adjustment_constructed;
+  object_class->get_property = nbtk_adjustment_get_property;
+  object_class->set_property = nbtk_adjustment_set_property;
+  object_class->dispose = nbtk_adjustment_dispose;

  g_object_class_install_property (object_class,
                                   PROP_LOWER,
@ -264,7 +255,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                        ST_PARAM_READWRITE |
+                                                        NBTK_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_UPPER,
@ -274,7 +265,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                        ST_PARAM_READWRITE |
+                                                        NBTK_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_VALUE,
@ -284,7 +275,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                        ST_PARAM_READWRITE |
+                                                        NBTK_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_STEP_INC,
@ -294,7 +285,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        0.0,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                        ST_PARAM_READWRITE |
+                                                        NBTK_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_PAGE_INC,
@ -304,7 +295,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        0.0,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                        ST_PARAM_READWRITE |
+                                                        NBTK_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_PAGE_SIZE,
@ -314,7 +305,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        0.0,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                        ST_PARAM_READWRITE |
+                                                        NBTK_PARAM_READWRITE |
                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_ELASTIC,
@ -325,11 +316,11 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                         "'elastic' way and "
                                                         "stop clamping value.",
                                                         FALSE,
-                                                         ST_PARAM_READWRITE |
-                                                         G_PARAM_CONSTRUCT));
+                                                        NBTK_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));

  /**
-   * StAdjustment::changed:
+   * NbtkAdjustment::changed:
   *
   * Emitted when any of the adjustment values have changed
   */
@ -337,29 +328,29 @@ st_adjustment_class_init (StAdjustmentClass *klass)
    g_signal_new ("changed",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (StAdjustmentClass, changed),
+                  G_STRUCT_OFFSET (NbtkAdjustmentClass, changed),
                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  _nbtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

 static void
-st_adjustment_init (StAdjustment *self)
+nbtk_adjustment_init (NbtkAdjustment *self)
 {
  self->priv = ADJUSTMENT_PRIVATE (self);

  self->priv->is_constructing = TRUE;
 }

-StAdjustment *
-st_adjustment_new (gdouble value,
-                   gdouble lower,
-                   gdouble upper,
-                   gdouble step_increment,
-                   gdouble page_increment,
-                   gdouble page_size)
+NbtkAdjustment *
+nbtk_adjustment_new (gdouble value,
+                     gdouble lower,
+                     gdouble upper,
+                     gdouble step_increment,
+                     gdouble page_increment,
+                     gdouble page_size)
 {
-  return g_object_new (ST_TYPE_ADJUSTMENT,
+  return g_object_new (NBTK_TYPE_ADJUSTMENT,
                       "value", value,
                       "lower", lower,
                       "upper", upper,
@ -370,11 +361,11 @@ st_adjustment_new (gdouble value,
 }

 gdouble
-st_adjustment_get_value (StAdjustment *adjustment)
+nbtk_adjustment_get_value (NbtkAdjustment *adjustment)
 {
-  StAdjustmentPrivate *priv;
+  NbtkAdjustmentPrivate *priv;

-  g_return_val_if_fail (ST_IS_ADJUSTMENT (adjustment), 0);
+  g_return_val_if_fail (NBTK_IS_ADJUSTMENT (adjustment), 0);

  priv = adjustment->priv;

@ -389,12 +380,12 @@ st_adjustment_get_value (StAdjustment *adjustment)
 }

 void
-st_adjustment_set_value (StAdjustment *adjustment,
-                         gdouble       value)
+nbtk_adjustment_set_value (NbtkAdjustment *adjustment,
+                           gdouble         value)
 {
-  StAdjustmentPrivate *priv;
+  NbtkAdjustmentPrivate *priv;

-  g_return_if_fail (ST_IS_ADJUSTMENT (adjustment));
+  g_return_if_fail (NBTK_IS_ADJUSTMENT (adjustment));

  priv = adjustment->priv;

@ -418,14 +409,14 @@ st_adjustment_set_value (StAdjustment *adjustment,
 }

 void
-st_adjustment_clamp_page (StAdjustment *adjustment,
-                          gdouble       lower,
-                          gdouble       upper)
+nbtk_adjustment_clamp_page (NbtkAdjustment *adjustment,
+                            gdouble         lower,
+                            gdouble         upper)
 {
-  StAdjustmentPrivate *priv;
+  NbtkAdjustmentPrivate *priv;
  gboolean changed;

-  g_return_if_fail (ST_IS_ADJUSTMENT (adjustment));
+  g_return_if_fail (NBTK_IS_ADJUSTMENT (adjustment));

  priv = adjustment->priv;

@ -453,10 +444,10 @@ st_adjustment_clamp_page (StAdjustment *adjustment,
 }

 static gboolean
-st_adjustment_set_lower (StAdjustment *adjustment,
-                         gdouble       lower)
+nbtk_adjustment_set_lower (NbtkAdjustment *adjustment,
+                           gdouble         lower)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  if (priv->lower != lower)
    {
@ -468,7 +459,7 @@ st_adjustment_set_lower (StAdjustment *adjustment,

      /* Defer clamp until after construction. */
      if (!priv->is_constructing)
-        st_adjustment_clamp_page (adjustment, priv->lower, priv->upper);
+        nbtk_adjustment_clamp_page (adjustment, priv->lower, priv->upper);

      return TRUE;
    }
@ -477,10 +468,10 @@ st_adjustment_set_lower (StAdjustment *adjustment,
 }

 static gboolean
-st_adjustment_set_upper (StAdjustment *adjustment,
-                         gdouble       upper)
+nbtk_adjustment_set_upper (NbtkAdjustment *adjustment,
+                           gdouble         upper)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  if (priv->upper != upper)
    {
@ -492,7 +483,7 @@ st_adjustment_set_upper (StAdjustment *adjustment,

      /* Defer clamp until after construction. */
      if (!priv->is_constructing)
-        st_adjustment_clamp_page (adjustment, priv->lower, priv->upper);
+        nbtk_adjustment_clamp_page (adjustment, priv->lower, priv->upper);

      return TRUE;
    }
@ -501,10 +492,10 @@ st_adjustment_set_upper (StAdjustment *adjustment,
 }

 static gboolean
-st_adjustment_set_step_increment (StAdjustment *adjustment,
-                                  gdouble       step)
+nbtk_adjustment_set_step_increment (NbtkAdjustment *adjustment,
+                                    gdouble         step)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  if (priv->step_increment != step)
    {
@ -521,10 +512,10 @@ st_adjustment_set_step_increment (StAdjustment *adjustment,
 }

 static gboolean
-st_adjustment_set_page_increment (StAdjustment *adjustment,
-                                  gdouble       page)
+nbtk_adjustment_set_page_increment (NbtkAdjustment *adjustment,
+                                    gdouble         page)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  if (priv->page_increment != page)
    {
@ -541,10 +532,10 @@ st_adjustment_set_page_increment (StAdjustment *adjustment,
 }

 static gboolean
-st_adjustment_set_page_size (StAdjustment *adjustment,
-                             gdouble       size)
+nbtk_adjustment_set_page_size (NbtkAdjustment *adjustment,
+                               gdouble         size)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  if (priv->page_size != size)
    {
@ -556,7 +547,7 @@ st_adjustment_set_page_size (StAdjustment *adjustment,

      /* Well explicitely clamp after construction. */
      if (!priv->is_constructing)
-        st_adjustment_clamp_page (adjustment, priv->lower, priv->upper);
+        nbtk_adjustment_clamp_page (adjustment, priv->lower, priv->upper);

      return TRUE;
    }
@ -565,18 +556,18 @@ st_adjustment_set_page_size (StAdjustment *adjustment,
 }

 void
-st_adjustment_set_values (StAdjustment *adjustment,
-                          gdouble       value,
-                          gdouble       lower,
-                          gdouble       upper,
-                          gdouble       step_increment,
-                          gdouble       page_increment,
-                          gdouble       page_size)
+nbtk_adjustment_set_values (NbtkAdjustment *adjustment,
+                            gdouble         value,
+                            gdouble         lower,
+                            gdouble         upper,
+                            gdouble         step_increment,
+                            gdouble         page_increment,
+                            gdouble         page_size)
 {
-  StAdjustmentPrivate *priv;
+  NbtkAdjustmentPrivate *priv;
  gboolean emit_changed = FALSE;

-  g_return_if_fail (ST_IS_ADJUSTMENT (adjustment));
+  g_return_if_fail (NBTK_IS_ADJUSTMENT (adjustment));
  g_return_if_fail (page_size >= 0 && page_size <= G_MAXDOUBLE);
  g_return_if_fail (step_increment >= 0 && step_increment <= G_MAXDOUBLE);
  g_return_if_fail (page_increment >= 0 && page_increment <= G_MAXDOUBLE);
@ -589,15 +580,15 @@ st_adjustment_set_values (StAdjustment *adjustment,

  g_object_freeze_notify (G_OBJECT (adjustment));

-  emit_changed |= st_adjustment_set_lower (adjustment, lower);
-  emit_changed |= st_adjustment_set_upper (adjustment, upper);
-  emit_changed |= st_adjustment_set_step_increment (adjustment, step_increment);
-  emit_changed |= st_adjustment_set_page_increment (adjustment, page_increment);
-  emit_changed |= st_adjustment_set_page_size (adjustment, page_size);
+  emit_changed |= nbtk_adjustment_set_lower (adjustment, lower);
+  emit_changed |= nbtk_adjustment_set_upper (adjustment, upper);
+  emit_changed |= nbtk_adjustment_set_step_increment (adjustment, step_increment);
+  emit_changed |= nbtk_adjustment_set_page_increment (adjustment, page_increment);
+  emit_changed |= nbtk_adjustment_set_page_size (adjustment, page_size);

  if (value != priv->value)
    {
-      st_adjustment_set_value (adjustment, value);
+      nbtk_adjustment_set_value (adjustment, value);
      emit_changed = TRUE;
    }

@ -608,17 +599,17 @@ st_adjustment_set_values (StAdjustment *adjustment,
 }

 void
-st_adjustment_get_values (StAdjustment *adjustment,
-                          gdouble      *value,
-                          gdouble      *lower,
-                          gdouble      *upper,
-                          gdouble      *step_increment,
-                          gdouble      *page_increment,
-                          gdouble      *page_size)
+nbtk_adjustment_get_values (NbtkAdjustment *adjustment,
+                            gdouble        *value,
+                            gdouble        *lower,
+                            gdouble        *upper,
+                            gdouble        *step_increment,
+                            gdouble        *page_increment,
+                            gdouble        *page_size)
 {
-  StAdjustmentPrivate *priv;
+  NbtkAdjustmentPrivate *priv;

-  g_return_if_fail (ST_IS_ADJUSTMENT (adjustment));
+  g_return_if_fail (NBTK_IS_ADJUSTMENT (adjustment));

  priv = adjustment->priv;

@ -629,7 +620,7 @@ st_adjustment_get_values (StAdjustment *adjustment,
    *upper = priv->upper;

  if (value)
-    *value = st_adjustment_get_value (adjustment);
+    *value = nbtk_adjustment_get_value (adjustment);

  if (step_increment)
    *step_increment = priv->step_increment;
@ -644,9 +635,9 @@ st_adjustment_get_values (StAdjustment *adjustment,
 static void
 interpolation_new_frame_cb (ClutterTimeline *timeline,
                            guint            msecs,
-                            StAdjustment    *adjustment)
+                            NbtkAdjustment  *adjustment)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  priv->interpolation = NULL;

@ -654,28 +645,28 @@ interpolation_new_frame_cb (ClutterTimeline *timeline,
    {
      gdouble progress = clutter_alpha_get_alpha (priv->bounce_alpha) / 1.0;
      gdouble dx = priv->old_position
-                   + (priv->new_position - priv->old_position)
-                   * progress;
+                 + (priv->new_position - priv->old_position)
+                 * progress;

-      st_adjustment_set_value (adjustment, dx);
+      nbtk_adjustment_set_value (adjustment, dx);
    }
  else
-    st_adjustment_set_value (adjustment,
-                             priv->old_position +
-                             (priv->new_position - priv->old_position) *
-                             clutter_timeline_get_progress (timeline));
+    nbtk_adjustment_set_value (adjustment,
+                               priv->old_position +
+                               (priv->new_position - priv->old_position) *
+                               clutter_timeline_get_progress (timeline));

  priv->interpolation = timeline;
 }

 static void
 interpolation_completed_cb (ClutterTimeline *timeline,
-                            StAdjustment    *adjustment)
+                            NbtkAdjustment  *adjustment)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  stop_interpolation (adjustment);
-  st_adjustment_set_value (adjustment, priv->new_position);
+  nbtk_adjustment_set_value (adjustment, priv->new_position);
 }

 /* Note, there's super-optimal code that does a similar thing in
@ -685,33 +676,33 @@ interpolation_completed_cb (ClutterTimeline *timeline,
 * better. Leaving code here in case this is revisited.
 */
 /*
-   static guint32
-   bounce_alpha_func (ClutterAlpha *alpha,
+static guint32
+bounce_alpha_func (ClutterAlpha *alpha,
                   gpointer      user_data)
-   {
-   ClutterFixed progress, angle;
-   ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
+{
+  ClutterFixed progress, angle;
+  ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);

-   progress = clutter_timeline_get_progressx (timeline);
-   angle = clutter_qmulx (CFX_PI_2 + CFX_PI_4/2, progress);
+  progress = clutter_timeline_get_progressx (timeline);
+  angle = clutter_qmulx (CFX_PI_2 + CFX_PI_4/2, progress);

-   return clutter_sinx (angle) +
+  return clutter_sinx (angle) +
    (CFX_ONE - clutter_sinx (CFX_PI_2 + CFX_PI_4/2));
-   }
- */
+}
+*/

 void
-st_adjustment_interpolate (StAdjustment *adjustment,
-                           gdouble       value,
-                           guint         duration)
+nbtk_adjustment_interpolate (NbtkAdjustment *adjustment,
+                             gdouble         value,
+                             guint           duration)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;

  stop_interpolation (adjustment);

  if (duration <= 1)
    {
-      st_adjustment_set_value (adjustment, value);
+      nbtk_adjustment_set_value (adjustment, value);
      return;
    }

@ -737,24 +728,24 @@ st_adjustment_interpolate (StAdjustment *adjustment,
 }

 gboolean
-st_adjustment_get_elastic (StAdjustment *adjustment)
+nbtk_adjustment_get_elastic (NbtkAdjustment *adjustment)
 {
  return adjustment->priv->elastic;
 }

 void
-st_adjustment_set_elastic (StAdjustment *adjustment,
-                           gboolean      elastic)
+nbtk_adjustment_set_elastic (NbtkAdjustment *adjustment,
+                             gboolean        elastic)
 {
  adjustment->priv->elastic = elastic;
 }

 gboolean
-st_adjustment_clamp (StAdjustment *adjustment,
-                     gboolean      interpolate,
-                     guint         duration)
+nbtk_adjustment_clamp (NbtkAdjustment *adjustment,
+                       gboolean        interpolate,
+                       guint           duration)
 {
-  StAdjustmentPrivate *priv = adjustment->priv;
+  NbtkAdjustmentPrivate *priv = adjustment->priv;
  gdouble dest = priv->value;

  if (priv->value < priv->lower)
@ -766,9 +757,9 @@ st_adjustment_clamp (StAdjustment *adjustment,
  if (dest != priv->value)
    {
      if (interpolate)
-        st_adjustment_interpolate (adjustment, dest, duration);
+        nbtk_adjustment_interpolate (adjustment, dest, duration);
      else
-        st_adjustment_set_value (adjustment, dest);
+        nbtk_adjustment_set_value (adjustment, dest);

      return TRUE;
    }
--- a/src/nbtk/nbtk-adjustment.h
+++ b/src/nbtk/nbtk-adjustment.h
@ -0,0 +1,121 @@
+/*
+ * nbtk-adjustment.h: Adjustment object
+ *
+ * Copyright 2008 OpenedHand
+ * Copyright 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by: Chris Lord <chris@openedhand.com>, inspired by GtkAdjustment
+ * Port to Nbtk by: Robert Staudinger <robsta@openedhand.com>
+ *
+ */
+
+#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
+#error "Only <nbtk/nbtk.h> can be included directly.h"
+#endif
+
+#ifndef __NBTK_ADJUSTMENT_H__
+#define __NBTK_ADJUSTMENT_H__
+
+#include <glib-object.h>
+#include <clutter/clutter.h>
+
+G_BEGIN_DECLS
+
+#define NBTK_TYPE_ADJUSTMENT            (nbtk_adjustment_get_type())
+#define NBTK_ADJUSTMENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NBTK_TYPE_ADJUSTMENT, NbtkAdjustment))
+#define NBTK_IS_ADJUSTMENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NBTK_TYPE_ADJUSTMENT))
+#define NBTK_ADJUSTMENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NBTK_TYPE_ADJUSTMENT, NbtkAdjustmentClass))
+#define NBTK_IS_ADJUSTMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NBTK_TYPE_ADJUSTMENT))
+#define NBTK_ADJUSTMENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NBTK_TYPE_ADJUSTMENT, NbtkAdjustmentClass))
+
+typedef struct _NbtkAdjustment          NbtkAdjustment;
+typedef struct _NbtkAdjustmentPrivate   NbtkAdjustmentPrivate;
+typedef struct _NbtkAdjustmentClass     NbtkAdjustmentClass;
+
+/**
+ * NbtkAdjustment:
+ *
+ * Class for handling an interval between to values. The contents of
+ * the #NbtkAdjustment are private and should be accessed using the
+ * public API.
+ */
+struct _NbtkAdjustment
+{
+  /*< private >*/
+  GObject parent_instance;
+
+  NbtkAdjustmentPrivate *priv;
+};
+
+/**
+ * NbtkAdjustmentClass
+ * @changed: Class handler for the ::changed signal.
+ *
+ * Base class for #NbtkAdjustment.
+ */
+struct _NbtkAdjustmentClass
+{
+  /*< private >*/
+  GObjectClass parent_class;
+
+  /*< public >*/
+  void (* changed) (NbtkAdjustment *adjustment);
+};
+
+GType nbtk_adjustment_get_type (void) G_GNUC_CONST;
+
+NbtkAdjustment *nbtk_adjustment_new          (gdouble         value,
+                                              gdouble         lower,
+                                              gdouble         upper,
+                                              gdouble         step_increment,
+                                              gdouble         page_increment,
+                                              gdouble         page_size);
+gdouble         nbtk_adjustment_get_value    (NbtkAdjustment *adjustment);
+void            nbtk_adjustment_set_value    (NbtkAdjustment *adjustment,
+                                              gdouble         value);
+void            nbtk_adjustment_clamp_page   (NbtkAdjustment *adjustment,
+                                              gdouble         lower,
+                                              gdouble         upper);
+void            nbtk_adjustment_set_values   (NbtkAdjustment *adjustment,
+                                              gdouble         value,
+                                              gdouble         lower,
+                                              gdouble         upper,
+                                              gdouble         step_increment,
+                                              gdouble         page_increment,
+                                              gdouble         page_size);
+void            nbtk_adjustment_get_values   (NbtkAdjustment *adjustment,
+                                              gdouble        *value,
+                                              gdouble        *lower,
+                                              gdouble        *upper,
+                                              gdouble        *step_increment,
+                                              gdouble        *page_increment,
+                                              gdouble        *page_size);
+
+void            nbtk_adjustment_interpolate  (NbtkAdjustment *adjustment,
+                                              gdouble         value,
+                                              guint           duration);
+
+gboolean        nbtk_adjustment_get_elastic  (NbtkAdjustment *adjustment);
+void            nbtk_adjustment_set_elastic  (NbtkAdjustment *adjustment,
+                                              gboolean        elastic);
+
+gboolean        nbtk_adjustment_clamp        (NbtkAdjustment *adjustment,
+                                              gboolean        interpolate,
+                                              guint           duration);
+
+G_END_DECLS
+
+#endif /* __NBTK_ADJUSTMENT_H__ */
--- a/src/nbtk/nbtk-bin.c
+++ b/src/nbtk/nbtk-bin.c
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-bin.c: Basic container actor
+ * nbtk-bin.c: Basic container actor
 *
 * Copyright (c) 2009 Intel Corporation.
 *
@ -22,13 +21,13 @@
 */

 /**
- * SECTION:st-bin
+ * SECTION:nbtk-bin
 * @short_description: a simple container with one actor
 *
- * #StBin is a simple container capable of having only one
+ * #NbtkBin is a simple container capable of having only one
 * #ClutterActor as a child.
 *
- * #StBin inherits from #StWidget, so it is fully themable.
+ * #NbtkBin inherits from #NbtkWidget, so it is fully themable.
 */

 #ifdef HAVE_CONFIG_H
@ -37,21 +36,21 @@

 #include <clutter/clutter.h>

-#include "st-bin.h"
-#include "st-enum-types.h"
-#include "st-private.h"
+#include "nbtk-bin.h"
+#include "nbtk-enum-types.h"
+#include "nbtk-private.h"

-#define ST_BIN_GET_PRIVATE(obj)       (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ST_TYPE_BIN, StBinPrivate))
+#define NBTK_BIN_GET_PRIVATE(obj)       (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NBTK_TYPE_BIN, NbtkBinPrivate))

-struct _StBinPrivate
+struct _NbtkBinPrivate
 {
  ClutterActor *child;

-  StAlign       x_align;
-  StAlign       y_align;
+  NbtkAlignment x_align;
+  NbtkAlignment y_align;

-  guint         x_fill : 1;
-  guint         y_fill : 1;
+  guint x_fill : 1;
+  guint y_fill : 1;
 };

 enum
@ -67,29 +66,29 @@ enum

 static void clutter_container_iface_init (ClutterContainerIface *iface);

-G_DEFINE_TYPE_WITH_CODE (StBin, st_bin, ST_TYPE_WIDGET,
+G_DEFINE_TYPE_WITH_CODE (NbtkBin, nbtk_bin, NBTK_TYPE_WIDGET,
                         G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
                                                clutter_container_iface_init));

 void
-_st_bin_get_align_factors (StBin   *bin,
-                           gdouble *x_align,
-                           gdouble *y_align)
+_nbtk_bin_get_align_factors (NbtkBin *bin,
+                             gdouble *x_align,
+                             gdouble *y_align)
 {
-  StBinPrivate *priv = bin->priv;
+  NbtkBinPrivate *priv = bin->priv;
  gdouble factor;

  switch (priv->x_align)
    {
-    case ST_ALIGN_START:
+    case NBTK_ALIGN_LEFT:
      factor = 0.0;
      break;

-    case ST_ALIGN_MIDDLE:
+    case NBTK_ALIGN_CENTER:
      factor = 0.5;
      break;

-    case ST_ALIGN_END:
+    case NBTK_ALIGN_RIGHT:
      factor = 1.0;
      break;

@ -103,15 +102,15 @@ _st_bin_get_align_factors (StBin   *bin,

  switch (priv->y_align)
    {
-    case ST_ALIGN_START:
+    case NBTK_ALIGN_TOP:
      factor = 0.0;
      break;

-    case ST_ALIGN_MIDDLE:
+    case NBTK_ALIGN_CENTER:
      factor = 0.5;
      break;

-    case ST_ALIGN_END:
+    case NBTK_ALIGN_BOTTOM:
      factor = 1.0;
      break;

@ -125,28 +124,28 @@ _st_bin_get_align_factors (StBin   *bin,
 }

 static void
-st_bin_add (ClutterContainer *container,
-            ClutterActor     *actor)
+nbtk_bin_add (ClutterContainer *container,
+              ClutterActor     *actor)
 {
-  st_bin_set_child (ST_BIN (container), actor);
+  nbtk_bin_set_child (NBTK_BIN (container), actor);
 }

 static void
-st_bin_remove (ClutterContainer *container,
-               ClutterActor     *actor)
+nbtk_bin_remove (ClutterContainer *container,
+                 ClutterActor     *actor)
 {
-  StBinPrivate *priv = ST_BIN (container)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (container)->priv;

  if (priv->child == actor)
-    st_bin_set_child (ST_BIN (container), NULL);
+    nbtk_bin_set_child (NBTK_BIN (container), NULL);
 }

 static void
-st_bin_foreach (ClutterContainer *container,
-                ClutterCallback   callback,
-                gpointer          user_data)
+nbtk_bin_foreach (ClutterContainer *container,
+                  ClutterCallback   callback,
+                  gpointer          user_data)
 {
-  StBinPrivate *priv = ST_BIN (container)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (container)->priv;

  if (priv->child)
    callback (priv->child, user_data);
@ -155,18 +154,18 @@ st_bin_foreach (ClutterContainer *container,
 static void
 clutter_container_iface_init (ClutterContainerIface *iface)
 {
-  iface->add = st_bin_add;
-  iface->remove = st_bin_remove;
-  iface->foreach = st_bin_foreach;
+  iface->add = nbtk_bin_add;
+  iface->remove = nbtk_bin_remove;
+  iface->foreach = nbtk_bin_foreach;
 }

 static void
-st_bin_paint (ClutterActor *self)
+nbtk_bin_paint (ClutterActor *self)
 {
-  StBinPrivate *priv = ST_BIN (self)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (self)->priv;

-  /* allow StWidget to paint the background */
-  CLUTTER_ACTOR_CLASS (st_bin_parent_class)->paint (self);
+  /* allow NbtkWidget to paint the background */
+  CLUTTER_ACTOR_CLASS (nbtk_bin_parent_class)->paint (self);

  /* the pain our child */
  if (priv->child)
@ -174,31 +173,31 @@ st_bin_paint (ClutterActor *self)
 }

 static void
-st_bin_pick (ClutterActor       *self,
-             const ClutterColor *pick_color)
+nbtk_bin_pick (ClutterActor       *self,
+               const ClutterColor *pick_color)
 {
-  StBinPrivate *priv = ST_BIN (self)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (self)->priv;

  /* get the default pick implementation */
-  CLUTTER_ACTOR_CLASS (st_bin_parent_class)->pick (self, pick_color);
+  CLUTTER_ACTOR_CLASS (nbtk_bin_parent_class)->pick (self, pick_color);

  if (priv->child)
    clutter_actor_paint (priv->child);
 }

 static void
-st_bin_allocate (ClutterActor          *self,
-                 const ClutterActorBox *box,
-                 ClutterAllocationFlags flags)
+nbtk_bin_allocate (ClutterActor          *self,
+                   const ClutterActorBox *box,
+                   ClutterAllocationFlags flags)
 {
-  StBinPrivate *priv = ST_BIN (self)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (self)->priv;

-  CLUTTER_ACTOR_CLASS (st_bin_parent_class)->allocate (self, box,
-                                                       flags);
+  CLUTTER_ACTOR_CLASS (nbtk_bin_parent_class)->allocate (self, box,
+                                                         flags);

  if (priv->child)
    {
-      StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
+      ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (self));
      gfloat natural_width, natural_height;
      gfloat min_width, min_height;
      gfloat child_width, child_height;
@ -208,9 +207,9 @@ st_bin_allocate (ClutterActor          *self,
      ClutterActorBox allocation = { 0, };
      gdouble x_align, y_align;

-      st_theme_node_get_content_box (theme_node, box, &content_box);
+      shell_theme_node_get_content_box (theme_node, box, &content_box);

-      _st_bin_get_align_factors (ST_BIN (self), &x_align, &y_align);
+      _nbtk_bin_get_align_factors (NBTK_BIN (self), &x_align, &y_align);

      available_width  = content_box.x2 - content_box.x1;
      available_height = content_box.y2 - content_box.y1;
@ -289,20 +288,20 @@ st_bin_allocate (ClutterActor          *self,
 }

 static void
-st_bin_get_preferred_width (ClutterActor *self,
-                            gfloat        for_height,
-                            gfloat       *min_width_p,
-                            gfloat       *natural_width_p)
+nbtk_bin_get_preferred_width (ClutterActor *self,
+                              gfloat   for_height,
+                              gfloat  *min_width_p,
+                              gfloat  *natural_width_p)
 {
-  StBinPrivate *priv = ST_BIN (self)->priv;
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
+  NbtkBinPrivate *priv = NBTK_BIN (self)->priv;
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (self));

-  st_theme_node_adjust_for_height (theme_node, &for_height);
+  shell_theme_node_adjust_for_height (theme_node, &for_height);

  if (priv->child == NULL)
    {
      if (min_width_p)
-        *min_width_p = 0;
+	*min_width_p = 0;

      if (natural_width_p)
        *natural_width_p = 0;
@ -314,19 +313,19 @@ st_bin_get_preferred_width (ClutterActor *self,
                                         natural_width_p);
    }

-  st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
+  shell_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
 }

 static void
-st_bin_get_preferred_height (ClutterActor *self,
-                             gfloat        for_width,
-                             gfloat       *min_height_p,
-                             gfloat       *natural_height_p)
+nbtk_bin_get_preferred_height (ClutterActor *self,
+                               gfloat   for_width,
+                               gfloat  *min_height_p,
+                               gfloat  *natural_height_p)
 {
-  StBinPrivate *priv = ST_BIN (self)->priv;
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (self));
+  NbtkBinPrivate *priv = NBTK_BIN (self)->priv;
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (self));

-  st_theme_node_adjust_for_width (theme_node, &for_width);
+  shell_theme_node_adjust_for_width (theme_node, &for_width);

  if (priv->child == NULL)
    {
@ -343,57 +342,59 @@ st_bin_get_preferred_height (ClutterActor *self,
                                          natural_height_p);
    }

-  st_theme_node_adjust_preferred_height (theme_node, min_height_p, natural_height_p);
+  shell_theme_node_adjust_preferred_height (theme_node, min_height_p, natural_height_p);
 }

 static void
-st_bin_dispose (GObject *gobject)
+nbtk_bin_dispose (GObject *gobject)
 {
-  StBinPrivate *priv = ST_BIN (gobject)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (gobject)->priv;

  if (priv->child)
-    clutter_actor_destroy (priv->child);
-  g_assert (priv->child == NULL);
+    {
+      clutter_actor_unparent (priv->child);
+      priv->child = NULL;
+    }

-  G_OBJECT_CLASS (st_bin_parent_class)->dispose (gobject);
+  G_OBJECT_CLASS (nbtk_bin_parent_class)->dispose (gobject);
 }

 static void
-st_bin_set_property (GObject      *gobject,
-                     guint         prop_id,
-                     const GValue *value,
-                     GParamSpec   *pspec)
+nbtk_bin_set_property (GObject      *gobject,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
-  StBin *bin = ST_BIN (gobject);
+  NbtkBin *bin = NBTK_BIN (gobject);

  switch (prop_id)
    {
    case PROP_CHILD:
-      st_bin_set_child (bin, g_value_get_object (value));
+      nbtk_bin_set_child (bin, g_value_get_object (value));
      break;

    case PROP_X_ALIGN:
-      st_bin_set_alignment (bin,
-                            g_value_get_enum (value),
-                            bin->priv->y_align);
+      nbtk_bin_set_alignment (bin,
+                              g_value_get_enum (value),
+                              bin->priv->y_align);
      break;

    case PROP_Y_ALIGN:
-      st_bin_set_alignment (bin,
-                            bin->priv->x_align,
-                            g_value_get_enum (value));
+      nbtk_bin_set_alignment (bin,
+                              bin->priv->x_align,
+                              g_value_get_enum (value));
      break;

    case PROP_X_FILL:
-      st_bin_set_fill (bin,
-                       g_value_get_boolean (value),
-                       bin->priv->y_fill);
+      nbtk_bin_set_fill (bin,
+                         g_value_get_boolean (value),
+                         bin->priv->y_fill);
      break;

    case PROP_Y_FILL:
-      st_bin_set_fill (bin,
-                       bin->priv->y_fill,
-                       g_value_get_boolean (value));
+      nbtk_bin_set_fill (bin,
+                         bin->priv->y_fill,
+                         g_value_get_boolean (value));
      break;

    default:
@ -402,12 +403,12 @@ st_bin_set_property (GObject      *gobject,
 }

 static void
-st_bin_get_property (GObject    *gobject,
-                     guint       prop_id,
-                     GValue     *value,
-                     GParamSpec *pspec)
+nbtk_bin_get_property (GObject    *gobject,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
 {
-  StBinPrivate *priv = ST_BIN (gobject)->priv;
+  NbtkBinPrivate *priv = NBTK_BIN (gobject)->priv;

  switch (prop_id)
    {
@ -423,78 +424,70 @@ st_bin_get_property (GObject    *gobject,
      g_value_set_boolean (value, priv->y_fill);
      break;

-    case PROP_X_ALIGN:
-      g_value_set_enum (value, priv->x_align);
-      break;
-
-    case PROP_Y_ALIGN:
-      g_value_set_enum (value, priv->y_align);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
    }
 }

 static void
-st_bin_class_init (StBinClass *klass)
+nbtk_bin_class_init (NbtkBinClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
  GParamSpec *pspec;

-  g_type_class_add_private (klass, sizeof (StBinPrivate));
+  g_type_class_add_private (klass, sizeof (NbtkBinPrivate));

-  gobject_class->set_property = st_bin_set_property;
-  gobject_class->get_property = st_bin_get_property;
-  gobject_class->dispose = st_bin_dispose;
+  gobject_class->set_property = nbtk_bin_set_property;
+  gobject_class->get_property = nbtk_bin_get_property;
+  gobject_class->dispose = nbtk_bin_dispose;

-  actor_class->get_preferred_width = st_bin_get_preferred_width;
-  actor_class->get_preferred_height = st_bin_get_preferred_height;
-  actor_class->allocate = st_bin_allocate;
-  actor_class->paint = st_bin_paint;
-  actor_class->pick = st_bin_pick;
+  actor_class->get_preferred_width = nbtk_bin_get_preferred_width;
+  actor_class->get_preferred_height = nbtk_bin_get_preferred_height;
+  actor_class->allocate = nbtk_bin_allocate;
+  actor_class->paint = nbtk_bin_paint;
+  actor_class->pick = nbtk_bin_pick;

  /**
-   * StBin:child:
+   * NbtkBin:child:
   *
-   * The child #ClutterActor of the #StBin container.
+   * The child #ClutterActor of the #NbtkBin container.
   */
  pspec = g_param_spec_object ("child",
                               "Child",
                               "The child of the Bin",
                               CLUTTER_TYPE_ACTOR,
-                               ST_PARAM_READWRITE);
+                               NBTK_PARAM_READWRITE);
  g_object_class_install_property (gobject_class, PROP_CHILD, pspec);

  /**
-   * StBin:x-align:
+   * NbtkBin:x-align:
   *
-   * The horizontal alignment of the #StBin child.
+   * The horizontal alignment of the #NbtkBin child.
   */
  pspec = g_param_spec_enum ("x-align",
                             "X Align",
                             "The horizontal alignment",
-                             ST_TYPE_ALIGN,
-                             ST_ALIGN_MIDDLE,
-                             ST_PARAM_READWRITE);
+                             NBTK_TYPE_ALIGNMENT,
+                             NBTK_ALIGN_CENTER,
+                             NBTK_PARAM_READWRITE);
  g_object_class_install_property (gobject_class, PROP_X_ALIGN, pspec);

  /**
-   * StBin:y-align:
+   * NbtkBin:y-align:
   *
-   * The vertical alignment of the #StBin child.
+   * The vertical alignment of the #NbtkBin child.
   */
  pspec = g_param_spec_enum ("y-align",
                             "Y Align",
                             "The vertical alignment",
-                             ST_TYPE_ALIGN,
-                             ST_ALIGN_MIDDLE,
-                             ST_PARAM_READWRITE);
+                             NBTK_TYPE_ALIGNMENT,
+                             NBTK_ALIGN_CENTER,
+                             NBTK_PARAM_READWRITE);
  g_object_class_install_property (gobject_class, PROP_Y_ALIGN, pspec);

  /**
-   * StBin:x-fill:
+   * NbtkBin:x-fill:
   *
   * Whether the child should fill the horizontal allocation
   */
@ -503,11 +496,11 @@ st_bin_class_init (StBinClass *klass)
                                "Whether the child should fill the "
                                "horizontal allocation",
                                FALSE,
-                                ST_PARAM_READWRITE);
+                                NBTK_PARAM_READWRITE);
  g_object_class_install_property (gobject_class, PROP_X_FILL, pspec);

  /**
-   * StBin:y-fill:
+   * NbtkBin:y-fill:
   *
   * Whether the child should fill the vertical allocation
   */
@ -516,48 +509,48 @@ st_bin_class_init (StBinClass *klass)
                                "Whether the child should fill the "
                                "vertical allocation",
                                FALSE,
-                                ST_PARAM_READWRITE);
+                                NBTK_PARAM_READWRITE);
  g_object_class_install_property (gobject_class, PROP_Y_FILL, pspec);
 }

 static void
-st_bin_init (StBin *bin)
+nbtk_bin_init (NbtkBin *bin)
 {
-  bin->priv = ST_BIN_GET_PRIVATE (bin);
+  bin->priv = NBTK_BIN_GET_PRIVATE (bin);

-  bin->priv->x_align = ST_ALIGN_MIDDLE;
-  bin->priv->y_align = ST_ALIGN_MIDDLE;
+  bin->priv->x_align = NBTK_ALIGN_CENTER;
+  bin->priv->y_align = NBTK_ALIGN_CENTER;
 }

 /**
- * st_bin_new:
+ * nbtk_bin_new:
 *
- * Creates a new #StBin, a simple container for one child.
+ * Creates a new #NbtkBin, a simple container for one child.
 *
- * Return value: the newly created #StBin actor
+ * Return value: the newly created #NbtkBin actor
 */
-StWidget *
-st_bin_new (void)
+NbtkWidget *
+nbtk_bin_new (void)
 {
-  return g_object_new (ST_TYPE_BIN, NULL);
+  return g_object_new (NBTK_TYPE_BIN, NULL);
 }

 /**
- * st_bin_set_child:
- * @bin: a #StBin
- * @child: (allow-none): a #ClutterActor, or %NULL
+ * nbtk_bin_set_child:
+ * @bin: a #NbtkBin
+ * @child: a #ClutterActor, or %NULL
 *
 * Sets @child as the child of @bin.
 *
 * If @bin already has a child, the previous child is removed.
 */
 void
-st_bin_set_child (StBin        *bin,
-                  ClutterActor *child)
+nbtk_bin_set_child (NbtkBin *bin,
+                    ClutterActor *child)
 {
-  StBinPrivate *priv;
+  NbtkBinPrivate *priv;

-  g_return_if_fail (ST_IS_BIN (bin));
+  g_return_if_fail (NBTK_IS_BIN (bin));
  g_return_if_fail (child == NULL || CLUTTER_IS_ACTOR (child));

  priv = bin->priv;
@ -593,39 +586,39 @@ st_bin_set_child (StBin        *bin,
 }

 /**
- * st_bin_get_child:
- * @bin: a #StBin
+ * nbtk_bin_get_child:
+ * @bin: a #NbtkBin
 *
 * Retrieves a pointer to the child of @bin.
 *
 * Return value: (transfer none): a #ClutterActor, or %NULL
 */
 ClutterActor *
-st_bin_get_child (StBin *bin)
+nbtk_bin_get_child (NbtkBin *bin)
 {
-  g_return_val_if_fail (ST_IS_BIN (bin), NULL);
+  g_return_val_if_fail (NBTK_IS_BIN (bin), NULL);

  return bin->priv->child;
 }

 /**
- * st_bin_set_alignment:
- * @bin: a #StBin
+ * nbtk_bin_set_alignment:
+ * @bin: a #NbtkBin
 * @x_align: horizontal alignment
 * @y_align: vertical alignment
 *
 * Sets the horizontal and vertical alignment of the child
- * inside a #StBin.
+ * inside a #NbtkBin.
 */
 void
-st_bin_set_alignment (StBin  *bin,
-                      StAlign x_align,
-                      StAlign y_align)
+nbtk_bin_set_alignment (NbtkBin       *bin,
+                        NbtkAlignment  x_align,
+                        NbtkAlignment  y_align)
 {
-  StBinPrivate *priv;
+  NbtkBinPrivate *priv;
  gboolean changed = FALSE;

-  g_return_if_fail (ST_IS_BIN (bin));
+  g_return_if_fail (NBTK_IS_BIN (bin));

  priv = bin->priv;

@ -652,22 +645,22 @@ st_bin_set_alignment (StBin  *bin,
 }

 /**
- * st_bin_get_alignment:
- * @bin: a #StBin
+ * nbtk_bin_get_alignment:
+ * @bin: a #NbtkBin
 * @x_align: return location for the horizontal alignment, or %NULL
 * @y_align: return location for the vertical alignment, or %NULL
 *
 * Retrieves the horizontal and vertical alignment of the child
- * inside a #StBin, as set by st_bin_set_alignment().
+ * inside a #NbtkBin, as set by nbtk_bin_set_alignment().
 */
 void
-st_bin_get_alignment (StBin   *bin,
-                      StAlign *x_align,
-                      StAlign *y_align)
+nbtk_bin_get_alignment (NbtkBin       *bin,
+                        NbtkAlignment *x_align,
+                        NbtkAlignment *y_align)
 {
-  StBinPrivate *priv;
+  NbtkBinPrivate *priv;

-  g_return_if_fail (ST_IS_BIN (bin));
+  g_return_if_fail (NBTK_IS_BIN (bin));

  priv = bin->priv;

@ -679,8 +672,8 @@ st_bin_get_alignment (StBin   *bin,
 }

 /**
- * st_bin_set_fill:
- * @bin: a #StBin
+ * nbtk_bin_set_fill:
+ * @bin: a #NbtkBin
 * @x_fill: %TRUE if the child should fill horizontally the @bin
 * @y_fill: %TRUE if the child should fill vertically the @bin
 *
@ -688,14 +681,14 @@ st_bin_get_alignment (StBin   *bin,
 * and/or vertical allocation of the parent
 */
 void
-st_bin_set_fill (StBin   *bin,
-                 gboolean x_fill,
-                 gboolean y_fill)
+nbtk_bin_set_fill (NbtkBin  *bin,
+                   gboolean  x_fill,
+                   gboolean  y_fill)
 {
-  StBinPrivate *priv;
+  NbtkBinPrivate *priv;
  gboolean changed = FALSE;

-  g_return_if_fail (ST_IS_BIN (bin));
+  g_return_if_fail (NBTK_IS_BIN (bin));

  priv = bin->priv;

@ -724,19 +717,19 @@ st_bin_set_fill (StBin   *bin,
 }

 /**
- * st_bin_get_fill:
- * @bin: a #StBin
+ * nbtk_bin_get_fill:
+ * @bin: a #NbtkBin
 * @x_fill: (out): return location for the horizontal fill, or %NULL
 * @y_fill: (out): return location for the vertical fill, or %NULL
 *
 * Retrieves the horizontal and vertical fill settings
 */
 void
-st_bin_get_fill (StBin    *bin,
-                 gboolean *x_fill,
-                 gboolean *y_fill)
+nbtk_bin_get_fill (NbtkBin  *bin,
+                   gboolean *x_fill,
+                   gboolean *y_fill)
 {
-  g_return_if_fail (ST_IS_BIN (bin));
+  g_return_if_fail (NBTK_IS_BIN (bin));

  if (x_fill)
    *x_fill = bin->priv->x_fill;
--- a/src/nbtk/nbtk-bin.h
+++ b/src/nbtk/nbtk-bin.h
@ -0,0 +1,92 @@
+/*
+ * nbtk-bin.h: Basic container actor
+ *
+ * Copyright 2009, 2008 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ *
+ * Written by: Emmanuele Bassi <ebassi@linux.intel.com>
+ *
+ */
+
+#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
+#error "Only <nbtk/nbtk.h> can be included directly.h"
+#endif
+
+#ifndef __NBTK_BIN_H__
+#define __NBTK_BIN_H__
+
+#include <nbtk/nbtk-types.h>
+#include <nbtk/nbtk-widget.h>
+
+G_BEGIN_DECLS
+
+#define NBTK_TYPE_BIN                   (nbtk_bin_get_type ())
+#define NBTK_BIN(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), NBTK_TYPE_BIN, NbtkBin))
+#define NBTK_IS_BIN(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NBTK_TYPE_BIN))
+#define NBTK_BIN_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), NBTK_TYPE_BIN, NbtkBinClass))
+#define NBTK_IS_BIN_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), NBTK_TYPE_BIN))
+#define NBTK_BIN_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), NBTK_TYPE_BIN, NbtkBinClass))
+
+typedef struct _NbtkBin                 NbtkBin;
+typedef struct _NbtkBinPrivate          NbtkBinPrivate;
+typedef struct _NbtkBinClass            NbtkBinClass;
+
+/**
+ * NbtkBin:
+ *
+ * The #NbtkBin struct contains only private data
+ */
+struct _NbtkBin
+{
+  /*< private >*/
+  NbtkWidget parent_instance;
+
+  NbtkBinPrivate *priv;
+};
+
+/**
+ * NbtkBinClass:
+ *
+ * The #NbtkBinClass struct contains only private data
+ */
+struct _NbtkBinClass
+{
+  /*< private >*/
+  NbtkWidgetClass parent_class;
+};
+
+GType nbtk_bin_get_type (void) G_GNUC_CONST;
+
+NbtkWidget   *nbtk_bin_new           (void);
+void          nbtk_bin_set_child     (NbtkBin           *bin,
+                                      ClutterActor      *child);
+ClutterActor *nbtk_bin_get_child     (NbtkBin           *bin);
+void          nbtk_bin_set_alignment (NbtkBin           *bin,
+                                      NbtkAlignment      x_align,
+                                      NbtkAlignment      y_align);
+void          nbtk_bin_get_alignment (NbtkBin           *bin,
+                                      NbtkAlignment     *x_align,
+                                      NbtkAlignment     *y_align);
+void          nbtk_bin_set_fill      (NbtkBin           *bin,
+                                      gboolean           x_fill,
+                                      gboolean           y_fill);
+void          nbtk_bin_get_fill      (NbtkBin           *bin,
+                                      gboolean          *x_fill,
+                                      gboolean          *y_fill);
+
+G_END_DECLS
+
+#endif /* __NBTK_BIN_H__ */
--- a/src/nbtk/nbtk-box-layout-child.c
+++ b/src/nbtk/nbtk-box-layout-child.c
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-box-layout-child.c: box layout child actor
+ * nbtk-box-layout-child.c: box layout child actor
 *
 * Copyright 2009 Intel Corporation
 *
@ -20,21 +19,13 @@
 * Written by: Thomas Wood <thomas.wood@intel.com>
 */

-/**
- * SECTION:st-box-layout-child
- * @short_description: meta data associated with a #StBoxLayout child.
- *
- * #StBoxLayoutChild is a #ClutterChildMeta implementation that stores the
- * child properties for children inside a #StBoxLayout.
- */
+#include "nbtk-box-layout-child.h"
+#include "nbtk-private.h"

-#include "st-box-layout-child.h"
-#include "st-private.h"
-
-G_DEFINE_TYPE (StBoxLayoutChild, st_box_layout_child, CLUTTER_TYPE_CHILD_META)
+G_DEFINE_TYPE (NbtkBoxLayoutChild, nbtk_box_layout_child, CLUTTER_TYPE_CHILD_META)

 #define BOX_LAYOUT_CHILD_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), ST_TYPE_BOX_LAYOUT_CHILD, StBoxLayoutChildPrivate))
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), NBTK_TYPE_BOX_LAYOUT_CHILD, NbtkBoxLayoutChildPrivate))


 enum
@ -49,12 +40,10 @@ enum
 };

 static void
-st_box_layout_child_get_property (GObject    *object,
-                                  guint       property_id,
-                                  GValue     *value,
-                                  GParamSpec *pspec)
+nbtk_box_layout_child_get_property (GObject *object, guint property_id,
+                                    GValue *value, GParamSpec *pspec)
 {
-  StBoxLayoutChild *child = ST_BOX_LAYOUT_CHILD (object);
+  NbtkBoxLayoutChild *child = NBTK_BOX_LAYOUT_CHILD (object);

  switch (property_id)
    {
@ -80,13 +69,11 @@ st_box_layout_child_get_property (GObject    *object,
 }

 static void
-st_box_layout_child_set_property (GObject      *object,
-                                  guint         property_id,
-                                  const GValue *value,
-                                  GParamSpec   *pspec)
+nbtk_box_layout_child_set_property (GObject *object, guint property_id,
+                                    const GValue *value, GParamSpec *pspec)
 {
-  StBoxLayoutChild *child = ST_BOX_LAYOUT_CHILD (object);
-  StBoxLayout *box = ST_BOX_LAYOUT (CLUTTER_CHILD_META (object)->container);
+  NbtkBoxLayoutChild *child = NBTK_BOX_LAYOUT_CHILD (object);
+  NbtkBoxLayout *box = NBTK_BOX_LAYOUT (CLUTTER_CHILD_META (object)->container);

  switch (property_id)
    {
@ -114,33 +101,33 @@ st_box_layout_child_set_property (GObject      *object,
 }

 static void
-st_box_layout_child_dispose (GObject *object)
+nbtk_box_layout_child_dispose (GObject *object)
 {
-  G_OBJECT_CLASS (st_box_layout_child_parent_class)->dispose (object);
+  G_OBJECT_CLASS (nbtk_box_layout_child_parent_class)->dispose (object);
 }

 static void
-st_box_layout_child_finalize (GObject *object)
+nbtk_box_layout_child_finalize (GObject *object)
 {
-  G_OBJECT_CLASS (st_box_layout_child_parent_class)->finalize (object);
+  G_OBJECT_CLASS (nbtk_box_layout_child_parent_class)->finalize (object);
 }

 static void
-st_box_layout_child_class_init (StBoxLayoutChildClass *klass)
+nbtk_box_layout_child_class_init (NbtkBoxLayoutChildClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GParamSpec *pspec;

-  object_class->get_property = st_box_layout_child_get_property;
-  object_class->set_property = st_box_layout_child_set_property;
-  object_class->dispose = st_box_layout_child_dispose;
-  object_class->finalize = st_box_layout_child_finalize;
+  object_class->get_property = nbtk_box_layout_child_get_property;
+  object_class->set_property = nbtk_box_layout_child_set_property;
+  object_class->dispose = nbtk_box_layout_child_dispose;
+  object_class->finalize = nbtk_box_layout_child_finalize;


  pspec = g_param_spec_boolean ("expand", "Expand",
                                "Allocate the child extra space",
                                FALSE,
-                                ST_PARAM_READWRITE);
+                                NBTK_PARAM_READWRITE);
  g_object_class_install_property (object_class, PROP_EXPAND, pspec);

  pspec = g_param_spec_boolean ("x-fill", "x-fill",
@ -148,7 +135,7 @@ st_box_layout_child_class_init (StBoxLayoutChildClass *klass)
                                "when the container is allocating spare space "
                                "on the horizontal axis",
                                TRUE,
-                                ST_PARAM_READWRITE);
+                                NBTK_PARAM_READWRITE);
  g_object_class_install_property (object_class, PROP_X_FILL, pspec);

  pspec = g_param_spec_boolean ("y-fill", "y-fill",
@ -156,35 +143,34 @@ st_box_layout_child_class_init (StBoxLayoutChildClass *klass)
                                "when the container is allocating spare space "
                                "on the vertical axis",
                                TRUE,
-                                ST_PARAM_READWRITE);
+                                NBTK_PARAM_READWRITE);
  g_object_class_install_property (object_class, PROP_Y_FILL, pspec);

  pspec = g_param_spec_enum ("x-align",
                             "X Alignment",
                             "X alignment of the widget within the cell",
-                             ST_TYPE_ALIGN,
-                             ST_ALIGN_MIDDLE,
-                             ST_PARAM_READWRITE);
+                             NBTK_TYPE_ALIGN,
+                             NBTK_ALIGN_MIDDLE,
+                             NBTK_PARAM_READWRITE);
  g_object_class_install_property (object_class, PROP_X_ALIGN, pspec);

  pspec = g_param_spec_enum ("y-align",
                             "Y Alignment",
                             "Y alignment of the widget within the cell",
-                             ST_TYPE_ALIGN,
-                             ST_ALIGN_MIDDLE,
-                             ST_PARAM_READWRITE);
+                             NBTK_TYPE_ALIGN,
+                             NBTK_ALIGN_MIDDLE,
+                             NBTK_PARAM_READWRITE);
  g_object_class_install_property (object_class, PROP_Y_ALIGN, pspec);
 }

 static void
-st_box_layout_child_init (StBoxLayoutChild *self)
+nbtk_box_layout_child_init (NbtkBoxLayoutChild *self)
 {
  self->expand = FALSE;

  self->x_fill = TRUE;
  self->y_fill = TRUE;

-  self->x_align = ST_ALIGN_MIDDLE;
-  self->y_align = ST_ALIGN_MIDDLE;
+  self->x_align = NBTK_ALIGN_CENTER;
+  self->y_align = NBTK_ALIGN_CENTER;
 }
-
--- a/src/nbtk/nbtk-box-layout-child.h
+++ b/src/nbtk/nbtk-box-layout-child.h
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-box-layout-child.h: box layout child actor
+ * nbtk-box-layout-child.h: box layout child actor
 *
 * Copyright 2009 Intel Corporation
 *
@ -20,48 +19,48 @@
 * Written by: Thomas Wood <thomas.wood@intel.com>
 */

-#ifndef _ST_BOX_LAYOUT_CHILD_H
-#define _ST_BOX_LAYOUT_CHILD_H
+#ifndef _NBTK_BOX_LAYOUT_CHILD_H
+#define _NBTK_BOX_LAYOUT_CHILD_H

 #include <clutter/clutter.h>
-#include "st-enum-types.h"
-#include "st-box-layout.h"
+#include "nbtk-enum-types.h"
+#include "nbtk-box-layout.h"

 G_BEGIN_DECLS

-#define ST_TYPE_BOX_LAYOUT_CHILD st_box_layout_child_get_type()
+#define NBTK_TYPE_BOX_LAYOUT_CHILD nbtk_box_layout_child_get_type()

-#define ST_BOX_LAYOUT_CHILD(obj) \
+#define NBTK_BOX_LAYOUT_CHILD(obj) \
  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  ST_TYPE_BOX_LAYOUT_CHILD, StBoxLayoutChild))
+  NBTK_TYPE_BOX_LAYOUT_CHILD, NbtkBoxLayoutChild))

-#define ST_BOX_LAYOUT_CHILD_CLASS(klass) \
+#define NBTK_BOX_LAYOUT_CHILD_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  ST_TYPE_BOX_LAYOUT_CHILD, StBoxLayoutChildClass))
+  NBTK_TYPE_BOX_LAYOUT_CHILD, NbtkBoxLayoutChildClass))

-#define ST_IS_BOX_LAYOUT_CHILD(obj) \
+#define NBTK_IS_BOX_LAYOUT_CHILD(obj) \
  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  ST_TYPE_BOX_LAYOUT_CHILD))
+  NBTK_TYPE_BOX_LAYOUT_CHILD))

-#define ST_IS_BOX_LAYOUT_CHILD_CLASS(klass) \
+#define NBTK_IS_BOX_LAYOUT_CHILD_CLASS(klass) \
  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  ST_TYPE_BOX_LAYOUT_CHILD))
+  NBTK_TYPE_BOX_LAYOUT_CHILD))

-#define ST_BOX_LAYOUT_CHILD_GET_CLASS(obj) \
+#define NBTK_BOX_LAYOUT_CHILD_GET_CLASS(obj) \
  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  ST_TYPE_BOX_LAYOUT_CHILD, StBoxLayoutChildClass))
+  NBTK_TYPE_BOX_LAYOUT_CHILD, NbtkBoxLayoutChildClass))

-typedef struct _StBoxLayoutChild StBoxLayoutChild;
-typedef struct _StBoxLayoutChildClass StBoxLayoutChildClass;
-typedef struct _StBoxLayoutChildPrivate StBoxLayoutChildPrivate;
+typedef struct _NbtkBoxLayoutChild NbtkBoxLayoutChild;
+typedef struct _NbtkBoxLayoutChildClass NbtkBoxLayoutChildClass;
+typedef struct _NbtkBoxLayoutChildPrivate NbtkBoxLayoutChildPrivate;

 /**
- * StBoxLayoutChild:
+ * NbtkBoxLayoutChild:
 *
 * The contents of this structure are private and should only be accessed
 * through the public API.
 */
-struct _StBoxLayoutChild
+struct _NbtkBoxLayoutChild
 {
  /*< private >*/
  ClutterChildMeta parent;
@ -69,17 +68,17 @@ struct _StBoxLayoutChild
  gboolean expand;
  gboolean x_fill : 1;
  gboolean y_fill : 1;
-  StAlign x_align;
-  StAlign y_align;
+  NbtkAlign x_align;
+  NbtkAlign y_align;
 };

-struct _StBoxLayoutChildClass
+struct _NbtkBoxLayoutChildClass
 {
  ClutterChildMetaClass parent_class;
 };

-GType st_box_layout_child_get_type (void);
+GType nbtk_box_layout_child_get_type (void);

 G_END_DECLS

-#endif /* _ST_BOX_LAYOUT_CHILD_H */
+#endif /* _NBTK_BOX_LAYOUT_CHILD_H */
--- a/src/nbtk/nbtk-box-layout.c
+++ b/src/nbtk/nbtk-box-layout.c
--- a/src/nbtk/nbtk-box-layout.h
+++ b/src/nbtk/nbtk-box-layout.h
@ -0,0 +1,91 @@
+/*
+ * nbtk-box-layout.h: box layout actor
+ *
+ * Copyright 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by: Thomas Wood <thomas.wood@intel.com>
+ *
+ */
+
+
+#ifndef _NBTK_BOX_LAYOUT_H
+#define _NBTK_BOX_LAYOUT_H
+
+#include <nbtk/nbtk-widget.h>
+
+G_BEGIN_DECLS
+
+#define NBTK_TYPE_BOX_LAYOUT nbtk_box_layout_get_type()
+
+#define NBTK_BOX_LAYOUT(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  NBTK_TYPE_BOX_LAYOUT, NbtkBoxLayout))
+
+#define NBTK_BOX_LAYOUT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  NBTK_TYPE_BOX_LAYOUT, NbtkBoxLayoutClass))
+
+#define NBTK_IS_BOX_LAYOUT(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  NBTK_TYPE_BOX_LAYOUT))
+
+#define NBTK_IS_BOX_LAYOUT_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  NBTK_TYPE_BOX_LAYOUT))
+
+#define NBTK_BOX_LAYOUT_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  NBTK_TYPE_BOX_LAYOUT, NbtkBoxLayoutClass))
+
+typedef struct _NbtkBoxLayout NbtkBoxLayout;
+typedef struct _NbtkBoxLayoutClass NbtkBoxLayoutClass;
+typedef struct _NbtkBoxLayoutPrivate NbtkBoxLayoutPrivate;
+
+/**
+ * NbtkBoxLayout:
+ *
+ * The contents of this structure are private and should only be accessed
+ * through the public API.
+ */
+struct _NbtkBoxLayout
+{
+  /*< private >*/
+  NbtkWidget parent;
+
+  NbtkBoxLayoutPrivate *priv;
+};
+
+struct _NbtkBoxLayoutClass
+{
+  NbtkWidgetClass parent_class;
+};
+
+GType nbtk_box_layout_get_type (void);
+
+NbtkWidget *nbtk_box_layout_new (void);
+
+void nbtk_box_layout_set_vertical (NbtkBoxLayout *box, gboolean vertical);
+gboolean nbtk_box_layout_get_vertical (NbtkBoxLayout *box);
+
+void nbtk_box_layout_set_pack_start (NbtkBoxLayout *box, gboolean pack_start);
+gboolean nbtk_box_layout_get_pack_start (NbtkBoxLayout *box);
+
+void nbtk_box_layout_set_spacing (NbtkBoxLayout *box, guint spacing);
+guint nbtk_box_layout_get_spacing (NbtkBoxLayout *box);
+
+G_END_DECLS
+
+#endif /* _NBTK_BOX_LAYOUT_H */
--- a/src/nbtk/nbtk-button.c
+++ b/src/nbtk/nbtk-button.c
@ -0,0 +1,690 @@
+/*-button.c: Plain button actor
+ * Copyright 2007 OpenedHand
+ * Copyright , 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by: Emmanuele Bassi <ebassi@openedhand.com>
+ *             Thomas Wood <thomas@linux.intel.com>
+ *
+ */
+
+/**
+ * SECTION:nbtk-button
+ * @short_description: Button widget
+ *
+ * A button widget with support for either a text label or icon, toggle mode
+ * and transitions effects between states.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include <clutter/clutter.h>
+
+#include "nbtk-button.h"
+
+#include "nbtk-marshal.h"
+#include "nbtk-texture-frame.h"
+#include "nbtk-texture-cache.h"
+#include "nbtk-private.h"
+
+enum
+{
+  PROP_0,
+
+  PROP_LABEL,
+  PROP_TOGGLE,
+  PROP_ACTIVE,
+  PROP_TRANSITION
+};
+
+enum
+{
+  CLICKED,
+
+  LAST_SIGNAL
+};
+
+#define NBTK_BUTTON_GET_PRIVATE(obj)    \
+        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NBTK_TYPE_BUTTON, NbtkButtonPrivate))
+
+struct _NbtkButtonPrivate
+{
+  gchar *text;
+
+  ClutterActor *old_bg;
+  gboolean old_bg_parented; /* TRUE if we have adopted old_bg */
+
+  guint8 old_opacity;
+
+  guint is_pressed : 1;
+  guint is_hover : 1;
+  guint is_checked : 1;
+  guint is_toggle : 1;
+
+  gint transition_duration;
+
+  ClutterAnimation *animation;
+
+  gint spacing;
+};
+
+static guint button_signals[LAST_SIGNAL] = { 0, };
+
+G_DEFINE_TYPE (NbtkButton, nbtk_button, NBTK_TYPE_BIN);
+
+static void
+nbtk_button_update_label_style (NbtkButton *button)
+{
+  ClutterActor *label;
+  ShellThemeNode *theme_node;
+  ClutterColor color;
+  const PangoFontDescription *font;
+  gchar *font_string = NULL;
+
+  label = nbtk_bin_get_child ((NbtkBin*) button);
+
+  /* check the child is really a label */
+  if (!CLUTTER_IS_TEXT (label))
+    return;
+
+  theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (button));
+
+  shell_theme_node_get_foreground_color (theme_node, &color);
+  clutter_text_set_color (CLUTTER_TEXT (label), &color);
+
+  font = shell_theme_node_get_font (theme_node);
+  font_string = pango_font_description_to_string (font);
+  clutter_text_set_font_name (CLUTTER_TEXT (label), font_string);
+  g_free (font_string);
+}
+
+static void
+nbtk_button_dispose_old_bg (NbtkButton *button)
+{
+  NbtkButtonPrivate *priv = button->priv;
+
+  if (priv->old_bg)
+    {
+      if (priv->old_bg_parented)
+        {
+          clutter_actor_unparent (priv->old_bg);
+          priv->old_bg_parented = FALSE;
+        }
+      g_object_unref (priv->old_bg);
+      priv->old_bg = NULL;
+    }
+}
+
+static void
+nbtk_animation_completed (ClutterAnimation  *animation,
+                          NbtkButton        *button)
+{
+  nbtk_button_dispose_old_bg (button);
+}
+
+static void
+nbtk_button_style_changed (NbtkWidget *widget)
+{
+  NbtkButton *button = NBTK_BUTTON (widget);
+  NbtkButtonPrivate *priv = button->priv;
+  NbtkButtonClass *button_class = NBTK_BUTTON_GET_CLASS (button);
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (button));
+  ClutterActor *bg_image;
+  double spacing;
+
+  nbtk_button_dispose_old_bg (button);
+
+  bg_image = nbtk_widget_get_border_image ((NbtkWidget*) button);
+  if (bg_image)
+    button->priv->old_bg = g_object_ref (bg_image);
+
+  NBTK_WIDGET_CLASS (nbtk_button_parent_class)->style_changed (widget);
+
+  spacing = 6;
+  shell_theme_node_get_length (theme_node, "border-spacing", FALSE, &spacing);
+  priv->spacing = round (spacing);
+
+  /* update the label styling */
+  nbtk_button_update_label_style (button);
+
+  /* run a transition if applicable */
+  if (button_class->transition)
+    {
+      button_class->transition (button, priv->old_bg);
+    }
+  else
+    {
+      if (priv->old_bg &&
+          (!nbtk_widget_get_style_pseudo_class (widget)))
+        {
+          ClutterAnimation *animation;
+          if (!clutter_actor_get_parent (priv->old_bg))
+            {
+              clutter_actor_set_parent (priv->old_bg, (ClutterActor*) widget);
+              priv->old_bg_parented = TRUE;
+            }
+          if (priv->transition_duration > 0)
+            {
+              animation = clutter_actor_animate (priv->old_bg,
+                                                 CLUTTER_LINEAR,
+                                                 priv->transition_duration,
+                                                 "opacity", 0,
+                                                 NULL);
+              g_signal_connect (animation, "completed",
+                                G_CALLBACK (nbtk_animation_completed), button);
+            }
+          else
+            {
+              nbtk_button_dispose_old_bg (button);
+            }
+
+        }
+    }
+}
+
+static void
+nbtk_button_real_pressed (NbtkButton *button)
+{
+  nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "active");
+}
+
+static void
+nbtk_button_real_released (NbtkButton *button)
+{
+  NbtkButtonPrivate *priv = button->priv;
+
+  if (priv->is_checked)
+    nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "checked");
+  else if (!priv->is_hover)
+    nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, NULL);
+  else
+    nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "hover");
+
+}
+
+static gboolean
+nbtk_button_button_press (ClutterActor       *actor,
+                          ClutterButtonEvent *event)
+{
+  nbtk_widget_hide_tooltip (NBTK_WIDGET (actor));
+
+  if (event->button == 1)
+    {
+      NbtkButton *button = NBTK_BUTTON (actor);
+      NbtkButtonClass *klass = NBTK_BUTTON_GET_CLASS (button);
+
+      button->priv->is_pressed = TRUE;
+
+      clutter_grab_pointer (actor);
+
+      if (klass->pressed)
+        klass->pressed (button);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+nbtk_button_button_release (ClutterActor       *actor,
+                            ClutterButtonEvent *event)
+{
+  if (event->button == 1)
+    {
+      NbtkButton *button = NBTK_BUTTON (actor);
+      NbtkButtonClass *klass = NBTK_BUTTON_GET_CLASS (button);
+
+      if (!button->priv->is_pressed)
+        return FALSE;
+
+      clutter_ungrab_pointer ();
+
+      if (button->priv->is_toggle)
+        {
+          nbtk_button_set_checked (button, !button->priv->is_checked);
+        }
+
+      button->priv->is_pressed = FALSE;
+
+      if (klass->released)
+        klass->released (button);
+
+      g_signal_emit (button, button_signals[CLICKED], 0);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+nbtk_button_enter (ClutterActor         *actor,
+                   ClutterCrossingEvent *event)
+{
+  NbtkButton *button = NBTK_BUTTON (actor);
+
+  if (!button->priv->is_checked)
+    nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "hover");
+
+  button->priv->is_hover = 1;
+
+  return CLUTTER_ACTOR_CLASS (nbtk_button_parent_class)->enter_event (actor, event);
+}
+
+static gboolean
+nbtk_button_leave (ClutterActor         *actor,
+                   ClutterCrossingEvent *event)
+{
+  NbtkButton *button = NBTK_BUTTON (actor);
+
+  button->priv->is_hover = 0;
+
+  if (button->priv->is_pressed)
+    {
+      NbtkButtonClass *klass = NBTK_BUTTON_GET_CLASS (button);
+
+      clutter_ungrab_pointer ();
+
+      button->priv->is_pressed = FALSE;
+
+      if (klass->released)
+        klass->released (button);
+    }
+
+  if (button->priv->is_checked)
+    nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "checked");
+  else
+    nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, NULL);
+
+  return CLUTTER_ACTOR_CLASS (nbtk_button_parent_class)->leave_event (actor, event);
+}
+
+static void
+nbtk_button_set_property (GObject      *gobject,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
+{
+  NbtkButton *button = NBTK_BUTTON (gobject);
+  NbtkButtonPrivate *priv = NBTK_BUTTON (gobject)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_LABEL:
+      nbtk_button_set_label (button, g_value_get_string (value));
+      break;
+    case PROP_TOGGLE:
+      nbtk_button_set_toggle_mode (button, g_value_get_boolean (value));
+      break;
+    case PROP_ACTIVE:
+      nbtk_button_set_checked (button, g_value_get_boolean (value));
+      break;
+    case PROP_TRANSITION:
+      priv->transition_duration = g_value_get_int (value);
+      break;
+
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+nbtk_button_get_property (GObject    *gobject,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
+{
+  NbtkButtonPrivate *priv = NBTK_BUTTON (gobject)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_LABEL:
+      g_value_set_string (value, priv->text);
+      break;
+    case PROP_TOGGLE:
+      g_value_set_boolean (value, priv->is_toggle);
+      break;
+    case PROP_ACTIVE:
+      g_value_set_boolean (value, priv->is_checked);
+      break;
+    case PROP_TRANSITION:
+      g_value_set_int (value, priv->transition_duration);
+      break;
+
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+nbtk_button_finalize (GObject *gobject)
+{
+  NbtkButtonPrivate *priv = NBTK_BUTTON (gobject)->priv;
+
+  g_free (priv->text);
+
+  G_OBJECT_CLASS (nbtk_button_parent_class)->finalize (gobject);
+}
+
+static void
+nbtk_button_dispose (GObject *gobject)
+{
+  nbtk_button_dispose_old_bg (NBTK_BUTTON (gobject));
+
+  G_OBJECT_CLASS (nbtk_button_parent_class)->dispose (gobject);
+}
+
+static void
+nbtk_button_map (ClutterActor *self)
+{
+  NbtkButtonPrivate *priv = NBTK_BUTTON (self)->priv;
+
+  CLUTTER_ACTOR_CLASS (nbtk_button_parent_class)->map (self);
+
+  if (priv->old_bg && priv->old_bg_parented)
+    clutter_actor_map (priv->old_bg);
+}
+
+static void
+nbtk_button_unmap (ClutterActor *self)
+{
+  NbtkButtonPrivate *priv = NBTK_BUTTON (self)->priv;
+
+  CLUTTER_ACTOR_CLASS (nbtk_button_parent_class)->unmap (self);
+
+  if (priv->old_bg && priv->old_bg_parented)
+    clutter_actor_unmap (priv->old_bg);
+}
+
+static void
+nbtk_button_draw_background (NbtkWidget         *widget)
+{
+  NbtkButtonPrivate *priv;
+
+  NBTK_WIDGET_CLASS (nbtk_button_parent_class)->draw_background (widget);
+
+  priv = NBTK_BUTTON (widget)->priv;
+
+  if (priv->old_bg && priv->old_bg_parented)
+      clutter_actor_paint (priv->old_bg);
+}
+
+static void
+nbtk_button_class_init (NbtkButtonClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+  NbtkWidgetClass *widget_class = NBTK_WIDGET_CLASS (klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private (klass, sizeof (NbtkButtonPrivate));
+
+  klass->pressed = nbtk_button_real_pressed;
+  klass->released = nbtk_button_real_released;
+
+  gobject_class->set_property = nbtk_button_set_property;
+  gobject_class->get_property = nbtk_button_get_property;
+  gobject_class->dispose = nbtk_button_dispose;
+  gobject_class->finalize = nbtk_button_finalize;
+
+  actor_class->button_press_event = nbtk_button_button_press;
+  actor_class->button_release_event = nbtk_button_button_release;
+  actor_class->enter_event = nbtk_button_enter;
+  actor_class->leave_event = nbtk_button_leave;
+
+  actor_class->map = nbtk_button_map;
+  actor_class->unmap = nbtk_button_unmap;
+
+  widget_class->draw_background = nbtk_button_draw_background;
+  widget_class->style_changed = nbtk_button_style_changed;
+
+  pspec = g_param_spec_string ("label",
+                               "Label",
+                               "Label of the button",
+                               NULL, G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_LABEL, pspec);
+
+  pspec = g_param_spec_boolean ("toggle-mode",
+                                "Toggle Mode",
+                                "Enable or disable toggling",
+                                FALSE, G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_TOGGLE, pspec);
+
+  pspec = g_param_spec_boolean ("checked",
+                                "Checked",
+                                "Indicates if a toggle button is \"on\""
+                                " or \"off\"",
+                                FALSE, G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_ACTIVE, pspec);
+
+  pspec = g_param_spec_int ("transition-duration",
+                            "Transition Duration",
+                            "Duration of the state transition effect",
+                            0, G_MAXINT, 120, G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_TRANSITION, pspec);
+
+
+  /**
+   * NbtkButton::clicked:
+   * @button: the object that received the signal
+   *
+   * Emitted when the user activates the button, either with a mouse press and
+   * release or with the keyboard.
+   */
+
+  button_signals[CLICKED] =
+    g_signal_new ("clicked",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (NbtkButtonClass, clicked),
+                  NULL, NULL,
+                  _nbtk_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
+}
+
+static void
+nbtk_button_init (NbtkButton *button)
+{
+  button->priv = NBTK_BUTTON_GET_PRIVATE (button);
+  button->priv->transition_duration = 120;
+  button->priv->spacing = 6;
+
+  clutter_actor_set_reactive ((ClutterActor *) button, TRUE);
+}
+
+/**
+ * nbtk_button_new:
+ *
+ * Create a new button
+ *
+ * Returns: a new #NbtkButton
+ */
+NbtkWidget *
+nbtk_button_new (void)
+{
+  return g_object_new (NBTK_TYPE_BUTTON, NULL);
+}
+
+/**
+ * nbtk_button_new_with_label:
+ * @text: text to set the label to
+ *
+ * Create a new #NbtkButton with the specified label
+ *
+ * Returns: a new #NbtkButton
+ */
+NbtkWidget *
+nbtk_button_new_with_label (const gchar *text)
+{
+  return g_object_new (NBTK_TYPE_BUTTON, "label", text, NULL);
+}
+
+/**
+ * nbtk_button_get_label:
+ * @button: a #NbtkButton
+ *
+ * Get the text displayed on the button
+ *
+ * Returns: the text for the button. This must not be freed by the application
+ */
+G_CONST_RETURN gchar *
+nbtk_button_get_label (NbtkButton *button)
+{
+  g_return_val_if_fail (NBTK_IS_BUTTON (button), NULL);
+
+  return button->priv->text;
+}
+
+/**
+ * nbtk_button_set_label:
+ * @button: a #Nbtkbutton
+ * @text: text to set the label to
+ *
+ * Sets the text displayed on the button
+ */
+void
+nbtk_button_set_label (NbtkButton  *button,
+                       const gchar *text)
+{
+  NbtkButtonPrivate *priv;
+  ClutterActor *label;
+
+  g_return_if_fail (NBTK_IS_BUTTON (button));
+
+  priv = button->priv;
+
+  g_free (priv->text);
+
+  if (text)
+    priv->text = g_strdup (text);
+  else
+    priv->text = g_strdup ("");
+
+  label = nbtk_bin_get_child ((NbtkBin*) button);
+
+  if (label && CLUTTER_IS_TEXT (label))
+    {
+      clutter_text_set_text (CLUTTER_TEXT (label), priv->text);
+    }
+  else
+    {
+      label = g_object_new (CLUTTER_TYPE_TEXT,
+                            "text", priv->text,
+                            "line-alignment", PANGO_ALIGN_CENTER,
+                            "ellipsize", PANGO_ELLIPSIZE_END,
+                            "use-markup", TRUE,
+                            NULL);
+      nbtk_bin_set_child ((NbtkBin*) button, label);
+    }
+
+  /* Fake a style change so that we reset the style properties on the label */
+  nbtk_widget_style_changed (NBTK_WIDGET (button));
+
+  g_object_notify (G_OBJECT (button), "label");
+}
+
+/**
+ * nbtk_button_get_toggle_mode:
+ * @button: a #NbtkButton
+ *
+ * Get the toggle mode status of the button.
+ *
+ * Returns: #TRUE if toggle mode is set, otherwise #FALSE
+ */
+gboolean
+nbtk_button_get_toggle_mode (NbtkButton *button)
+{
+  g_return_val_if_fail (NBTK_IS_BUTTON (button), FALSE);
+
+  return button->priv->is_toggle;
+}
+
+/**
+ * nbtk_button_set_toggle_mode:
+ * @button: a #Nbtkbutton
+ * @toggle: #TRUE or #FALSE
+ *
+ * Enables or disables toggle mode for the button. In toggle mode, the active
+ * state will be "toggled" when the user clicks the button.
+ */
+void
+nbtk_button_set_toggle_mode (NbtkButton  *button,
+                             gboolean     toggle)
+{
+  g_return_if_fail (NBTK_IS_BUTTON (button));
+
+  button->priv->is_toggle = toggle;
+
+  g_object_notify (G_OBJECT (button), "toggle-mode");
+}
+
+/**
+ * nbtk_button_get_checked:
+ * @button: a #NbtkButton
+ *
+ * Get the state of the button that is in toggle mode.
+ *
+ * Returns: #TRUE if the button is checked, or #FALSE if not
+ */
+gboolean
+nbtk_button_get_checked (NbtkButton *button)
+{
+  g_return_val_if_fail (NBTK_IS_BUTTON (button), FALSE);
+
+  return button->priv->is_checked;
+}
+
+/**
+ * nbtk_button_set_checked:
+ * @button: a #Nbtkbutton
+ * @checked: #TRUE or #FALSE
+ *
+ * Sets the pressed state of the button. This is only really useful if the
+ * button has #toggle-mode mode set to #TRUE.
+ */
+void
+nbtk_button_set_checked (NbtkButton  *button,
+                         gboolean     checked)
+{
+  g_return_if_fail (NBTK_IS_BUTTON (button));
+
+  if (button->priv->is_checked != checked)
+    {
+      button->priv->is_checked = checked;
+
+      if (checked)
+        nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "checked");
+      else
+        if (button->priv->is_hover)
+          nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, "hover");
+        else
+          nbtk_widget_set_style_pseudo_class ((NbtkWidget*) button, NULL);
+    }
+
+  g_object_notify (G_OBJECT (button), "checked");
+}
--- a/src/nbtk/nbtk-button.h
+++ b/src/nbtk/nbtk-button.h
@ -0,0 +1,90 @@
+/*
+ * nbtk-button.h: Plain button actor
+ *
+ * Copyright 2007 OpenedHand
+ * Copyright 2008, 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ *
+ * Written by: Emmanuele Bassi <ebassi@openedhand.com>
+ *             Thomas Wood <thomas@linux.intel.com>
+ *
+ */
+
+#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
+#error "Only <nbtk/nbtk.h> can be included directly.h"
+#endif
+
+#ifndef __NBTK_BUTTON_H__
+#define __NBTK_BUTTON_H__
+
+G_BEGIN_DECLS
+
+#include <nbtk/nbtk-bin.h>
+
+#define NBTK_TYPE_BUTTON                (nbtk_button_get_type ())
+#define NBTK_BUTTON(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), NBTK_TYPE_BUTTON, NbtkButton))
+#define NBTK_IS_BUTTON(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NBTK_TYPE_BUTTON))
+#define NBTK_BUTTON_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), NBTK_TYPE_BUTTON, NbtkButtonClass))
+#define NBTK_IS_BUTTON_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), NBTK_TYPE_BUTTON))
+#define NBTK_BUTTON_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), NBTK_TYPE_BUTTON, NbtkButtonClass))
+
+typedef struct _NbtkButton              NbtkButton;
+typedef struct _NbtkButtonPrivate       NbtkButtonPrivate;
+typedef struct _NbtkButtonClass         NbtkButtonClass;
+
+/**
+ * NbtkButton:
+ *
+ * The contents of this structure is private and should only be accessed using
+ * the provided API.
+ */
+
+struct _NbtkButton
+{
+  /*< private >*/
+  NbtkBin parent_instance;
+
+  NbtkButtonPrivate *priv;
+};
+
+struct _NbtkButtonClass
+{
+  NbtkBinClass parent_class;
+
+  /* vfuncs, not signals */
+  void (* pressed)  (NbtkButton *button);
+  void (* released) (NbtkButton *button);
+  void (* transition) (NbtkButton *button, ClutterActor *old_bg);
+
+  /* signals */
+  void (* clicked) (NbtkButton *button);
+};
+
+GType nbtk_button_get_type (void) G_GNUC_CONST;
+
+NbtkWidget *          nbtk_button_new            (void);
+NbtkWidget *          nbtk_button_new_with_label (const gchar  *text);
+G_CONST_RETURN gchar *nbtk_button_get_label      (NbtkButton   *button);
+void                  nbtk_button_set_label      (NbtkButton   *button,
+                                                  const gchar  *text);
+void                  nbtk_button_set_toggle_mode    (NbtkButton *button, gboolean toggle);
+gboolean              nbtk_button_get_toggle_mode    (NbtkButton *button);
+void                  nbtk_button_set_checked        (NbtkButton *button, gboolean checked);
+gboolean              nbtk_button_get_checked        (NbtkButton *button);
+
+G_END_DECLS
+
+#endif /* __NBTK_BUTTON_H__ */
--- a/src/nbtk/nbtk-clipboard.c
+++ b/src/nbtk/nbtk-clipboard.c
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-clipboard.c: clipboard object
+ * nbtk-clipboard.c: clipboard object
 *
 * Copyright 2009 Intel Corporation.
 *
@ -21,42 +20,33 @@
 *
 */

-/**
- * SECTION:st-clipboard
- * @short_description: a simple representation of the X clipboard
- *
- * #StCliboard is a very simple object representation of the clipboard
- * available to applications. Text is always assumed to be UTF-8 and non-text
- * items are not handled.
- */

-
-#include "st-clipboard.h"
+#include "nbtk-clipboard.h"
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <clutter/x11/clutter-x11.h>
 #include <string.h>

-G_DEFINE_TYPE (StClipboard, st_clipboard, G_TYPE_OBJECT)
+G_DEFINE_TYPE (NbtkClipboard, nbtk_clipboard, G_TYPE_OBJECT)

 #define CLIPBOARD_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), ST_TYPE_CLIPBOARD, StClipboardPrivate))
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), NBTK_TYPE_CLIPBOARD, NbtkClipboardPrivate))

-struct _StClipboardPrivate
+struct _NbtkClipboardPrivate
 {
  Window clipboard_window;
  gchar *clipboard_text;

-  Atom  *supported_targets;
-  gint   n_targets;
+  Atom *supported_targets;
+  gint n_targets;
 };

 typedef struct _EventFilterData EventFilterData;
 struct _EventFilterData
 {
-  StClipboard            *clipboard;
-  StClipboardCallbackFunc callback;
-  gpointer                user_data;
+  NbtkClipboard *clipboard;
+  NbtkClipboardCallbackFunc callback;
+  gpointer user_data;
 };

 static Atom __atom_clip = None;
@ -64,10 +54,8 @@ static Atom __utf8_string = None;
 static Atom __atom_targets = None;

 static void
-st_clipboard_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
+nbtk_clipboard_get_property (GObject *object, guint property_id,
+                              GValue *value, GParamSpec *pspec)
 {
  switch (property_id)
    {
@ -77,10 +65,8 @@ st_clipboard_get_property (GObject    *object,
 }

 static void
-st_clipboard_set_property (GObject      *object,
-                           guint         property_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
+nbtk_clipboard_set_property (GObject *object, guint property_id,
+                              const GValue *value, GParamSpec *pspec)
 {
  switch (property_id)
    {
@ -90,15 +76,15 @@ st_clipboard_set_property (GObject      *object,
 }

 static void
-st_clipboard_dispose (GObject *object)
+nbtk_clipboard_dispose (GObject *object)
 {
-  G_OBJECT_CLASS (st_clipboard_parent_class)->dispose (object);
+  G_OBJECT_CLASS (nbtk_clipboard_parent_class)->dispose (object);
 }

 static void
-st_clipboard_finalize (GObject *object)
+nbtk_clipboard_finalize (GObject *object)
 {
-  StClipboardPrivate *priv = ((StClipboard *) object)->priv;
+  NbtkClipboardPrivate *priv = ((NbtkClipboard *) object)->priv;

  g_free (priv->clipboard_text);
  priv->clipboard_text = NULL;
@ -107,13 +93,13 @@ st_clipboard_finalize (GObject *object)
  priv->supported_targets = NULL;
  priv->n_targets = 0;

-  G_OBJECT_CLASS (st_clipboard_parent_class)->finalize (object);
+  G_OBJECT_CLASS (nbtk_clipboard_parent_class)->finalize (object);
 }

 static ClutterX11FilterReturn
-st_clipboard_provider (XEvent       *xev,
-                       ClutterEvent *cev,
-                       StClipboard  *clipboard)
+nbtk_clipboard_provider (XEvent        *xev,
+                         ClutterEvent  *cev,
+                         NbtkClipboard *clipboard)
 {
  XSelectionEvent notify_event;
  XSelectionRequestEvent *req_event;
@ -173,23 +159,23 @@ st_clipboard_provider (XEvent       *xev,


 static void
-st_clipboard_class_init (StClipboardClass *klass)
+nbtk_clipboard_class_init (NbtkClipboardClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);

-  g_type_class_add_private (klass, sizeof (StClipboardPrivate));
+  g_type_class_add_private (klass, sizeof (NbtkClipboardPrivate));

-  object_class->get_property = st_clipboard_get_property;
-  object_class->set_property = st_clipboard_set_property;
-  object_class->dispose = st_clipboard_dispose;
-  object_class->finalize = st_clipboard_finalize;
+  object_class->get_property = nbtk_clipboard_get_property;
+  object_class->set_property = nbtk_clipboard_set_property;
+  object_class->dispose = nbtk_clipboard_dispose;
+  object_class->finalize = nbtk_clipboard_finalize;
 }

 static void
-st_clipboard_init (StClipboard *self)
+nbtk_clipboard_init (NbtkClipboard *self)
 {
  Display *dpy;
-  StClipboardPrivate *priv;
+  NbtkClipboardPrivate *priv;

  priv = self->priv = CLIPBOARD_PRIVATE (self);

@ -216,14 +202,14 @@ st_clipboard_init (StClipboard *self)
  priv->supported_targets[0] = __utf8_string;
  priv->supported_targets[1] = __atom_targets;

-  clutter_x11_add_filter ((ClutterX11FilterFunc) st_clipboard_provider,
+  clutter_x11_add_filter ((ClutterX11FilterFunc) nbtk_clipboard_provider,
                          self);
 }

 static ClutterX11FilterReturn
-st_clipboard_x11_event_filter (XEvent          *xev,
-                               ClutterEvent    *cev,
-                               EventFilterData *filter_data)
+nbtk_clipboard_x11_event_filter (XEvent          *xev,
+                                 ClutterEvent    *cev,
+                                 EventFilterData *filter_data)
 {
  Atom actual_type;
  int actual_format, result;
@ -240,7 +226,7 @@ st_clipboard_x11_event_filter (XEvent          *xev,
                             NULL,
                             filter_data->user_data);

-      clutter_x11_remove_filter ((ClutterX11FilterFunc) st_clipboard_x11_event_filter,
+      clutter_x11_remove_filter ((ClutterX11FilterFunc) nbtk_clipboard_x11_event_filter,
                                 filter_data);
      g_free (filter_data);
      return CLUTTER_X11_FILTER_REMOVE;
@ -270,8 +256,8 @@ st_clipboard_x11_event_filter (XEvent          *xev,
                         filter_data->user_data);

  clutter_x11_remove_filter
-                          ((ClutterX11FilterFunc) st_clipboard_x11_event_filter,
-                          filter_data);
+                    ((ClutterX11FilterFunc) nbtk_clipboard_x11_event_filter,
+                     filter_data);

  g_free (filter_data);

@ -282,29 +268,29 @@ st_clipboard_x11_event_filter (XEvent          *xev,
 }

 /**
- * st_clipboard_get_default:
+ * nbtk_clipboard_get_default:
 *
- * Get the global #StClipboard object that represents the clipboard.
+ * Get the global #NbtkClipboard object that represents the clipboard.
 *
- * Returns: (transfer none): a #StClipboard owned by St and must not be
+ * Returns: (transfer none): a #NbtkClipboard owned by Nbtk and must not be
 * unrefferenced or freed.
 */
-StClipboard*
-st_clipboard_get_default (void)
+NbtkClipboard*
+nbtk_clipboard_get_default (void)
 {
-  static StClipboard *default_clipboard = NULL;
+  static NbtkClipboard *default_clipboard = NULL;

  if (!default_clipboard)
    {
-      default_clipboard = g_object_new (ST_TYPE_CLIPBOARD, NULL);
+      default_clipboard = g_object_new (NBTK_TYPE_CLIPBOARD, NULL);
    }

  return default_clipboard;
 }

 /**
- * st_clipboard_get_text:
- * @clipboard: A #StCliboard
+ * nbtk_clipboard_get_text:
+ * @clipboard: A #NbtkCliboard
 * @callback: function to be called when the text is retreived
 * @user_data: data to be passed to the callback
 *
@ -313,15 +299,15 @@ st_clipboard_get_default (void)
 *
 */
 void
-st_clipboard_get_text (StClipboard            *clipboard,
-                       StClipboardCallbackFunc callback,
-                       gpointer                user_data)
+nbtk_clipboard_get_text (NbtkClipboard             *clipboard,
+                         NbtkClipboardCallbackFunc  callback,
+                         gpointer                   user_data)
 {
  EventFilterData *data;

  Display *dpy;

-  g_return_if_fail (ST_IS_CLIPBOARD (clipboard));
+  g_return_if_fail (NBTK_IS_CLIPBOARD (clipboard));
  g_return_if_fail (callback != NULL);

  data = g_new0 (EventFilterData, 1);
@ -329,7 +315,7 @@ st_clipboard_get_text (StClipboard            *clipboard,
  data->callback = callback;
  data->user_data = user_data;

-  clutter_x11_add_filter ((ClutterX11FilterFunc) st_clipboard_x11_event_filter,
+  clutter_x11_add_filter ((ClutterX11FilterFunc)nbtk_clipboard_x11_event_filter,
                          data);

  dpy = clutter_x11_get_default_display ();
@ -346,21 +332,21 @@ st_clipboard_get_text (StClipboard            *clipboard,
 }

 /**
- * st_clipboard_set_text:
- * @clipboard: A #StClipboard
+ * nbtk_clipboard_set_text:
+ * @clipboard: A #NbtkClipboard
 * @text: text to copy to the clipboard
 *
 * Sets text as the current contents of the clipboard.
 *
 */
 void
-st_clipboard_set_text (StClipboard *clipboard,
-                       const gchar *text)
+nbtk_clipboard_set_text (NbtkClipboard *clipboard,
+                         const gchar   *text)
 {
-  StClipboardPrivate *priv;
+  NbtkClipboardPrivate *priv;
  Display *dpy;

-  g_return_if_fail (ST_IS_CLIPBOARD (clipboard));
+  g_return_if_fail (NBTK_IS_CLIPBOARD (clipboard));
  g_return_if_fail (text != NULL);

  priv = clipboard->priv;
--- a/src/nbtk/nbtk-clipboard.h
+++ b/src/nbtk/nbtk-clipboard.h
@ -0,0 +1,94 @@
+/*
+ * nbtk-clipboard.h: clipboard object
+ *
+ * Copyright 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by: Thomas Wood <thomas.wood@intel.com>
+ *
+ */
+
+#ifndef _NBTK_CLIPBOARD_H
+#define _NBTK_CLIPBOARD_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define NBTK_TYPE_CLIPBOARD nbtk_clipboard_get_type()
+
+#define NBTK_CLIPBOARD(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+  NBTK_TYPE_CLIPBOARD, NbtkClipboard))
+
+#define NBTK_CLIPBOARD_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+  NBTK_TYPE_CLIPBOARD, NbtkClipboardClass))
+
+#define NBTK_IS_CLIPBOARD(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+  NBTK_TYPE_CLIPBOARD))
+
+#define NBTK_IS_CLIPBOARD_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+  NBTK_TYPE_CLIPBOARD))
+
+#define NBTK_CLIPBOARD_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+  NBTK_TYPE_CLIPBOARD, NbtkClipboardClass))
+
+typedef struct _NbtkClipboard NbtkClipboard;
+typedef struct _NbtkClipboardClass NbtkClipboardClass;
+typedef struct _NbtkClipboardPrivate NbtkClipboardPrivate;
+
+/**
+ * NbtkClipboard:
+ *
+ * The contents of this structure is private and should only be accessed using
+ * the provided API.
+ */
+struct _NbtkClipboard
+{
+  /*< private >*/
+  GObject parent;
+  NbtkClipboardPrivate *priv;
+};
+
+struct _NbtkClipboardClass
+{
+  GObjectClass parent_class;
+};
+
+/**
+ * NbtkClipboardCallbackFunc:
+ * @clipboard: A #NbtkClipboard
+ * @text: text from the clipboard
+ * @user_data: user data
+ *
+ * Callback function called when text is retrieved from the clipboard.
+ */
+typedef void (*NbtkClipboardCallbackFunc) (NbtkClipboard *clipboard,
+                                           const gchar   *text,
+                                           gpointer       user_data);
+
+GType nbtk_clipboard_get_type (void);
+
+NbtkClipboard* nbtk_clipboard_get_default (void);
+void nbtk_clipboard_get_text (NbtkClipboard *clipboard, NbtkClipboardCallbackFunc callback, gpointer user_data);
+void nbtk_clipboard_set_text (NbtkClipboard *clipboard, const gchar *text);
+
+G_END_DECLS
+
+#endif /* _NBTK_CLIPBOARD_H */
--- a/src/nbtk/nbtk-entry.c
+++ b/src/nbtk/nbtk-entry.c
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-entry.c: Plain entry actor
+ * nbtk-entry.c: Plain entry actor
 *
 * Copyright 2008, 2009 Intel Corporation
 *
@ -22,15 +21,15 @@
 */

 /**
- * SECTION:st-entry
+ * SECTION:nbtk-entry
 * @short_description: Widget for displaying text
 *
- * #StEntry is a simple widget for displaying text. It derives from
- * #StWidget to add extra style and placement functionality over
+ * #NbtkEntry is a simple widget for displaying text. It derives from
+ * #NbtkWidget to add extra style and placement functionality over
 * #ClutterText. The internal #ClutterText is publicly accessibly to allow
 * applications to set further properties.
 *
- * #StEntry supports the following pseudo style states:
+ * #NbtkEntry supports the following pseudo style states:
 * <itemizedlist>
 *  <listitem>
 *   <para>focus: the widget has focus</para>
@ -53,14 +52,14 @@
 #include <glib.h>

 #include <clutter/clutter.h>
+#include <clutter-imcontext/clutter-imtext.h>

-#include "st-entry.h"
+#include "nbtk-entry.h"

-#include "st-im-text.h"
-#include "st-widget.h"
-#include "st-texture-cache.h"
-#include "st-marshal.h"
-#include "st-clipboard.h"
+#include "nbtk-widget.h"
+#include "nbtk-texture-cache.h"
+#include "nbtk-marshal.h"
+#include "nbtk-clipboard.h"

 #define HAS_FOCUS(actor) (clutter_actor_get_stage (actor) && clutter_stage_get_key_focus ((ClutterStage *) clutter_actor_get_stage (actor)) == actor)

@ -84,11 +83,11 @@ enum
  LAST_SIGNAL
 };

-#define ST_ENTRY_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ST_TYPE_ENTRY, StEntryPrivate))
-#define ST_ENTRY_PRIV(x) ((StEntry *) x)->priv
+#define NBTK_ENTRY_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NBTK_TYPE_ENTRY, NbtkEntryPrivate))
+#define NBTK_ENTRY_PRIV(x) ((NbtkEntry *) x)->priv


-struct _StEntryPrivate
+struct _NbtkEntryPrivate
 {
  ClutterActor *entry;
  gchar        *hint;
@ -96,29 +95,29 @@ struct _StEntryPrivate
  ClutterActor *primary_icon;
  ClutterActor *secondary_icon;

-  gfloat        spacing;
+  gfloat   spacing;
 };

 static guint entry_signals[LAST_SIGNAL] = { 0, };

-G_DEFINE_TYPE (StEntry, st_entry, ST_TYPE_WIDGET);
+G_DEFINE_TYPE (NbtkEntry, nbtk_entry, NBTK_TYPE_WIDGET);

 static void
-st_entry_set_property (GObject      *gobject,
-                       guint         prop_id,
-                       const GValue *value,
-                       GParamSpec   *pspec)
+nbtk_entry_set_property (GObject      *gobject,
+                         guint         prop_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
 {
-  StEntry *entry = ST_ENTRY (gobject);
+  NbtkEntry *entry = NBTK_ENTRY (gobject);

  switch (prop_id)
    {
    case PROP_HINT_TEXT:
-      st_entry_set_hint_text (entry, g_value_get_string (value));
+      nbtk_entry_set_hint_text (entry, g_value_get_string (value));
      break;

    case PROP_TEXT:
-      st_entry_set_text (entry, g_value_get_string (value));
+      nbtk_entry_set_text (entry, g_value_get_string (value));
      break;

    default:
@ -128,12 +127,12 @@ st_entry_set_property (GObject      *gobject,
 }

 static void
-st_entry_get_property (GObject    *gobject,
-                       guint       prop_id,
-                       GValue     *value,
-                       GParamSpec *pspec)
+nbtk_entry_get_property (GObject    *gobject,
+                         guint       prop_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (gobject);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (gobject);

  switch (prop_id)
    {
@ -156,65 +155,65 @@ st_entry_get_property (GObject    *gobject,
 }

 static void
-st_entry_dispose (GObject *object)
+nbtk_entry_dispose (GObject *object)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (object);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (object);

  if (priv->entry)
    {
-      clutter_actor_destroy (priv->entry);
+      clutter_actor_unparent (priv->entry);
      priv->entry = NULL;
    }
 }

 static void
-st_entry_finalize (GObject *object)
+nbtk_entry_finalize (GObject *object)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (object);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (object);

  g_free (priv->hint);
  priv->hint = NULL;
 }

 static void
-st_entry_style_changed (StWidget *self)
+nbtk_entry_style_changed (NbtkWidget *self)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (self);
-  StThemeNode *theme_node;
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (self);
+  ShellThemeNode *theme_node;
  ClutterColor color;
  const PangoFontDescription *font;
  gchar *font_string;

-  theme_node = st_widget_get_theme_node (self);
- 
-  st_theme_node_get_foreground_color (theme_node, &color);
+  theme_node = nbtk_widget_get_theme_node (self);
+
+  shell_theme_node_get_foreground_color (theme_node, &color);
  clutter_text_set_color (CLUTTER_TEXT (priv->entry), &color);

-  if (st_theme_node_get_color (theme_node, "caret-color", FALSE, &color))
-    clutter_text_set_cursor_color (CLUTTER_TEXT (priv->entry), &color);
+  if (shell_theme_node_get_color (theme_node, "caret-color", FALSE, &color))
+      clutter_text_set_cursor_color (CLUTTER_TEXT (priv->entry), &color);

-  if (st_theme_node_get_color (theme_node, "selection-background-color", FALSE, &color))
+  if (shell_theme_node_get_color (theme_node, "selection-background-color", FALSE, &color))
    clutter_text_set_selection_color (CLUTTER_TEXT (priv->entry), &color);

-  font = st_theme_node_get_font (theme_node);
+  font = shell_theme_node_get_font (theme_node);
  font_string = pango_font_description_to_string (font);
  clutter_text_set_font_name (CLUTTER_TEXT (priv->entry), font_string);
  g_free (font_string);

-  ST_WIDGET_CLASS (st_entry_parent_class)->style_changed (self);
+  NBTK_WIDGET_CLASS (nbtk_entry_parent_class)->style_changed (self);
 }

 static void
-st_entry_get_preferred_width (ClutterActor *actor,
-                              gfloat        for_height,
-                              gfloat       *min_width_p,
-                              gfloat       *natural_width_p)
+nbtk_entry_get_preferred_width (ClutterActor *actor,
+                                gfloat   for_height,
+                                gfloat  *min_width_p,
+                                gfloat  *natural_width_p)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (actor));
  gfloat icon_w;

-  st_theme_node_adjust_for_height (theme_node, &for_height);
+  shell_theme_node_adjust_for_height (theme_node, &for_height);

  clutter_actor_get_preferred_width (priv->entry, for_height,
                                     min_width_p,
@ -243,20 +242,20 @@ st_entry_get_preferred_width (ClutterActor *actor,
        *natural_width_p += icon_w + priv->spacing;
    }

-  st_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
+  shell_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
 }

 static void
-st_entry_get_preferred_height (ClutterActor *actor,
-                               gfloat        for_width,
-                               gfloat       *min_height_p,
-                               gfloat       *natural_height_p)
+nbtk_entry_get_preferred_height (ClutterActor *actor,
+                                 gfloat   for_width,
+                                 gfloat  *min_height_p,
+                                 gfloat  *natural_height_p)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (actor));
  gfloat icon_h;

-  st_theme_node_adjust_for_width (theme_node, &for_width);
+  shell_theme_node_adjust_for_width (theme_node, &for_width);

  clutter_actor_get_preferred_height (priv->entry, for_width,
                                      min_height_p,
@ -286,25 +285,25 @@ st_entry_get_preferred_height (ClutterActor *actor,
        *natural_height_p = icon_h;
    }

-  st_theme_node_adjust_preferred_height (theme_node, min_height_p, natural_height_p);
+  shell_theme_node_adjust_preferred_height (theme_node, min_height_p, natural_height_p);
 }

 static void
-st_entry_allocate (ClutterActor          *actor,
-                   const ClutterActorBox *box,
-                   ClutterAllocationFlags flags)
+nbtk_entry_allocate (ClutterActor          *actor,
+                     const ClutterActorBox *box,
+                     ClutterAllocationFlags flags)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
-  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (actor));
  ClutterActorClass *parent_class;
  ClutterActorBox content_box, child_box, icon_box;
  gfloat icon_w, icon_h;
  gfloat entry_h, min_h, pref_h, avail_h;

-  parent_class = CLUTTER_ACTOR_CLASS (st_entry_parent_class);
+  parent_class = CLUTTER_ACTOR_CLASS (nbtk_entry_parent_class);
  parent_class->allocate (actor, box, flags);

-  st_theme_node_get_content_box (theme_node, box, &content_box);
+  shell_theme_node_get_content_box (theme_node, box, &content_box);

  avail_h = content_box.y2 - content_box.y1;

@ -365,10 +364,10 @@ st_entry_allocate (ClutterActor          *actor,
 }

 static void
-clutter_text_focus_in_cb (ClutterText  *text,
+clutter_text_focus_in_cb (ClutterText *text,
                          ClutterActor *actor)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);

  /* remove the hint if visible */
  if (priv->hint
@ -376,7 +375,7 @@ clutter_text_focus_in_cb (ClutterText  *text,
    {
      clutter_text_set_text (text, "");
    }
-  st_widget_set_style_pseudo_class (ST_WIDGET (actor), "focus");
+  nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (actor), "focus");
  clutter_text_set_cursor_visible (text, TRUE);
 }

@ -384,28 +383,28 @@ static void
 clutter_text_focus_out_cb (ClutterText  *text,
                           ClutterActor *actor)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);

  /* add a hint if the entry is empty */
  if (priv->hint && !strcmp (clutter_text_get_text (text), ""))
    {
      clutter_text_set_text (text, priv->hint);
-      st_widget_set_style_pseudo_class (ST_WIDGET (actor), "indeterminate");
+      nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (actor), "indeterminate");
    }
  else
    {
-      st_widget_set_style_pseudo_class (ST_WIDGET (actor), NULL);
+      nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (actor), NULL);
    }
  clutter_text_set_cursor_visible (text, FALSE);
 }

 static void
-st_entry_paint (ClutterActor *actor)
+nbtk_entry_paint (ClutterActor *actor)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);
  ClutterActorClass *parent_class;

-  parent_class = CLUTTER_ACTOR_CLASS (st_entry_parent_class);
+  parent_class = CLUTTER_ACTOR_CLASS (nbtk_entry_parent_class);
  parent_class->paint (actor);

  clutter_actor_paint (priv->entry);
@ -418,12 +417,12 @@ st_entry_paint (ClutterActor *actor)
 }

 static void
-st_entry_pick (ClutterActor       *actor,
-               const ClutterColor *c)
+nbtk_entry_pick (ClutterActor *actor,
+                 const ClutterColor *c)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);

-  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->pick (actor, c);
+  CLUTTER_ACTOR_CLASS (nbtk_entry_parent_class)->pick (actor, c);

  clutter_actor_paint (priv->entry);

@ -435,11 +434,11 @@ st_entry_pick (ClutterActor       *actor,
 }

 static void
-st_entry_map (ClutterActor *actor)
+nbtk_entry_map (ClutterActor *actor)
 {
-  StEntryPrivate *priv = ST_ENTRY (actor)->priv;
+  NbtkEntryPrivate *priv = NBTK_ENTRY (actor)->priv;

-  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->map (actor);
+  CLUTTER_ACTOR_CLASS (nbtk_entry_parent_class)->map (actor);

  clutter_actor_map (priv->entry);

@ -451,11 +450,11 @@ st_entry_map (ClutterActor *actor)
 }

 static void
-st_entry_unmap (ClutterActor *actor)
+nbtk_entry_unmap (ClutterActor *actor)
 {
-  StEntryPrivate *priv = ST_ENTRY (actor)->priv;
+  NbtkEntryPrivate *priv = NBTK_ENTRY (actor)->priv;

-  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->unmap (actor);
+  CLUTTER_ACTOR_CLASS (nbtk_entry_parent_class)->unmap (actor);

  clutter_actor_unmap (priv->entry);

@ -467,11 +466,11 @@ st_entry_unmap (ClutterActor *actor)
 }

 static void
-st_entry_clipboard_callback (StClipboard *clipboard,
-                             const gchar *text,
-                             gpointer     data)
+nbtk_entry_clipboard_callback (NbtkClipboard *clipboard,
+                               const gchar   *text,
+                               gpointer       data)
 {
-  ClutterText *ctext = (ClutterText*)((StEntry *) data)->priv->entry;
+  ClutterText *ctext = (ClutterText*) ((NbtkEntry *) data)->priv->entry;
  gint cursor_pos;

  if (!text)
@ -486,10 +485,10 @@ st_entry_clipboard_callback (StClipboard *clipboard,
 }

 static gboolean
-st_entry_key_press_event (ClutterActor    *actor,
-                          ClutterKeyEvent *event)
+nbtk_entry_key_press_event (ClutterActor    *actor,
+                            ClutterKeyEvent *event)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);

  /* This is expected to handle events that were emitted for the inner
     ClutterText. They only reach this function if the ClutterText
@ -499,11 +498,11 @@ st_entry_key_press_event (ClutterActor    *actor,
  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
      && event->keyval == CLUTTER_v)
    {
-      StClipboard *clipboard;
+      NbtkClipboard *clipboard;

-      clipboard = st_clipboard_get_default ();
+      clipboard = nbtk_clipboard_get_default ();

-      st_clipboard_get_text (clipboard, st_entry_clipboard_callback, actor);
+      nbtk_clipboard_get_text (clipboard, nbtk_entry_clipboard_callback, actor);

      return TRUE;
    }
@ -512,15 +511,15 @@ st_entry_key_press_event (ClutterActor    *actor,
  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
      && event->keyval == CLUTTER_c)
    {
-      StClipboard *clipboard;
+      NbtkClipboard *clipboard;
      gchar *text;

-      clipboard = st_clipboard_get_default ();
+      clipboard = nbtk_clipboard_get_default ();

      text = clutter_text_get_selection ((ClutterText*) priv->entry);

      if (text && strlen (text))
-        st_clipboard_set_text (clipboard, text);
+        nbtk_clipboard_set_text (clipboard, text);

      return TRUE;
    }
@ -530,16 +529,16 @@ st_entry_key_press_event (ClutterActor    *actor,
  if ((event->modifier_state & CLUTTER_CONTROL_MASK)
      && event->keyval == CLUTTER_x)
    {
-      StClipboard *clipboard;
+      NbtkClipboard *clipboard;
      gchar *text;

-      clipboard = st_clipboard_get_default ();
+      clipboard = nbtk_clipboard_get_default ();

      text = clutter_text_get_selection ((ClutterText*) priv->entry);

      if (text && strlen (text))
        {
-          st_clipboard_set_text (clipboard, text);
+          nbtk_clipboard_set_text (clipboard, text);

          /* now delete the text */
          clutter_text_delete_selection ((ClutterText *) priv->entry);
@ -552,9 +551,9 @@ st_entry_key_press_event (ClutterActor    *actor,
 }

 static void
-st_entry_key_focus_in (ClutterActor *actor)
+nbtk_entry_key_focus_in (ClutterActor *actor)
 {
-  StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
+  NbtkEntryPrivate *priv = NBTK_ENTRY_PRIV (actor);

  /* We never want key focus. The ClutterText should be given first
     pass for all key events */
@ -562,32 +561,32 @@ st_entry_key_focus_in (ClutterActor *actor)
 }

 static void
-st_entry_class_init (StEntryClass *klass)
+nbtk_entry_class_init (NbtkEntryClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-  StWidgetClass *widget_class = ST_WIDGET_CLASS (klass);
+  NbtkWidgetClass *widget_class = NBTK_WIDGET_CLASS (klass);
  GParamSpec *pspec;

-  g_type_class_add_private (klass, sizeof (StEntryPrivate));
+  g_type_class_add_private (klass, sizeof (NbtkEntryPrivate));

-  gobject_class->set_property = st_entry_set_property;
-  gobject_class->get_property = st_entry_get_property;
-  gobject_class->finalize = st_entry_finalize;
-  gobject_class->dispose = st_entry_dispose;
+  gobject_class->set_property = nbtk_entry_set_property;
+  gobject_class->get_property = nbtk_entry_get_property;
+  gobject_class->finalize = nbtk_entry_finalize;
+  gobject_class->dispose = nbtk_entry_dispose;

-  actor_class->get_preferred_width = st_entry_get_preferred_width;
-  actor_class->get_preferred_height = st_entry_get_preferred_height;
-  actor_class->allocate = st_entry_allocate;
-  actor_class->paint = st_entry_paint;
-  actor_class->pick = st_entry_pick;
-  actor_class->map = st_entry_map;
-  actor_class->unmap = st_entry_unmap;
+  actor_class->get_preferred_width = nbtk_entry_get_preferred_width;
+  actor_class->get_preferred_height = nbtk_entry_get_preferred_height;
+  actor_class->allocate = nbtk_entry_allocate;
+  actor_class->paint = nbtk_entry_paint;
+  actor_class->pick = nbtk_entry_pick;
+  actor_class->map = nbtk_entry_map;
+  actor_class->unmap = nbtk_entry_unmap;

-  actor_class->key_press_event = st_entry_key_press_event;
-  actor_class->key_focus_in = st_entry_key_focus_in;
+  actor_class->key_press_event = nbtk_entry_key_press_event;
+  actor_class->key_focus_in = nbtk_entry_key_focus_in;

-  widget_class->style_changed = st_entry_style_changed;
+  widget_class->style_changed = nbtk_entry_style_changed;

  pspec = g_param_spec_object ("clutter-text",
 			       "Clutter Text",
@ -611,7 +610,7 @@ st_entry_class_init (StEntryClass *klass)

  /* signals */
  /**
-   * StEntry::primary-icon-clicked:
+   * NbtkEntry::primary-icon-clicked:
   *
   * Emitted when the primary icon is clicked
   */
@ -619,12 +618,12 @@ st_entry_class_init (StEntryClass *klass)
    g_signal_new ("primary-icon-clicked",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (StEntryClass, primary_icon_clicked),
+                  G_STRUCT_OFFSET (NbtkEntryClass, primary_icon_clicked),
                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  _nbtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
  /**
-   * StEntry::secondary-icon-clicked:
+   * NbtkEntry::secondary-icon-clicked:
   *
   * Emitted when the secondary icon is clicked
   */
@ -632,20 +631,20 @@ st_entry_class_init (StEntryClass *klass)
    g_signal_new ("secondary-icon-clicked",
                  G_TYPE_FROM_CLASS (klass),
                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (StEntryClass, secondary_icon_clicked),
+                  G_STRUCT_OFFSET (NbtkEntryClass, secondary_icon_clicked),
                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  _nbtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }

 static void
-st_entry_init (StEntry *entry)
+nbtk_entry_init (NbtkEntry *entry)
 {
-  StEntryPrivate *priv;
+  NbtkEntryPrivate *priv;

-  priv = entry->priv = ST_ENTRY_GET_PRIVATE (entry);
+  priv = entry->priv = NBTK_ENTRY_GET_PRIVATE (entry);

-  priv->entry = g_object_new (ST_TYPE_IM_TEXT,
+  priv->entry = g_object_new (CLUTTER_TYPE_IMTEXT,
                              "line-alignment", PANGO_ALIGN_LEFT,
                              "editable", TRUE,
                              "reactive", TRUE,
@ -668,20 +667,20 @@ st_entry_init (StEntry *entry)
 }

 /**
- * st_entry_new:
+ * nbtk_entry_new:
 * @text: text to set the entry to
 *
- * Create a new #StEntry with the specified entry
+ * Create a new #NbtkEntry with the specified entry
 *
- * Returns: a new #StEntry
+ * Returns: a new #NbtkEntry
 */
-StWidget *
-st_entry_new (const gchar *text)
+NbtkWidget *
+nbtk_entry_new (const gchar *text)
 {
-  StWidget *entry;
+  NbtkWidget *entry;

  /* add the entry to the stage, but don't allow it to be visible */
-  entry = g_object_new (ST_TYPE_ENTRY,
+  entry = g_object_new (NBTK_TYPE_ENTRY,
                        "text", text,
                        NULL);

@ -689,35 +688,35 @@ st_entry_new (const gchar *text)
 }

 /**
- * st_entry_get_text:
- * @entry: a #StEntry
+ * nbtk_entry_get_text:
+ * @entry: a #NbtkEntry
 *
 * Get the text displayed on the entry
 *
 * Returns: the text for the entry. This must not be freed by the application
 */
 G_CONST_RETURN gchar *
-st_entry_get_text (StEntry *entry)
+nbtk_entry_get_text (NbtkEntry *entry)
 {
-  g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
+  g_return_val_if_fail (NBTK_IS_ENTRY (entry), NULL);

  return clutter_text_get_text (CLUTTER_TEXT (entry->priv->entry));
 }

 /**
- * st_entry_set_text:
- * @entry: a #StEntry
+ * nbtk_entry_set_text:
+ * @entry: a #NbtkEntry
 * @text: text to set the entry to
 *
 * Sets the text displayed on the entry
 */
 void
-st_entry_set_text (StEntry     *entry,
-                   const gchar *text)
+nbtk_entry_set_text (NbtkEntry *entry,
+                     const gchar *text)
 {
-  StEntryPrivate *priv;
+  NbtkEntryPrivate *priv;

-  g_return_if_fail (ST_IS_ENTRY (entry));
+  g_return_if_fail (NBTK_IS_ENTRY (entry));

  priv = entry->priv;

@ -727,14 +726,14 @@ st_entry_set_text (StEntry     *entry,
      && !HAS_FOCUS (priv->entry))
    {
      text = priv->hint;
-      st_widget_set_style_pseudo_class (ST_WIDGET (entry), "indeterminate");
+      nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (entry), "indeterminate");
    }
  else
    {
      if (HAS_FOCUS (priv->entry))
-        st_widget_set_style_pseudo_class (ST_WIDGET (entry), "focus");
+        nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (entry), "focus");
      else
-        st_widget_set_style_pseudo_class (ST_WIDGET (entry), NULL);
+        nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (entry), NULL);
    }

  clutter_text_set_text (CLUTTER_TEXT (priv->entry), text);
@ -743,25 +742,25 @@ st_entry_set_text (StEntry     *entry,
 }

 /**
- * st_entry_get_clutter_text:
- * @entry: a #StEntry
+ * nbtk_entry_get_clutter_text:
+ * @entry: a #NbtkEntry
 *
 * Retrieve the internal #ClutterText so that extra parameters can be set
 *
- * Returns: (transfer none): the #ClutterText used by #StEntry. The entry is
- * owned by the #StEntry and should not be unref'ed by the application.
+ * Returns: (transfer none): the #ClutterText used by #NbtkEntry. The entry is
+ * owned by the #NbtkEntry and should not be unref'ed by the application.
 */
 ClutterActor*
-st_entry_get_clutter_text (StEntry *entry)
+nbtk_entry_get_clutter_text (NbtkEntry *entry)
 {
-  g_return_val_if_fail (ST_ENTRY (entry), NULL);
+  g_return_val_if_fail (NBTK_ENTRY (entry), NULL);

  return entry->priv->entry;
 }

 /**
- * st_entry_set_hint_text:
- * @entry: a #StEntry
+ * nbtk_entry_set_hint_text:
+ * @entry: a #NbtkEntry
 * @text: text to set as the entry hint
 *
 * Sets the text to display when the entry is empty and unfocused. When the
@ -769,12 +768,12 @@ st_entry_get_clutter_text (StEntry *entry)
 * A value of NULL unsets the hint.
 */
 void
-st_entry_set_hint_text (StEntry     *entry,
-                        const gchar *text)
+nbtk_entry_set_hint_text (NbtkEntry *entry,
+                          const gchar *text)
 {
-  StEntryPrivate *priv;
+  NbtkEntryPrivate *priv;

-  g_return_if_fail (ST_IS_ENTRY (entry));
+  g_return_if_fail (NBTK_IS_ENTRY (entry));

  priv = entry->priv;

@ -785,34 +784,34 @@ st_entry_set_hint_text (StEntry     *entry,
  if (!strcmp (clutter_text_get_text (CLUTTER_TEXT (priv->entry)), ""))
    {
      clutter_text_set_text (CLUTTER_TEXT (priv->entry), priv->hint);
-      st_widget_set_style_pseudo_class (ST_WIDGET (entry), "indeterminate");
+      nbtk_widget_set_style_pseudo_class (NBTK_WIDGET (entry), "indeterminate");
    }
 }

 /**
- * st_entry_get_hint_text:
- * @entry: a #StEntry
+ * nbtk_entry_get_hint_text:
+ * @entry: a #NbtkEntry
 *
 * Gets the text that is displayed when the entry is empty and unfocused
 *
 * Returns: the current value of the hint property. This string is owned by the
- * #StEntry and should not be freed or modified.
+ * #NbtkEntry and should not be freed or modified.
 */
 G_CONST_RETURN
 gchar *
-st_entry_get_hint_text (StEntry *entry)
+nbtk_entry_get_hint_text (NbtkEntry *entry)
 {
-  g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
+  g_return_val_if_fail (NBTK_IS_ENTRY (entry), NULL);

  return entry->priv->hint;
 }

 static gboolean
-_st_entry_icon_press_cb (ClutterActor       *actor,
-                         ClutterButtonEvent *event,
-                         StEntry            *entry)
+_nbtk_entry_icon_press_cb (ClutterActor       *actor,
+                           ClutterButtonEvent *event,
+                           NbtkEntry          *entry)
 {
-  StEntryPrivate *priv = entry->priv;
+  NbtkEntryPrivate *priv = entry->priv;

  if (actor == priv->primary_icon)
    g_signal_emit (entry, entry_signals[PRIMARY_ICON_CLICKED], 0);
@ -823,14 +822,14 @@ _st_entry_icon_press_cb (ClutterActor       *actor,
 }

 static void
-_st_entry_set_icon_from_file (StEntry       *entry,
-                              ClutterActor **icon,
-                              const gchar   *filename)
+_nbtk_entry_set_icon_from_file (NbtkEntry     *entry,
+                                ClutterActor **icon,
+                                const gchar   *filename)
 {
  if (*icon)
    {
      g_signal_handlers_disconnect_by_func (*icon,
-                                            _st_entry_icon_press_cb,
+                                            _nbtk_entry_icon_press_cb,
                                            entry);
      clutter_actor_unparent (*icon);
      *icon = NULL;
@ -838,62 +837,61 @@ _st_entry_set_icon_from_file (StEntry       *entry,

  if (filename)
    {
-      StTextureCache *cache;
+      NbtkTextureCache *cache;

-      cache = st_texture_cache_get_default ();
+      cache = nbtk_texture_cache_get_default ();



-      *icon = (ClutterActor*) st_texture_cache_get_texture (cache, filename);
+      *icon = (ClutterActor*) nbtk_texture_cache_get_texture (cache, filename, FALSE);

      clutter_actor_set_reactive (*icon, TRUE);
      clutter_actor_set_parent (*icon, CLUTTER_ACTOR (entry));
      g_signal_connect (*icon, "button-release-event",
-                        G_CALLBACK (_st_entry_icon_press_cb), entry);
+                        G_CALLBACK (_nbtk_entry_icon_press_cb), entry);
    }

  clutter_actor_queue_relayout (CLUTTER_ACTOR (entry));
 }

 /**
- * st_entry_set_primary_icon_from_file:
- * @entry: a #StEntry
+ * nbtk_entry_set_primary_icon_from_file:
+ * @entry: a #NbtkEntry
 * @filename: filename of an icon
 *
 * Set the primary icon of the entry to the given filename
 */
 void
-st_entry_set_primary_icon_from_file (StEntry     *entry,
-                                     const gchar *filename)
+nbtk_entry_set_primary_icon_from_file (NbtkEntry   *entry,
+                                       const gchar *filename)
 {
-  StEntryPrivate *priv;
+  NbtkEntryPrivate *priv;

-  g_return_if_fail (ST_IS_ENTRY (entry));
+  g_return_if_fail (NBTK_IS_ENTRY (entry));

  priv = entry->priv;

-  _st_entry_set_icon_from_file (entry, &priv->primary_icon, filename);
+  _nbtk_entry_set_icon_from_file (entry, &priv->primary_icon, filename);

 }

 /**
- * st_entry_set_secondary_icon_from_file:
- * @entry: a #StEntry
+ * nbtk_entry_set_secondary_icon_from_file:
+ * @entry: a #NbtkEntry
 * @filename: filename of an icon
 *
 * Set the primary icon of the entry to the given filename
 */
 void
-st_entry_set_secondary_icon_from_file (StEntry     *entry,
-                                       const gchar *filename)
+nbtk_entry_set_secondary_icon_from_file (NbtkEntry   *entry,
+                                         const gchar *filename)
 {
-  StEntryPrivate *priv;
+  NbtkEntryPrivate *priv;

-  g_return_if_fail (ST_IS_ENTRY (entry));
+  g_return_if_fail (NBTK_IS_ENTRY (entry));

  priv = entry->priv;

-  _st_entry_set_icon_from_file (entry, &priv->secondary_icon, filename);
+  _nbtk_entry_set_icon_from_file (entry, &priv->secondary_icon, filename);

 }
-
--- a/src/nbtk/nbtk-entry.h
+++ b/src/nbtk/nbtk-entry.h
@ -0,0 +1,88 @@
+/*
+ * nbtk-entry.h: Plain entry actor
+ *
+ * Copyright 2008, 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ *
+ * Written by: Thomas Wood <thomas@linux.intel.com>
+ *
+ */
+
+#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
+#error "Only <nbtk/nbtk.h> can be included directly.h"
+#endif
+
+#ifndef __NBTK_ENTRY_H__
+#define __NBTK_ENTRY_H__
+
+G_BEGIN_DECLS
+
+#include <nbtk/nbtk-widget.h>
+
+#define NBTK_TYPE_ENTRY                (nbtk_entry_get_type ())
+#define NBTK_ENTRY(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), NBTK_TYPE_ENTRY, NbtkEntry))
+#define NBTK_IS_ENTRY(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NBTK_TYPE_ENTRY))
+#define NBTK_ENTRY_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), NBTK_TYPE_ENTRY, NbtkEntryClass))
+#define NBTK_IS_ENTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), NBTK_TYPE_ENTRY))
+#define NBTK_ENTRY_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), NBTK_TYPE_ENTRY, NbtkEntryClass))
+
+typedef struct _NbtkEntry              NbtkEntry;
+typedef struct _NbtkEntryPrivate       NbtkEntryPrivate;
+typedef struct _NbtkEntryClass         NbtkEntryClass;
+
+/**
+ * NbtkEntry:
+ *
+ * The contents of this structure is private and should only be accessed using
+ * the provided API.
+ */
+struct _NbtkEntry
+{
+  /*< private >*/
+  NbtkWidget parent_instance;
+
+  NbtkEntryPrivate *priv;
+};
+
+struct _NbtkEntryClass
+{
+  NbtkWidgetClass parent_class;
+
+  /* signals */
+  void (*primary_icon_clicked) (NbtkEntry *entry);
+  void (*secondary_icon_clicked) (NbtkEntry *entry);
+};
+
+GType nbtk_entry_get_type (void) G_GNUC_CONST;
+
+NbtkWidget *          nbtk_entry_new              (const gchar *text);
+G_CONST_RETURN gchar *nbtk_entry_get_text         (NbtkEntry   *entry);
+void                  nbtk_entry_set_text         (NbtkEntry   *entry,
+                                                   const gchar *text);
+ClutterActor*         nbtk_entry_get_clutter_text (NbtkEntry   *entry);
+
+void                  nbtk_entry_set_hint_text (NbtkEntry *entry,
+                                                const gchar *text);
+G_CONST_RETURN gchar *nbtk_entry_get_hint_text (NbtkEntry *entry);
+
+void nbtk_entry_set_primary_icon_from_file (NbtkEntry   *entry,
+                                            const gchar *filename);
+void nbtk_entry_set_secondary_icon_from_file (NbtkEntry   *entry,
+                                              const gchar *filename);
+
+G_END_DECLS
+
+#endif /* __NBTK_ENTRY_H__ */
--- a/src/nbtk/nbtk-enum-types.c.in
+++ b/src/nbtk/nbtk-enum-types.c.in
@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "st-enum-types.h"
+#include "nbtk-enum-types.h"
 /*** END file-header ***/

 /*** BEGIN file-production ***/
--- a/src/nbtk/nbtk-enum-types.h.in
+++ b/src/nbtk/nbtk-enum-types.h.in
@ -1,10 +1,10 @@
 /*** BEGIN file-header ***/
-#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
-#error "Only <st/st.h> can be included directly.h"
+#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
+#error "Only <nbtk/nbtk.h> can be included directly.h"
 #endif

-#ifndef __ST_ENUM_TYPES_H__
-#define __ST_ENUM_TYPES_H__
+#ifndef __NBTK_ENUM_TYPES_H__
+#define __NBTK_ENUM_TYPES_H__

 #include <glib-object.h>

@ -19,11 +19,11 @@ G_BEGIN_DECLS
 /*** BEGIN file-tail ***/
 G_END_DECLS

-#endif /* !__ST_ENUM_TYPES_H__ */
+#endif /* !__NBTK_ENUM_TYPES_H__ */
 /*** END file-tail ***/

 /*** BEGIN value-header ***/
 GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define ST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+#define NBTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())

 /*** END value-header ***/
--- a/src/nbtk/nbtk-label.c
+++ b/src/nbtk/nbtk-label.c
@ -0,0 +1,341 @@
+/*
+ * nbtk-label.c: Plain label actor
+ *
+ * Copyright 2008,2009 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Written by: Thomas Wood <thomas@linux.intel.com>
+ *
+ */
+
+/**
+ * SECTION:nbtk-label
+ * @short_description: Widget for displaying text
+ *
+ * #NbtkLabel is a simple widget for displaying text. It derives from
+ * #NbtkWidget to add extra style and placement functionality over
+ * #ClutterText. The internal #ClutterText is publicly accessibly to allow
+ * applications to set further properties.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include <clutter/clutter.h>
+
+#include "nbtk-label.h"
+
+#include "nbtk-widget.h"
+
+enum
+{
+  PROP_0,
+
+  PROP_CLUTTER_TEXT,
+  PROP_TEXT
+};
+
+#define NBTK_LABEL_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NBTK_TYPE_LABEL, NbtkLabelPrivate))
+
+struct _NbtkLabelPrivate
+{
+  ClutterActor *label;
+};
+
+G_DEFINE_TYPE (NbtkLabel, nbtk_label, NBTK_TYPE_WIDGET);
+
+static void
+nbtk_label_set_property (GObject      *gobject,
+                           guint         prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+  NbtkLabel *label = NBTK_LABEL (gobject);
+
+  switch (prop_id)
+    {
+    case PROP_TEXT:
+      nbtk_label_set_text (label, g_value_get_string (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+nbtk_label_get_property (GObject    *gobject,
+                           guint       prop_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (gobject)->priv;
+
+  switch (prop_id)
+    {
+    case PROP_CLUTTER_TEXT:
+      g_value_set_object (value, priv->label);
+      break;
+
+    case PROP_TEXT:
+      g_value_set_string (value, clutter_text_get_text (CLUTTER_TEXT (priv->label)));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+nbtk_label_style_changed (NbtkWidget *self)
+{
+  NbtkLabelPrivate *priv;
+  ShellThemeNode *theme_node;
+  ClutterColor color;
+  const PangoFontDescription *font;
+  gchar *font_string;
+
+  priv = NBTK_LABEL (self)->priv;
+  theme_node = nbtk_widget_get_theme_node (self);
+  shell_theme_node_get_foreground_color (theme_node, &color);
+  clutter_text_set_color (CLUTTER_TEXT (priv->label), &color);
+
+  font = shell_theme_node_get_font (theme_node);
+  font_string = pango_font_description_to_string (font);
+  clutter_text_set_font_name (CLUTTER_TEXT (priv->label), font_string);
+  g_free (font_string);
+
+  NBTK_WIDGET_CLASS (nbtk_label_parent_class)->style_changed (self);
+}
+
+static void
+nbtk_label_get_preferred_width (ClutterActor *actor,
+                                gfloat        for_height,
+                                gfloat       *min_width_p,
+                                gfloat       *natural_width_p)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (actor)->priv;
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (actor));
+
+  shell_theme_node_adjust_for_height (theme_node, &for_height);
+
+  clutter_actor_get_preferred_width (priv->label, for_height,
+                                     min_width_p,
+                                     natural_width_p);
+
+  shell_theme_node_adjust_preferred_width (theme_node, min_width_p, natural_width_p);
+}
+
+static void
+nbtk_label_get_preferred_height (ClutterActor *actor,
+                                 gfloat        for_width,
+                                 gfloat       *min_height_p,
+                                 gfloat       *natural_height_p)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (actor)->priv;
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (actor));
+
+  shell_theme_node_adjust_for_width (theme_node, &for_width);
+
+  clutter_actor_get_preferred_height (priv->label, for_width,
+                                      min_height_p,
+                                      natural_height_p);
+
+  shell_theme_node_adjust_preferred_height (theme_node, min_height_p, natural_height_p);
+}
+
+static void
+nbtk_label_allocate (ClutterActor          *actor,
+                     const ClutterActorBox *box,
+                     ClutterAllocationFlags flags)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (actor)->priv;
+  ShellThemeNode *theme_node = nbtk_widget_get_theme_node (NBTK_WIDGET (actor));
+  ClutterActorClass *parent_class;
+  ClutterActorBox content_box;
+
+  shell_theme_node_get_content_box (theme_node, box, &content_box);
+
+  parent_class = CLUTTER_ACTOR_CLASS (nbtk_label_parent_class);
+  parent_class->allocate (actor, box, flags);
+
+  clutter_actor_allocate (priv->label, &content_box, flags);
+}
+
+static void
+nbtk_label_paint (ClutterActor *actor)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (actor)->priv;
+  ClutterActorClass *parent_class;
+
+  parent_class = CLUTTER_ACTOR_CLASS (nbtk_label_parent_class);
+  parent_class->paint (actor);
+
+  clutter_actor_paint (priv->label);
+}
+
+static void
+nbtk_label_map (ClutterActor *actor)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (actor)->priv;
+
+  CLUTTER_ACTOR_CLASS (nbtk_label_parent_class)->map (actor);
+
+  clutter_actor_map (priv->label);
+}
+
+static void
+nbtk_label_unmap (ClutterActor *actor)
+{
+  NbtkLabelPrivate *priv = NBTK_LABEL (actor)->priv;
+
+  CLUTTER_ACTOR_CLASS (nbtk_label_parent_class)->unmap (actor);
+
+  clutter_actor_unmap (priv->label);
+}
+
+static void
+nbtk_label_class_init (NbtkLabelClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+  NbtkWidgetClass *widget_class = NBTK_WIDGET_CLASS (klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private (klass, sizeof (NbtkLabelPrivate));
+
+  gobject_class->set_property = nbtk_label_set_property;
+  gobject_class->get_property = nbtk_label_get_property;
+
+  actor_class->paint = nbtk_label_paint;
+  actor_class->allocate = nbtk_label_allocate;
+  actor_class->get_preferred_width = nbtk_label_get_preferred_width;
+  actor_class->get_preferred_height = nbtk_label_get_preferred_height;
+  actor_class->map = nbtk_label_map;
+  actor_class->unmap = nbtk_label_unmap;
+
+  widget_class->style_changed = nbtk_label_style_changed;
+
+  pspec = g_param_spec_object ("clutter-text",
+			       "Clutter Text",
+			       "Internal ClutterText actor",
+			       CLUTTER_TYPE_TEXT,
+			       G_PARAM_READABLE);
+  g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
+
+  pspec = g_param_spec_string ("text",
+                               "Text",
+                               "Text of the label",
+                               NULL, G_PARAM_READWRITE);
+  g_object_class_install_property (gobject_class, PROP_TEXT, pspec);
+
+}
+
+static void
+nbtk_label_init (NbtkLabel *label)
+{
+  NbtkLabelPrivate *priv;
+
+  label->priv = priv = NBTK_LABEL_GET_PRIVATE (label);
+
+  label->priv->label = g_object_new (CLUTTER_TYPE_TEXT,
+                                     "ellipsize", PANGO_ELLIPSIZE_END,
+                                     NULL);
+
+  clutter_actor_set_parent (priv->label, CLUTTER_ACTOR (label));
+}
+
+/**
+ * nbtk_label_new:
+ * @text: text to set the label to
+ *
+ * Create a new #NbtkLabel with the specified label
+ *
+ * Returns: a new #NbtkLabel
+ */
+NbtkWidget *
+nbtk_label_new (const gchar *text)
+{
+  if (text == NULL || *text == '\0')
+    return g_object_new (NBTK_TYPE_LABEL, NULL);
+  else
+    return g_object_new (NBTK_TYPE_LABEL,
+                         "text", text,
+                         NULL);
+}
+
+/**
+ * nbtk_label_get_text:
+ * @label: a #NbtkLabel
+ *
+ * Get the text displayed on the label
+ *
+ * Returns: the text for the label. This must not be freed by the application
+ */
+G_CONST_RETURN gchar *
+nbtk_label_get_text (NbtkLabel *label)
+{
+  g_return_val_if_fail (NBTK_IS_LABEL (label), NULL);
+
+  return clutter_text_get_text (CLUTTER_TEXT (label->priv->label));
+}
+
+/**
+ * nbtk_label_set_text:
+ * @label: a #NbtkLabel
+ * @text: text to set the label to
+ *
+ * Sets the text displayed on the label
+ */
+void
+nbtk_label_set_text (NbtkLabel *label,
+                     const gchar *text)
+{
+  NbtkLabelPrivate *priv;
+
+  g_return_if_fail (NBTK_IS_LABEL (label));
+  g_return_if_fail (text != NULL);
+
+  priv = label->priv;
+
+  clutter_text_set_text (CLUTTER_TEXT (priv->label), text);
+
+  g_object_notify (G_OBJECT (label), "text");
+}
+
+/**
+ * nbtk_label_get_clutter_text:
+ * @label: a #NbtkLabel
+ *
+ * Retrieve the internal #ClutterText so that extra parameters can be set
+ *
+ * Returns: (transfer none): ethe #ClutterText used by #NbtkLabel. The label
+ * is owned by the #NbtkLabel and should not be unref'ed by the application.
+ */
+ClutterActor*
+nbtk_label_get_clutter_text (NbtkLabel *label)
+{
+  g_return_val_if_fail (NBTK_LABEL (label), NULL);
+
+  return label->priv->label;
+}
--- a/src/nbtk/nbtk-label.h
+++ b/src/nbtk/nbtk-label.h
@ -0,0 +1,75 @@
+/*
+ * nbtk-label.h: Plain label actor
+ *
+ * Copyright 2008, 2009 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ * Boston, MA 02111-1307, USA.
+ *
+ * Written by: Thomas Wood <thomas@linux.intel.com>
+ *
+ */
+
+#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
+#error "Only <nbtk/nbtk.h> can be included directly.h"
+#endif
+
+#ifndef __NBTK_LABEL_H__
+#define __NBTK_LABEL_H__
+
+G_BEGIN_DECLS
+
+#include <nbtk/nbtk-widget.h>
+
+#define NBTK_TYPE_LABEL                (nbtk_label_get_type ())
+#define NBTK_LABEL(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), NBTK_TYPE_LABEL, NbtkLabel))
+#define NBTK_IS_LABEL(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NBTK_TYPE_LABEL))
+#define NBTK_LABEL_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), NBTK_TYPE_LABEL, NbtkLabelClass))
+#define NBTK_IS_LABEL_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), NBTK_TYPE_LABEL))
+#define NBTK_LABEL_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), NBTK_TYPE_LABEL, NbtkLabelClass))
+
+typedef struct _NbtkLabel              NbtkLabel;
+typedef struct _NbtkLabelPrivate       NbtkLabelPrivate;
+typedef struct _NbtkLabelClass         NbtkLabelClass;
+
+/**
+ * NbtkLabel:
+ *
+ * The contents of this structure is private and should only be accessed using
+ * the provided API.
+ */
+struct _NbtkLabel
+{
+  /*< private >*/
+  NbtkWidget parent_instance;
+
+  NbtkLabelPrivate *priv;
+};
+
+struct _NbtkLabelClass
+{
+  NbtkWidgetClass parent_class;
+};
+
+GType nbtk_label_get_type (void) G_GNUC_CONST;
+
+NbtkWidget *          nbtk_label_new              (const gchar *text);
+G_CONST_RETURN gchar *nbtk_label_get_text         (NbtkLabel   *label);
+void                  nbtk_label_set_text         (NbtkLabel   *label,
+                                                   const gchar *text);
+ClutterActor *        nbtk_label_get_clutter_text (NbtkLabel   *label);
+
+G_END_DECLS
+
+#endif /* __NBTK_LABEL_H__ */
--- a/src/nbtk/nbtk-marshal.list
+++ b/src/nbtk/nbtk-marshal.list
--- a/src/nbtk/nbtk-private.c
+++ b/src/nbtk/nbtk-private.c
@ -1,17 +1,16 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#include "st-private.h"
+#include "nbtk-private.h"

 /* Utility function to modify a child allocation box with respect to the
 * x/y-fill child properties. Expects childbox to contain the available
 * allocation space.
 */
 void
-_st_allocate_fill (ClutterActor    *child,
-                   ClutterActorBox *childbox,
-                   StAlign          x_alignment,
-                   StAlign          y_alignment,
-                   gboolean         x_fill,
-                   gboolean         y_fill)
+_nbtk_allocate_fill (ClutterActor *child,
+                     ClutterActorBox *childbox,
+                     NbtkAlign x_alignment,
+                     NbtkAlign y_alignment,
+                     gboolean x_fill,
+                     gboolean y_fill)
 {
  gfloat natural_width, natural_height;
  gfloat min_width, min_height;
@ -21,16 +20,16 @@ _st_allocate_fill (ClutterActor    *child,
  ClutterActorBox allocation = { 0, };
  gdouble x_align, y_align;

-  if (x_alignment == ST_ALIGN_START)
+  if (x_alignment == NBTK_ALIGN_START)
    x_align = 0.0;
-  else if (x_alignment == ST_ALIGN_MIDDLE)
+  else if (x_alignment == NBTK_ALIGN_MIDDLE)
    x_align = 0.5;
  else
    x_align = 1.0;

-  if (y_alignment == ST_ALIGN_START)
+  if (y_alignment == NBTK_ALIGN_START)
    y_align = 0.0;
-  else if (y_alignment == ST_ALIGN_MIDDLE)
+  else if (y_alignment == NBTK_ALIGN_MIDDLE)
    y_align = 0.5;
  else
    y_align = 1.0;
@ -47,13 +46,13 @@ _st_allocate_fill (ClutterActor    *child,
  if (x_fill)
    {
      allocation.x1 = childbox->x1;
-      allocation.x2 = (int)(allocation.x1 + available_width);
+      allocation.x2 = (int) (allocation.x1 + available_width);
    }

  if (y_fill)
    {
      allocation.y1 = childbox->y1;
-      allocation.y2 = (int)(allocation.y1 + available_height);
+      allocation.y2 = (int) (allocation.y1 + available_height);
    }

  /* if we are filling horizontally and vertically then we're done */
@ -97,65 +96,16 @@ _st_allocate_fill (ClutterActor    *child,

  if (!x_fill)
    {
-      allocation.x1 = childbox->x1 + (int)((available_width - child_width) * x_align);
+      allocation.x1 = childbox->x1 + (int) ((available_width - child_width) * x_align);
      allocation.x2 = allocation.x1 + (int) child_width;
    }

  if (!y_fill)
    {
-      allocation.y1 = childbox->y1 + (int)((available_height - child_height) * y_align);
+      allocation.y1 = childbox->y1 + (int) ((available_height - child_height) * y_align);
      allocation.y2 = allocation.y1 + (int) child_height;
    }

  *childbox = allocation;

 }
-
-/**
- * _st_set_text_from_style:
- * @text: Target #ClutterText
- * @theme_node: Source #StThemeNode
- *
- * Set various GObject properties of the @text object using
- * CSS information from @theme_node.
- */
-void
-_st_set_text_from_style (ClutterText *text,
-                         StThemeNode *theme_node)
-{
-
-  ClutterColor color;
-  StTextDecoration decoration;
-  PangoAttrList *attribs;
-  const PangoFontDescription *font;
-  gchar *font_string;
-
-  st_theme_node_get_foreground_color (theme_node, &color);
-  clutter_text_set_color (text, &color);
-
-  font = st_theme_node_get_font (theme_node);
-  font_string = pango_font_description_to_string (font);
-  clutter_text_set_font_name (text, font_string);
-  g_free (font_string);
-
-  attribs = pango_attr_list_new ();
-
-  decoration = st_theme_node_get_text_decoration (theme_node);
-  if (decoration & ST_TEXT_DECORATION_UNDERLINE)
-    {
-      PangoAttribute *underline = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE);
-      pango_attr_list_insert (attribs, underline);
-    }
-  if (decoration & ST_TEXT_DECORATION_LINE_THROUGH)
-    {
-      PangoAttribute *strikethrough = pango_attr_strikethrough_new (TRUE);
-      pango_attr_list_insert (attribs, strikethrough);
-    }
-  /* Pango doesn't have an equivalent attribute for _OVERLINE, and we deliberately
-   * skip BLINK (for now...)
-   */
-
-  clutter_text_set_attributes (text, attribs);
-
-  pango_attr_list_unref (attribs);
-}
--- a/src/nbtk/nbtk-private.h
+++ b/src/nbtk/nbtk-private.h
@ -1,6 +1,5 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * st-private.h: Private declarations
+ * nbtk-private.h: Private declarations
 *
 * Copyright 2007 OpenedHand
 * Copyright 2009 Intel Corporation.
@ -21,41 +20,30 @@
 *
 */

-#ifndef __ST_PRIVATE_H__
-#define __ST_PRIVATE_H__
+#ifndef __NBTK_PRIVATE_H__
+#define __NBTK_PRIVATE_H__

 #include <glib.h>
-#include "st-widget.h"
-#include "st-bin.h"
+#include "nbtk-widget.h"
+#include "nbtk-bin.h"

 G_BEGIN_DECLS

 #define I_(str)         (g_intern_static_string ((str)))

-#define ST_PARAM_READABLE     \
+#define NBTK_PARAM_READABLE     \
        (G_PARAM_READABLE |     \
         G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)

-#define ST_PARAM_READWRITE    \
+#define NBTK_PARAM_READWRITE    \
        (G_PARAM_READABLE | G_PARAM_WRITABLE | \
         G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)

 G_END_DECLS

-ClutterActor *_st_widget_get_dnd_clone (StWidget *widget);
+ClutterActor *_nbtk_widget_get_dnd_clone (NbtkWidget *widget);
+void _nbtk_bin_get_align_factors (NbtkBin *bin, gdouble *x_align, gdouble *y_align);

-void _st_bin_get_align_factors (StBin   *bin,
-                                gdouble *x_align,
-                                gdouble *y_align);
+void _nbtk_allocate_fill (ClutterActor *child, ClutterActorBox *childbox, NbtkAlign x_align, NbtkAlign y_align, gboolean x_fill, gboolean y_fill);

-void _st_allocate_fill (ClutterActor    *child,
-                        ClutterActorBox *childbox,
-                        StAlign          x_align,
-                        StAlign          y_align,
-                        gboolean         x_fill,
-                        gboolean         y_fill);
-
-void _st_set_text_from_style (ClutterText *text,
-                              StThemeNode *theme_node);
-
-#endif /* __ST_PRIVATE_H__ */
+#endif /* __NBTK_PRIVATE_H__ */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen W. Taylor	4f070317d2	lookingGlass: Get font from GConf Instead of using "Monospace", pick the users configured monospace font name up from GConf. (This is a nice touch, but is more done here to demonstrate that we can do it rather than for any great utility.)	2009-09-21 20:13:00 -04:00
Owen W. Taylor	661100abe8	Port LookingGlass console to NBTK * Style aspects like colors and fonts are moved into gnome-shell.css. * Scrolling is adding using NbtkScrollView. Based on a patch from Colin Walters https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-21 20:11:09 -04:00
Owen W. Taylor	3e90b11cfb	Add clutter-text properties to NbtkEntry and NbtkLabel Add clutter-text properties to allow getting access to the underlying ClutterText actor. This corresponds to the get_clutter_text() methods. The PROP_LABEL and PROP_ENTRY enum values are renamed to PROP_TEXT to match the names of the properties that they correspond to, and the properties of NbtkEntry are reordered into alphabetical order. Based on a patch from Colin Walters https://bugzilla.gnome.org/show_bug.cgi?id=591245 http://bugzilla.moblin.org/show_bug.cgi?id=6313	2009-09-21 19:32:38 -04:00
Owen W. Taylor	4b4a1be420	Fix interaction of borders/background and scrolling NbtkBoxLayout: Make consistent that the area scrolled and clipped to is the content area (excluding borders and padding.) Translate back appropriately when chaining up so that the parent background is drawn at the right place and picking on the box (if it's reactive) picks at the right place on the screen. clip-to-allocation is removed from NbtkScrollView since it's just not right - if the child has any non-moving elements, like headers or borders, it will need to set a narrower clip. And even if the entire child scrolls, we want to clip to an arrow that excludes the scrollbars.	2009-09-21 19:32:38 -04:00
Owen W. Taylor	1a4861ec4f	Remove NbtkViewport from our tree NbtkBoxLayout provides the basic functionality of 2-dimensional scrolling and we don't use NbtkViewport anywhere, so remove it. This avoids fixing NbtkViewport up for the interaction of scrolling and borders/padding, which would be a little involved and require a test program for NbtkViewport to be written.	2009-09-21 19:32:33 -04:00
Owen W. Taylor	2ac82da232	Allocate children as wide as the scrolled area When we are scrolling a vertical box horizontally , children should be allocated horizontally as wide as the full horizontal scrolled area, not just to the size of the "viewport". Similarly for a horizontal box. http://bugzilla.moblin.org/show_bug.cgi?id=6312	2009-09-21 19:32:33 -04:00
Owen W. Taylor	8f7e6f8117	Allow NbtkBoxLayout to shrink down to its minimum size When a NbtkBoxLayout is allocated a size less than its natural size, think "shrink" needs to be divided among the children that have a smaller minimum size than natural size. This is done by preferentially shrinking the children that are most expanded from their minimum size and then increasing that set of children until we've found enough total shrink. A new method is used of allocating children at integral sizes - instead of rounding the per-child extra amount to an integer (which causes cumulative round-off errors), compute the position as we go along in floats and round individually for each child widget. Extend the box-layout test to include of a test of a box being set to various widths, starting quite narrow. http://bugzilla.moblin.org/show_bug.cgi?id=6311	2009-09-21 19:32:33 -04:00
Owen W. Taylor	d2b98701be	Don't count not-visible children among expand children When counting how many children we should divide extra space among, don't count not-visible children. http://bugzilla.moblin.org/show_bug.cgi?id=6310	2009-09-21 19:32:33 -04:00
Owen W. Taylor	faeda5dc8b	Don't use the default stage when setting up adjustments If the actor isn't in a stage, then setting up the adjustment based on the actor's size (which we can't compute) and the size of the default stage (which isn't relevant), doesn't make sense. Just use arbitrary default values. The adjustments will be updated to reasonable values when first the box is first allocated. It's not entirely clear to me why we ever want to compute the adjustment settings this way; perhaps we should always use default values. http://bugzilla.moblin.org/show_bug.cgi?id=6307	2009-09-21 19:32:32 -04:00
Owen W. Taylor	70cb8e180b	Match CSS for background extents The CSS specification says that the background extends to the edge of the border (settable in CSS3 with border-clip), make BigRectangle match this by computing an "effective border color" as 'border OVER background'. (If we don't want this behavior - e.g., to be able to use the transparent borders as margins, then alternatively transparent border handling would have to be fixed in nbtk-widget.c, since prior to this transparent and translucent borders were handled differently.)	2009-09-21 19:32:32 -04:00
Owen W. Taylor	2232a92ba8	Rename ShellThemeImage to ShellBorderImage The current CSS3 border-image is close to a superset of what we were doing for -hippo-background-image. Woot! rename ShellThemeImage to ShellBorderImage and change parsing to look for: border-image: <url> <number>... Rather than -shell-background-image: <url> <length>... percentanges for the border sizes are not currently supported, neither are the keywords for handling of the middle part. We always do 'stretch' for now.	2009-09-21 19:32:32 -04:00
Owen W. Taylor	4743a8e750	Add support for colored borders Use BigRectangle to draw the border and background if there's a border width or border radius and no border image. (Only uniform borders are supported for now with some deviations from the CSS model noted in the comments.) The background color and image parameters are removed from NbtkWidget's draw_background() method since they were not used for NbtkButton (the only current user) and the encapsulation break that they presented caused some minor problems. Add a test case for borders, and also use borders to style the buttons in the 'inline-style' test case.	2009-09-21 19:32:32 -04:00
Owen W. Taylor	e1390c7dd5	Centralize computations of border and padding into ShellThemeNode Rather than repeating the computation of borders in many different widget subclasses, add helper functions: shell_theme_node_adjust_for_height() shell_theme_node_adjust_preferred_width() shell_theme_node_adjust_for_width() shell_theme_node_adjust_preferred_height() shell_theme_node_get_content_box() That are used in get_preferred_width()/get_preferred_height() and allocate() methods to consistently apply the necessary adjustments. This allows removing the NbtkPadding type. Queueing a relayout when the borders/padding change is moved from nbtk_widget_real_style_changed() to the invoking code to allow access to the old ShellThemeNode for comparison. (Should this be added as a parameter to the signal?) Borders are included in the geometry adjustments, but borders are not yet drawn.	2009-09-21 19:32:24 -04:00
Owen W. Taylor	49ba54820c	ShellThemeNode: Add border-radius support Add support for parsing and caching the border-radius property. Different radii for the 4 corners are supported; elliptical corners are not supported.	2009-09-21 19:32:23 -04:00
Owen W. Taylor	8ffa161a7f	Fix problems with 4-sided padding: specifiers The test for identifying such a specifier was wrong, and the last value was assigned to the wrong sides.	2009-09-21 19:32:23 -04:00
Owen W. Taylor	0eca3efcb0	Add support for inline styles Add support for passing an inline-style string when creating a ShellThemeNode. Hook this up to a new 'style' property of NbtkWidget. Add a test case that demonstrates using this to update font sizes on the fly.	2009-09-21 19:32:23 -04:00
Owen W. Taylor	9c3af62dc4	run-test.sh: support running tests under gdb As with the 'gnome-shell' -g/--debug can be passed to run under the debugger.	2009-09-21 19:32:23 -04:00
Owen W. Taylor	db0c2b5959	Port our imported parts of Nbtk to ShellTheme ShellTheme replaces both NbtkStyle and ccss_stylesheet_t. The interface NbtkStylable is replaced by usage of ShellThemeNode. A concrete node class allows some significant optimizations of property inheritance that would have been much more difficult to achieve with the highly abstract pair of NbtkStylable and ccss_node_t. Some operations that were previously on NbtkStylable (like the ::style-changed signal) are directly on NtkWidget. Custom properties are no longer registered as param-specs; instead you call directly into shell theme node to look up a length or color: shell_theme_node_get_length (theme_node, "border-spacing", FALSE, &spacing); The dependency on libccss is dropped, while preserving all existing functionality and adding proper parsing and inheritance of font properties and proper inheritance for the 'color' property. Some more javascript tests for CSS functionality are added; workarounds for a CSS bug where *.some-class was needed instead of .some-class are removed.	2009-09-21 19:32:18 -04:00
Owen W. Taylor	98215f497d	Import stylesheet code from hippo-canvas Import: HippoCanvasTheme => ShellTheme HippoCanvasThemeImage => ShellThemeImage HippoCanvasStyle => ShellThemeNode ShellThemeContext is a new class managing the theme for a stage and global properties like resolution. test-theme.c is a newly written test program to do verification of the style matching and property handling rules. Various changes are made in the import: - Comprehensive reindentation - guint32 pixels replaced with ClutterColor - General pseudo-class support added - Old-fashioned (non-bordered) background image support added, though with no support for repeat, etc. - Bug fixes for problems revealed by test program	2009-09-20 16:59:06 -04:00
Owen W. Taylor	9dbafe156e	Makefile.am cleanups for NBTK Clean up indentation, line up backslashes, and add missing $(AM_V_GEN). Remove include of GTK+ when generating Nbtk-1.0.gir.	2009-09-20 16:58:30 -04:00
Owen W. Taylor	277dd7106a	Fix installation and distribution of stylesheet data Install and distribute gnome-shell.css and theme images. They are moved down from $datadir to $datadir/theme to avoid a weirdness where we have images in $datadir and then also in $datadir/images. (Also moved in the source tree to avoid adding another difference between installed and uninstalled operation.)	2009-09-18 16:29:28 -04:00
Owen W. Taylor	431f299756	Extend distcheck for files in Git to all files Instead of just checking that we distribute all Javascript files, check that we distribute everything that is in Git. The toplevel Makefile.am has a variable DIST_EXCLUDE that lists patterns of files that we actually don't want to distribute. Remove several stale C files that we are no longer using.	2009-09-18 16:18:54 -04:00
Owen W. Taylor	d8d7f5f711	Add some structure for interactive tests of UI components js/ui/environment.js: Split out initial UI setup (Tweener initialization, Nbtk monkey-patching) into a separate file we can import from tests. tests/: Directory for various types of tests tests/run-test.sh: Shell script that to run tests with an appropriate environment set up. tests/testcommon/: Common modules and data for tests tests/interactive/: Interactive tests tests/interactive/box-layout.js: A sample test of NbtkLayout	2009-09-18 16:18:50 -04:00
Owen W. Taylor	a07af9fb14	Monkey-patch in ClutterContainer methods for NbtkBoxLayout Setting options for children added to NbtkBoxLayout is not convenient since we are missing the varargs methods of clutter_container. Patch in: child_set() - set properties of a child add() - add a child and set properties (this is different from clutter_container_add()! I think the deviation is with avoiding the awkward name add_with_properties() which is what might be expected. ClutterContainer currently doesn't have a method like this at all.) The code is written to allow patching into multiple ClutterContainer classes but for now only NbtkBoxLayout is patched, since it's the only container we are using where we need to set options as properties. https://bugzilla.gnome.org/show_bug.cgi?id=595419	2009-09-16 19:59:38 -04:00
Owen W. Taylor	f1f11f1e76	Add GObject Introspection annotations Add GObject Introspection annotations to methods where needed, in particular adding (transfer none) to return values that don't transfer ownership. clutter_texture_cache_get_actor() and clutter_texture_cache_get_texture() are annotated as (transfer none) since they return a newly created floating texture. https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 19:12:53 -04:00
Colin Walters	c60a6a49de	Import NbtkEntry, NbtkLabel, NbtkClipboard For now this commit introduces an external dependency on clutter-imcontext. https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 18:04:51 -04:00
Colin Walters	6687054474	Import NbtkBoxLayout, NbtkBoxLayoutChild https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 17:59:06 -04:00
Colin Walters	60819b3a79	Add css for scrolling Port bits of Nbtk's default.css into gnome-shell.css, and use some hand-rolled .pngs with colors from http://live.gnome.org/GnomeShell/DesignerPlayground/ExpandedViewMockups https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 17:58:55 -04:00
Colin Walters	3e265b4bc6	Load gnome-shell.css at startup https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 17:56:24 -04:00
Colin Walters	e2aa2a00f0	Add a "datadir" property Will be used to load stylesheets from main.js. https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 17:56:24 -04:00
Colin Walters	1edc88a2bd	Remove hardcoded '28' from NbtkScrollView https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 17:56:22 -04:00
Colin Walters	271e4ca07e	Import NbtkScrollView and dependencies https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 16:52:26 -04:00
Colin Walters	9f79296276	Import nbtk core Import the core NbtkWidget/NbtkBin and their dependencies. https://bugzilla.gnome.org/show_bug.cgi?id=591245	2009-09-16 11:35:43 -04:00