diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5cd7995..f58997f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.8.0.1
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source2: redhat-panel-default-setup.entries
@@ -57,11 +57,10 @@ BuildRequires: evolution-data-server-devel
 
 Patch1: gnome-panel-2.6.0-use-correct-applications-uri.patch
 Patch2: gnome-panel-2.3.6.2-pager-rows.patch
-Patch3: gnome-panel-2.3.6.2-clock-date.patch
-Patch4: gnome-panel-2.3.6.2-default-menu-flags.patch
-Patch5: gnome-panel-2.0.3-remove-screenshot-menuitem.patch
-Patch6: gnome-panel-2.7.90-menu-fixup.patch
-Patch8: gnome-panel-2.1.90.1-no-fortune.patch
+Patch3: gnome-panel-2.3.6.2-default-menu-flags.patch
+Patch4: gnome-panel-2.0.3-remove-screenshot-menuitem.patch
+Patch5: gnome-panel-2.7.90-menu-fixup.patch
+Patch6: gnome-panel-2.1.90.1-no-fortune.patch
 
 %description
 
@@ -85,11 +84,10 @@ Panel Applets using the libpanel-applet library.
 
 %patch1 -p1 -b .use-correct-applications-uri
 %patch2 -p1 -b .pager-rows
-%patch3 -p1 -b .clock-seconds
-%patch4 -p1 -b .default-menu-flags
-%patch5 -p1 -b .remove-screenshot-menuitem
-%patch6 -p1 -b .menu-fixup
-%patch8 -p1 -b .no-fortune
+%patch3 -p1 -b .default-menu-flags
+%patch4 -p1 -b .remove-screenshot-menuitem
+%patch5 -p1 -b .menu-fixup
+%patch6 -p1 -b .no-fortune
 
 cp -f %{SOURCE2} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} gnome-panel/panel-compatibility.schemas
@@ -187,6 +185,9 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Oct  1 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-1
+- New panel layout from Bryan and Seth
+
 * Wed Sep 29 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-1
 - Update to 2.8.0.1
 
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 2e5157d..712051e 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -10,6 +10,9 @@
       <value>
         <list type="string">
           <value>
+            <string>top_panel</string>
+          </value>
+          <value>
             <string>bottom_panel</string>
           </value>
         </list>
@@ -24,7 +27,7 @@
       <value>
         <list type="string">
           <value>
-            <string>main_menu</string>
+            <string>menu_bar</string>
           </value>
           <value>
             <string>web_launcher</string>
@@ -53,22 +56,25 @@
       <value>
         <list type="string">
           <value>
-            <string>workspace_switcher</string>
+            <string>mixer</string>
           </value>
           <value>
-            <string>window_list</string>
+            <string>clock</string>
           </value>
           <value>
-            <string>mixer</string>
+            <string>systray</string>
           </value>
           <value>
-            <string>systray</string>
+            <string>battstat_applet</string>
           </value>
           <value>
-            <string>clock</string>
+            <string>show_desktop_button</string>
           </value>
           <value>
-            <string>battstat_applet</string>
+            <string>window_list</string>
+          </value>
+          <value>
+            <string>workspace_switcher</string>
           </value>
         </list>
       </value>
@@ -77,6 +83,58 @@
     <entry><key>general/enable_program_list</key><schema_key>/schemas/apps/panel/general/enable_program_list</schema_key></entry>
     <entry><key>general/show_program_list</key><schema_key>/schemas/apps/panel/general/show_program_list</schema_key></entry>
 
+  <!-- Top Panel -->
+
+    <entry>
+      <key>toplevels/top_panel/name</key>
+      <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
+      <value>
+        <string>Top Panel</string>
+      </value>
+    </entry>
+    <entry>
+      <key>toplevels/top_panel/expand</key>
+      <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>toplevels/top_panel/orientation</key>
+      <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
+      <value>
+        <string>top</string>
+      </value>
+    </entry>
+    <entry>
+      <key>toplevels/top_panel/size</key>
+      <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+      <value>
+        <int>24</int>
+      </value>
+    </entry>
+
+    <entry><key>toplevels/top_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
+    <entry><key>toplevels/top_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
+    <entry><key>toplevels/top_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
+    <entry><key>toplevels/top_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
+    <entry><key>toplevels/top_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
+    <entry><key>toplevels/top_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
+    <entry><key>toplevels/top_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
+    <entry><key>toplevels/top_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
+    <entry><key>toplevels/top_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
+    <entry><key>toplevels/top_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
+    <entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
+    <entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
+    <entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
+    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+
   <!-- Bottom Panel -->
 
     <entry>
