From 17770abd297be66d59c46ade8b820d151184f779 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Tue, 30 Mar 2010 10:00:12 +0400
Subject: [PATCH] Firefox templates refactoring

---
 .../firefox/calculate.default/mimeTypes.rdf   | 207 ----------------
 .../20-kde-4.3/.stardict/stardict.cfg         |  16 --
 .../firefox/calculate.default/mimeTypes.rdf   | 225 ------------------
 .../20-kde-4.4/.stardict/stardict.cfg         |  16 --
 .../20-kde-always/.calculate_directory        |   1 -
 .../mozilla-firefox-3.5.desktop.del           |   1 -
 .../mozilla-firefox-3.6.desktop.del           |   1 -
 .../300_webbrowser/%gconf.xml                 |   2 +-
 .../applications/mozilla-firefox-3.6.desktop  |   5 -
 .../firefox/calculate.default/mimeTypes.rdf   | 189 ---------------
 .../firefox/calculate.default/mimeTypes.rdf   | 189 ---------------
 .../firefox/calculate.default/mimeTypes.rdf   |  20 +-
 .../90-firefox-always/.calculate_directory    |   1 +
 .../applications/mozilla-firefox-3.5.desktop  |   0
 .../mozilla-firefox-3.5.desktop.del           |   3 +
 .../applications/mozilla-firefox-3.6.desktop  |   0
 .../mozilla-firefox-3.6.desktop.del           |   4 +
 .../firefox/calculate.default/mimeTypes.rdf   |   0
 18 files changed, 28 insertions(+), 852 deletions(-)
 delete mode 100644 client-profiles/20-kde-4.3/.mozilla/firefox/calculate.default/mimeTypes.rdf
 delete mode 100644 client-profiles/20-kde-4.3/.stardict/stardict.cfg
 delete mode 100644 client-profiles/20-kde-4.4/.mozilla/firefox/calculate.default/mimeTypes.rdf
 delete mode 100644 client-profiles/20-kde-4.4/.stardict/stardict.cfg
 delete mode 100644 client-profiles/20-kde-always/.calculate_directory
 delete mode 100644 client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del
 delete mode 100644 client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del
 delete mode 100644 client-profiles/30-gnome-2.6/.local/share/applications/mozilla-firefox-3.6.desktop
 delete mode 100644 client-profiles/30-gnome-2.6/.mozilla/firefox/calculate.default/mimeTypes.rdf
 delete mode 100644 client-profiles/40-xfce-4.6/.mozilla/firefox/calculate.default/mimeTypes.rdf
 create mode 100644 client-profiles/90-firefox-always/.calculate_directory
 rename client-profiles/{20-kde-always => 90-firefox-always}/.local/share/applications/mozilla-firefox-3.5.desktop (100%)
 create mode 100644 client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del
 rename client-profiles/{20-kde-always => 90-firefox-always}/.local/share/applications/mozilla-firefox-3.6.desktop (100%)
 create mode 100644 client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del
 rename client-profiles/{20-kde-4.3-4.4 => 90-firefox-always}/.mozilla/firefox/calculate.default/mimeTypes.rdf (100%)

