diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_keylayout/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/00_object_mainmenu/%gconf.xml
similarity index 70%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_keylayout/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/00_object_mainmenu/%gconf.xml
index f24c221..bc53529 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_keylayout/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/00_object_mainmenu/%gconf.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_keylayout)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_keylayout,x_applet_keylayout)-#"/>
-	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
+	#-pop(x_object_mainmenu)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_mainmenu,x_object_mainmenu)-#"/>
+	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path" type="bool" value="false"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
 		<stringvalue>top_panel_screen0</stringvalue>
 	</entry>
-	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
-	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
+	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip" type="string">
+		<stringvalue>Main Menu</stringvalue>
+	</entry>
+	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon" type="bool" value="true"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>menu-object</stringvalue>
 	</entry>
-	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="true"/>
+	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
-	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_KeyboardApplet</stringvalue>
+	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon" type="string">
+		<stringvalue>/usr/share/icons/Calculate/scalable/place/start-here-gnome.svg</stringvalue>
 	</entry>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_windowlist/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/05_object_home/%gconf.xml
similarity index 82%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_windowlist/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/05_object_home/%gconf.xml
index c835c5b..0a1e3f3 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_windowlist/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/05_object_home/%gconf.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_windowlist)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_windowlist,x_applet_windowlist)-#"/>
+	#-pop(x_object_home)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_home,x_object_home)-#"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
@@ -11,14 +11,14 @@
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
 	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>launcher-object</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_WindowListApplet</stringvalue>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
+	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
+		<stringvalue>Home.desktop</stringvalue>
 	</entry>
-	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_drivemount/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/10_object_disks/%gconf.xml
similarity index 82%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_drivemount/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/10_object_disks/%gconf.xml
index 8083ff7..8296fca 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_drivemount/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/10_object_disks/%gconf.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_drivemount)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_drivemount,x_applet_drivemount)-#"/>
+	#-pop(x_object_disks)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_disks,x_object_disks)-#"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
@@ -11,14 +11,14 @@
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
 	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>launcher-object</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_DriveMountApplet</stringvalue>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
+	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
+		<stringvalue>Disks.desktop</stringvalue>
 	</entry>
-	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/10_object_disks/.calculate_directory b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/10_object_disks/.calculate_directory
new file mode 100644
index 0000000..1bafc2a
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/10_object_disks/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate cl_remote_host!=
+
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_workspaceswitcher/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/15_object_ftp/%gconf.xml
similarity index 81%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_workspaceswitcher/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/15_object_ftp/%gconf.xml
index b9df1c5..a122d93 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_workspaceswitcher/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/15_object_ftp/%gconf.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_workspaceswitcher)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_workspaceswitcher,x_applet_workspaceswitcher)-#"/>
+	#-pop(x_object_ftp)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_ftp,x_object_ftp)-#"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
 	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
@@ -11,14 +11,14 @@
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
 	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>launcher-object</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_WorkspaceSwitcherApplet</stringvalue>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
+	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location" type="string">
+		<stringvalue>FTP.desktop</stringvalue>
 	</entry>
-	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/15_object_ftp/.calculate_directory b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/15_object_ftp/.calculate_directory
new file mode 100644
index 0000000..70450b1
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/00_top_objects_left/15_object_ftp/.calculate_directory
@@ -0,0 +1 @@
+# Calculate cl_remote_host!=&cl_remote_ftp!=
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_glipper/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_logout/%gconf.xml
similarity index 84%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_glipper/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_logout/%gconf.xml
index cc4b60b..de7ceea 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_glipper/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_logout/%gconf.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_glipper)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_glipper,x_applet_glipper)-#"/>
+	#-pop(x_object_logout)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_logout,x_object_logout)-#"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
-	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
+	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type" type="string">
+		<stringvalue>logout</stringvalue>
+	</entry>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
 		<stringvalue>top_panel_screen0</stringvalue>
 	</entry>
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
 	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>action-applet</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="true"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:Glipper</stringvalue>