@@ -104,7 +162,7 @@
       <key>toplevels/bottom_panel/size</key>
       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
       <value>
-        <int>48</int>
+        <int>24</int>
       </value>
     </entry>
 
@@ -129,64 +187,53 @@
     <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
     <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
 
-  <!-- Main Menu -->
-  
+  <!-- Menu Bar -->
+
     <entry>
-      <key>objects/main_menu/object_type</key>
+      <key>objects/menu_bar/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
-        <string>menu-object</string>
+        <string>menu-bar</string>
       </value>
     </entry>
     <entry>
-      <key>objects/main_menu/toplevel_id</key>
+      <key>objects/menu_bar/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
-      <key>objects/main_menu/position</key>
+      <key>objects/menu_bar/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
         <int>0</int>
       </value>
     </entry>
     <entry>
-      <key>objects/main_menu/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <key>objects/menu_bar/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>false</bool>
       </value>
     </entry>
     <entry>
-      <key>objects/main_menu/locked</key>
+      <key>objects/menu_bar/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
 
-    <entry><key>objects/main_menu/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-    <entry><key>objects/main_menu/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-    <entry><key>objects/main_menu/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-    <entry><key>objects/main_menu/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-    <entry><key>objects/main_menu/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-    <entry><key>objects/main_menu/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-    <entry><key>objects/main_menu/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-    <entry><key>objects/main_menu/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-    <entry><key>objects/main_menu/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-    <entry><key>objects/main_menu/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-    <entry><key>objects/main_menu/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-    <entry><key>objects/main_menu/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-    <entry><key>objects/main_menu/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-    <entry><key>objects/main_menu/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-    <entry><key>objects/main_menu/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-    <entry><key>objects/main_menu/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-    <entry><key>objects/main_menu/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-    <entry><key>objects/main_menu/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-    <entry><key>objects/main_menu/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-    <entry><key>objects/main_menu/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+    <entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+    <entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>objects/menu_bar/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>objects/menu_bar/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   <!-- Web Launcher -->
 
@@ -201,7 +248,7 @@
       <key>objects/web_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
@@ -213,7 +260,7 @@
     </entry>
     <entry>
       <key>objects/web_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>false</bool>
       </value>
@@ -229,7 +276,7 @@
       <key>objects/web_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>applications:///Internet/redhat-web.desktop</string>
+        <string>applications:///Internet/epiphany.desktop</string>
       </value>
     </entry>
 
@@ -255,7 +302,7 @@
       <key>objects/email_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
@@ -267,7 +314,7 @@
     </entry>
     <entry>
       <key>objects/email_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>false</bool>
       </value>
@@ -309,7 +356,7 @@
       <key>objects/wordprocessor_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
@@ -321,7 +368,7 @@
     </entry>
     <entry>
       <key>objects/wordprocessor_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>false</bool>
       </value>
@@ -363,7 +410,7 @@
       <key>objects/presentation_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
@@ -375,7 +422,7 @@
     </entry>
     <entry>
       <key>objects/presentation_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>false</bool>
       </value>
@@ -417,7 +464,7 @@
       <key>objects/spreadsheet_launcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
@@ -429,7 +476,7 @@
     </entry>
     <entry>
       <key>objects/spreadsheet_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>false</bool>
       </value>
@@ -458,276 +505,337 @@
     <entry><key>objects/spreadsheet_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/spreadsheet_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Workspace Switcher Applet -->
+  <!-- Mixer Applet -->
 
     <entry>
-      <key>applets/workspace_switcher/object_type</key>
+      <key>applets/mixer/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>applets/workspace_switcher/toplevel_id</key>
+      <key>applets/mixer/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
-      <key>applets/workspace_switcher/position</key>
+      <key>applets/mixer/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
-        <int>7</int>
+        <int>0</int>
       </value>
     </entry>
     <entry>
-      <key>applets/workspace_switcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <key>applets/mixer/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/workspace_switcher/locked</key>
+      <key>applets/mixer/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/workspace_switcher/bonobo_iid</key>
+      <key>applets/mixer/bonobo_iid</key>
       <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
+        <string>OAFIID:GNOME_MixerApplet</string>
       </value>
     </entry>
 
-    <entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Window List Applet -->
+  <!-- Clock Applet -->
 
     <entry>
-      <key>applets/window_list/object_type</key>
+      <key>applets/clock/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>applets/window_list/toplevel_id</key>
+      <key>applets/clock/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
-      <key>applets/window_list/position</key>
+      <key>applets/clock/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
-        <int>8</int>
+        <int>1</int>
       </value>
     </entry>
     <entry>
