diff --git a/desktop/user/20-kde/kde-4.4/.config/autostart/kopete.desktop b/desktop/user/20-kde/kde-4.4/.config/autostart/kopete.desktop
index a3d95e5..46aaa95 100644
--- a/desktop/user/20-kde/kde-4.4/.config/autostart/kopete.desktop
+++ b/desktop/user/20-kde/kde-4.4/.config/autostart/kopete.desktop
@@ -1,2 +1,2 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=
+# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&server(jabber.host)!=
#добавим Kopete в автозагрузку если настроен локальный Jabber сервер
diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/emaildefaults b/desktop/user/20-kde/kde-4.4/.kde4/share/config/emaildefaults
index 006c4f4..253fc04 100644
--- a/desktop/user/20-kde/kde-4.4/.kde4/share/config/emaildefaults
+++ b/desktop/user/20-kde/kde-4.4/.kde4/share/config/emaildefaults
@@ -6,5 +6,5 @@ Profile=Default
[PROFILE_Default]
EmailAddress=#-ur_mail-#
FullName=#-ur_fullname-#
-Organization=#-env(client.ur_organization)-#
-OutgoingServer=#-env(client.sr_mail_host)-#
+Organization=#-server(mail.organization)-#
+OutgoingServer=#-server(mail.send_host)-#
diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/emailidentities b/desktop/user/20-kde/kde-4.4/.kde4/share/config/emailidentities
index fab5d59..dc61b21 100644
--- a/desktop/user/20-kde/kde-4.4/.kde4/share/config/emailidentities
+++ b/desktop/user/20-kde/kde-4.4/.kde4/share/config/emailidentities
@@ -7,14 +7,14 @@ Default Identity=1
#?os_locale_language==ru#
Dictionary=Русский
#os_locale_language#
-#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap#
+#?server(mail.type)==imap&&env(client.os_remote_auth)!=#
Drafts=.1.directory/Drafts
Fcc=.1.directory/Sent
-#env#
+#server#
Email Address=#-ur_mail-#
Identity=Default
-Inline Signature=#-env(client.ur_signature)-#
+Inline Signature=#-server(mail.signature)-#
Name=#-ur_fullname-#
-Organization=#-env(client.ur_organization)-#
+Organization=#-server(mail.organization)-#
Signature Type=inline
uoid=1
diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc b/desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc
index eed3700..d589ef4 100644
--- a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc
+++ b/desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc
@@ -1,13 +1,13 @@
# Calculate format=kde append=replace
-#?env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=#
+#?env(client.os_remote_auth)!=&&server(jabber.host)!=#
[Account_JabberProtocol_#-ur_jid-#]
AccountId=#-ur_jid-#
AllowPlainTextPassword=true
CustomServer=true
-Port=#-env(client.sr_jabber_port)-#
+Port=#-server(jabber.port)-#
Protocol=JabberProtocol
RememberPassword=true
-Server=#-env(client.sr_jabber_host)-#
+Server=#-server(jabber.host)-#
UseSSL=true
#env#
@@ -72,9 +72,9 @@ Width 1680=500
Width 1920=500
[Notification Messages]
-#?env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=#
+#?env(client.os_remote_auth)!=&&server(jabber.host)!=#
#выдавать предупреждение при проверке сертификата защищенного соединения
-KopeteTLSWarning#-env(client.ur_jid_host)-#InvalidCertSelfSigned=false
+KopeteTLSWarning#-replace('as@','',ur_jid)-#InvalidCertSelfSigned=false
#env#
#предупреждать что программа остается запущенной при закрытии главного окна
hideOnCloseInfo=false
diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/mailtransports b/desktop/user/20-kde/kde-4.4/.kde4/share/config/mailtransports
index 6b80880..563fec2 100644
--- a/desktop/user/20-kde/kde-4.4/.kde4/share/config/mailtransports
+++ b/desktop/user/20-kde/kde-4.4/.kde4/share/config/mailtransports
@@ -1,11 +1,11 @@
# Calculate format=kde
#настройка отправки писем kmail
-#?env(client.sr_mail_host)!=&&env(client.os_remote_auth)!=#
+#?server(mail.host)!=&&env(client.os_remote_auth)!=#
[General]
default-transport=1
[Transport 1]
-host=#-sr_mail_host-#
+host=#-server(mail.host)-#
id=1
name=SMTP
-#env#
+#server#
diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc b/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
index 09185d4..88db82c 100644
--- a/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
+++ b/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc
@@ -102,7 +102,7 @@ Url=file:///home/#-ur_login-#/Disks
Order=#-sum(apporder,apporder+1)-#
#env#
-#?env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1
plugin=icon
@@ -112,10 +112,10 @@ Url=file:///home/#-ur_login-#/FTP
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
#env#
-#?env(client.cl_remote_ftp)==#
+#?server(ftp.host)==#
[Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
#-sum(apporder,,apporder+1)-#
-#env#
+#server#
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
immutability=1
@@ -147,7 +147,7 @@ groupingStrategy=0
maxRows=1
#показывать задачи только с текущего рабочего стола
showOnlyCurrentDesktop=true
-#сотрировка
+#сортировка
sortingStrategy=0
[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
Order=#-sum(apporder,apporder+1)-#
diff --git a/desktop/user/20-kde/kde-4.4/Desktop/FTP.desktop b/desktop/user/20-kde/kde-4.4/Desktop/FTP.desktop
index 58dc333..d8307ee 100644
--- a/desktop/user/20-kde/kde-4.4/Desktop/FTP.desktop
+++ b/desktop/user/20-kde/kde-4.4/Desktop/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
Name=FTP
diff --git a/desktop/user/20-kde/kde-always/Desktop/FTP.desktop b/desktop/user/20-kde/kde-always/Desktop/FTP.desktop
index 9fda71f..6a8bd3d 100644
--- a/desktop/user/20-kde/kde-always/Desktop/FTP.desktop
+++ b/desktop/user/20-kde/kde-always/Desktop/FTP.desktop
@@ -1,4 +1,4 @@
-# Calculate format=kde env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
+# Calculate format=kde env(client.os_remote_auth)!=&&server(ftp.host)!=
[Desktop Entry]
Encoding=UTF-8
Name=FTP
diff --git a/desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove b/desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove
index 1e9f535..5e46308 100644
--- a/desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove
+++ b/desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove
@@ -1 +1 @@
-# 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/20-kde/kmail-4.4/.kde4/share/config/kmailrc b/desktop/user/20-kde/kmail-4.4/.kde4/share/config/kmailrc
index 86b140b..d845fad 100644
--- a/desktop/user/20-kde/kmail-4.4/.kde4/share/config/kmailrc
+++ b/desktop/user/20-kde/kmail-4.4/.kde4/share/config/kmailrc
@@ -1,6 +1,6 @@
# Calculate format=kde
#создадим учетную запись
-#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap#
+#?env(client.os_remote_auth)!=&&server(mail.type)==imap#
[Account 1]
#автоматически очищать удаленные сообщения
auto-expunge=true
@@ -12,11 +12,11 @@ Type=Imap
auth=*
#периодическая проверка почты
check-interval=5
-host=#-env(client.sr_mail_host)-#
+host=#-server(mail.host)-#
#загружать вложения по требованию
loadondemand=true
login=#-ur_login-#
-port=#-env(client.sr_mail_port)-#
+port=#-server(mail.port)-#
trash=.1.directory/Trash
use-tls=true
@@ -35,7 +35,7 @@ isOpen=true
SystemTrayEnabled=true
#режим отображения значка
SystemTrayPolicy=ShowAlways
-#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap#
+#?env(client.os_remote_auth)!=&&server(mail.type)==imap#
#количество учётных записей
accounts=1
#проверять почту при запуске
diff --git a/desktop/user/30-gnome/evolution-2.6/.calculate_directory b/desktop/user/30-gnome/evolution-2.6/.calculate_directory
index 5e739b3..eba8595 100644
--- a/desktop/user/30-gnome/evolution-2.6/.calculate_directory
+++ b/desktop/user/30-gnome/evolution-2.6/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg(mail-client/evolution)>=2.26
+# Calculate append=skip ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg(mail-client/evolution)>=2.26
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 60787a7..2e3a878 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
@@ -3,8 +3,8 @@
#-push(serial,#-rnd(num,2)-#)-#
#-push(pid,#-rnd(num,5)-#)-#
#-push(mtime,#-rnd(num,10)-#)-#
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
-#cl_remote_host#
+#env#
diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml b/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
index e08af05..6ab2e8d 100644
--- a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
+++ b/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml
@@ -1,4 +1,4 @@
-# Calculate format=xml_gconf cl_remote_host!=
+# Calculate format=xml_gconf env(client.os_remote_auth)!=
#-pop(mtime)-#
@@ -17,7 +17,7 @@
<?xml version="1.0"?>
-<account name="IMAP" uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#" enabled="true"><identity><name>#-ur_fullname-#</name><addr-spec>#-ur_mail-#</addr-spec><reply-to>#-ur_mail-#</reply-to><organization>#-ur_organization-#</organization><signature uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#"/></identity><source save-passwd="true" keep-on-server="false" auto-check="true" auto-check-timeout="5"><url>imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all</url></source><transport save-passwd="false"><url>smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never</url></transport><drafts-folder>imap://#-ur_login-#@#-sr_mail_host-#/Drafts</drafts-folder><sent-folder>imap://#-ur_login-#@#-sr_mail_host-#/Sent</sent-folder><auto-cc always="false"><recipients></recipients></auto-cc><auto-bcc always="false"><recipients></recipients></auto-bcc><receipt-policy policy="never"/><pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false"/><smime sign-default="false" encrypt-default="false" encrypt-to-self="false"/></account>
+<account name="IMAP" uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#" enabled="true"><identity><name>#-ur_fullname-#</name><addr-spec>#-ur_mail-#</addr-spec><reply-to>#-ur_mail-#</reply-to><organization>#-ur_organization-#</organization><signature uid="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#"/></identity><source save-passwd="true" keep-on-server="false" auto-check="true" auto-check-timeout="5"><url>imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all</url></source><transport save-passwd="false"><url>smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never</url></transport><drafts-folder>imap://#-ur_login-#@#-env(client.sr_mail_host)-#/Drafts</drafts-folder><sent-folder>imap://#-ur_login-#@#-env(client.sr_mail_host)-#/Sent</sent-folder><auto-cc always="false"><recipients></recipients></auto-cc><auto-bcc always="false"><recipients></recipients></auto-bcc><receipt-policy policy="never"/><pgp encrypt-to-self="false" always-trust="false" always-sign="false" no-imip-sign="false"/><smime sign-default="false" encrypt-default="false" encrypt-to-self="false"/></account>
diff --git a/desktop/user/30-gnome/gnome-2.6/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.calculate_directory
index 2b0138e..c8cc5d6 100644
--- a/desktop/user/30-gnome/gnome-2.6/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.gnome)!=off&&ini(ver.gnome)==&&pkg(gnome-base/libgnome)>=2.26
+# Calculate append=skip ini(update.gnome)!=off&&ini(ver.gnome)==&&pkg(gnome-base/libgnome)>=2.26
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory
index 1bafc2a..e93e0ac 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory
@@ -1,2 +1,2 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml
index bd4e347..9c90d14 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml
@@ -1,11 +1,11 @@
# Calculate format=xml_gconf
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
-#cl_remote_host#
+#env#
Scroll_Lock
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml
index 5585596..e08cf4c 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml
@@ -2,12 +2,12 @@
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
-#cl_remote_host#
+#env#
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory
index bdcb518..a4471e9 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory
@@ -1 +1 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=
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 8b23abe..d1f6ddc 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 cl_remote_host!=&&cl_remote_ftp!=
+# Calculate env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory
index bdcb518..a4471e9 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory
@@ -1 +1 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory
index 8e9a09d..8aa2c96 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory
@@ -1 +1 @@
-# Calculate cl_remote_host==
+# Calculate env(client.os_remote_auth)==
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml
index b15fd2e..e424c23 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml
@@ -14,16 +14,16 @@
103_ftp
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
200_logout
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
201_shutdown
-#cl_remote_host#
+#env#
202_lock
diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory b/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory
index bdcb518..a4471e9 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory
@@ -1 +1 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=
diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop b/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop
index a609047..a58d581 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop
+++ b/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop
@@ -1,4 +1,4 @@
-# Calculate format=samba cl_remote_host!=
+# Calculate format=samba env(client.os_remote_auth)!=
[Desktop Entry]
Encoding=UTF-8
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 a11df0e..488a686 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 cl_remote_host!=&&cl_remote_ftp!=
+# Calculate format=samba env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
[Desktop Entry]
Encoding=UTF-8
diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop b/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop
index 4475931..44ccc3f 100644
--- a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop
+++ b/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop
@@ -6,10 +6,10 @@ Version=1.0
Name=Home
Comment=Browser Home
Icon=user-home
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
URL=file:///home/#-ur_login-#/Home
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
URL=file:///home/#-ur_login-#
-#cl_remote_host#
+#env#
Type=Link
diff --git a/desktop/user/30-gnome/gnome-always/.calculate_directory b/desktop/user/30-gnome/gnome-always/.calculate_directory
index 64b707a..0db1286 100644
--- a/desktop/user/30-gnome/gnome-always/.calculate_directory
+++ b/desktop/user/30-gnome/gnome-always/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&&ini(domain)!=#-cl_remote_host-#
+# Calculate append=skip ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&& env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-#
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 5ea4db0..07b495b 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 cl_remote_host!=&&cl_remote_ftp!=
+# Calculate format=xml_gconf env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
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 c70e7b6..43f9e72 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 cl_remote_host!=&&cl_remote_ftp==
+# Calculate append=remove name=%gconf.xml env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==
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 a11df0e..488a686 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 cl_remote_host!=&&cl_remote_ftp!=
+# Calculate format=samba env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
[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 022a926..9b3abdb 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 cl_remote_host!=&&cl_remote_ftp==
+# Calculate append=remove name=FTP.desktop env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==