diff --git a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del b/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del
index 0a42a16..611a54c 100644
--- a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del
+++ b/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del
@@ -1,6 +1,6 @@
# Calculate format=kde name=mozilla-firefox-3.5.desktop
[Desktop Entry]
Name=
-Exec=
+Exec=/usr/bin/firefox
Type=Application
NoDisplay=true
diff --git a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del b/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del
index 2d2ad7a..cb7d92a 100644
--- a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del
+++ b/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del
@@ -2,6 +2,6 @@
[Desktop Entry]
Name=
-Exec=
+Exec=/usr/bin/firefox
Type=Application
NoDisplay=true
diff --git a/desktop/user/80-patches/patch-2.1.19/.calculate/ini.env b/desktop/user/80-patches/patch-2.1.19/.calculate/ini.env
deleted file mode 100644
index 00cc998..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.calculate/ini.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=samba
-
-[ver]
-patch = 2.1.19
-
-[update]
-patch = on
diff --git a/desktop/user/80-patches/patch-2.1.19/.calculate_directory b/desktop/user/80-patches/patch-2.1.19/.calculate_directory
deleted file mode 100644
index 2a3152e..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(ver.patch)<2.1.19
diff --git a/desktop/user/80-patches/patch-2.1.19/.config/xfce4/.calculate_directory b/desktop/user/80-patches/patch-2.1.19/.config/xfce4/.calculate_directory
deleted file mode 100644
index e305e8e..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.config/xfce4/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(xfce-base/xfdesktop)>=4.6
diff --git a/desktop/user/80-patches/patch-2.1.19/.config/xfce4/helpers.rc b/desktop/user/80-patches/patch-2.1.19/.config/xfce4/helpers.rc
deleted file mode 100644
index de29c21..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.config/xfce4/helpers.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=procmail
-#?pkg(www-client/chromium)!=#
-WebBrowser=chromium
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
-WebBrowser=firefox
-#pkg#
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.config/xfce4/panel/launcher-30.rc b/desktop/user/80-patches/patch-2.1.19/.config/xfce4/panel/launcher-30.rc
deleted file mode 100644
index 853a846..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.config/xfce4/panel/launcher-30.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Calculate format=kde
-[Entry 0]
-#?pkg(www-client/chromium)!=#
-Icon=chromium-browser
-Exec=chromium
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
-Icon=browser
-Exec=firefox
-#pkg#
-#?pkg(www-client/mozilla-firefox)==&&pkg(www-client/chromium)==#
-Icon=browser
-Exec=exo-open --launch WebBrowser
-#pkg#
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/.calculate_directory b/desktop/user/80-patches/patch-2.1.19/.gconf/.calculate_directory
deleted file mode 100644
index 8d9572f..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(gnome-base/libgnome)>=2.26
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml
deleted file mode 100644
index b3f95cc..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium-chromium.desktop
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- mozilla-firefox.desktop
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml
deleted file mode 100644
index cab7b3c..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/applications/browser/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
deleted file mode 100644
index c186ab1..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/about/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium %s
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox %s
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
deleted file mode 100644
index 9d9bb74..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium %s
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox %s
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
deleted file mode 100644
index c186ab1..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium %s
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox %s
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
deleted file mode 100644
index c186ab1..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/http/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium %s
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox %s
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
deleted file mode 100644
index c186ab1..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/https/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium %s
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox %s
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
deleted file mode 100644
index c186ab1..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=xml_gconf
-
-
-
-#?pkg(www-client/chromium)!=#
- chromium %s
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
- firefox %s
-#pkg#
-
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.gnome2/.calculate_directory b/desktop/user/80-patches/patch-2.1.19/.gnome2/.calculate_directory
deleted file mode 100644
index 8d9572f..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gnome2/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate pkg(gnome-base/libgnome)>=2.26
diff --git a/desktop/user/80-patches/patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/desktop/user/80-patches/patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd
deleted file mode 100644
index 0615eef..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde
-
-[Desktop Entry]
-#?os_locale_language!=ru#
-Exec=xdg-open /usr/calculate/install/doc/handbook.html
-#os_locale_language#
-#?os_locale_language==ru#
-Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html
-#os_locale_language#
diff --git a/desktop/user/80-patches/patch-2.1.19/.kde4/.calculate_directory b/desktop/user/80-patches/patch-2.1.19/.kde4/.calculate_directory
deleted file mode 100644
index 3f0dc89..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.kde4/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate pkg(kde-base/kdelibs)<4.5
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.kde4/share/config/kdeglobals b/desktop/user/80-patches/patch-2.1.19/.kde4/share/config/kdeglobals
deleted file mode 100644
index 66997a9..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.kde4/share/config/kdeglobals
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=kde
-
-[General]
-# сделать chromium браузером по умолчанию, если он установлен
-#?pkg(www-client/chromium)!=#
-BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop
-#pkg#
-# сделать mozilla firefox браузером по умолчанию, если он установлен
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
-BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
-#pkg#
-#?pkg(www-client/mozilla-firefox)==&&pkg(www-client/chromium)==#
-BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop
-#pkg#
diff --git a/desktop/user/80-patches/patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc b/desktop/user/80-patches/patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc
deleted file mode 100644
index a0a3eb8..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.kde4/share/config/plasma-desktop-appletsrc
+++ /dev/null
@@ -1,36 +0,0 @@
-# Calculate format=plasma
-#------------------------------------------------------------------------------
-#нижняя панель
-#------------------------------------------------------------------------------
-
-#-sum(cont,,2)-#
-#-sum(bs,,40)-#
-#-sum(sp,,4)-#
-#-sum(height,,bs+sp)-#
-#-sum(width,,height*15)-#
-
-[Containments][#-sum(cont,cont+1)-#]
-desktop=-1
-formfactor=2
-geometry=0,0,#-sum(width,width)-#,#-sum(height,height)-#
-immutability=1
-location=4
-plugin=panel
-screen=0
-zvalue=150
-
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,cont*100)-#]
-geometry=#-sum(x,0)-#,0,#-sum(x,bs,x+bs)-#,#-sum(bs,bs)-#
-immutability=1
-plugin=icon
-zvalue=0
-[Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
-#?pkg(www-client/chromium)!=#
-Url=file:///usr/share/applications/chromium-chromium.desktop
-#pkg#
-#?pkg(www-client/mozilla-firefox)!=&&pkg(www-client/chromium)==#
-Url=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
-#pkg#
-#?pkg(www-client/mozilla-firefox)==&&pkg(www-client/chromium)==#
-Url=file:///usr/share/applications/kde4/konqbrowser.desktop
-#pkg#
diff --git a/desktop/user/80-patches/patch-2.1.19/.local/share/applications/defaults.list b/desktop/user/80-patches/patch-2.1.19/.local/share/applications/defaults.list
deleted file mode 100644
index de73771..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.local/share/applications/defaults.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=compiz
-[Default Applications]
-application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop
-application/rtf=writer.desktop
-application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop
-application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop
-application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop
-application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop
-application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop
-application/xml=chromium-chromium.desktop;mozilla-firefox.desktop
-application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop
-application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop
-text/html=chromium-chromium.desktop;mozilla-firefox.desktop
-
diff --git a/desktop/user/80-patches/patch-2.1.19/.local/share/applications/mimeapps.list b/desktop/user/80-patches/patch-2.1.19/.local/share/applications/mimeapps.list
deleted file mode 100644
index 18b80b9..0000000
--- a/desktop/user/80-patches/patch-2.1.19/.local/share/applications/mimeapps.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=compiz pkg(kdelibs)>=4.3
-[Added Associations]
-application/rss+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/vnd.mozilla.xul+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/x-font-ttx=chromium-chromium.desktop;mozilla-firefox.desktop;
-application/x-ufraw=chromium-chromium.desktop;mozilla-firefox.desktop;
-application/xhtml+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xml-external-parsed-entity=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xsd=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-application/xslt+xml=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
-text/html=chromium-chromium.desktop;mozilla-firefox.desktop;kde4-kfmclient_html.desktop;pgadmin3.desktop;kde4-kwrite.desktop;writer.desktop;kde4-kate.desktop;
diff --git a/desktop/user/80-patches/patch-2.1.19/Desktop/README.desktop b/desktop/user/80-patches/patch-2.1.19/Desktop/README.desktop
deleted file mode 100644
index dd85e09..0000000
--- a/desktop/user/80-patches/patch-2.1.19/Desktop/README.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=kde os_root_type==livecd chmod=0755
-
-[Desktop Entry]
-#?os_locale_language!=ru#
-Exec=xdg-open /usr/calculate/install/doc/handbook.html
-#os_locale_language#
-#?os_locale_language==ru#
-Exec=xdg-open /usr/calculate/install/doc/handbook-ru.html
-#os_locale_language#