-	</entry>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_logout/.calculate_directory b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_logout/.calculate_directory
new file mode 100644
index 0000000..1bafc2a
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_logout/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate cl_remote_host!=
+
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_clock/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_shutdown/%gconf.xml
similarity index 84%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_clock/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_shutdown/%gconf.xml
index 38957bd..c80ddb2 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_clock/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_shutdown/%gconf.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_clock)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_clock,x_applet_clock)-#"/>
+	#-pop(x_object_shutdown)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_shutdown,x_object_shutdown)-#"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
-	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
+	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type" type="string">
+		<stringvalue>shutdown</stringvalue>
+	</entry>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
 		<stringvalue>top_panel_screen0</stringvalue>
 	</entry>
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
 	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>action-applet</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="true"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_ClockApplet</stringvalue>
-	</entry>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_shutdown/.calculate_directory b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_shutdown/.calculate_directory
new file mode 100644
index 0000000..8e9a09d
--- /dev/null
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/00_object_shutdown/.calculate_directory
@@ -0,0 +1 @@
+# Calculate cl_remote_host==
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_power/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/05_object_lock/%gconf.xml
similarity index 84%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_power/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/05_object_lock/%gconf.xml
index 115f03b..710b187 100644
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_power/%gconf.xml
+++ b/client-profiles/50-default-CLDG/.gconf/apps/panel/20_top_objects_right/05_object_lock/%gconf.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_power)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_power,x_applet_power)-#"/>
+	#-pop(x_object_lock)-#
+	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_object_lock,x_object_lock)-#"/>
 	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
-	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
+	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type" type="string">
+		<stringvalue>lock</stringvalue>
+	</entry>
 	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
 		<stringvalue>top_panel_screen0</stringvalue>
 	</entry>
 	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
 	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
 	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
+		<stringvalue>action-applet</stringvalue>
 	</entry>
 	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="true"/>
 	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_BattstatApplet</stringvalue>
-	</entry>
+	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid"/>
 	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/%gconf.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_clock/prefs/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_clock/prefs/%gconf.xml
