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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- pdf
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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=
-
-[/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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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=
-
-[/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 @@
- mozilla-firefox-3.6.desktop
+ mozilla-firefox.desktop
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
+
@@ -92,7 +95,7 @@
NC:useSystemDefault="false"
NC:handleInternal="false">
- pdf
+
+
+
+
+
+
+
+
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