-      <key>applets/window_list/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <key>applets/clock/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/window_list/locked</key>
+      <key>applets/clock/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/window_list/bonobo_iid</key>
+      <key>applets/clock/bonobo_iid</key>
       <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>OAFIID:GNOME_WindowListApplet</string>
+        <string>OAFIID:GNOME_ClockApplet</string>
       </value>
     </entry>
 
-    <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Mixer Applet -->
+  <!-- System Tray Applet -->
 
     <entry>
-      <key>applets/mixer/object_type</key>
+      <key>applets/systray/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>applets/mixer/toplevel_id</key>
+      <key>applets/systray/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>bottom_panel</string>
+        <string>top_panel</string>
       </value>
     </entry>
     <entry>
-      <key>applets/mixer/position</key>
+      <key>applets/systray/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
-        <int>-1</int>
+        <int>2</int>
       </value>
     </entry>
     <entry>
-      <key>applets/mixer/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <key>applets/systray/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/mixer/locked</key>
+      <key>applets/systray/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/mixer/bonobo_iid</key>
+      <key>applets/systray/bonobo_iid</key>
       <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>OAFIID:GNOME_MixerApplet</string>
+        <string>OAFIID:GNOME_SystemTrayApplet</string>
       </value>
     </entry>
 
-    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- System Tray Applet -->
+  <!-- Show Desktop Applet -->
 
     <entry>
-      <key>applets/systray/object_type</key>
+      <key>applets/show_desktop_button/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>applets/systray/toplevel_id</key>
+      <key>applets/show_desktop_button/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>applets/systray/position</key>
+      <key>applets/show_desktop_button/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
-        <int>-2</int>
+        <int>0</int>
       </value>
     </entry>
     <entry>
-      <key>applets/systray/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <key>applets/show_desktop_button/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/show_desktop_button/locked</key>
+      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/systray/locked</key>
+      <key>applets/show_desktop_button/bonobo_iid</key>
+      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+      <value>
+        <string>OAFIID:GNOME_ShowDesktopApplet</string>
+      </value>
+    </entry>
+
+    <entry><key>applets/show_desktop_button/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/show_desktop_button/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/show_desktop_button/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/show_desktop_button/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/show_desktop_button/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/show_desktop_button/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/show_desktop_button/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/show_desktop_button/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+  <!-- Window List Applet -->
+
+    <entry>
+      <key>applets/window_list/object_type</key>
+      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+      <value>
+        <string>bonobo-applet</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/window_list/toplevel_id</key>
+      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+      <value>
+        <string>bottom_panel</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/window_list/position</key>
+      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+      <value>
+        <int>1</int>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/window_list/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/window_list/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/systray/bonobo_iid</key>
+      <key>applets/window_list/bonobo_iid</key>
       <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>OAFIID:GNOME_SystemTrayApplet</string>
+        <string>OAFIID:GNOME_WindowListApplet</string>
       </value>
     </entry>
 
-    <entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
-  <!-- Clock Applet -->
+  <!-- Workspace Switcher Applet -->
 
     <entry>
-      <key>applets/clock/object_type</key>
+      <key>applets/workspace_switcher/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
         <string>bonobo-applet</string>
       </value>
     </entry>
     <entry>
-      <key>applets/clock/toplevel_id</key>
+      <key>applets/workspace_switcher/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
         <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
-      <key>applets/clock/position</key>
+      <key>applets/workspace_switcher/position</key>
       <schema_key>/schemas/apps/panel/objects/position</schema_key>
       <value>
-        <int>-4</int>
+        <int>0</int>
       </value>
     </entry>
     <entry>
-      <key>applets/clock/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick_type</schema_key>
+      <key>applets/workspace_switcher/panel_right_stick</key>
+      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/clock/locked</key>
+      <key>applets/workspace_switcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
     <entry>
-      <key>applets/clock/bonobo_iid</key>
+      <key>applets/workspace_switcher/bonobo_iid</key>
       <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
       <value>
-        <string>OAFIID:GNOME_ClockApplet</string>
+        <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/workspace_switcher/prefs/num_rows</key>
+      <schema_key>/schemas/apps/panel/objects/prefes/num_rows</schema_key>
+      <value>
+        <int>1</int>
       </value>
     </entry>
 
-    <entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+    <entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+    <entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+    <entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+    <entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+    <entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+    <entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+    <entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+    <entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
 
   </entrylist>
- 
+
 </gconfentryfile>