deleted file mode 100644
index b043d5b..0000000
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_clock/prefs/%gconf.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="hour_format" schema="/schemas/apps/clock_applet/prefs/hour_format"/>
-	<entry name="temperature_unit" schema="/schemas/apps/clock_applet/prefs/temperature_unit"/>
-	<entry name="expand_locations" schema="/schemas/apps/clock_applet/prefs/expand_locations"/>
-	<entry name="unix_time" schema="/schemas/apps/clock_applet/prefs/unix_time"/>
-	<entry name="show_temperature" schema="/schemas/apps/clock_applet/prefs/show_temperature" type="bool" value="false"/>
-	<entry name="format" schema="/schemas/apps/clock_applet/prefs/format" type="string">
-		<stringvalue>24-hour</stringvalue>
-	</entry>
-	<entry name="config_tool" schema="/schemas/apps/clock_applet/prefs/config_tool"/>
-	<entry name="expand_birthdays" schema="/schemas/apps/clock_applet/prefs/expand_birthdays"/>
-	<entry name="show_date" schema="/schemas/apps/clock_applet/prefs/show_date" type="bool" value="true"/>
-	<entry name="expand_appointments" schema="/schemas/apps/clock_applet/prefs/expand_appointments"/>
-	<entry name="speed_unit" schema="/schemas/apps/clock_applet/prefs/speed_unit"/>
-	<entry name="expand_weather" schema="/schemas/apps/clock_applet/prefs/expand_weather"/>
-	<entry name="show_seconds" schema="/schemas/apps/clock_applet/prefs/show_seconds"/>
-	<entry name="internet_time" schema="/schemas/apps/clock_applet/prefs/internet_time"/>
-	<entry name="show_week_numbers" schema="/schemas/apps/clock_applet/prefs/show_week_numbers"/>
-	<entry name="expand_tasks" schema="/schemas/apps/clock_applet/prefs/expand_tasks"/>
-	<entry name="show_weather" schema="/schemas/apps/clock_applet/prefs/show_weather" type="bool" value="false"/>
-	<entry name="gmt_time" schema="/schemas/apps/clock_applet/prefs/gmt_time"/>
-	<entry name="show_tooltip" schema="/schemas/apps/clock_applet/prefs/show_tooltip"/>
-	<entry name="custom_format" schema="/schemas/apps/clock_applet/prefs/custom_format"/>
-	<entry name="cities" schema="/schemas/apps/clock_applet/prefs/cities"/>
-</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_drivemount/prefs/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_drivemount/prefs/%gconf.xml
deleted file mode 100644
index bfd7004..0000000
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_drivemount/prefs/%gconf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="autofs_friendly" mtime="1267429250" schema="/schemas/apps/drivemount-applet/prefs/autofs_friendly"/>
-	<entry name="mount_point" mtime="1267429250" schema="/schemas/apps/drivemount-applet/prefs/mount_point"/>
-	<entry name="auto_eject" mtime="1267429250" schema="/schemas/apps/drivemount-applet/prefs/auto_eject"/>
-	<entry name="pixmap" mtime="1267429250" schema="/schemas/apps/drivemount-applet/prefs/pixmap"/>
-	<entry name="scale" mtime="1267429250" schema="/schemas/apps/drivemount-applet/prefs/scale"/>
-	<entry name="interval" mtime="1267429250" schema="/schemas/apps/drivemount-applet/prefs/interval"/>
-</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_notification/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_notification/%gconf.xml
deleted file mode 100644
index a332c80..0000000
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_notification/%gconf.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	#-pop(x_applet_notification)-#
-	<entry name="position" schema="/schemas/apps/panel/objects/position" type="int" value="#-sum(x_applet_notification,x_applet_notification)-#"/>
-	<entry name="use_menu_path" schema="/schemas/apps/panel/objects/use_menu_path"/>
-	<entry name="action_type" schema="/schemas/apps/panel/objects/action_type"/>
-	<entry name="toplevel_id" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
-		<stringvalue>top_panel_screen0</stringvalue>
-	</entry>
-	<entry name="tooltip" schema="/schemas/apps/panel/objects/tooltip"/>
-	<entry name="use_custom_icon" schema="/schemas/apps/panel/objects/use_custom_icon"/>
-	<entry name="object_type" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
-	</entry>
-	<entry name="panel_right_stick" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="true"/>
-	<entry name="locked" schema="/schemas/apps/panel/objects/locked"/>
-	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_NotificationAreaApplet</stringvalue>
-	</entry>
-	<entry name="launcher_location" schema="/schemas/apps/panel/objects/launcher_location"/>
-	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
-</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_power/prefs/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_power/prefs/%gconf.xml
deleted file mode 100644
index 8ba7a5a..0000000
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_power/prefs/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="show_battery" mtime="1267430608" schema="/schemas/apps/battstat-applet/prefs/show_battery" type="bool" value="false"/>
-	<entry name="full_battery_notification" mtime="1267430558" schema="/schemas/apps/battstat-applet/prefs/full_battery_notification"/>
-	<entry name="show_status" mtime="1267430608" schema="/schemas/apps/battstat-applet/prefs/show_status" type="bool" value="true"/>
-	<entry name="beep" mtime="1267430558" schema="/schemas/apps/battstat-applet/prefs/beep"/>
-	<entry name="low_battery_notification" mtime="1267430595" schema="/schemas/apps/battstat-applet/prefs/low_battery_notification" type="bool" value="true"/>
-	<entry name="drain_from_top" mtime="1267430558" schema="/schemas/apps/battstat-applet/prefs/drain_from_top"/>
-	<entry name="red_value_is_time" mtime="1267430595" schema="/schemas/apps/battstat-applet/prefs/red_value_is_time" type="bool" value="false"/>
-	<entry name="show_text" mtime="1267430611" schema="/schemas/apps/battstat-applet/prefs/show_text" type="int" value="0"/>
-	<entry name="red_value" mtime="1267430558" schema="/schemas/apps/battstat-applet/prefs/red_value"/>
-</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_windowlist/prefs/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_windowlist/prefs/%gconf.xml
deleted file mode 100644
index d2190b2..0000000
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_windowlist/prefs/%gconf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="minimum_size" schema="/schemas/apps/window_list_applet/prefs/minimum_size"/>
-	<entry name="move_unminimized_windows" schema="/schemas/apps/window_list_applet/prefs/move_unminimized_windows"/>
-	<entry name="maximum_size" schema="/schemas/apps/window_list_applet/prefs/maximum_size"/>
-	<entry name="group_windows" schema="/schemas/apps/window_list_applet/prefs/group_windows"/>
-	<entry name="display_all_workspaces" schema="/schemas/apps/window_list_applet/prefs/display_all_workspaces"/>
-</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_workspaceswitcher/prefs/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_workspaceswitcher/prefs/%gconf.xml
deleted file mode 100644
index c635670..0000000
--- a/client-profiles/50-default-CLDG/.gconf/apps/panel/40_bottom_applets/applet_workspaceswitcher/prefs/%gconf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<gconf>
-	<entry name="display_workspace_names" schema="/schemas/apps/workspace_switcher_applet/prefs/display_workspace_names"/>
-	<entry name="num_rows" schema="/schemas/apps/workspace_switcher_applet/prefs/num_rows"/>
-	<entry name="display_all_workspaces" schema="/schemas/apps/workspace_switcher_applet/prefs/display_all_workspaces" type="bool" value="true"/>
-</gconf>
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/.calculate_directory b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/.calculate_directory
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/.calculate_directory
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/.calculate_directory
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/00_object_firefox/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/00_object_firefox/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/00_object_firefox/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/00_object_firefox/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/05_object_evolution/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/05_object_evolution/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/05_object_evolution/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/05_object_evolution/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/10_object_xchat/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/10_object_xchat/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/10_object_xchat/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/10_object_xchat/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/15_object_pidgin/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/15_object_pidgin/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/15_object_pidgin/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/15_object_pidgin/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/20_object_oowriter/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/20_object_oowriter/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/20_object_oowriter/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/20_object_oowriter/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/25_object_oocalc/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/25_object_oocalc/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/25_object_oocalc/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/25_object_oocalc/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/30_object_calculator/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/30_object_calculator/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/30_object_calculator/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/30_object_calculator/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/35_object_gimp/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/35_object_gimp/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/35_object_gimp/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/35_object_gimp/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/40_object_imageviewer/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/40_object_imageviewer/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/40_object_imageviewer/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/40_object_imageviewer/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/45_object_rhythmbox/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/45_object_rhythmbox/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/45_object_rhythmbox/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/45_object_rhythmbox/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/50_object_totem/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/50_object_totem/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/50_object_totem/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/50_object_totem/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/55_object_cdburner/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/55_object_cdburner/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/55_object_cdburner/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/55_object_cdburner/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/60_object_dictionary/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/60_object_dictionary/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/60_object_dictionary/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/65_object_editor/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/65_object_editor/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/65_object_editor/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/65_object_editor/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/70_object_terminal/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/70_object_terminal/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/70_object_terminal/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/70_object_terminal/%gconf.xml
diff --git a/client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/75_object_mainmenu/%gconf.xml b/client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/75_object_mainmenu/%gconf.xml
similarity index 100%
rename from client-profiles/50-default-CLDG/.gconf/apps/panel/30_bottom_objects/75_object_mainmenu/%gconf.xml
rename to client-profiles/50-default-CLDG/.gconf/apps/panel/50_bottom_objects/75_object_mainmenu/%gconf.xml