diff --git a/client-profiles/20-kde-4.3/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/20-kde-4.3/.mozilla/firefox/calculate.default/mimeTypes.rdf
deleted file mode 100644
index 1c5584f..0000000
--- a/client-profiles/20-kde-4.3/.mozilla/firefox/calculate.default/mimeTypes.rdf
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:application/msword"
-                   NC:value="application/msword"
-                   NC:editable="true"
-                   NC:fileExtensions="doc"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                   NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:scheme:externalApplication:file"
-                   NC:prettyName="xdg-open"
-                   NC:path="/usr/bin/xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-tar"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"
-                   NC:prettyName="Яндекс.Календарь"
-                   NC:uriTemplate="https://calendar.yandex.ru/importics.xml?ics=%s" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-tar"
-                   NC:value="application/x-tar"
-                   NC:editable="true"
-                   NC:fileExtensions="tar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:irc"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"
-                   NC:prettyName="Яндекс.Почта"
-                   NC:uriTemplate="https://mail.yandex.ru/compose?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-rar-compressed"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:scheme:handler:ircs"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-tar"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/msword"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-torrent"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:root"
-                   NC:ru_defaultHandlersVersion="4" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/msword"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/zip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-gzip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-gzip"
-                   NC:value="application/x-gzip"
-                   NC:editable="true"
-                   NC:fileExtensions="gz"
-                   NC:description="gzip">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"
-                   NC:prettyName="Mail.Ru"
-                   NC:uriTemplate="http://win.mail.ru/cgi-bin/sentmsg?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:handler:application/pdf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
-  </RDF:Description>pdf
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-torrent"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-torrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/zip"
-                   NC:value="application/zip"
-                   NC:editable="true"
-                   NC:fileExtensions="zip"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:file"
-                   NC:value="file">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:file"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:schemes:root">
-    <RDF:li RDF:resource="urn:scheme:mailto"/>
-    <RDF:li RDF:resource="urn:scheme:webcal"/>
-    <RDF:li RDF:resource="urn:scheme:irc"/>
-    <RDF:li RDF:resource="urn:scheme:ircs"/>
-    <RDF:li RDF:resource="urn:scheme:file"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:ircs"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:schemes">
-    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:webcal"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-rar-compressed"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:mailto"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/pdf"
-                   NC:value="application/pdf"
-                   NC:editable="true"
-                   NC:fileExtensions="pdf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-torrent"
-                   NC:value="application/x-torrent"
-                   NC:editable="true"
-                   NC:fileExtensions="torrent"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-torrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetypes">
-    <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:irc"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-rar-compressed"
-                   NC:value="application/x-rar-compressed"
-                   NC:editable="true"
-                   NC:fileExtensions="rar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-torrent"/>
-    <RDF:li RDF:resource="urn:mimetype:application/zip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/msword"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-rar-compressed"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-gzip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-tar"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:handler:file"
-                   NC:alwaysAsk="false">
-    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:file"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-gzip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/zip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-</RDF:RDF>
diff --git a/client-profiles/20-kde-4.3/.stardict/stardict.cfg b/client-profiles/20-kde-4.3/.stardict/stardict.cfg
deleted file mode 100644
index 0934bc0..0000000
--- a/client-profiles/20-kde-4.3/.stardict/stardict.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[/apps/stardict/preferences/dictionary]
-#сканировать, только если модификатор нажат
-only_scan_while_modifier_key=true
-
-[/apps/stardict/preferences/network]
-#включить сетевые словари
-enable_netdict=false
-
-[/apps/stardict/manage_dictionaries]
-#отключим пустой китайский словарь
-dict_config_xml=<dictgroup name="Default Group"><querydict><netdict enable="false" id="/usr/lib64/stardict/plugins/stardict_dictdotcn.so"/></querydict><scandict><netdict enable="false" id="/usr/lib64/stardict/plugins/stardict_dictdotcn.so"/></scandict></dictgroup>
-
-[/apps/stardict/preferences/main_window]
-#прятать главное окно при старте
-hide_on_startup=true
-
diff --git a/client-profiles/20-kde-4.4/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/20-kde-4.4/.mozilla/firefox/calculate.default/mimeTypes.rdf
deleted file mode 100644
index f3459b4..0000000
--- a/client-profiles/20-kde-4.4/.mozilla/firefox/calculate.default/mimeTypes.rdf
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:application/msword"
-                   NC:value="application/msword"
-                   NC:editable="true"
-                   NC:fileExtensions="doc"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                   NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:scheme:externalApplication:file"
-                   NC:prettyName="xdg-open"
-                   NC:path="/usr/bin/xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-tar"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"
-                   NC:prettyName="Яндекс.Календарь"
-                   NC:uriTemplate="https://calendar.yandex.ru/importics.xml?ics=%s" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-tar"
-                   NC:value="application/x-tar"
-                   NC:editable="true"
-                   NC:fileExtensions="tar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:irc"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"
-                   NC:prettyName="Яндекс.Почта"
-                   NC:uriTemplate="https://mail.yandex.ru/compose?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-rar-compressed"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:scheme:handler:ircs"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-tar"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/msword"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:text/rtf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-torrent"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:root"
-                   NC:ru_defaultHandlersVersion="4" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/msword"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/zip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-gzip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-gzip"
-                   NC:value="application/x-gzip"
-                   NC:editable="true"
-                   NC:fileExtensions="gz"
-                   NC:description="gzip">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"
-                   NC:prettyName="Mail.Ru"
-                   NC:uriTemplate="http://win.mail.ru/cgi-bin/sentmsg?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:handler:application/pdf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-torrent"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-torrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:text/rtf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:text/rtf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/zip"
-                   NC:value="application/zip"
-                   NC:editable="true"
-                   NC:fileExtensions="zip"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:file"
-                   NC:value="file">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:file"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:schemes:root">
-    <RDF:li RDF:resource="urn:scheme:mailto"/>
-    <RDF:li RDF:resource="urn:scheme:webcal"/>
-    <RDF:li RDF:resource="urn:scheme:irc"/>
-    <RDF:li RDF:resource="urn:scheme:ircs"/>
-    <RDF:li RDF:resource="urn:scheme:file"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:ircs"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:schemes">
-    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:webcal"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-rar-compressed"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:mailto"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/pdf"
-                   NC:value="application/pdf"
-                   NC:editable="true"
-                   NC:fileExtensions="pdf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:text/rtf"
-                   NC:value="text/rtf"
-                   NC:editable="true"
-                   NC:fileExtensions="rtf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:text/rtf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-torrent"
-                   NC:value="application/x-torrent"
-                   NC:editable="true"
-                   NC:fileExtensions="torrent"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-torrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetypes">
-    <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:irc"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-rar-compressed"
-                   NC:value="application/x-rar-compressed"
-                   NC:editable="true"
-                   NC:fileExtensions="rar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-torrent"/>
-    <RDF:li RDF:resource="urn:mimetype:application/zip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/msword"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-rar-compressed"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-gzip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-tar"/>
-    <RDF:li RDF:resource="urn:mimetype:text/rtf"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:handler:file"
-                   NC:alwaysAsk="false">
-    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:file"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-gzip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/zip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-</RDF:RDF>
diff --git a/client-profiles/20-kde-4.4/.stardict/stardict.cfg b/client-profiles/20-kde-4.4/.stardict/stardict.cfg
deleted file mode 100644
index 0934bc0..0000000
--- a/client-profiles/20-kde-4.4/.stardict/stardict.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[/apps/stardict/preferences/dictionary]
-#сканировать, только если модификатор нажат
-only_scan_while_modifier_key=true
-
-[/apps/stardict/preferences/network]
-#включить сетевые словари
-enable_netdict=false
-
-[/apps/stardict/manage_dictionaries]
-#отключим пустой китайский словарь
-dict_config_xml=<dictgroup name="Default Group"><querydict><netdict enable="false" id="/usr/lib64/stardict/plugins/stardict_dictdotcn.so"/></querydict><scandict><netdict enable="false" id="/usr/lib64/stardict/plugins/stardict_dictdotcn.so"/></scandict></dictgroup>
-
-[/apps/stardict/preferences/main_window]
-#прятать главное окно при старте
-hide_on_startup=true
-
diff --git a/client-profiles/20-kde-always/.calculate_directory b/client-profiles/20-kde-always/.calculate_directory
deleted file mode 100644
index d8cfc5d..0000000
--- a/client-profiles/20-kde-always/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate ini(main.update)!=off&ini(update.kde)!=off&pkg(kde-base/kdelibs)>4.3
diff --git a/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del b/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del
deleted file mode 100644
index 0cde24c..0000000
--- a/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=mozilla-firefox-3.5.desktop append=remove
diff --git a/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del b/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del
deleted file mode 100644
index 2fc63b6..0000000
--- a/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop.del
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate name=mozilla-firefox-3.6.desktop append=remove
diff --git a/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml b/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml
index f7d4282..cbbf786 100644
--- a/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml
+++ b/client-profiles/30-gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml
@@ -20,7 +20,7 @@
 	<entry name="custom_icon" schema="/schemas/apps/panel/objects/custom_icon"/>
 	<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>mozilla-firefox-3.6.desktop</stringvalue>
