diff --git a/desktop/desktop/40-xfce-4.6/.calculate_directory b/desktop/desktop/40-xfce-4.6/.calculate_directory
index 591ebe1..8cb2bbf 100644
--- a/desktop/desktop/40-xfce-4.6/.calculate_directory
+++ b/desktop/desktop/40-xfce-4.6/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6
+# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.6&&pkg(xfce-base/xfdesktop)<4.8
diff --git a/desktop/desktop/40-xfce-4.8/.calculate/ini.env b/desktop/desktop/40-xfce-4.8/.calculate/ini.env
new file mode 100644
index 0000000..62caa3f
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+xfce = 4.8
+
+[update]
+xfce = on
diff --git a/desktop/desktop/40-xfce-4.8/.calculate_directory b/desktop/desktop/40-xfce-4.8/.calculate_directory
new file mode 100644
index 0000000..30724e4
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(xfdesktop)!=&&ini(update.xfce)!=off&&ini(ver.xfce)==&&pkg(xfce-base/xfdesktop)>=4.8
diff --git a/desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc b/desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
new file mode 100644
index 0000000..fb593dd
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/Terminal/terminalrc
@@ -0,0 +1,4 @@
+# Calculate format=kde
+[Configuration]
+FontName=Droid Sans Mono 10
+MiscSingleClick=TRUE
diff --git a/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop
new file mode 100644
index 0000000..b8ca220
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-clipman-plugin-autostart.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=false
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop
new file mode 100644
index 0000000..5673067
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/autostart/xfce4-tips-autostart.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Hidden=true
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc b/desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc
new file mode 100644
index 0000000..3164f60
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/helpers.rc
@@ -0,0 +1,5 @@
+# Calculate format=procmail
+WebBrowser=chromium-chromium
+FileManager=Thunar
+MailReader=sylpheed-claws
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop
new file mode 100644
index 0000000..bb59fd7
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-13/12952684181.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/chromium-chromium.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/chromium-chromium.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop
new file mode 100644
index 0000000..67565c2
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-14/12952684322.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/claws-mail.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/claws-mail.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop
new file mode 100644
index 0000000..b17d5f3
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-15/12952684423.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/xchat.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/xchat.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop
new file mode 100644
index 0000000..5827db6
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-16/12952684614.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/galculator.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/galculator.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop
new file mode 100644
index 0000000..8f07621
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-17/12952684805.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/writer.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/writer.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop
new file mode 100644
index 0000000..a64d647
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/launcher-18/12952684846.desktop
@@ -0,0 +1,3 @@
+# Calculate format=kde link=/usr/share/applications/calc.desktop
+[Desktop Entry]
+X-XFCE-Source=file:///usr/share/applications/calc.desktop
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc
new file mode 100644
index 0000000..f04b04d
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/panel/xkb-plugin-10.rc
@@ -0,0 +1,10 @@
+display_type=1
+group_policy=2
+default_group=0
+never_modify_config=false
+model=pc104
+layouts=us,ru
+variants=,
+toggle_option=grp:caps_toggle
+compose_key_position=
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
new file mode 100644
index 0000000..dd8ce7c
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
new file mode 100644
index 0000000..f0e5a2a
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
new file mode 100644
index 0000000..9666572
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
new file mode 100644
index 0000000..861c741
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
new file mode 100644
index 0000000..4fa587e
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000..868aa29
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory b/desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory
new file mode 100644
index 0000000..879d998
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/.calculate_directory
@@ -0,0 +1 @@
+# Calculate name= path="#-ini(resource.desktop)-#"
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop b/desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop
new file mode 100644
index 0000000..2f51da8
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/FTP.desktop
@@ -0,0 +1,12 @@
+# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on&&server(ftp.host)!=
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=FTP
+Comment=Browser FTP
+Categories=Application;
+Exec=thunar /home/#-ur_login-#/FTP
+Icon=update-manager
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/Home.desktop b/desktop/desktop/40-xfce-4.8/Desktop/Home.desktop
new file mode 100644
index 0000000..ed986f2
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/Home.desktop
@@ -0,0 +1,17 @@
+# Calculate format=samba
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Home
+Comment=Browser Home
+Categories=Application;
+#?env(client.os_remote_auth)!=&&ur_domain_set==on#
+Exec=thunar /home/#-ur_login-#/Home
+#env#
+#?env(client.os_remote_auth)==||ur_domain_set==off#
+Exec=thunar /home/#-ur_login-#
+#env#
+Icon=user-home
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/README.desktop b/desktop/desktop/40-xfce-4.8/Desktop/README.desktop
new file mode 100644
index 0000000..0868118
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/README.desktop
@@ -0,0 +1,27 @@
+# Calculate os_root_type==livecd chmod=0755
+#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name[bg]=Ръководство за инсталиране
+Name[ru]=Руководство по установке
+Name=Installation Guide
+Comment=
+Categories=Application;
+#?os_locale_language!=ru&&pkg(www-client/chromium)==0#
+Exec=xdg-open /usr/share/calculate/doc/handbook-en.html
+#os_locale_language#
+#?os_locale_language!=ru&&pkg(www-client/chromium)>0#
+Exec=chromium --app="file:///usr/share/calculate/doc/handbook-en.html"
+#os_locale_language#
+#?os_locale_language==ru&&pkg(www-client/chromium)==0#
+Exec=xdg-open /usr/share/calculate/doc/handbook-ru.html
+#os_locale_language#
+#?os_locale_language==ru&&pkg(www-client/chromium)>0#
+Exec=chromium --app="file:///usr/share/calculate/doc/handbook-ru.html"
+#os_locale_language#
+Icon=text-html
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/Share.desktop b/desktop/desktop/40-xfce-4.8/Desktop/Share.desktop
new file mode 100644
index 0000000..53bec28
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/Share.desktop
@@ -0,0 +1,12 @@
+# Calculate format=samba env(client.os_remote_auth)!=&&ur_domain_set==on
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Share
+Comment=Browser Share
+Categories=Application;
+Exec=thunar /home/#-ur_login-#/Share
+Icon=folder-remote
+Terminal=false
+StartupNotify=false
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop b/desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop
new file mode 100644
index 0000000..da74a5c
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/calculate-community.desktop
@@ -0,0 +1,14 @@
+# Calculate format=kde link=/usr/share/applications/xchat.desktop mirror os_root_type==livecd
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Calculate Linux Community
+Name[ru]=Сообщество Calculate Linux
+#Change command line
+#?os_locale_language!=ru#
+Exec=xchat "--url=irc://irc.freenode.net:6667/#calculate"
+#os_locale_language#
+#?os_locale_language==ru#
+Exec=xchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
+#os_locale_language#
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop b/desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop
new file mode 100644
index 0000000..2c04924
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/calculate-install.desktop
@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/cl-install-gui.desktop os_root_type==livecd mirror
+[Desktop Entry]
+Exec=sudo cl-install-gui
+
diff --git a/desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop b/desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop
new file mode 100644
index 0000000..7b59502
--- /dev/null
+++ b/desktop/desktop/40-xfce-4.8/Desktop/gparted.desktop
@@ -0,0 +1,4 @@
+# Calculate format=kde link=/usr/share/applications/gparted.desktop mirror os_root_type==livecd
+[Desktop Entry]
+Exec=sudo /usr/sbin/gparted %f
+!OnlyShowIn=
diff --git a/desktop/desktop/40-xfce-always/.calculate_directory b/desktop/desktop/40-xfce-always/.calculate_directory
index f00fc2a..ce254d4 100644
--- a/desktop/desktop/40-xfce-always/.calculate_directory
+++ b/desktop/desktop/40-xfce-always/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip belong(xfdesktop)!=&&ini(domain)!=#-env(client.os_remote_auth)-#&&pkg(xfce-base/xfdesktop)>=4.6||belong(xfdesktop)!=&&ini(xsession)!=#-cl_desktop_xsession-#&&pkg(xfce-base/xfdesktop)>=4.6
+# Calculate append=skip belong(xfdesktop)!=&&ini(domain)!=#-env(client.os_remote_auth)-#&&pkg(xfce-base/xfdesktop)<4.8||belong(xfdesktop)!=&&ini(xsession)!=#-cl_desktop_xsession-#&&pkg(xfce-base/xfdesktop)>=4.6&&pkg(xfce-base/xfdesktop)<4.8
diff --git a/desktop/desktop/60-gqview-2.1/.calculate/ini.env b/desktop/desktop/60-gqview-2.1/.calculate/ini.env
new file mode 100644
index 0000000..bb4b21c
--- /dev/null
+++ b/desktop/desktop/60-gqview-2.1/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+gqview = 2.1
+
+[update]
+gqview = on
diff --git a/desktop/desktop/60-gqview-2.1/.calculate_directory b/desktop/desktop/60-gqview-2.1/.calculate_directory
new file mode 100644
index 0000000..fee07fa
--- /dev/null
+++ b/desktop/desktop/60-gqview-2.1/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip belong(gqview)!=&&ini(update.gqview)!=off&&ini(ver.gqview)==&&pkg(media-gfx/gqview)>=2.1
diff --git a/desktop/desktop/40-xfce-4.6/.gqview/gqviewrc b/desktop/desktop/60-gqview-2.1/gqviewrc
similarity index 88%
rename from desktop/desktop/40-xfce-4.6/.gqview/gqviewrc
rename to desktop/desktop/60-gqview-2.1/gqviewrc
index f0f752a..0c398e9 100644
--- a/desktop/desktop/40-xfce-4.6/.gqview/gqviewrc
+++ b/desktop/desktop/60-gqview-2.1/gqviewrc
@@ -1,3 +1,4 @@
+# Calculate path=~/.gqview
# черный фон окна
black_window_background: true
# автовращение по exit