diff --git a/desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml b/desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml
index 2e3a878..285e4f2 100644
--- a/desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml
+++ b/desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml
@@ -5,6 +5,6 @@
 #-push(mtime,#-rnd(num,10)-#)-#
 #?env(client.os_remote_auth)!=#
   <node name="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#" expand="true"/>
-  <selected uri="imap://#-ur_login-#@#-sr_mail_host-#/INBOX"/>
+  <selected uri="imap://#-ur_login-#@#server(mail.host)-#/INBOX"/>
 #env#
 </tree-state>
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory
index d1f6ddc..32de6c7 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory
@@ -1 +1 @@
-# Calculate env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
+# Calculate env(client.os_remote_auth)!=&&server(ftp.host)!=
diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop b/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop
index 488a686..c0a8edd 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop
+++ b/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop
@@ -1,4 +1,4 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
+# Calculate format=samba env(client.os_remote_auth)!=&&server(ftp.host)!=
 
 [Desktop Entry]
 Encoding=UTF-8
diff --git a/desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml b/desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
index 947f6f5..f836139 100644
--- a/desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
+++ b/desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-#?cl_remote_host==#
+#?env(client.os_remote_auth)==#
 <directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
-#cl_remote_host#
-#?cl_remote_host!=#
+#env#
+#?env(client.os_remote_auth)!=#
 <directory><file name="Home.volume" icon_position="64,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/user-home.svg"/><file name="FTP.volume" icon_position="220,22" custom_icon="file:///usr/share/icons/gnome/scalable/apps/update-manager.svg" icon_scale="1"/><file name="Disks.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
-#cl_remote_host#
+#env#
diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
index 07b495b..b09a778 100644
--- a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
+++ b/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml
@@ -1,4 +1,4 @@
-# Calculate format=xml_gconf env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
+# Calculate format=xml_gconf env(client.os_remote_auth)!=&&server(ftp.host)!=
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove b/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove
index 43f9e72..10d89ab 100644
--- a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove
+++ b/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove
@@ -1 +1 @@
-# Calculate append=remove name=%gconf.xml env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==
+# Calculate append=remove name=%gconf.xml env(client.os_remote_auth)!=&&server(ftp.host)==
diff --git a/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop b/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop
index 488a686..c0a8edd 100644
--- a/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop
+++ b/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop
@@ -1,4 +1,4 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
+# Calculate format=samba env(client.os_remote_auth)!=&&server(ftp.host)!=
 
 [Desktop Entry]
 Encoding=UTF-8
diff --git a/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove b/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove
index 9b3abdb..e737e3d 100644
--- a/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove
+++ b/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove
@@ -1,2 +1,2 @@
-# Calculate append=remove name=FTP.desktop env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==
+# Calculate append=remove name=FTP.desktop env(client.os_remote_auth)!=&&server(ftp.host)==
 
diff --git a/desktop/user/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml b/desktop/user/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
index 947f6f5..f836139 100644
--- a/desktop/user/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
+++ b/desktop/user/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-#?cl_remote_host==#
+#?env(client.os_remote_auth)==#
 <directory><file name="home" timestamp="1267778829" icon_position="64,22" icon_scale="1" icon_position_timestamp="1267778829"/></directory>
-#cl_remote_host#
-#?cl_remote_host!=#
+#env#
+#?env(client.os_remote_auth)!=#
 <directory><file name="Home.volume" icon_position="64,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/user-home.svg"/><file name="FTP.volume" icon_position="220,22" custom_icon="file:///usr/share/icons/gnome/scalable/apps/update-manager.svg" icon_scale="1"/><file name="Disks.volume" icon_position="142,22" custom_icon="file:///usr/share/icons/gnome/scalable/places/folder-remote.svg" icon_scale="1"/></directory>
-#cl_remote_host#
+#env#