+		<stringvalue>mozilla-firefox.desktop</stringvalue>
 	</entry>
 	<entry name="menu_path" schema="/schemas/apps/panel/objects/menu_path"/>
 </gconf>
diff --git a/client-profiles/30-gnome-2.6/.local/share/applications/mozilla-firefox-3.6.desktop b/client-profiles/30-gnome-2.6/.local/share/applications/mozilla-firefox-3.6.desktop
deleted file mode 100644
index aa31384..0000000
--- a/client-profiles/30-gnome-2.6/.local/share/applications/mozilla-firefox-3.6.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-# Calculate format=kde link=/usr/share/applications/mozilla-firefox-3.6.desktop mirror
-[Desktop Entry]
-Name=Internet Browser
-Icon=applications-internet
-StartupNotify=false
diff --git a/client-profiles/30-gnome-2.6/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/30-gnome-2.6/.mozilla/firefox/calculate.default/mimeTypes.rdf
deleted file mode 100644
index 115efa3..0000000
--- a/client-profiles/30-gnome-2.6/.mozilla/firefox/calculate.default/mimeTypes.rdf
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:application/msword"
-                   NC:value="application/msword"
-                   NC:editable="true"
-                   NC:fileExtensions="doc"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                   NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:scheme:externalApplication:file"
-                   NC:prettyName="xdg-open"
-                   NC:path="/usr/bin/xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-tar"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"
-                   NC:prettyName="Яндекс.Календарь"
-                   NC:uriTemplate="https://calendar.yandex.ru/importics.xml?ics=%s" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-tar"
-                   NC:value="application/x-tar"
-                   NC:editable="true"
-                   NC:fileExtensions="tar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:irc"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"
-                   NC:prettyName="Яндекс.Почта"
-                   NC:uriTemplate="https://mail.yandex.ru/compose?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-rar-compressed"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:scheme:handler:ircs"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-tar"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/msword"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:root"
-                   NC:ru_defaultHandlersVersion="4" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/msword"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/zip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-gzip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-gzip"
-                   NC:value="application/x-gzip"
-                   NC:editable="true"
-                   NC:fileExtensions="gz"
-                   NC:description="gzip">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"
-                   NC:prettyName="Mail.Ru"
-                   NC:uriTemplate="http://win.mail.ru/cgi-bin/sentmsg?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:handler:application/pdf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/zip"
-                   NC:value="application/zip"
-                   NC:editable="true"
-                   NC:fileExtensions="zip"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:file"
-                   NC:value="file">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:file"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:schemes:root">
-    <RDF:li RDF:resource="urn:scheme:mailto"/>
-    <RDF:li RDF:resource="urn:scheme:webcal"/>
-    <RDF:li RDF:resource="urn:scheme:irc"/>
-    <RDF:li RDF:resource="urn:scheme:ircs"/>
-    <RDF:li RDF:resource="urn:scheme:file"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:ircs"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:schemes">
-    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:webcal"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-rar-compressed"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:mailto"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/pdf"
-                   NC:value="application/pdf"
-                   NC:editable="true"
-                   NC:fileExtensions="pdf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetypes">
-    <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:irc"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-rar-compressed"
-                   NC:value="application/x-rar-compressed"
-                   NC:editable="true"
-                   NC:fileExtensions="rar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
-    <RDF:li RDF:resource="urn:mimetype:application/zip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/msword"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-rar-compressed"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-gzip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-tar"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:handler:file"
-                   NC:alwaysAsk="false">
-    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:file"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-gzip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/zip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-</RDF:RDF>
diff --git a/client-profiles/40-xfce-4.6/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/40-xfce-4.6/.mozilla/firefox/calculate.default/mimeTypes.rdf
deleted file mode 100644
index 115efa3..0000000
--- a/client-profiles/40-xfce-4.6/.mozilla/firefox/calculate.default/mimeTypes.rdf
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:application/msword"
-                   NC:value="application/msword"
-                   NC:editable="true"
-                   NC:fileExtensions="doc"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:mailto"
-                   NC:value="mailto">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:mailto"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://www.mibbit.com/?url=%s"
-                   NC:prettyName="Mibbit"
-                   NC:uriTemplate="https://www.mibbit.com/?url=%s" />
-  <RDF:Description RDF:about="urn:scheme:externalApplication:file"
-                   NC:prettyName="xdg-open"
-                   NC:path="/usr/bin/xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-tar"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"
-                   NC:prettyName="Яндекс.Календарь"
-                   NC:uriTemplate="https://calendar.yandex.ru/importics.xml?ics=%s" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-tar"
-                   NC:value="application/x-tar"
-                   NC:editable="true"
-                   NC:fileExtensions="tar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:irc"
-                   NC:value="irc">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:irc"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"
-                   NC:prettyName="Яндекс.Почта"
-                   NC:uriTemplate="https://mail.yandex.ru/compose?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-rar-compressed"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:scheme:handler:ircs"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-tar"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-tar"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/msword"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/msword"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:root"
-                   NC:ru_defaultHandlersVersion="4" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/msword"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/zip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-gzip"
-                   NC:path="/usr/bin/xdg-open"
-                   NC:prettyName="xdg-open" />
-  <RDF:Description RDF:about="urn:mimetype:application/x-gzip"
-                   NC:value="application/x-gzip"
-                   NC:editable="true"
-                   NC:fileExtensions="gz"
-                   NC:description="gzip">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"
-                   NC:prettyName="Mail.Ru"
-                   NC:uriTemplate="http://win.mail.ru/cgi-bin/sentmsg?mailto=%s" />
-  <RDF:Description RDF:about="urn:mimetype:handler:application/pdf"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/zip"
-                   NC:value="application/zip"
-                   NC:editable="true"
-                   NC:fileExtensions="zip"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:file"
-                   NC:value="file">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:file"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:schemes:root">
-    <RDF:li RDF:resource="urn:scheme:mailto"/>
-    <RDF:li RDF:resource="urn:scheme:webcal"/>
-    <RDF:li RDF:resource="urn:scheme:irc"/>
-    <RDF:li RDF:resource="urn:scheme:ircs"/>
-    <RDF:li RDF:resource="urn:scheme:file"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:ircs"
-                   NC:value="ircs">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:ircs"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:schemes">
-    <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:webcal"
-                   NC:value="webcal">
-    <NC:handlerProp RDF:resource="urn:scheme:handler:webcal"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-rar-compressed"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:mailto"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:http://win.mail.ru/cgi-bin/sentmsg?mailto=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"/>
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://mail.yandex.ru/compose?mailto=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/pdf"
-                   NC:value="application/pdf"
-                   NC:editable="true"
-                   NC:fileExtensions="pdf"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetypes">
-    <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:irc"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://www.mibbit.com/?url=%s"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-rar-compressed"
-                   NC:value="application/x-rar-compressed"
-                   NC:editable="true"
-                   NC:fileExtensions="rar"
-                   NC:description="">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-rar-compressed"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:scheme:handler:webcal"
-                   NC:alwaysAsk="true">
-    <NC:possibleApplication RDF:resource="urn:handler:web:https://calendar.yandex.ru/importics.xml?ics=%s"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:application/pdf"/>
-    <RDF:li RDF:resource="urn:mimetype:application/zip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/msword"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-rar-compressed"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-gzip"/>
-    <RDF:li RDF:resource="urn:mimetype:application/x-tar"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:scheme:handler:file"
-                   NC:alwaysAsk="false">
-    <NC:externalApplication RDF:resource="urn:scheme:externalApplication:file"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-gzip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-gzip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:handler:application/zip"
-                   NC:alwaysAsk="false"
-                   NC:saveToDisk="false"
-                   NC:useSystemDefault="false"
-                   NC:handleInternal="false">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/zip"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
-                   NC:prettyName="Gmail"
-                   NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-</RDF:RDF>
diff --git a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf
index 1c5584f..f3459b4 100644
--- a/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf
+++ b/client-profiles/90-firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf
@@ -62,6 +62,9 @@
   <RDF:Description RDF:about="urn:mimetype:externalApplication:application/pdf"
                    NC:path="/usr/bin/xdg-open"
                    NC:prettyName="xdg-open" />
+  <RDF:Description RDF:about="urn:mimetype:externalApplication:text/rtf"
+                   NC:path="/usr/bin/xdg-open"
+                   NC:prettyName="xdg-open" />
   <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-torrent"
                    NC:path="/usr/bin/xdg-open"
                    NC:prettyName="xdg-open" />
@@ -92,7 +95,7 @@
                    NC:useSystemDefault="false"
                    NC:handleInternal="false">
     <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/pdf"/>
-  </RDF:Description>pdf
+  </RDF:Description>
   <RDF:Description RDF:about="urn:mimetype:handler:application/x-torrent"
                    NC:alwaysAsk="false"
                    NC:saveToDisk="false"
@@ -100,6 +103,13 @@
                    NC:handleInternal="false">
     <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-torrent"/>
   </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:handler:text/rtf"
+                   NC:alwaysAsk="false"
+                   NC:saveToDisk="false"
+                   NC:useSystemDefault="false"
+                   NC:handleInternal="false">
+    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:text/rtf"/>
+  </RDF:Description>
   <RDF:Description RDF:about="urn:mimetype:application/zip"
                    NC:value="application/zip"
                    NC:editable="true"
@@ -149,6 +159,13 @@
                    NC:description="">
     <NC:handlerProp RDF:resource="urn:mimetype:handler:application/pdf"/>
   </RDF:Description>
+  <RDF:Description RDF:about="urn:mimetype:text/rtf"
+                   NC:value="text/rtf"
+                   NC:editable="true"
+                   NC:fileExtensions="rtf"
+                   NC:description="">
+    <NC:handlerProp RDF:resource="urn:mimetype:handler:text/rtf"/>
+  </RDF:Description>
   <RDF:Description RDF:about="urn:mimetype:application/x-torrent"
                    NC:value="application/x-torrent"
                    NC:editable="true"
@@ -182,6 +199,7 @@
     <RDF:li RDF:resource="urn:mimetype:application/x-rar-compressed"/>
     <RDF:li RDF:resource="urn:mimetype:application/x-gzip"/>
     <RDF:li RDF:resource="urn:mimetype:application/x-tar"/>
+    <RDF:li RDF:resource="urn:mimetype:text/rtf"/>
   </RDF:Seq>
   <RDF:Description RDF:about="urn:scheme:handler:file"
                    NC:alwaysAsk="false">
diff --git a/client-profiles/90-firefox-always/.calculate_directory b/client-profiles/90-firefox-always/.calculate_directory
new file mode 100644
index 0000000..0548580
--- /dev/null
+++ b/client-profiles/90-firefox-always/.calculate_directory
@@ -0,0 +1 @@
+# Calculate ini(main.update)!=off&ini(update.firefox)!=off&pkg(www-client/mozilla-firefox)>=3.5&ini(newsystem)==on
diff --git a/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop b/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop
similarity index 100%
rename from client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.5.desktop
rename to client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop
diff --git a/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del b/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del
new file mode 100644
index 0000000..d58c5e5
--- /dev/null
+++ b/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del
@@ -0,0 +1,3 @@
+# Calculate format=kde name=mozilla-firefox-3.5.desktop
+[Desktop Entry]
+NoDisplay=true
diff --git a/client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop b/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop
similarity index 100%
rename from client-profiles/20-kde-always/.local/share/applications/mozilla-firefox-3.6.desktop
rename to client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop
diff --git a/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del b/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del
new file mode 100644
index 0000000..31b1ca8
--- /dev/null
+++ b/client-profiles/90-firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del
@@ -0,0 +1,4 @@
+# Calculate format=kde name=mozilla-firefox-3.6.desktop
+
+[Desktop Entry]
+NoDisplay=True
diff --git a/client-profiles/20-kde-4.3-4.4/.mozilla/firefox/calculate.default/mimeTypes.rdf b/client-profiles/90-firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf
similarity index 100%
rename from client-profiles/20-kde-4.3-4.4/.mozilla/firefox/calculate.default/mimeTypes.rdf
rename to client-profiles/90-firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf