diff --git a/Makefile.in b/Makefile.in
index a287990..b8ff0a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,10 +5,9 @@ VERSION=@VERSION@
 
 all:
 # background
-	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/droid/DroidSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
 	cp -al wallpaper.png graphics/backgrounds/default.png
 	cp -al wallpaper.png graphics/backgrounds/xdm.png
 
 include components.mk
-install: browser-qt ahttpd indexhtml
-x86: boot
+install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
diff --git a/branding.spec b/branding.spec
index 22ac8df..41d84bc 100644
--- a/branding.spec
+++ b/branding.spec
@@ -1,15 +1,16 @@
 %define theme junior
 %define Name School Junior
-%define codename none
-%define status %nil
-%define variants altlinux-office-desktop altlinux-office-server altlinux-desktop
+%define codename Parus major
+%define variants altlinux-backup-server altlinux-desktop altlinux-gnome-desktop altlinux-kdesktop altlinux-lite altlinux-lxdesktop altlinux-office-desktop altlinux-office-server altlinux-school-server altlinux-sisyphus altlinux-spt altlinux-tablet altlinux-workbench informika-schoolmaster ivk-chainmail lxde-desktop lxde-school-lite Platform6-server-light school-teacher school-lite school-master school-server school-terminal altlinux-centaurus sisyphus-server-light simply-linux
 %define brand school
-%define distro_name Informika 6.0 School Junior
-%define distro_name_ru Информика 6.0 Школьный Юниор
+%define status альфа
+%define status_en alpha
+%define distro_name Informika 6.9.9 School Junior (alpha)
+%define distro_name_ru Информика 6.9.9 Школьный Юниор (альфа)
 
 Name: branding-%brand-%theme
-Version: 6.0.0
-Release: alt5
+Version: 6.9.9
+Release: alt1
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
@@ -25,7 +26,7 @@ Source: branding.tar
 
 Group: Graphics
 Summary: System/Base
-License: GPL
+License: GPLv2+
 
 %description
 Distro-specific packages with design and texts for %distro_name.
@@ -37,7 +38,7 @@ Distro-specific packages with design and texts for %distro_name.
 Group: System/Configuration/Boot and Init
 Summary: Graphical boot logo for grub2, lilo and syslinux
 Summary(ru_RU.UTF-8): Тема для экрана выбора вариантов загрузки (lilo и syslinux) 
-License: GPL
+License: GPLv2+
 
 PreReq: coreutils
 Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
@@ -45,8 +46,8 @@ Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design
 Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
 Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootloader ";done )
 
-%define grub_normal dark-gray/white
-%define grub_high black/white
+%define grub_normal white/light-blue
+%define grub_high black/light-gray
 
 %description bootloader
 Here you find the graphical boot logo for %distro_name.
@@ -84,7 +85,10 @@ Provides: design-alterator-browser-%theme  branding-alt-%theme-browser-qt brandi
 Provides: alterator-icons design-alterator design-alterator-%theme
 Obsoletes:  branding-alt-%theme-browser-qt  branding-altlinux-%theme-browser-qt 
 
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-browser-qt ";done )
+# lexicographically first of the village
+Conflicts: branding-sisyphus-server-light-alterator
+
+Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-alterator ";done )
 Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop  design-altertor-browser-server branding-altlinux-backup-server-alterator
 PreReq(post,preun): alternatives >= 0.2 alterator
 
@@ -159,9 +163,9 @@ Summary: default settings for Xfce 4.6 for %distro_name
 License: Distributable
 Group: Graphical desktop/XFce
 Requires: PolicyKit-gnome
-Requires: etcskel gtk2-theme-simplicity
-Requires: gnome-icon-theme icon-theme-simple
-Requires: branding-simply-linux-graphics
+Requires: etcskel gtk3-theme-clearlooks-phenix
+Requires: gnome-icon-theme icon-theme-simple-sl
+Requires: branding-%brand-%theme-graphics
 Obsoletes: xfce-settings-lite xfce-settings-school-lite
 Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-xfce-settings ";done )
 Conflicts: xfce-settings-simply-linux
@@ -213,7 +217,6 @@ Requires(post): indexhtml-common
 %distro_name_ru.
 
 %package menu
-
 Summary: Menu for %distro_name
 License: Distributable
 Group: Graphical desktop/Other
@@ -223,20 +226,32 @@ Requires: altlinux-freedesktop-menu-common
 %description menu
 Menu for %distro_name
 
+%package system-settings
+Summary: Some system settings for Simply Linux
+License: GPLv2+
+Group: System/Base
+# Really we need lightdm only, but it can pull another greeter.
+Requires: lightdm-gtk-greeter
+
+%description system-settings
+Some system settings for Simply Linux.
 
 %prep
 %setup -n branding
 
+%ifnarch %arm
+%define x86 boot
+%else
+%define x86 %nil
+%endif
 
 %build
 autoconf
-THEME=%theme NAME='%Name' STATUS=%status VERSION=%version ./configure 
+THEME=%theme NAME='%Name' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' ./configure
 make
 
 %install
 %makeinstall
-make x86 DESTDIR=%buildroot datadir=%buildroot%_datadir sysconfdir=%buildroot%_sysconfdir
-
 
 #graphics
 mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}
@@ -261,36 +276,40 @@ __EOF__
 
 #release
 install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
-echo "%Name %version %status (%codename)" >%buildroot%_sysconfdir/altlinux-release
+echo "%Name %version %status_en (%codename)" >%buildroot%_sysconfdir/altlinux-release
 for n in fedora redhat system; do
 	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
 done
+install -pD -m644 components/systemd/os-release %buildroot%_sysconfdir/os-release
 
 #notes
 pushd notes
 %makeinstall
 popd
+ln -s license.ru.html %buildroot%_datadir/alt-notes/license.uk.html
 
-mkdir -p %buildroot/etc/skel/Документы/
+mkdir -p %buildroot/etc/skel/XDG-Templates.skel/
 
 cp -r xfce-settings/etcskel/* %buildroot/etc/skel/
 cp -r xfce-settings/etcskel/.config %buildroot/etc/skel/
+cp -r xfce-settings/etcskel/.local %buildroot/etc/skel/
 cp -r xfce-settings/etcskel/.gconf %buildroot/etc/skel/
+cp -r xfce-settings/etcskel/.vimrc %buildroot/etc/skel/
 
 install -m 644 xfce-settings/etcskel/.wm-select %buildroot/etc/skel/
-install -m 644 xfce-settings/etcskel/.fonts.conf %buildroot/etc/skel/
 
-mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200
-mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050
-cp -P xfce-settings/backgrounds/*.png %buildroot/usr/share/xfce4/backdrops/
-#popd
+mkdir -p %buildroot/usr/share/backgrounds/xfce/
+cp -P xfce-settings/backgrounds/*.{jpg,png} %buildroot/usr/share/backgrounds/xfce/
 
+install -pDm0755 xfce-settings/scripts/zdg-move-templates.sh %buildroot%_sysconfdir/X11/profile.d/zdg-move-templates.sh
 
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
 mkdir -p %buildroot/etc/alterator
-install slideshow/slides/*  %buildroot/usr/share/install2/slideshow/
+cp -a slideshow/*  %buildroot/usr/share/install2/slideshow/
 install slideshow/slideshow.conf %buildroot/etc/alterator/
+# Set English slideshow as default
+#ln -s slides-en %buildroot/usr/share/install2/slideshow/slides
 
 #indexhtml
 %define _altdocsdir %_defaultdocdir/alt-docs
@@ -303,13 +322,16 @@ install components/indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images
 #menu
 mkdir -p %buildroot/usr/share/slinux-style/applications
 install menu/applications/* %buildroot/usr/share/slinux-style/applications/
-mkdir -p %buildroot/etc/xdg/menus/applications-merged
-cp menu/50-slinux-menu-style.menu %buildroot/etc/xdg/menus/applications-merged/
 mkdir -p %buildroot/etc/xdg/menus/xfce-applications-merged
 cp menu/50-xfce-applications.menu %buildroot/etc/xdg/menus/xfce-applications-merged/
 mkdir -p %buildroot/usr/share/desktop-directories
 cp menu/altlinux-wine.directory %buildroot/usr/share/desktop-directories/
 
+# system-settings
+mkdir -p %buildroot/%_sysconfdir/polkit-1/rules.d/
+cp -a system-settings/polkit-rules/*.rules %buildroot/%_sysconfdir/polkit-1/rules.d/
+install -Dm644 system-settings/ldm_pam_environment %buildroot%_localstatedir/ldm/.pam_environment
+
 #bootloader
 %pre bootloader
 [ -s /usr/share/gfxboot/%theme ] && rm -fr  /usr/share/gfxboot/%theme ||:
@@ -336,6 +358,13 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
 %post indexhtml
 %_sbindir/indexhtml-update
 
+%post system-settings
+chown _ldm:_ldm %_localstatedir/ldm/.pam_environment
+sed -i '/pam_env\.so/ {
+		/user_readenv/ b
+		s/pam_env\.so/pam_env.so user_readenv=1/ }
+' %_sysconfdir/pam.d/lightdm-greeter
+
 %files bootloader
 %_datadir/gfxboot/%theme
 /boot/splash/%theme
@@ -361,21 +390,24 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 
 %files bootsplash
 %_datadir/plymouth/themes/%theme/*
+%exclude %_datadir/plymouth/themes/%theme/*.in
 
 %files release
-%_sysconfdir/*-*
+%_sysconfdir/*-release
 %_sysconfdir/buildreqs/packages/ignore.d/*
 
 %files notes
 %_datadir/alt-notes/*
 
 %files xfce-settings
-/etc/skel/Документы
+%_sysconfdir/X11/profile.d/zdg-move-templates.sh
+/etc/skel/XDG-Templates.skel/
 /etc/skel/.wm-select
-/etc/skel/.fonts.conf
 /etc/skel/.config
+/etc/skel/.local
 /etc/skel/.gconf
-/usr/share/xfce4/backdrops
+/etc/skel/.vimrc
+/usr/share/backgrounds/xfce/*
 
 %files slideshow
 /etc/alterator/slideshow.conf
@@ -396,11 +428,17 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 
 %files menu
 /usr/share/slinux-style
-/etc/xdg/menus/applications-merged/50-slinux-menu-style.menu
 /etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
 /usr/share/desktop-directories/altlinux-wine.directory
 
+%files system-settings
+%config %_sysconfdir/polkit-1/rules.d/*.rules
+%config %_localstatedir/ldm/.pam_environment
+
 %changelog
+* Tue Sep 03 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.9-alt1
+- Update branding for Seven platform
+
 * Wed Aug 29 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt5
 - Set correct distribution name
 
@@ -412,7 +450,7 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 - Fix grub background color and font
 
 * Fri Jul 13 2012 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt2
-- autoboot from usb hacked
+- autoboot from usb
 
 * Tue Nov 22 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
 - school variant
diff --git a/components.mk b/components.mk
index d192c45..9c4384d 100644
--- a/components.mk
+++ b/components.mk
@@ -1,25 +1,30 @@
 # browser-qt
 
 components/browser-qt/design/bg.png: images/installer.png
-	convert $< -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
+	convert $<  -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
 
 browser-qt:components/browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
-	cd components/browser-qt; rcc-qt4 -binary theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc; cd -
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc
+	#cp -f components/browser-qt/design/design-live.qss components/browser-qt/design/design.qss
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc
 	install -d $(sysconfdir)/alternatives/packages.d
 	printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
 
 # ahttpd
 
 ahttpd:
+	for i in components/ahttpd/images/*.svg; do \
+	    image=$${i%.svg}; \
+	    convert -background none $$image.svg $$image.png ; \
+	done
 	install -d $(datadir)/alterator/design/styles
 	cp -a components/ahttpd/images $(datadir)/alterator/design
-	install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
 	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
 
 
 # bootloader and bootsplash
-boot:
+boot-images:
 	cp -a  /usr/src/design-bootloader-source ./
 	cp -a components/bootloader/config design-bootloader-source/
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
@@ -30,13 +35,14 @@ boot:
 	cp -al boot-800x600.jpg design-bootloader-source/data-boot/back.jpg
 	convert images/boot.png -resize "800x600!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' design-bootloader-source/data-install/back.jpg
 #bootsplash
+boot-splash: boot-images
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
-	convert -size 800x600 xc:#306ac4 $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	#cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
 	cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
 	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
 #bootloader
-	subst 's/label:ALT/label:School/g' design-bootloader-source/src/dia_install.inc
+boot: boot-images
 	DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
 	install -d -m 755  $(sysconfdir)/../boot/splash/$(THEME)
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)
@@ -45,15 +51,21 @@ boot:
 #grub2
 	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
 	cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
-	 install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 boot-800x600.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg
 
 # index html page, start page for all local browsers
+components/indexhtml/index.css:
+	sed 's|/design/|file:///usr/share/alterator/design/|g' components/ahttpd/styles/alterator.css > components/indexhtml/index.css
+
 INDEXHTML_DIR=$(datadir)/doc/indexhtml
-indexhtml:
-	for i in notes/index*.html components/indexhtml/*.css;do \
+indexhtml: components/indexhtml/index.css
+	for i in components/indexhtml/*.html components/indexhtml/*.css;do \
 	  install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
 	done
 	install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
 	cp -a components/indexhtml/images $(INDEXHTML_DIR)
-	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
+	for i in alt-docs documentation;do \
+	  ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
+	done
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
diff --git a/components/ahttpd/images/asc-desc.gif b/components/ahttpd/images/asc-desc.gif
new file mode 100644
index 0000000..fac668f
Binary files /dev/null and b/components/ahttpd/images/asc-desc.gif differ
diff --git a/components/ahttpd/images/asc.gif b/components/ahttpd/images/asc.gif
new file mode 100644
index 0000000..7415786
Binary files /dev/null and b/components/ahttpd/images/asc.gif differ
diff --git a/components/ahttpd/images/attention.gif b/components/ahttpd/images/attention.gif
new file mode 100644
index 0000000..f654e86
Binary files /dev/null and b/components/ahttpd/images/attention.gif differ
diff --git a/components/ahttpd/images/bottom.gif b/components/ahttpd/images/bottom.gif
new file mode 100644
index 0000000..62560b6
Binary files /dev/null and b/components/ahttpd/images/bottom.gif differ
diff --git a/components/ahttpd/images/button-active.png b/components/ahttpd/images/button-active.png
new file mode 100644
index 0000000..480b9eb
Binary files /dev/null and b/components/ahttpd/images/button-active.png differ
diff --git a/components/ahttpd/images/button-dark-left.png b/components/ahttpd/images/button-dark-left.png
new file mode 100644
index 0000000..1d9ccd0
Binary files /dev/null and b/components/ahttpd/images/button-dark-left.png differ
diff --git a/components/ahttpd/images/button-dark-right.png b/components/ahttpd/images/button-dark-right.png
new file mode 100644
index 0000000..67bcc37
Binary files /dev/null and b/components/ahttpd/images/button-dark-right.png differ
diff --git a/components/ahttpd/images/button-help.png b/components/ahttpd/images/button-help.png
new file mode 100644
index 0000000..b06e82d
Binary files /dev/null and b/components/ahttpd/images/button-help.png differ
diff --git a/components/ahttpd/images/button-light-left.png b/components/ahttpd/images/button-light-left.png
new file mode 100644
index 0000000..d1d3c0f
Binary files /dev/null and b/components/ahttpd/images/button-light-left.png differ
diff --git a/components/ahttpd/images/button-light-right.png b/components/ahttpd/images/button-light-right.png
new file mode 100644
index 0000000..cf55367
Binary files /dev/null and b/components/ahttpd/images/button-light-right.png differ
diff --git a/components/ahttpd/images/button-passive.png b/components/ahttpd/images/button-passive.png
new file mode 100644
index 0000000..4c9d8dc
Binary files /dev/null and b/components/ahttpd/images/button-passive.png differ
diff --git a/components/ahttpd/images/checkbox-checked.png b/components/ahttpd/images/checkbox-checked.png
new file mode 100644
index 0000000..ee93b72
Binary files /dev/null and b/components/ahttpd/images/checkbox-checked.png differ
diff --git a/components/ahttpd/images/checkbox-empty.png b/components/ahttpd/images/checkbox-empty.png
new file mode 100644
index 0000000..f1720aa
Binary files /dev/null and b/components/ahttpd/images/checkbox-empty.png differ
diff --git a/components/ahttpd/images/clock-face.png b/components/ahttpd/images/clock-face.png
new file mode 100644
index 0000000..0b69c63
Binary files /dev/null and b/components/ahttpd/images/clock-face.png differ
diff --git a/components/ahttpd/images/close-dialog-button.svg b/components/ahttpd/images/close-dialog-button.svg
new file mode 100644
index 0000000..c09d6b1
--- /dev/null
+++ b/components/ahttpd/images/close-dialog-button.svg
@@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22.088934"
+   height="22.084892"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47pre2 r22153"
+   version="1.0"
+   sodipodi:docname="dialog_close.svg"
+   inkscape:output_extension="org.inkscape.output.svgz.inkscape"
+   inkscape:export-filename="/home/pinheiro/pics/oxygen/scalable/actions/dialog-close.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective62" />
+    <linearGradient
+       id="linearGradient4296">
+      <stop
+         id="stop4298"
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:1;" />
+      <stop
+         id="stop4300"
+         offset="1"
+         style="stop-color:#650000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient4272"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       id="linearGradient7321">
+      <stop
+         style="stop-color:#8c0000;stop-opacity:1;"
+         offset="0"
+         id="stop7323" />
+      <stop
+         style="stop-color:#650000;stop-opacity:1;"
+         offset="1"
+         id="stop7325" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6740">
+      <stop
+         style="stop-color:#4d0000;stop-opacity:0;"
+         offset="0"
+         id="stop6742" />
+      <stop
+         id="stop6748"
+         offset="0.5"
+         style="stop-color:#4d0000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#4d0000;stop-opacity:0;"
+         offset="1"
+         id="stop6744" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       y2="-383.9971"
+       x2="-12.0029"
+       y1="-383.9971"
+       x1="-84.002403"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5958">
+      <stop
+         id="stop5960"
+         style="stop-color:#8c0000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop5962"
+         style="stop-color:#bf0000;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       y2="-383.9971"
+       x2="-12.0029"
+       y1="-383.9971"
+       x1="-84.002403"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4770">
+      <stop
+         id="stop4772"
+         style="stop-color:#ffbe00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4774"
+         style="stop-color:#f5d600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       y2="-383.9975"
+       x2="-23.516129"
+       y1="-383.9971"
+       x1="-84.002403"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3711">
+      <stop
+         id="stop3713"
+         style="stop-color:white;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3715"
+         style="stop-color:white;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3290">
+      <stop
+         style="stop-color:yellow;stop-opacity:1;"
+         offset="0"
+         id="stop3292" />
+      <stop
+         style="stop-color:#ffb66d;stop-opacity:1;"
+         offset="1"
+         id="stop3294" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1563">
+      <stop
+         id="stop1565"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop1567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3273">
+      <stop
+         id="stop3275"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.55035973;" />
+      <stop
+         id="stop3277"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5163">
+      <circle
+         sodipodi:ry="36"
+         sodipodi:rx="36"
+         sodipodi:cy="92"
+         sodipodi:cx="343.99899"
+         style="fill:url(#linearGradient5167);fill-opacity:1"
+         r="36"
+         rx="8.0010004"
+         cx="343.99899"
+         cy="92"
+         ry="8.0010004"
+         id="circle5165" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter5943"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.04"
+         id="feGaussianBlur5945" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7317"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.8805897"
+         id="feGaussianBlur7319" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7321"
+       id="linearGradient8922"
+       gradientUnits="userSpaceOnUse"
+       x1="351.02234"
+       y1="65.788521"
+       x2="309.21854"
+       y2="82.680611" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient2390"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3711"
+       id="linearGradient3003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3460321,-1.3460321,0,-112.6741,119.24399)"
+       x1="-80.00296"
+       y1="-131.93112"
+       x2="-45.096584"
+       y2="-131.93112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6740"
+       id="linearGradient3008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.000035,-56.000003)"
+       x1="117.81589"
+       y1="103.01254"
+       x2="90.537666"
+       y2="76.633896" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient3010"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4770"
+       id="radialGradient3012"
+       gradientUnits="userSpaceOnUse"
+       cx="345.80753"
+       cy="85.250488"
+       fx="345.80753"
+       fy="85.250488"
+       r="36"
+       gradientTransform="matrix(0.6662862,-0.6560105,0.9893764,1.0048737,31.05592,226.43791)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5958"
+       id="linearGradient3014"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       x1="-86.120354"
+       y1="-381.09921"
+       x2="-56.357521"
+       y2="-373.1243" />
+    <filter
+       inkscape:collect="always"
+       id="filter3138"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.6513927"
+         id="feGaussianBlur3140" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3162"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.96794009"
+         id="feGaussianBlur3164" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5958"
+       id="linearGradient2878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       x1="-86.120354"
+       y1="-381.09921"
+       x2="-56.357521"
+       y2="-373.1243" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4770"
+       id="radialGradient2880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6662862,-0.6560105,0.9893764,1.0048737,31.05592,226.43791)"
+       cx="345.80753"
+       cy="85.250488"
+       fx="345.80753"
+       fy="85.250488"
+       r="36" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3711"
+       id="linearGradient2884"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3460321,-1.3460321,0,-112.6741,119.24399)"
+       x1="-80.00296"
+       y1="-131.93112"
+       x2="-45.096584"
+       y2="-131.93112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6740"
+       id="linearGradient2886"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.000035,-56.000003)"
+       x1="117.81589"
+       y1="103.01254"
+       x2="90.537666"
+       y2="76.633896" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="9.01806"
+     inkscape:cy="12.37148"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1024"
+     inkscape:window-height="697"
+     inkscape:window-x="107"
+     inkscape:window-y="70"
+     showgrid="true"
+     inkscape:grid-points="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="4px"
+       spacingy="4px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-3.2427146,-50.107128)">
+    <g
+       id="g2868"
+       transform="matrix(0.17079235,0,0,0.17076092,3.2683312,49.899927)">
+      <path
+         transform="matrix(0.5662048,0,0,0.5662048,55.73989,54.555422)"
+         d="m 115.5,20 c 0,55.228475 -44.771525,100 -100,100 -55.228475,0 -100,-44.771525 -100,-100 0,-55.228475 44.771525,-100 100,-100 55.228475,0 100,44.771525 100,100 z"
+         sodipodi:ry="100"
+         sodipodi:rx="100"
+         sodipodi:cy="20"
+         sodipodi:cx="15.5"
+         id="path2396"
+         style="opacity:0.50271738;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4.15;filter:url(#filter3138)"
+         sodipodi:type="arc" />
+      <circle
+         transform="matrix(-1.5639433,0.4190574,-0.4190574,-1.5639433,641.54821,62.027543)"
+         id="circle3581_2_"
+         ry="8.0010004"
+         cy="92"
+         cx="343.99899"
+         rx="8.0010004"
+         r="36"
+         style="fill:url(#linearGradient2878);fill-opacity:1"
+         sodipodi:cx="343.99899"
+         sodipodi:cy="92"
+         sodipodi:rx="36"
+         sodipodi:ry="36"
+         d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
+      <circle
+         sodipodi:ry="36"
+         sodipodi:rx="36"
+         sodipodi:cy="92"
+         sodipodi:cx="343.99899"
+         style="fill:url(#radialGradient2880);fill-opacity:1;filter:url(#filter3162)"
+         r="36"
+         rx="8.0010004"
+         cx="343.99899"
+         cy="92"
+         ry="8.0010004"
+         id="circle4383"
+         transform="matrix(-1.1729576,0.3142929,-0.3142929,-1.1729576,497.41122,62.095683)"
+         d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
+      <circle
+         sodipodi:ry="36"
+         sodipodi:rx="36"
+         sodipodi:cy="92"
+         sodipodi:cx="343.99899"
+         style="opacity:0.8;fill:none;stroke:url(#linearGradient2882);stroke-width:6.75138187;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter7317)"
+         r="36"
+         rx="8.0010004"
+         cx="343.99899"
+         cy="92"
+         ry="8.0010004"
+         id="circle4776"
+         transform="matrix(-1.5639433,-0.4190574,-0.4190574,1.5639433,641.54821,62.572542)"
+         clip-path="url(#clipPath5163)"
+         d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
+      <path
+         id="circle16776"
+         d="m 65.000079,11.557516 c -20.67048,0 -37.942548,14.596148 -42.105568,34.029379 8.298024,7.735491 24.043093,12.955554 42.105568,12.955554 18.062496,0 33.807544,-5.220063 42.105561,-12.955554 -4.163,-19.433231 -21.435087,-34.029379 -42.105561,-34.029379 z"
+         style="opacity:0.8;fill:url(#linearGradient2884);fill-opacity:1" />
+      <g
+         transform="matrix(1.2882604,1.2882604,-1.2882604,1.2882604,-45.790405,-141.24514)"
+         id="g6850">
+        <path
+           id="path4123"
+           d="m 118.00003,15.999997 0,16 -16,0 0,8 16,0 0,16 8,0 0,-16 16,0 0,-8 -16,0 0,-16 -8,0 z"
+           style="fill:none;stroke:url(#linearGradient2886);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter5943)"
+           sodipodi:nodetypes="ccccccccccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           d="m 118.00003,15.999997 0,16 -16,0 0,8 16,0 0,16 8,0 0,-16 16,0 0,-8 -16,0 0,-16 -8,0 z"
+           id="rect3232"
+           sodipodi:nodetypes="ccccccccccccc" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/components/ahttpd/images/desc.gif b/components/ahttpd/images/desc.gif
new file mode 100644
index 0000000..3b30b3c
Binary files /dev/null and b/components/ahttpd/images/desc.gif differ
diff --git a/components/ahttpd/images/first-page-button.svg b/components/ahttpd/images/first-page-button.svg
new file mode 100644
index 0000000..5e1d715
--- /dev/null
+++ b/components/ahttpd/images/first-page-button.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.163"
+   height="20.163"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="first-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3595">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.4325"
+         id="feGaussianBlur3597" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="6.4719397"
+     inkscape:cy="12.058399"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(5.25272,-2084.818)">
+    <g
+       id="g4551"
+       transform="translate(-100.54622,1652.5558)">
+      <rect
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
+         id="rect3719-6"
+         width="25"
+         height="20"
+         x="95.375"
+         y="432.34937"
+         rx="3.8469892"
+         ry="3.8469892" />
+      <path
+         d="m 99.21875,432.78125 c -1.896868,0 -3.40625,1.50938 -3.40625,3.40625 l 0,12.3125 c 0,1.89687 1.509382,3.40625 3.40625,3.40625 l 17.3125,0 c 1.89687,0 3.40625,-1.50938 3.40625,-3.40625 l 0,-12.3125 c 0,-1.89687 -1.50938,-3.40625 -3.40625,-3.40625 l -17.3125,0 z"
+         inkscape:href="#rect3719-6"
+         id="path3791-1"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3595)"
+         xlink:href="#rect3719-6"
+         inkscape:original="M 99.21875 432.34375 C 97.087518 432.34375 95.375 434.05627 95.375 436.1875 L 95.375 448.5 C 95.375 450.63123 97.087518 452.34375 99.21875 452.34375 L 116.53125 452.34375 C 118.66248 452.34375 120.375 450.63123 120.375 448.5 L 120.375 436.1875 C 120.375 434.05627 118.66248 432.34375 116.53125 432.34375 L 99.21875 432.34375 z "
+         inkscape:radius="-0.4375"
+         sodipodi:type="inkscape:offset" />
+      <path
+         id="path3721-0"
+         d="m 114.375,437.34936 0,10 -10,-5 10,-5 z"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         inkscape:label="Triangle" />
+      <rect
+         y="437.34937"
+         x="102.375"
+         height="10.000001"
+         width="2.0000136"
+         id="rect3715-6"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/components/ahttpd/images/gradient-menu.png b/components/ahttpd/images/gradient-menu.png
index 1b5d18f..3ba0669 100644
Binary files a/components/ahttpd/images/gradient-menu.png and b/components/ahttpd/images/gradient-menu.png differ
diff --git a/components/ahttpd/images/gradient-top.png b/components/ahttpd/images/gradient-top.png
index c433406..c54ee08 100644
Binary files a/components/ahttpd/images/gradient-top.png and b/components/ahttpd/images/gradient-top.png differ
diff --git a/components/ahttpd/images/gradient.png b/components/ahttpd/images/gradient.png
index 1fb505f..b6c4996 100644
Binary files a/components/ahttpd/images/gradient.png and b/components/ahttpd/images/gradient.png differ
diff --git a/components/ahttpd/images/groups/firewall.png b/components/ahttpd/images/groups/firewall.png
new file mode 100644
index 0000000..f6a5cee
Binary files /dev/null and b/components/ahttpd/images/groups/firewall.png differ
diff --git a/components/ahttpd/images/groups/mail.png b/components/ahttpd/images/groups/mail.png
old mode 100755
new mode 100644
diff --git a/components/ahttpd/images/groups/pkg-groups.png b/components/ahttpd/images/groups/pkg-groups.png
old mode 100755
new mode 100644
diff --git a/components/ahttpd/images/groups/pkg.png b/components/ahttpd/images/groups/pkg.png
old mode 100755
new mode 100644
diff --git a/components/ahttpd/images/groups/servers.png b/components/ahttpd/images/groups/servers.png
old mode 100755
new mode 100644
diff --git a/components/ahttpd/images/groups/system.png b/components/ahttpd/images/groups/system.png
index e41016d..d5cbd5f 100644
Binary files a/components/ahttpd/images/groups/system.png and b/components/ahttpd/images/groups/system.png differ
diff --git a/components/ahttpd/images/header-gradient.png b/components/ahttpd/images/header-gradient.png
new file mode 100644
index 0000000..33b9358
Binary files /dev/null and b/components/ahttpd/images/header-gradient.png differ
diff --git a/components/ahttpd/images/header.png b/components/ahttpd/images/header.png
new file mode 100644
index 0000000..d89efaa
Binary files /dev/null and b/components/ahttpd/images/header.png differ
diff --git a/components/ahttpd/images/help.png b/components/ahttpd/images/help.png
old mode 100755
new mode 100644
index aa7139b..28a0f9e
Binary files a/components/ahttpd/images/help.png and b/components/ahttpd/images/help.png differ
diff --git a/components/ahttpd/images/hgrabber.gif b/components/ahttpd/images/hgrabber.gif
new file mode 100644
index 0000000..6a59bf8
Binary files /dev/null and b/components/ahttpd/images/hgrabber.gif differ
diff --git a/components/ahttpd/images/information.gif b/components/ahttpd/images/information.gif
new file mode 100644
index 0000000..16e81cb
Binary files /dev/null and b/components/ahttpd/images/information.gif differ
diff --git a/components/ahttpd/images/last-page-button.svg b/components/ahttpd/images/last-page-button.svg
new file mode 100644
index 0000000..2811650
--- /dev/null
+++ b/components/ahttpd/images/last-page-button.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.163"
+   height="20.163"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="last-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4711"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4769"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4827"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3602">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.4325"
+         id="feGaussianBlur3604" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="6.2525407"
+     inkscape:cy="9.4532616"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(34.78794,-2065.2186)">
+    <g
+       id="g4567"
+       transform="translate(-219.70644,1632.9251)">
+      <rect
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
+         id="rect3719"
+         width="25"
+         height="20"
+         x="185"
+         y="432.36218"
+         rx="3.8469892"
+         ry="3.8469892" />
+      <path
+         d="m 188.84375,432.8125 c -1.89687,0 -3.40625,1.50938 -3.40625,3.40625 l 0,12.28125 c 0,1.89687 1.51366,3.4375 3.40625,3.4375 l 17.3125,0 c 1.89259,0 3.40625,-1.54063 3.40625,-3.4375 l 0,-12.28125 c 0,-1.89687 -1.50938,-3.40625 -3.40625,-3.40625 l -17.3125,0 z"
+         inkscape:href="#rect3719"
+         id="path3791"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3602)"
+         xlink:href="#rect3719"
+         inkscape:original="M 188.84375 432.375 C 186.71252 432.375 185 434.08752 185 436.21875 L 185 448.5 C 185 450.63123 186.71252 452.375 188.84375 452.375 L 206.15625 452.375 C 208.28748 452.375 210 450.63123 210 448.5 L 210 436.21875 C 210 434.08752 208.28748 432.375 206.15625 432.375 L 188.84375 432.375 z "
+         inkscape:radius="-0.4375"
+         sodipodi:type="inkscape:offset" />
+      <path
+         id="path3721"
+         d="m 192,437.36218 0,10 10,-5 -10,-5 z"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         inkscape:label="Triangle" />
+      <rect
+         transform="scale(-1,1)"
+         y="437.36218"
+         x="-204"
+         height="10.000001"
+         width="2.0000136"
+         id="rect3715"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/components/ahttpd/images/menu-header.png b/components/ahttpd/images/menu-header.png
new file mode 100644
index 0000000..79be4f8
Binary files /dev/null and b/components/ahttpd/images/menu-header.png differ
diff --git a/components/ahttpd/images/menu-selected.png b/components/ahttpd/images/menu-selected.png
new file mode 100644
index 0000000..8ef3ec7
Binary files /dev/null and b/components/ahttpd/images/menu-selected.png differ
diff --git a/components/ahttpd/images/next-page-button.svg b/components/ahttpd/images/next-page-button.svg
new file mode 100644
index 0000000..d21655b
--- /dev/null
+++ b/components/ahttpd/images/next-page-button.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.02"
+   height="20.022818"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="next-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4711"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4769"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3596">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.43"
+         id="feGaussianBlur3598" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="10.329226"
+     inkscape:cy="5.3197997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(21.03808,-2078.2196)">
+    <g
+       id="g4562"
+       transform="translate(-176.02808,1645.8574)">
+      <rect
+         ry="3.8469892"
+         rx="3.8469892"
+         y="432.36218"
+         x="155"
+         height="20"
+         width="25"
+         id="rect2849"
+         style="fill:#729fcf;fill-opacity:1;stroke:none" />
+      <path
+         d="m 158.84375,432.875 c -1.86901,0 -3.34375,1.47474 -3.34375,3.34375 l 0,12.28125 c 0,1.86901 1.47952,3.375 3.34375,3.375 l 17.3125,0 c 1.86423,0 3.34375,-1.50599 3.34375,-3.375 l 0,-12.28125 c 0,-1.86901 -1.47474,-3.34375 -3.34375,-3.34375 l -17.3125,0 z"
+         inkscape:href="#rect2849"
+         id="path3785"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3596)"
+         xlink:href="#rect2849"
+         inkscape:original="M 158.84375 432.375 C 156.71252 432.375 155 434.08752 155 436.21875 L 155 448.5 C 155 450.63123 156.71252 452.375 158.84375 452.375 L 176.15625 452.375 C 178.28748 452.375 180 450.63123 180 448.5 L 180 436.21875 C 180 434.08752 178.28748 432.375 176.15625 432.375 L 158.84375 432.375 z "
+         inkscape:radius="-0.48949021"
+         sodipodi:type="inkscape:offset" />
+      <path
+         inkscape:label="Triangle"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         d="m 163,437.36218 0,10 10,-5 -10,-5 z"
+         id="path2828" />
+    </g>
+  </g>
+</svg>
diff --git a/components/ahttpd/images/off.png b/components/ahttpd/images/off.png
old mode 100755
new mode 100644
index deba6ca..14f6dc9
Binary files a/components/ahttpd/images/off.png and b/components/ahttpd/images/off.png differ
diff --git a/components/ahttpd/images/on.png b/components/ahttpd/images/on.png
old mode 100755
new mode 100644
index 07cc5a6..6168132
Binary files a/components/ahttpd/images/on.png and b/components/ahttpd/images/on.png differ
diff --git a/components/ahttpd/images/prev-page-button.svg b/components/ahttpd/images/prev-page-button.svg
new file mode 100644
index 0000000..d3d7b92
--- /dev/null
+++ b/components/ahttpd/images/prev-page-button.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.032"
+   height="20.032"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="prev-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4711"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3595">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.43"
+         id="feGaussianBlur3597" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="16.33258"
+     inkscape:cy="6.4077993"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(15.11336,-2079.2984)">
+    <g
+       id="g4557"
+       transform="translate(-140.09736,1646.9394)">
+      <rect
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
+         id="rect3707"
+         width="25"
+         height="20"
+         x="125"
+         y="432.36218"
+         rx="3.8469892"
+         ry="3.8469892" />
+      <path
+         d="m 128.84375,432.875 c -1.86338,0 -3.34375,1.48037 -3.34375,3.34375 l 0,12.28125 c 0,1.86338 1.48525,3.375 3.34375,3.375 l 17.3125,0 c 1.8585,0 3.34375,-1.51162 3.34375,-3.375 l 0,-12.28125 c 0,-1.86338 -1.48037,-3.34375 -3.34375,-3.34375 l -17.3125,0 z"
+         inkscape:href="#rect3707"
+         id="path3725"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3595)"
+         xlink:href="#rect3707"
+         inkscape:original="M 128.84375 432.375 C 126.71252 432.375 125 434.08752 125 436.21875 L 125 448.5 C 125 450.63123 126.71252 452.375 128.84375 452.375 L 146.15625 452.375 C 148.28748 452.375 150 450.63123 150 448.5 L 150 436.21875 C 150 434.08752 148.28748 432.375 146.15625 432.375 L 128.84375 432.375 z "
+         inkscape:radius="-0.5"
+         sodipodi:type="inkscape:offset" />
+      <path
+         id="path3709"
+         d="m 142,437.36218 0,10 -10,-5 10,-5 z"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         inkscape:label="Triangle" />
+    </g>
+  </g>
+</svg>
diff --git a/components/ahttpd/images/product-logo.png b/components/ahttpd/images/product-logo.png
new file mode 100644
index 0000000..56e4f01
Binary files /dev/null and b/components/ahttpd/images/product-logo.png differ
diff --git a/components/ahttpd/images/product.png b/components/ahttpd/images/product.png
new file mode 100644
index 0000000..511d127
Binary files /dev/null and b/components/ahttpd/images/product.png differ
diff --git a/components/ahttpd/images/right.gif b/components/ahttpd/images/right.gif
new file mode 100644
index 0000000..6e28960
Binary files /dev/null and b/components/ahttpd/images/right.gif differ
diff --git a/components/ahttpd/images/section.png b/components/ahttpd/images/section.png
new file mode 100644
index 0000000..f1442f5
Binary files /dev/null and b/components/ahttpd/images/section.png differ
diff --git a/components/ahttpd/images/table-header.png b/components/ahttpd/images/table-header.png
new file mode 100644
index 0000000..18fb26a
Binary files /dev/null and b/components/ahttpd/images/table-header.png differ
diff --git a/components/ahttpd/images/up-down.png b/components/ahttpd/images/up-down.png
new file mode 100644
index 0000000..5f20461
Binary files /dev/null and b/components/ahttpd/images/up-down.png differ
diff --git a/components/ahttpd/styles/alterator.css b/components/ahttpd/styles/alterator.css
deleted file mode 100644
index b186fef..0000000
--- a/components/ahttpd/styles/alterator.css
+++ /dev/null
@@ -1,173 +0,0 @@
-body {
-	background-color: #cdcdcd;/*#92b2b8;/*#67999a;/*#c0dbdb;*/
-	color: #178093;
-	margin: 0px;
-	padding: 10px;
-	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 9pt;
-}
-
-a {
-	color: #178093;
-	font-weight: bold;
-}
-
-table {
-	font-size: 9pt;
-	border-color: #178093;
-	border-collapse: collapse;
-}
-
-th {
-	padding: 0px 7px 3px 0px;
-}
-
-tr {
-	vertical-align: top;
-}
-
-hr {
-	border: none;
-	border-top: 1px solid #5ac;
-}
-
-h1 {
-	text-align: center;
-	margin: 0px;
-}
-
-textarea, select, input.text {
-	border: 1px solid #178093;
-	font-size: 8pt;
-	margin: 1px 3px 1px 0px;
-	padding: 1px 3px;
-}
-
-.btn {
-	background-color: #cdcdcd;
-	color: #178093;
-	border: 1px solid #178093;
-	cursor: pointer;
-	font-size: 9pt;
-	padding: 0px 3px;
-}
-
-.btn:hover {
-	background-color: #94c4cd;
-}
-
-.error-message {
-	background-color: #FFCACA;
-	border: 1px solid #FF6060;
-	padding-left:10px;
-	padding-right:10px;
-	margin-bottom:10px;
-}
-
-.info-name {
-	font-size: 18pt;
-	border-bottom: 2px solid #178093;
-}
-
-.info-description {
-	font-size: 12pt;
-	font-weight: bold;
-	padding-top: 10px;
-}
-
-
-.frame-table {
-	border-style:solid;
-	border-width:1px;
-	margin: 3px;
-}
-
-.frame-table td, .frame-table th {
-	border-style:solid;
-	border-width:1px;
-	padding: 1px 1px 3px 3px;
-}
-
-.disabled {
-	color: #6e6e6e;
-}
-
-.alterator-progress {
-	border: 1px solid #178093;
-	height: 20px;
-	width: 200px;
-	padding: 2px;
-	background-color: #FFFFFF;
-}
-
-.alterator-progress div {
-	background-color: #178093;
-	height: 20px;
-}
-
-.year {
-	font-weight: bold;
-	background-color: #baeaea;
-}
-
-.week {
-	border-style:solid;
-	border-width:1px;
-	background-color: white;
-}
-
-.today {
-	border-style:solid;
-	border-width:1px;
-	background-color: pink;
-	cursor: pointer;
-}
-
-.day {
-	border-style:solid;
-	border-width:1px;
-	background-color: #baeaea;
-	cursor: pointer;
-}
-
-.day:hover {
-	background-color: #178093;
-}
-
-.alterator-dateedit-calendar table {
-	width: 100%;
-	text-align: center;
-	background-color: #baeaea;
-	border-style: solid;
-	border-width: 1px;
-}
-
-.alterator-dateedit-calendar td {
-	padding: 3px;
-}
-
-.alterator-dateedit-button {
-	vertical-align:middle;
-	cursor:pointer;
-	background: url(/design/images/dateedit.png) no-repeat;
-	width: 15px;
-	height: 16px;
-}
-
-table.alterator-listbox {
-	border: solid 1px;
-}
-
-table.alterator-listbox th {
-	background-color:  #cdcdcd;
-	font-weight: bold;
-	border: solid 1px;
-	padding: 3px;
-}
-
-table.alterator-listbox td {
-	background: #ffffff;
-	border-left: solid 1px;
-	border-right: solid 1px;
-	padding: 3px;
-}
diff --git a/components/ahttpd/styles/alterator.css.in b/components/ahttpd/styles/alterator.css.in
new file mode 100644
index 0000000..9d87f3f
--- /dev/null
+++ b/components/ahttpd/styles/alterator.css.in
@@ -0,0 +1,826 @@
+/* basic elements and widgets */
+
+body {
+	background-color: white;
+	margin: 5px;
+	padding: 10px;
+	font-family : "Liberation Sans", Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 9pt;
+	width: 85%;
+}
+
+a {
+	color: #0088bf;
+	font-weight: bold;
+}
+
+#acl a {
+	color: #888;
+	font-weight: normal;
+}
+
+table {
+	font-size: 9pt;
+	border-color: #306ac4;
+	border-spacing: 0px;
+	border-collapse: collapse;
+}
+
+#main table {
+	margin: 0;
+	margin-bottom: 0;
+}
+
+th {
+	padding: 0px 7px 3px 0px;
+}
+
+/*tr:nth-child(even) {background: #eaecf2}
+tr:nth-child(odd) {background: #FFF}*/
+
+tr {
+	vertical-align: top;
+}
+
+hr {
+	border: none;
+	border-top: 1px solid #415E6F;;
+}
+
+h1 {
+	text-align: center;
+	margin: 0px;
+	color: black;
+}
+
+h2 {
+	color: black;
+}
+
+h3 {
+	color: black;
+}
+
+
+textarea, select, input.text {
+	
+	/*border: 1px solid #e2e6eb; #MIDDLE_LABELS_HEX@;*/ /*FIX NEEDED!!!!!*/
+
+	font-size: 9pt;
+	margin: 0px 5px 1px 5px;
+	padding: 2px 4px;
+	border: 1px solid #c4c4c4;
+	background-color: white;
+	vertical-align: middle;
+}
+
+select {
+	background-color: #e6e6e6;
+}
+
+fieldset {
+	border: 1px solid #c4c4c4;
+	margin-bottom: 6px;
+}
+
+input.text[disabled], select[disabled]{
+	background-color: #e2e6eb;
+}
+
+.disabled{
+	color:#666666;
+}
+
+small {
+	margin-left: 5px;
+	margin-bottom: 3px;
+}
+
+.btn, button {
+	color: black;
+	background-color: #dbeef6;
+	border: 1px solid #36a1cc;
+	
+	cursor: pointer;
+	font-size: 9pt;
+	font-weight: bold;
+	padding: 2.5px 10px;
+	vertical-align: middle;
+}
+
+.btn:hover, button:hover, #main .btn, .box .btn {
+	font-weight: bold;
+	color: #FFFFFF;
+	background-color: #455a85;
+	border: 1px solid #1b2575;
+}
+
+#main .btn:hover, .box .btn:hover {
+        background-color: #5b76af;
+}
+
+div#top .btn {
+	width: 7em;
+}
+
+.box {
+    position: relative;
+    width: 780px;
+    margin-top: 10px;
+
+    padding: 10px 20px;
+    padding-top: 10px;
+    background-color: #dbeef6;
+    border: 1px solid #36a1cc;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+}
+
+.next-page-button,.prev-page-button,.first-page-button,.last-page-button {
+    width: 31px;
+    height: 25px;
+    vertical-align:middle;
+    cursor: pointer;
+}
+
+.next-page-button {
+    background: url(/design/images/next-page-button.png) no-repeat;
+}
+
+.prev-page-button {
+    background: url(/design/images/prev-page-button.png) no-repeat;
+}
+
+.first-page-button {
+    background: url(/design/images/first-page-button.png) no-repeat;
+}
+
+.last-page-button {
+    background: url(/design/images/last-page-button.png) no-repeat;
+}
+
+.close-dialog-button {
+	width: 27px;
+	height: 27px;
+	border: 0px;
+	cursor: pointer;
+	background: url(/design/images/close-dialog-button.png) no-repeat;
+}
+
+/* messages */
+
+.alterator-information-message {
+    font-style:italic;
+    font-size: 9pt;
+    padding-top:3px;
+    padding-bottom:3px;
+}
+
+.alterator-information-message img {
+    vertical-align:middle;
+}
+
+.alterator-attention-message {
+    color: darkred;
+    border-color: #cf7878;
+    border-width: 5px;
+    border-style: solid;
+    background-color: #e8cfcf;
+    padding: 14px;
+    margin: 4px;
+    margin-bottom: 10px;
+
+    min-width:10px;
+
+    -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
+    -khtml-border-radius: 7px;
+    border-radius: 7px;
+}
+
+.alterator-attention-message a {
+    color: darkred;
+}
+
+.alterator-attention-message img {
+    vertical-align:middle;
+}
+
+/* clock and timeedit */
+
+canvas.alterator-clock {
+    background: url(/design/images/clock-face.png) no-repeat;
+}
+
+/* calendar and dateedit */
+
+.year {
+	font-weight: bold;
+	color: black;
+	font-size: 10pt;
+	vertical-align: middle;
+}
+
+.month {
+	font-weight:bold;
+	color: black;
+	font-size: 10pt;
+	vertical-align: middle;
+}
+
+.week {
+	border-style:solid;
+	border-width:1px;
+	background-color: white;
+}
+
+.today {
+	border: 1px solid #242a60;
+	cursor: pointer;
+
+	background-image: url(/design/images/button-passive.png);
+	background-repeat:repeat-x;
+	color: #FFFFFF;
+
+}
+
+.day {
+	border-style:solid;
+	border-width:1px;
+	background-color: #FFFFFF;
+	cursor: pointer;
+}
+
+.day:hover {
+	background-color: #306ac4;
+}
+
+.alterator-dateedit-calendar table {
+	width: 100%;
+	text-align: center;
+	background-color: #ebebeb;
+	margin-top: 10px;
+/*	background-image: url(/design/images/table-header.png);
+	background-repeat:repeat-x;*/
+
+/*	-webkit-border-top-left-radius: 0.7em;
+	-webkit-border-top-right-radius: 0.7em;
+	-moz-border-radius-topleft: 0.7em;
+	-moz-border-radius-topright: 0.7em;
+	border-top-left-radius: 0.7em;
+	border-top-right-radius: 0.7em;*/
+	/*border: 2px solid #242a60;*/
+	border: 2px solid #c4c4c4;
+	border-collapse: collapse;
+
+/*
+        -moz-border-radius-topright: 0.7em;
+        -webkit-border-top-right-radius: 0.7em;
+        -khtml-border-radius-topright: 0.7em;
+        border-top-right-radius: 0.7em;
+	-webkit-border-top-right-radius: 4px;
+*/
+
+/*	-moz-box-shadow: 0 0 8px 0.2em #a6a6a6;
+	-webkit-box-shadow: 0 0 8px 0.2em #a6a6a6;
+	box-shadow: 0 0 8px 0.2em #a6a6a6;*/
+}
+
+.alterator-dateedit-calendar td {
+	padding: 3px;
+}
+
+.alterator-dateedit-button {
+	vertical-align:middle;
+	cursor:pointer;
+	width: 15px;
+	height: 16px;
+
+}
+
+/* main menu */
+
+#main, #box {
+	margin-top: 14px;
+	padding: 10px 20px;
+	padding-top: 10px;
+
+	background-color: #dbeef6;
+	border: 1px solid #36a1cc;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+}
+
+#main-td {
+	width: 100%;
+	padding-top: 10px;
+}
+
+#menu-td {
+	padding-top: 10px;
+}
+
+#menu {
+	padding: 0;
+	margin-right: 10px;
+}
+
+.menu-item-normal a {
+	font-weight: normal;
+	text-decoration: none;
+	color: black;
+}
+
+.menu-item-selected a {
+	font-weight: bold;
+	text-decoration: none;
+	color: #0088bf;
+	padding-top: 10px;
+	margin-top: 10px;
+}
+
+.menu-item-normal {
+	padding-left: 10px;
+	width: 100%;
+	padding-right: 4px;
+	margin-top: 3px;
+	margin-bottom: 2px;
+}
+
+.menu-item-selected {
+	color: #0088bf;
+	background-color: #dbeef6;
+	padding-left: 10px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 3px;
+	margin-top: 3px;
+	margin-bottom: 2px;
+	margin-right: 10px;
+
+}
+.menu-item-normal a:hover {
+	color: #0088bf;
+}
+
+.menu-group-name  {
+	width: 224px;
+	color: #0088bf;
+	height: 16px;
+	background: url(/design/images/section.png) no-repeat 0px 23px;
+	font-size: 10pt;
+	
+	padding-top: 3px;
+	padding-bottom: 10px;
+	padding-right: 4px;
+	padding-left: 10px;
+	margin-top: 10px;
+	margin-bottom: 8px;
+	margin-right: 10px;
+	font-weight: bold;
+}
+
+/* tables */
+
+table.alterator-listbox {
+	font-family:arial;
+	/*margin:10px 0pt 15px;*/
+	font-size: 8pt;
+	width: 100%;
+	text-align: left;
+	border: 1px solid #808080;
+	border-spacing: 0;
+}
+
+table.alterator-listbox thead tr th, table.alterator-listbox tfoot tr th {
+
+	/*border-collapse: separate;
+	border: solid 1px;
+	border-right-color:#242a60;
+	border-right: 1px solid #242a60;*/
+	font-size: 8pt;
+	margin: 0px;
+	padding: 4px;
+	color: black;
+	background-color: #e6e6e6;
+	border: 1px solid #808080;
+	vertical-align: middle;
+}
+
+table.alterator-listbox thead tr th:hover, table.alterator-listbox tfoot tr th:hover {
+	background-color: #d6d6d6;
+}
+
+table.alterator-listbox thead tr .header {
+	background-image: url(/design/images/asc-desc.gif);
+	background-repeat: no-repeat;
+	background-position: center right;
+	cursor: pointer;
+	padding-right: 24px;
+}
+
+table.alterator-listbox tbody td {
+	color: #001056;
+	padding: 4px;
+	background-color: #FFFFFF;
+	vertical-align: top;
+	/*border-left: solid 1px;
+	border-right: solid 1px;
+	border:none;*/
+	border-right: 1px solid #808080;
+}
+
+table.alterator-listbox tbody tr.odd td {
+	background-color:#f0f0f0;
+	/*border:none;*/
+}
+
+table.alterator-listbox tbody tr.selected td, table.alterator-listbox tbody tr.odd.selected td {
+	background-color: #D0E1FF;
+	/*border-top:  #ffffff solid 1px; WTF??*/
+}
+
+table.alterator-listbox tbody tr.error td {
+	background-color: #e6999b;
+	font-weight: bold;
+}
+
+table.alterator-listbox tbody tr.odd.error td {
+	background-color: #e68b8d;
+	font-weight: bold;
+}
+
+table.alterator-listbox tbody tr.working td {
+	background-color: #f2ecbd;
+}
+
+table.alterator-listbox tbody tr.odd.working td {
+	background-color: #f2e88f;
+}
+
+table.alterator-listbox thead tr .headerSortUp {
+	background-image: url(/design/images/asc.gif);
+}
+
+table.alterator-listbox thead tr .headerSortDown {
+	background-image: url(/design/images/desc.gif);
+}
+
+table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead tr .headerSortUp {
+	background-color: #d6d6d6;
+}
+
+/* states */
+
+.ui-state-disabled {
+	cursor: default !important;
+	color: #c3c7cb;
+	/*background-color: #e2e6eb;*/
+}
+
+.btn.ui-state-disabled {
+	color: #415E6F;
+	background-color: #E2E6EB;
+}
+
+.btn.ui-state-disabled:hover {
+	background-color: #E2E6EB;
+}
+
+/* progressbar */
+
+.ui-progressbar {
+    height:20px;
+    text-align: left;
+}
+.ui-progressbar .ui-progressbar-value {
+    height:100%;
+}
+
+/* states */
+
+.ui-state-disabled {
+	cursor: default !important;
+	color: #c3c7cb;
+/*	background-color: #F5F5F5;*/
+}
+
+#main .btn.ui-state-disabled, #main .btn.ui-state-disabled:hover {
+	cursor: default !important;
+	color: #c3c7cb;
+	background-color: #E2E6EB;
+	border: 1px solid #c0c0c0;
+}
+
+/* progressbar */
+
+.ui-progressbar {
+    height:20px;
+    text-align: left;
+}
+.ui-progressbar .ui-progressbar-value {
+    height:100%;
+}
+
+/* accordion */
+
+div.alterator-accordion h3 {
+	background-color:  #DBEEF6;
+	font-size: 9pt;
+
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-left: 24px;
+
+	margin: 0px;
+	border-top: 1px solid #36A1CC;
+	border-left: 1px solid #36A1CC;
+	border-right: 1px solid #36A1CC;
+
+	background-image: url(/design/images/right.gif);
+	background-repeat: no-repeat;
+	background-position: center left;
+	cursor: pointer;
+	outline: none;
+}
+
+div.alterator-accordion h3.ui-state-active {
+	color: #0088bf;
+	background-image: url(/design/images/bottom.gif);
+	background-repeat: no-repeat;
+	background-position: center left;
+	cursor: pointer;
+}
+
+/* TODO: don't work */
+div.alterator-accordion .btn {
+	font-weight: bold;
+        color: black;
+        background-color: #dbeef6;
+        border: 1px solid #36a1cc;
+}
+
+div.alterator-accordion div {
+	padding: 10px 10px 5px 15px;
+	border-top: 1px solid #36A1CC;
+	border-left: 1px solid #36A1CC;
+	border-right: 1px solid #36A1CC;
+}
+
+div.alterator-accordion td {
+	white-space: nowrap;
+}
+
+div.alterator-accordion {
+	border-bottom: 1px solid #36A1CC;
+}
+
+/* resizeable */
+
+.ui-resizable-s {
+    cursor: s-resize;
+    height: 7px;
+    width: 100%;
+    bottom: 0px;
+    left: 0px;
+    background:#E2E6EB url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+}
+
+.ui-resizable-s:hover {
+	background-color: #1B3664;
+}
+
+
+/* corner radius */
+
+.ui-corner-tl {
+	-moz-border-radius-topleft: 0px;
+	-webkit-border-top-left-radius: 0px;
+}
+
+.ui-corner-tr {
+	-moz-border-radius-topright: 0px;
+	-webkit-border-top-right-radius: 0px;
+}
+
+.ui-corner-bl {
+	-moz-border-radius-bottomleft: 0px;
+	-webkit-border-bottom-left-radius: 0px;
+}
+
+.ui-corner-br {
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+}
+
+.ui-corner-top {
+	-moz-border-radius-topleft: 0px;
+	-webkit-border-top-left-radius: 0px;
+	-moz-border-radius-topright: 0px;
+	-webkit-border-top-right-radius: 0px;
+}
+
+.ui-corner-bottom {
+	-moz-border-radius-bottomleft: 0px;
+	-webkit-border-bottom-left-radius: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+}
+
+.ui-corner-right {
+	-moz-border-radius-topright: 0px;
+	-webkit-border-top-right-radius: 0px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-bottom-right-radius: 0px;
+}
+
+.ui-corner-left {
+	-moz-border-radius-topleft: 0px;
+	-webkit-border-top-left-radius: 0px;
+	-moz-border-radius-bottomleft: 0px;
+	-webkit-border-bottom-left-radius: 0px;
+}
+
+.ui-corner-all {
+	/*-moz-border-radius: 0.8em;
+	-webkit-border-radius: 0.8em;*/
+}
+
+/* overlays */
+
+.ui-widget-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: #aaaaaa;
+	opacity: .3;
+	filter:Alpha(Opacity=30);
+}
+
+/* dialog */
+
+.ui-widget-content {
+	background-color: #FFFFFF;
+}
+
+.ui-widget-header {
+	color: #EAEDEF;
+	background-color: #306ac4;
+	font-weight: bold;
+}
+
+.ui-dialog {
+	border: 2px solid #c4c4c4;
+}
+
+.ui-dialog .ui-dialog-title {
+    float: left;
+    margin: .1em 0 .2em;
+}
+
+.ui-dialog .ui-dialog-titlebar {
+    padding: .5em .3em .3em 1em;
+}
+
+
+.ui-dialog .ui-dialog-titlebar-close {
+    float:right;
+}
+
+.ui-dialog .ui-dialog-titlebar-close span {
+    display: block;
+    margin: 1px;
+}
+
+.ui-dialog .ui-dialog-content {
+    border: 0;
+    padding: .5em 1em;
+    background: none;
+    overflow: auto;
+}
+
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin: .5em 0 0 0;
+	padding: .3em 1em .5em .4em;
+}
+
+.ui-dialog .ui-dialog-buttonpane button {
+	float: right;
+	margin: .5em .4em .5em 0;
+	width:auto;
+	overflow:visible;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-color: #455a85;
+	border: 1px solid #1b2575;
+}
+
+.ui-icon-closethick {
+    width: 27px;
+    height: 27px;
+    text-indent: -99999px;
+    overflow: hidden;
+    background: url(/design/images/close-dialog-button.png) no-repeat;
+}
+
+/* layout helpers */
+
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+
+/* help button */
+
+.ui-help-button {
+	background-color: #FFFFFF;
+	margin-bottom: 10px;
+	padding-top: 7px;
+
+	border: 1px solid #c1c3cb;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.ui-help-button-content {
+	padding-left: 10px;
+	padding-right: 30px;
+}
+
+/* top line */
+
+#top {
+	text-align:left;
+	padding: 0em;
+	margin-bottom: 0px;
+	border-bottom: 1px solid #ebebeb;
+}
+
+#product-logo {
+	background: url(/design/images/product-logo.png) no-repeat;
+	width: 348px;
+	height: 52px;
+	border: 0px;
+	padding: 0px;
+	margin: 0px;
+}
+
+#title {
+	padding-left: 1em;
+	padding-right: 1em;
+	text-align: left;
+
+	color: black;
+	font-family: "DejaVu Sans",Verdana,Tahoma,Helvetica;
+	font-weight: bold;
+	text-decoration: none;
+	font-size:large;
+	text-transform: uppercase;
+}
+
+.top-button {
+        padding-left: 10px;
+}
+
+
+/* deprecated */
+
+.error-message {
+	background-color: #efc9d3;
+	border: 1px solid #f81751;
+	padding-left:10px;
+	padding-right:10px;
+	margin-bottom:10px;
+}
+
+#help-popup {
+	padding-left: 10px;
+	padding-right: -30px;
+	background-color: #FFFFFF;
+
+        border: 1px solid #c1c3cb;
+        -moz-border-radius: 0.5em;
+        -webkit-border-radius: 0.5em;
+        -khtml-border-radius: 0.5em;
+        border-radius: 0.5em;
+}
+
+.hresizeable {
+	width: 100%;
+	height: 7px;
+	background:#001056 url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+	cursor: s-resize;
+}
+
+.hresizeable:hover {
+	background-color: #306ac4;
+}
diff --git a/components/ahttpd/styles/card-index.css b/components/ahttpd/styles/card-index.css
deleted file mode 100644
index 2cc3861..0000000
--- a/components/ahttpd/styles/card-index.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.selector-actions {
-	position: absolute;
-	right: 30px;
-}
-
-.selector-chooser {
-	width: 100%;
-}
diff --git a/components/ahttpd/styles/menu.css b/components/ahttpd/styles/menu.css
deleted file mode 100644
index bad01a3..0000000
--- a/components/ahttpd/styles/menu.css
+++ /dev/null
@@ -1,188 +0,0 @@
-/* c0dbdb */
-
-#logo-td {
-	border-left: none;
-	padding-left: 10px;
-	padding-right: 10px;
-	text-align:left;
-/*	background: #fff;*/
-	padding-top: 10px;
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-	width: 275px;
-	-moz-border-radius-topleft: 1em;
-	-webkit-border-radius-topleft: 1em;
-	-khtml-border-radius-topleft: 1em;
-	border-radius-topleft: 1em;
-	-moz-border-radius-bottomleft: 1em;
-	-webkit-border-radius-bottomleft: 1em;
-	-khtml-border-radius-bottomleft: 1em;
-	border-radius-bottomleft: 1em;
-}
-
-#logo-td img {
-	background: url(/design/images/logo.png) no-repeat;
-	width: 275px; /*325*/
-	height: 30px;
-}
-
-#help-td {
-	/*border-left: none;*/
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	width: 20px;
-	text-align:left;
-	color: #fff;
-/*        border-bottom: 1px solid #056560;;*/
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	-moz-border-radius-topleft: 1em;
-	-moz-border-radius-topright: 1em;
-        -webkit-border-radius-topleft: 1em;
-        -khtml-border-radius-topleft: 1em;
-        border-radius-topleft: 1em; */
-}
-
-#locale-td {
-/*	border-left: none; */
-	padding-left: 10px;
-	padding-top: 10px;
-	color: #fff;
-	padding-right: 10px;
-	text-align:center;
-	width: 100px;
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	border-left: 1px solid #056560;;
-	border-right: 1px solid #056560;;
-	border-bottom: 1px solid #056560;; */
-	-moz-border-radius-topright: 1em;
-        -webkit-border-radius-topright: 1em;
-        -khtml-border-radius-topright: 1em;
-        border-radius-topright: 1em;
-}
-
-#hostinfo-td {
-/*	border-left:  1px solid #056560;;
-	border-top:  1px solid #056560;;
-	border-right:  1px solid #056560;; */
-	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-/*	-moz-border-radius-topleft: 1em;
-        -webkit-border-radius-topleft: 1em;
-        -khtml-border-radius-topleft: 1em;
-        border-radius-topleft: 1em;
-	*/
-	
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	text-align: left;
-
-	color: #fff; /*#0574B2;*/
-	font-weight: bold;
-	text-decoration: none;
-	font-size:large;
-}
-
-.expanded {
-/*	padding-left: 40px;*/
-    width: 100%;
-}
-
-
-
-/* main menu */
-
-#menu-td {
-	padding-right: 12px;
-}
-
-#main {
-	padding: 10px 20px;
-}
-
-
-#main-td {
-/*	padding: 10px 20px;*/
-/*	background-color: #baeaea;*/
-	background-color: #fff;
-	width: 100%;
-	/*border: 1px solid #056560;;*/
-	-moz-border-radius-bottomright: 1em;
-        -webkit-border-radius-bottomright: 1em;
-        -khtml-border-radius-bottomright: 1em;
-        border-radius-bottomright: 1em;
-	-moz-border-radius-bottomleft: 1em;
-        -webkit-border-radius-bottomleft: 1em;
-        -khtml-border-radius-bottomleft: 1em;
-        border-radius-bottomleft: 1em;
-}
-
-.menu-item-normal a {
-	font-weight: normal;
-	padding-left: 5px;
-	padding-right: 5px;
-	text-decoration: none;
-}
-
-.menu-item-selected a {
-	font-weight: bold;
-	padding-left: 5px;
-	padding-right: 5px;
-}
-
-.menu-group-name  {
-	padding-left: 5px;
-	padding-right: 5px;
-	color: #fff;
-	text-decoration: none;
-	/*background-color:#baeaea;*/
-	padding-top: 3px;
-	background: url(/design/images/gradient.png) 0% 0% repeat-x;
-	font-weight: bold;
-	-moz-border-radius-topright: 1em;
-	-webkit-border-radius-topright: 1em;
-	-khtml-border-radius-topright: 1em;
-	border-radius-topright: 1em;
-	-moz-border-radius-topleft: 1em;
-	-webkit-border-radius-topleft: 1em;
-	-khtml-border-radius-topleft: 1em;
-	border-radius-topleft: 1em;
-}
-
-.menu-group {
-	padding-bottom: 5px;
-	/*width:250px;*/
-/*	padding-right: 5px;*/
-	padding-top: 5px;
-	border-collapse: collapse;
-	background: url(/design/images/gradient-menu.png) 0% 0% repeat-x;
-/*	border-bottom: 1px solid #056560;;
-	border-left: 1px solid #056560;;
-	border-right: 1px solid #056560;; */
-	-moz-border-radius-bottomright: 1em;     /* mozilla 1.5 */
-	-webkit-border-radius-bottomright: 1em;  /* safari 3 */
-	-khtml-border-radius-bottomright: 1em;   /* Konqueror */
-	border-radius-bottomright: 1em;          /* CSS3 */
-	-moz-border-radius-bottomleft: 1em;     /* mozilla 1.5 */
-	-webkit-border-radius-bottomleft: 1em;  /* safari 3 */
-	-khtml-border-radius-bottomleft: 1em;   /* Konqueror */
-	border-radius-bottomleft: 1em;          /* CSS3 */
-}
-
-#help-popup {
-	padding-left: 10px;
-	width: 95%;
-	background-color: #EEF2F5;
-/*	padding-right: 5px;
-	padding-top: 10px;*/
-}
-
-.hresizeable {
-	width: 100%;
-	height: 7px;
-	background:#cdcdcd url(/design/images/hgrabber.gif) no-repeat scroll 45%;
-	cursor: s-resize;
-}
-
-.hresizeable:hover {
-	background-color: #178093;
-}
diff --git a/components/bootloader/config.in b/components/bootloader/config.in
index f6d7fba..5e1b54a 100644
--- a/components/bootloader/config.in
+++ b/components/bootloader/config.in
@@ -1,2 +1,2 @@
-product=@NAME@ @VERSION@ @STATUS@
+product=@NAME@ @VERSION@@STATUS@
 based_on=ALT Linux Sisyphus
diff --git a/components/bootloader/gfxboot.cfg.in b/components/bootloader/gfxboot.cfg.in
index 122dd48..813e21f 100644
--- a/components/bootloader/gfxboot.cfg.in
+++ b/components/bootloader/gfxboot.cfg.in
@@ -35,16 +35,16 @@ background=back.jpg
 ; max. visible main menu items
 mainmenu.entries=8
 ; minimal main menu selection bar width
-mainmenu.bar.minwidth=294
+mainmenu.bar.minwidth=280
 ; main menu selection bar transparency (0..255)
 mainmenu.bar.transparency=0
 ; main menu colors
-mainmenu.bar.color=0xffffff
+mainmenu.bar.color=0x77b5f2
 mainmenu.normal.fg=0x787878
-mainmenu.selected.fg=0x118bca
+mainmenu.selected.fg=0xe4ecf2
 ; boot option colors
-bootopt.label.fg=0x787878
-bootopt.text.fg=0x787878
+bootopt.label.fg=0x000000
+bootopt.text.fg=0x000000
 ; progress bar color
 progress.bar.color=0xd4ecfa
 ; menu colors
@@ -65,9 +65,9 @@ help.link.selected.bg=0x@DARK_COLOR_HEX@
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0x787878
-panel.normal.fg=0x787878
-panel.f-key.fg=0x787878
+panel.title.fg=0x000000
+panel.normal.fg=0x000000
+panel.f-key.fg=0x000080
 ; default keymap (e.g. de_DE, czech)
 keymap=
 
@@ -75,7 +75,7 @@ keymap=
 ; screen size
 screen.size=800,600
 ; upper left corner
-mainmenu.pos=253,210
+mainmenu.pos=260,200
 ; boot option input field position
 bootopt.pos=200,480
 
diff --git a/components/bootsplash/progress_bar.png b/components/bootsplash/progress_bar.png
index cb0e6aa..dd1e747 100644
Binary files a/components/bootsplash/progress_bar.png and b/components/bootsplash/progress_bar.png differ
diff --git a/components/bootsplash/progress_box.png b/components/bootsplash/progress_box.png
index 8df8be2..57a0c30 100644
Binary files a/components/bootsplash/progress_box.png and b/components/bootsplash/progress_box.png differ
diff --git a/components/bootsplash/segment_cornerL.png b/components/bootsplash/segment_cornerL.png
index 2fa8d81..f12b9ac 100644
Binary files a/components/bootsplash/segment_cornerL.png and b/components/bootsplash/segment_cornerL.png differ
diff --git a/components/bootsplash/segment_cornerR.png b/components/bootsplash/segment_cornerR.png
index bd872bc..6e3db91 100644
Binary files a/components/bootsplash/segment_cornerR.png and b/components/bootsplash/segment_cornerR.png differ
diff --git a/components/bootsplash/segment_middle.png b/components/bootsplash/segment_middle.png
new file mode 100644
index 0000000..6093db1
Binary files /dev/null and b/components/bootsplash/segment_middle.png differ
diff --git a/components/bootsplash/segment_status.png b/components/bootsplash/segment_status.png
new file mode 100644
index 0000000..5f12464
Binary files /dev/null and b/components/bootsplash/segment_status.png differ
diff --git a/components/bootsplash/theme.script b/components/bootsplash/theme.script
index f7881dd..08304d9 100644
--- a/components/bootsplash/theme.script
+++ b/components/bootsplash/theme.script
@@ -13,11 +13,11 @@ fun imgscale2( image, scaleX, scaleY )
 # background
 if( Window.GetWidth()/Window.GetHeight() > 1.5 )
 {
-	logo.raw = Image("background16x9.png");
+   logo.raw = Image("background16x9.png");
 }
 else
 {
-	logo.raw = Image("background4x3.png");
+   logo.raw = Image("background4x3.png");
 }
 
 logo.image = imgscale2( logo.raw, 
@@ -123,34 +123,48 @@ progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetW
 progress_box.y = Window.GetY() + Window.GetHeight() / 2 - progress_box.image.GetHeight() / 2;
 progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
 
-progress_bar.original_image = imgscale(Image("progress_bar.png"), scale_factor);
-progress_bar.sprite = Sprite();
+progress_bar.status.raw = Image("segment_status.png");
+progress_bar.runner = Sprite();
+progress_bar.runner.SetImage ( imgscale(progress_bar.status.raw, scale_factor));
 
-progress_bar.x = progress_box.x ; 
-progress_bar.y = Window.GetY() + Window.GetHeight() / 2 - progress_box.image.GetHeight() / 2 + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
 
+progress_bar.x = Window.GetX() + Window.GetWidth()  / 2 -  progress_box.image.GetWidth() / 2;
+progress_bar.y = Window.GetY() + Window.GetHeight() / 2 - progress_box.image.GetHeight() / 2 +
+	(progress_box.image.GetHeight() - progress_box.image.GetHeight()) / 2;
+
+#Total steps
+steps=33;
 
 #left corner
 progress_bar.l = imgscale( Image("segment_cornerL.png") , scale_factor );
 progress_bar.spriteL = Sprite();
 progress_bar.spriteL.SetImage (progress_bar.l);
 progress_bar.spriteL.SetPosition(progress_bar.x,progress_bar.y, 2) ;
-progress_bar.x += progress_bar.l.GetWidth();
-progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
+progress_bar.x += progress_bar.l.GetWidth()-1;
 
+#middle
+progress_bar.image = imgscale(Image("segment_middle.png"), scale_factor);
+step = progress_bar.image.GetWidth()-1;
+for( i=0; i<steps; i++ ) 
+{
+	progress_bar.sprites[i] = Sprite();
+        progress_bar.sprites[i].SetImage (progress_bar.image);
+	progress_bar.sprites[i].SetPosition(progress_bar.x+i*step,progress_bar.y, -1000) ;
+}
 #right corner
-#progress_bar.r = imgscale( Image("segment_cornerR.png") , scale_factor );
-#progress_bar.sprites[steps+1] = Sprite();
-#progress_bar.sprites[steps+1].SetImage (progress_bar.r);
-#progress_bar.sprites[steps+1].SetPosition(progress_bar.x+step*steps,progress_bar.y, -1000) ;
+progress_bar.r = imgscale( Image("segment_cornerR.png") , scale_factor );
+progress_bar.sprites[steps+1] = Sprite();
+progress_bar.sprites[steps+1].SetImage (progress_bar.r);
+progress_bar.sprites[steps+1].SetPosition(progress_bar.x+step*steps,progress_bar.y, -1000) ;
 
 fun progress_callback (duration, progress)
 {
-	if (progress_bar.image.GetWidth () != Math.Int (progress_bar.original_image.GetWidth () * progress))
-	{
-		progress_bar.image = progress_bar.original_image.Scale(progress_bar.original_image.GetWidth(progress_bar.original_image) * progress, progress_bar.original_image.GetHeight());
-		progress_bar.sprite.SetImage (progress_bar.image);
-	}
+	for( i=0; i< progress*steps; i++ )
+         	progress_bar.sprites[i].SetZ(2);
+	if( progress > 0.99 ) 
+         	progress_bar.sprites[i+1].SetZ(2);
+	if( progress < 0.96 )
+         	progress_bar.runner.SetPosition(progress_bar.x+progress*step*steps, progress_bar.y, 1);
 }
 
 Plymouth.SetBootProgressFunction(progress_callback);
diff --git a/components/browser-qt/design/design.qss.in b/components/browser-qt/design/design.qss.in
index ca2eb56..0f65f39 100644
--- a/components/browser-qt/design/design.qss.in
+++ b/components/browser-qt/design/design.qss.in
@@ -2,30 +2,28 @@
 .AWizardFace {
     border-style: none;
     background-image: url(:/design/bg.png);
-    background-color: rgb(0,139,209);
-    background-position: center;
-    background-repeat: no-repeat
+    background-color: rgb(167,228,255);
+    background-position: top left;
+    background-repeat: no-repeat;
 }
 
 .AWizardFace #wizardface_title_text {
     color: white;
 }
 
-
 .ACenterFace {
     border-style: none;
-    }
+}
 
 .ACenterFace #modules_view {
     background-color: white;
 }
 
 /* Nice WindowsXP-style password character for password line edits. */
-QLineEdit[echoMode="2"] {
+QLineEdit {
     lineedit-password-character: 9679;
 }
 
-
 /* Customize tooltips. */
 QToolTip {
     background-color: rgb(200,200,255);
@@ -38,3 +36,14 @@ QToolTip {
     opacity: 200;
 }
 
+QProgressBar {
+    background: white;
+    border: 1px solid #B8B2AD;
+}
+
+QProgressBar::chunk {
+    background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1,
+    stop: 0 #648fb6,
+    stop: 1 #6f9fca) url(:/design/progress-cleanlooks.png);
+    border: 1px solid #46647f;
+}
diff --git a/components/browser-qt/design/progress-cleanlooks.png b/components/browser-qt/design/progress-cleanlooks.png
new file mode 100644
index 0000000..fa4f87b
Binary files /dev/null and b/components/browser-qt/design/progress-cleanlooks.png differ
diff --git a/components/browser-qt/theme.qrc b/components/browser-qt/theme.qrc
index 4e3e1cf..f52c1d8 100644
--- a/components/browser-qt/theme.qrc
+++ b/components/browser-qt/theme.qrc
@@ -5,5 +5,6 @@
    <file>design/design.ini</file>
    <file>design/forward.png</file>
    <file>design/backward.png</file>
+   <file>design/progress-cleanlooks.png</file>
 </qresource>
 </RCC>
diff --git a/components/grub2/f/misc_fixed_13.pf2 b/components/grub2/f/misc_fixed_13.pf2
new file mode 100644
index 0000000..68d8847
Binary files /dev/null and b/components/grub2/f/misc_fixed_13.pf2 differ
diff --git a/components/grub2/theme.txt b/components/grub2/theme.txt
index be43daf..8eb16aa 100644
--- a/components/grub2/theme.txt
+++ b/components/grub2/theme.txt
@@ -21,45 +21,57 @@
 # THE SOFTWARE.
 
 #general settings
-message-font: "Misc Fixed Bold 13"
+essage-font: "DejaVu Sans Regular 12"
 title-text: ""
 message-color: "#000000"
-message-bg-color: "#ffffff"
+message-bg-color: "#77b5f2"
 desktop-image: "boot.png"
 terminal-font: "Misc Fixed Regular 13"
 
 #help bar at the bottom
 + label {
-	top = 100%-25
-	left = 0
-	width = 100%
-	height = 20
-	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
+	top = 100%-60
+	left = 20%
+	width = 60%
+	height = 25
+	text = "Для запуска системы выберите пункт меню и нажмите Enter."
 	align = "center"
-	font = "DejaVu Sans Regular 10"
-	color = "#000000"
+	font = "Droid Sans Bold 14"
+	color = "#008"
+}
+
++ label {
+	top = 100%-40
+	left = 20%
+	width = 60%
+	height = 25
+	text = "Для редактирования меню нажмите E. Для выхода - Esc."
+	align = "center"
+	font = "Droid Sans Bold 14"
+	color = "#008"
 }
 
 #menu
 + boot_menu {
-	left = 30%
-	width = 40%
-	top = 32%
+	left = 20%
+	width = 60%
+	top = 30%
 	height = 40%
-	item_font = "Misc Fixed Bold 13"
-	selected_item_font = "Misc Fixed Bold 13"
+	item_font = "DejaVu Sans Bold 14"
+	selected_item_font = "DejaVu Sans Bold 14"
 	icon_height = 24
 	icon_width = 24
 	item_height = 26
 	item_padding = 0
 	item_icon_space = 0
 	item_spacing = 1
+	selected_item_pixmap_style = "selected_blob_*.png"
 	scrollbar = true
 	scrollbar_width = 20
 	scrollbar_thumb = "scrollbar_slider_*.png"
 	scrollbar_frame = "scrollbar_border_*.png"
-	item_color = "#676769"
-	selected_item_color = "#4f88c7"
+	item_color = "#000080"
+	selected_item_color = "#ffffff"
 }
 
 + circular_progress
diff --git a/components/indexhtml/index-en.html.in b/components/indexhtml/index-en.html.in
index 8451d63..7c550e0 100644
--- a/components/indexhtml/index-en.html.in
+++ b/components/indexhtml/index-en.html.in
@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>Informika 6.0 School Junior</title>
+<title>@PRODUCT_NAME@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">Informika 6.0 School Junior</div>
+<div id="title">@PRODUCT_NAME@</div>
 
 <div id="main">
 <!-- Links columns -->
@@ -87,7 +87,7 @@
 <div id="footer">
 <table border="0" width="100%">
 <tr>
-<td id="left_footer">&copy; 2012 ALT Linux. All rights reserved.</td>
+<td id="left_footer">&copy; 2013 ALT Linux. All rights reserved.</td>
 <td id="right_footer">
 Tel/fax: +7 (495) 662-3883<br>
 119334, Russian Federation, Moscow, 5-th Donskoy proezd, 15, build 6.
diff --git a/components/indexhtml/index-ru.html.in b/components/indexhtml/index-ru.html.in
index a063cdf..0f0d0af 100644
--- a/components/indexhtml/index-ru.html.in
+++ b/components/indexhtml/index-ru.html.in
@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>Информика 6.0 Школьный Юниор</title>
+<title>@PRODUCT_NAME_RU@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">Информика 6.0 Школьный Юниор</div>
+<div id="title">@PRODUCT_NAME_RU@</div>
 
 <div id="main">
 <!-- Links columns -->
@@ -87,7 +87,7 @@
 <div id="footer">
 <table border="0" width="100%">
 <tr>
-<td id="left_footer">&copy; ALT Linux, 2012. Все права защищены.</td>
+<td id="left_footer">&copy; ALT Linux, 2013. Все права защищены.</td>
 <td id="right_footer">
 Телефон/факс: +7 (495) 662-3883<br>
 Москва, 5-й Донской проезд, д. 15, стр. 6
diff --git a/components/indexhtml/indexhtml.desktop.in b/components/indexhtml/indexhtml.desktop.in
index 273535d..836d4d5 100644
--- a/components/indexhtml/indexhtml.desktop.in
+++ b/components/indexhtml/indexhtml.desktop.in
@@ -4,8 +4,8 @@ Type=Application
 Exec=xdg-open /usr/share/doc/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
-Name=About Informika 6.0 School Junior
+Name=About @PRODUCT_NAME@
 Categories=System;Documentation;
 
 # Translations
-Name[ru]=О дистрибутиве Информика 6.0 Школьный Юниор
+Name[ru]=О дистрибутиве «@PRODUCT_NAME_RU@»
diff --git a/components/systemd/os-release.in b/components/systemd/os-release.in
new file mode 100644
index 0000000..27bbdee
--- /dev/null
+++ b/components/systemd/os-release.in
@@ -0,0 +1,9 @@
+NAME="@NAME@"
+VERSION="@VERSION@@STATUS@ (@CODENAME@)"
+ID=altlinux
+VERSION_ID=@VERSION@
+PRETTY_NAME="@PRODUCT_NAME@ (@CODENAME@)"
+ANSI_COLOR="1;36"
+CPE_NAME="cpe:/o:alt linux:school teacher:@VERSION@"
+HOME_URL="http://altlinux.ru/"
+BUG_REPORT_URL="https://bugs.altlinux.org/"
diff --git a/configure.ac b/configure.ac
index 6b46111..703ebd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,15 @@ MIDDLE_LABELS_HEX=4d4d4f
 DOCDIR=documentation
 
 AC_SUBST(THEME)
+AC_SUBST(CODENAME)
 AC_SUBST(NAME)
+AC_SUBST(BRAND)
+AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
+AC_SUBST(STATUS_EN)
 AC_SUBST(VERSION)
+AC_SUBST(PRODUCT_NAME)
+AC_SUBST(PRODUCT_NAME_RU)
 AC_SUBST(DOCDIR)
 AC_SUBST(PROGRESS_COLOR)
 AC_SUBST(LIGHT_COLOR_HEX)
@@ -24,7 +30,12 @@ AC_SUBST(DARK_COLOR_HEX)
 AC_SUBST(LIGHT_LABELS_HEX)
 AC_SUBST(DARK_LABELS_HEX)
 AC_SUBST(MIDDLE_LABELS_HEX)
+AC_SUBST(LIGHT_COLOR_DEC)
+AC_SUBST(MIDDLE_COLOR_DEC)
+AC_SUBST(DARK_COLOR_DEC)
 AC_SUBST(TITLE_COLOR)
+AC_SUBST(INACTIVE_COLOR)
+AC_SUBST(X86)
 
 AC_CONFIG_FILES([
 		 Makefile
@@ -40,5 +51,7 @@ AC_CONFIG_FILES([
 		 components/indexhtml/indexhtml.desktop
 		 components/indexhtml/index-ru.html
 		 components/indexhtml/index-en.html
+		 components/systemd/os-release
+         components/ahttpd/styles/alterator.css
 ])
 AC_OUTPUT
diff --git a/configure.ac.tmp b/configure.ac.tmp
deleted file mode 100644
index a6b0275..0000000
--- a/configure.ac.tmp
+++ /dev/null
@@ -1,33 +0,0 @@
-AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
-
-
-PROGRESS_COLOR=23b8dc
-TITLE_COLOR=23b8dc
-INACTIVE_COLOR=d3d7cf
-
-
-AC_SUBST(THEME)
-AC_SUBST(NAME)
-AC_SUBST(STATUS)
-AC_SUBST(VERSION)
-AC_SUBST(PROGRESS_COLOR)
-AC_SUBST(TITLE_COLOR)
-AC_SUBST(INACTIVE_COLOR)
-
-AC_CONFIG_FILES([
-		 Makefile
-		 bootloader/config
-		 bootsplash/config/bootsplash-640x480.cfg
-		 bootsplash/config/bootsplash-800x600.cfg
-		 bootsplash/config/bootsplash-1024x768.cfg
-		 alterator/design/design.ini
-		 bootloader/gfxboot.cfg
-		 notes/release-notes.ru.html
-		 notes/release-notes.all.html
-		 notes/license.ru.html
-		 notes/license.all.html
-		 indexhtml.desktop
-		 indexhtml/index-ru.html
-		 indexhtml/index-en.html
-])
-AC_OUTPUT
diff --git a/images/background16x9.png b/images/background16x9.png
index 3e0a47c..23af39a 100644
Binary files a/images/background16x9.png and b/images/background16x9.png differ
diff --git a/images/background4x3.png b/images/background4x3.png
index 4368562..e32b6e6 100644
Binary files a/images/background4x3.png and b/images/background4x3.png differ
diff --git a/images/boot.png b/images/boot.png
index 644e71b..5e94a47 100644
Binary files a/images/boot.png and b/images/boot.png differ
diff --git a/images/grub.png b/images/grub.png
index 181993c..dbf0102 100644
Binary files a/images/grub.png and b/images/grub.png differ
diff --git a/images/installer.png b/images/installer.png
index c783186..09d2652 100644
Binary files a/images/installer.png and b/images/installer.png differ
diff --git a/images/logo.png b/images/logo.png
deleted file mode 100644
index d346faa..0000000
Binary files a/images/logo.png and /dev/null differ
diff --git a/images/product-logo.png b/images/product-logo.png
index 88d2386..56e4f01 100644
Binary files a/images/product-logo.png and b/images/product-logo.png differ
diff --git a/menu/50-slinux-menu-style.menu b/menu/50-slinux-menu-style.menu
deleted file mode 100644
index 6cc82ab..0000000
--- a/menu/50-slinux-menu-style.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-            "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
-<Menu>
-<AppDir>/usr/share/slinux-style/applications</AppDir>
-</Menu>
\ No newline at end of file
diff --git a/menu/50-xfce-applications.menu b/menu/50-xfce-applications.menu
index 4baaeb1..9d1d374 100644
--- a/menu/50-xfce-applications.menu
+++ b/menu/50-xfce-applications.menu
@@ -3,6 +3,7 @@
 
 <Menu>
     <Name>Xfce</Name>
+    <AppDir>/usr/share/slinux-style/applications</AppDir>
 
     <Menu>
         <Name>ShallowSettings</Name>
@@ -22,6 +23,7 @@
         </Include>
         <Exclude>
 			<Category>Wine</Category>
+			<Category>X-XFCE-SettingsDialog</Category>
         </Exclude>
 
         <Layout>
@@ -40,11 +42,8 @@
         </Menu>
     </Menu>
 
-    <MergeFile>altlinux-applications.menu</MergeFile>
-    <MergeDir>applications-merged</MergeDir>
-
     <Layout>
-        <Filename>xfrun4.desktop</Filename>
+        <Filename>xfce4-run.desktop</Filename>
         <Filename>xfce4-appfinder.desktop</Filename>
         <Separator/>
         <Filename>exo-terminal-emulator.desktop</Filename>
@@ -57,7 +56,6 @@
         <Separator/>
         <Merge type="all"/>
         <Separator/>
-        <Filename>xfhelp4.desktop</Filename>
         <Filename>xfce4-about.desktop</Filename>
         <Filename>xfce4-session-logout.desktop</Filename>
     </Layout>
@@ -84,7 +82,7 @@
                 <Filename>exo-file-manager.desktop</Filename>
                 <Filename>exo-terminal-emulator.desktop</Filename>
                 <Filename>xfce4-about.desktop</Filename>
-                <Filename>xfrun4.desktop</Filename>
+                <Filename>xfce4-run.desktop</Filename>
                 <Category>Wine</Category>
             </Or>
         </Exclude>
@@ -96,7 +94,7 @@
 		    <Filename>exo-file-manager.desktop</Filename>
 		    <Filename>exo-terminal-emulator.desktop</Filename>
 		    <Filename>xfce4-about.desktop</Filename>
-		    <Filename>xfrun4.desktop</Filename>
+		    <Filename>xfce4-run.desktop</Filename>
 		</Or>
 	    </Exclude>
 	</Menu>
@@ -151,7 +149,6 @@
         <Category>X-Xfce-Toplevel</Category>
     </Include>
 
-    <MergeDir>xfce-applications-merged</MergeDir>
     <MergeFile>applications-menueditor.menu</MergeFile>
     <MergeFile>xfce-applications-menueditor.menu</MergeFile>
 
diff --git a/menu/applications/Ri-li.desktop b/menu/applications/Ri-li.desktop
new file mode 100644
index 0000000..c6e3534
--- /dev/null
+++ b/menu/applications/Ri-li.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Ri-li
+GenericName=Ri-li
+Comment=Drive a toy wood engine
+Exec=Ri_li
+TryExec=Ri_li
+Icon=Ri-li
+Terminal=false
+StartupNotify=false
+Categories=Game;ArcadeGame;
diff --git a/menu/applications/Terminal.desktop b/menu/applications/Terminal.desktop
deleted file mode 100644
index 57da7fa..0000000
--- a/menu/applications/Terminal.desktop
+++ /dev/null
@@ -1,145 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Name=Terminal
-Name[ar]=طرفية
-Name[ast]=Terminal
-Name[be]=Тэрмінал
-Name[ca]=Terminal
-Name[cs]=Terminal
-Name[da]=Terminal
-Name[de]=Terminal
-Name[dz]=ཊར་མི་ནཱལ།
-Name[el]=Τερματικό
-Name[en_GB]=Terminal
-Name[eo]=Terminalo
-Name[es]=Terminal
-Name[et]=Terminal
-Name[eu]=Terminala
-Name[fi]=Pääte
-Name[fr]=Terminal
-Name[gl]=Terminal
-Name[he]=מסוף
-Name[hu]=Terminál
-Name[id]=Terminal
-Name[it]=Terminale
-Name[ja]=Terminal
-Name[kk]=Терминал
-Name[ko]=터미널
-Name[ku]=Termînal
-Name[lv]=Terminālis
-Name[nb]=Terminal
-Name[nl]=Terminal
-Name[pa]=ਟਰਮੀਨਲ
-Name[pl]=Terminal
-Name[pt]=Terminal
-Name[pt_BR]=Terminal
-Name[ro]=Terminal
-Name[ru]=Терминал
-Name[sk]=Terminál
-Name[sq]=Terminal
-Name[sv]=Terminal
-Name[tr]=Uçbirim
-Name[uk]=Термінал
-Name[ur]=ٹرمنل
-Name[ur_PK]=ٹرمنل
-Name[vi]=Terminal
-Name[zh_CN]=Xfce 终端
-Name[zh_TW]=終端機
-Comment=Terminal Emulator
-Comment[ar]=محاكي طرفية
-Comment[ast]=Emulador de terminal
-Comment[be]=Эмулятар тэрмінала
-Comment[ca]=Emulador de terminal
-Comment[cs]=Emulátor terminálu
-Comment[da]=Terminal Emulator
-Comment[de]=Terminal-Programm
-Comment[dz]=ཊར་མི་ནཱལ་ནུས་འཕྲུལ།
-Comment[el]=Προσομοίωση τερματικού
-Comment[en_GB]=Terminal Emulator
-Comment[eo]=Terminala Simulilo
-Comment[es]=Emulador de terminal
-Comment[et]=Terminaliemulaator
-Comment[eu]=Terminal emuladorea
-Comment[fi]=Pääte-emulaattori
-Comment[fr]=Émulateur de terminal
-Comment[gl]=Emulador de Terminal
-Comment[he]=מדמה מסוף
-Comment[hu]=Terminálemulátor
-Comment[id]=Emulator Terminal
-Comment[ja]=ターミナルエミュレータ
-Comment[kk]=Терминал эмуляторы
-Comment[ko]=터미널 에뮬레이터
-Comment[ku]=Emûlatorê Termînalê
-Comment[lv]=Termināļa emulators
-Comment[nb]=Teminalemulator
-Comment[nl]=Terminal-emulatieprogramma
-Comment[pa]=ਟਰਮੀਨਲ ਈਮੂਲੇਟਰ
-Comment[pl]=Emulator terminala
-Comment[pt]=Emulador de Terminal
-Comment[pt_BR]=Emulador de Terminal
-Comment[ro]=Emulator de terminal
-Comment[ru]=Эмулятор терминала
-Comment[sk]=Terminál Emulátor
-Comment[sq]=Emulues Terminali
-Comment[sv]=Terminalemulator
-Comment[tr]=Uçbirim Öykünücüsü
-Comment[uk]=Емулятор терміналу
-Comment[ur]=ٹرمنل ایمولیٹر
-Comment[ur_PK]=ٹرمنل ایمولیٹر
-Comment[vi]=Trình giả lập Terminal
-Comment[zh_CN]=终端模拟器
-Comment[zh_TW]=終端機程式
-GenericName=Terminal Emulator
-GenericName[ar]=محاكي طرفية
-GenericName[ast]=Emulador de terminal
-GenericName[be]=Эмулятар тэрмінала
-GenericName[ca]=Emulador de terminal
-GenericName[cs]=Emulátor terminálu
-GenericName[da]=Terminal Emulator
-GenericName[de]=Terminal-Programm
-GenericName[dz]=ཊར་མི་ནཱལ་ནུས་འཕྲུལ།
-GenericName[el]=Προσομοίωση τερματικού
-GenericName[en_GB]=Terminal Emulator
-GenericName[eo]=Terminala Simulilo
-GenericName[es]=Emulador de terminal
-GenericName[et]=Terminaliemulaator
-GenericName[eu]=Terminal emuladorea
-GenericName[fi]=Pääte-emulaattori
-GenericName[fr]=Émulateur de terminal
-GenericName[gl]=Emulador de Terminal
-GenericName[he]=מדמה מסוף
-GenericName[hu]=Terminálemulátor
-GenericName[id]=Emulator Terminal
-GenericName[ja]=ターミナルエミュレータ
-GenericName[kk]=Терминал эмуляторы
-GenericName[ko]=터미널 에뮬레이터
-GenericName[ku]=Emûlatorê Termînalê
-GenericName[lv]=Termināļa emulators
-GenericName[nb]=Teminalemulator
-GenericName[nl]=Terminal-emulatieprogramma
-GenericName[pa]=ਟਰਮੀਨਲ ਈਮੂਲੇਟਰ
-GenericName[pl]=Emulator terminala
-GenericName[pt]=Emulador de Terminal
-GenericName[pt_BR]=Emulador de Terminal
-GenericName[ro]=Emulator de terminal
-GenericName[ru]=Эмулятор терминала
-GenericName[sk]=Terminál Emulátor
-GenericName[sq]=Emulues Terminali
-GenericName[sv]=Terminalemulator
-GenericName[tr]=Uçbirim Öykünücüsü
-GenericName[uk]=Емулятор терміналу
-GenericName[ur]=ٹرمنل ایمولیٹر
-GenericName[ur_PK]=ٹرمنل ایمولیٹر
-GenericName[vi]=Trình giả lập Terminal
-GenericName[zh_CN]=终端模拟器
-GenericName[zh_TW]=終端機程式
-Exec=Terminal
-TryExec=Terminal
-Icon=Terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;Utility;
-StartupNotify=true
-
-# vi:set encoding=UTF-8:
diff --git a/menu/applications/apt-indicator.desktop b/menu/applications/apt-indicator.desktop
deleted file mode 100644
index 6628f74..0000000
--- a/menu/applications/apt-indicator.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=APT Indicator
-Name[ru]=Индикатор обновлений
-Type=Application
-Exec=apt-indicator
-TryExec=apt-indicator
-Icon=altlinux
-Terminal=false
-StartupNotify=false
-X-KDE-autostart-phase=1
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-DBUS-StartupType=none
-Categories=Qt;System;
-GenericName=Updates Indicator
-GenericName[ru]=Индикатор обновлений
-Comment=Applet for indication that newer packages are available
-Comment[ru]=Аплет для отображения доступности новых пакетов
diff --git a/menu/applications/audacious.desktop b/menu/applications/audacious.desktop
deleted file mode 100644
index 26dfd4b..0000000
--- a/menu/applications/audacious.desktop
+++ /dev/null
@@ -1,41 +0,0 @@
-[Desktop Entry]
-Version=1.0
-
-Type=Application
-
-Name=Audacious
-Name[ru]=Музыкальный плеер Audacious
-GenericName=Music Player
-GenericName[be]=Музычны плэер
-GenericName[da]=Lydafspiller
-GenericName[de]=Musikspieler
-GenericName[es]=Reproductor de música
-GenericName[fr]=Lecteur de Musique
-GenericName[it]=Lettore di Musica
-GenericName[lt]=Muzikos grotuvas
-GenericName[nl]=Muziekspeler
-GenericName[nb]=Lydavspiller
-GenericName[pt]=Leitor de Música
-GenericName[ro]=Lector de Muzică
-GenericName[ru]=Аудиоплеер
-GenericName[se]=Ljudspelare
-Comment=Listen to music
-Comment[be]=Слухайце музыку
-Comment[de]=Musik hören
-Comment[fr]=Écouter de la musique
-Comment[hu]=Hallgasson zenét
-Comment[it]=Ascoltare musica
-Comment[lt]=Klausyti muzikos
-Comment[nb]=Lytt til musikk
-Comment[nl]=Muziek luisteren
-Comment[ru]=Слушайте музыку
-Comment[es]=Escucha música
-Icon=audacious
-
-Categories=AudioVideo;Audio;Player;GTK;
-
-Exec=audacious %U
-TryExec=audacious %U
-TryExec=audacious
-Terminal=false
-MimeType=application/ogg;application/x-cue;application/x-ogg;application/xspf+xml;audio/midi;audio/mp3;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-vorbis+ogg;audio/x-wav;audio/x-xm;x-content/audio-cdda;
diff --git a/menu/applications/audacity.desktop b/menu/applications/audacity.desktop
deleted file mode 100644
index 7abd4bd..0000000
--- a/menu/applications/audacity.desktop
+++ /dev/null
@@ -1,21 +0,0 @@
-[Desktop Entry]
-Name=Audacity
-Name[de]=Audacity
-Name[ru]=Редактор звуковых файлов Audacity
-GenericName=Sound Editor
-GenericName[de]=Audio-Editor
-GenericName[ru]=Редактор звуковых файлов
-Comment=Record and edit audio files
-Comment[de]=Audio-Dateien aufnehmen und bearbeiten
-Comment[ru]=Запись и редактирование звуковых файлов
-
-Icon=audacity
-
-Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
-
-Exec=audacity
-TryExec=audacity
-StartupNotify=false
-Terminal=false
-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
diff --git a/menu/applications/base.desktop b/menu/applications/base.desktop
deleted file mode 100644
index 693f6a3..0000000
--- a/menu/applications/base.desktop
+++ /dev/null
@@ -1,68 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Icon=libreoffice-base.png
-Type=Application
-Categories=Application;Office;Database;
-Exec=lobase %U
-TryExec=lobase %U
-MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
-Name=LibreOffice Base
-Name[ru]=LibreOffice Базы данных
-GenericName=Databases
-GenericName[ru]=База данных
-GenericName[tt_RU]=Мәгълүмат базасы
-Comment=Manage databases, create queries and reports to track and manage your information by using Base.
-Comment[en]=Manage databases, create queries and reports to track and manage your information by using Base.
-Comment[de]=Verwalten von Datenbanken, Erstellen von Abfragen und Berichten - Base macht's möglich.
-Comment[af]=Bestuur databasisse, skep navrae en verslae om u inligting na te speur en te bestuur, met Base.
-Comment[be_BY]=Кіруйце базамі дадзеных, стварайце звароты і справаздачы, каб зважаць на, і кіраваць інфармацыяй з дапамогаю Base.
-Comment[bg]=С Base можете да управлявате бази от данни и да създавате заявки и справки, за да следите и управлявате Вашата информация.
-Comment[bs]=Upravljanje bazama podataka, kreiranje upita i izvještaja radi praćenja i upravljanja vašim informacijama koristeći Base.
-Comment[ca]=Gestioneu bases de dades i creeu consultes i informes per fer el seguiment i gestionar la vostra informació amb el Base.
-Comment[cs]=Spravujte databáze, vytvářejte dotazy a sestavy pro sledování a řízení vašich informací pomocí Base.
-Comment[cy]=Rheoli cronfeydd data, creu ymholiadau ac adroddiadau i ddilyn a rheoli eich gwybodaeth drwy ddefnyddio Base.
-Comment[da]=Administrer databaser, opret forespørgsler og rapporter til at spore og administrere dine informationer ved at bruge Base.
-Comment[el]=Διαχείριση βάσης δεδομένων, δημιουργία ερωτημάτων και αναφορών για την παρακολούθηση και διαχείριση πληροφοριών.
-Comment[en_GB]=Manage databases, create queries, reports, track and manage your information using Base.
-Comment[en_ZA]=Manage databases, create queries and reports to track and manage your information by using Base.
-Comment[es]=Administrar bases de datos, crear consultas e informes para controlar y editar información con Base.
-Comment[et]=Base võimaldab kasutada andmebaase ja luua andmete jälgimiseks ning haldamiseks päringuid ja aruandeid.
-Comment[fi]=Hallinnoi tietokantoja, luo kyselyjä ja seurantaraportteja, ja hallinnoi tietojasi käyttämällä Base -ohjelmaa.
-Comment[fr]=Base - Gestion de bases de données, création de requêtes et rapports
-Comment[gu_IN]=ડેટાબેઝોની વ્યવસ્થા કરો, પ્રશ્નો બનાવો અને તમારી જાણકારી આધારની મદદથી ટ્રેક કરવા અને તેની વ્યવસ્થા કરવા માટેના અહેવાલો.
-Comment[hi_IN]=Manage databases, create queries and reports to track and manage your information by using Base.
-Comment[hr]=Upravljanje bazama podataka, kreiranje upita i izvještaja za praćenje i upravljanje informacija koristeći Base.
-Comment[hu]=Adatbázisok kezelése, lekérdezések és jelentések készítése a Base használatával.
-Comment[it]=Usando Base, potete gestire i database e creare interrogazioni e rapporti per controllare e organizzare le vostre informazioni.
-Comment[ja]=Base を使用することで、データベースを管理し、クエリーとレポートを作成して、情報を追跡および管理します。
-Comment[km]=គ្រប់គ្រង​មូលដ្ឋាន​ទិន្នន័យ បង្កើត​សំណួរ និង រាយការណ៍​ ដើម្បី​តាមដាន និង គ្រប់គ្រង​ព័ត៌មាន​របស់​អ្នក​ដោយ​ប្រើ Base ។
-Comment[ko]=Base를 사용하여 데이터베이스를 관리하고, 추적할 쿼리와 보고서를 만들며, 정보를 관리합니다.
-Comment[lt]=Duomenų bazių programa galima tvarkyti duomenų bazes, rašyti užklausas ir ataskaitas.
-Comment[nb]=Håndter databaser, lag spørringer og rapporter og håndter informasjon ved hjelp av Base.
-Comment[nl]=Met Base kunt u databases beheren, query's en rapporten maken om uw gegevens te controleren en beheren.
-Comment[nn]=Med Base kan du handtera databasar, laga spørjingar og rapportar for sporing og handtering av informasjon.
-Comment[nr]=Phatha amabulungelo wekhompyutha, enza imibuzo nemibiko nokulandela nokuphatha ilwazi lakho ngokusebenzisa iBulungelo lekhompyutha.
-Comment[ns]=Laola didatapeisi, hlama dingongorego le dipego gore o latedišiše le go laola tshedimošo ya gago ka go diriša Base.
-Comment[pa_IN]=ਬੇਸ ਨਾਲ ਆਪਣਾ ਡਾਟਾਬੇਸ ਸੰਭਾਲੋ, ਸਵਾਲ ਬਣਾਓ ਅਤੇ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਨੂੰ ਜਾਂਚਿਆ ਅਤੇ ਪ੍ਰਬੰਧ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।
-Comment[pl]=Administruj bazami danych, twórz kwerendy i raporty aby efektywnie zarządzać informacją używając programu Base.
-Comment[pt_BR]=Gerenciar bancos de dados, criar consultas e relatórios para rastrear e gerenciar suas informações por meio do Base.
-Comment[ru]=Управление базами данных, создание запросов и отчетов для слежения и управления вашей информацией при помощи Base.  
-Comment[rw]=Kuyobora ububikoshingiro, kurema ibibazo na raporo kugira ngo ugenzure kandi uyobore ibyatanzwe byawe ukoresheje Base.
-Comment[sh_YU]=Upravlja bazama podataka, pravi upite i izveštaje za praćenje Vaših podataka korićenjem Baze.
-Comment[sk]=Spravujte databázy, vytvárajte dotazy a správy pre správu a analýzu vašich informácií s použitím Base.
-Comment[sl]=Z Base upravljajte z zbirkami podatkov, ustvarjajte povpraševanja in poročila za sledenje in upravljanje s podatki.
-Comment[sr_CS]=Управља базама података, прави упите и извештаје за праћење Ваших података корићењем Базе.
-Comment[st]=Laola didatapeisi, bopa dingongoreho le ditlaleho bakeng sa ho latedisisa le ho laola tlhahisoleseding ya hao ka ho sebedisa Motheo.
-Comment[sv]=Hantera databaser, skapa sökningar och rapporter för att spåra och hantera information med hjälp av Base.
-Comment[sw_TZ]=Manage databases, create queries and reports to track and manage your information by using Base.
-Comment[th]=Manage databases, create queries and reports to track and manage your information by using Base.
-Comment[tr]=Base kullanarak veritabanlarını yönetebilir, sorgular ve raporlar oluşturarak bilgilerinizi takip edebilirsiniz.
-Comment[ts]=Tirhisa swihlayisela-rungula, endla mindzavisiso ni swiviko leswaku u landzelerisisa rungula ra wena hi ku tirhisa Base.
-Comment[tt_RU]=Мәгълүмат базалары белән идарә итү, Base ярдәмендә сораулар һәм хисаплар башкару, алар сезнең мәгълүматларны күзәтергә һәм идарә итүргү ярдәм итә.
-Comment[uk]=Керуйте базами даний, створюйте запити і повідомлення, щоб прослідковувати і керувати вашою інформацією використовуючі Базу даних.
-Comment[vi]=Quản lý CSDL, tạo truy vấn và báo cáo để theo dõi và quản lý thông tin của bạn bằng Base.
-Comment[xh]=Lawula iziseko zeenkcukacha, dala iintandabuzo neengxelo ukuze ulande ekhondweni ngokunjalo ulawule ulwazi lwakho ngokusebenzisa u-Base.
-Comment[zh_CN]=使用 Base 管理数据库并创建查询和报表，以对信息进行跟踪和管理。
-Comment[zh_TW]=使用 Base 來管理資料庫、建立查詢與報告，以追蹤及管理您的資訊。
-Comment[zu]=Lawula idatabheyzi, yenza amakhwiri nemibiko ukuze uthole futhi ulawule ukwaziswa kwakho ngokusebenzisa iBheysi.
diff --git a/menu/applications/brasero.desktop b/menu/applications/brasero.desktop
deleted file mode 100644
index 11b5e5e..0000000
--- a/menu/applications/brasero.desktop
+++ /dev/null
@@ -1,251 +0,0 @@
-[Desktop Entry]
-Name=Brasero
-Name[af]=Brasero
-Name[ar]=براسيرو
-Name[as]=Brasero
-Name[ast]=Brasero
-Name[be]=Brasero
-Name[bg]=Brasero
-Name[bn]=ব্রাসেরো
-Name[bn_IN]=Brasero
-Name[br]=Brasero
-Name[ca]=Brasero
-Name[ca@valencia]=Brasero
-Name[cs]=Brasero
-Name[da]=Brasero
-Name[de]=Brasero
-Name[el]=Brasero
-Name[en@shaw]=·𐑚𐑮𐑩𐑟𐑽𐑴
-Name[en_GB]=Brasero
-Name[eo]=Brasero
-Name[es]=Brasero
-Name[et]=Brasero
-Name[eu]=Brasero
-Name[fi]=Brasero
-Name[fr]=Brasero
-Name[ga]=Brasero
-Name[gl]=Brasero
-Name[gu]=Brasero
-Name[he]=יציאה מ־Brasero
-Name[hi]=ब्रैसेरो
-Name[hu]=Brasero
-Name[id]=Brasero
-Name[it]=Brasero
-Name[ja]=Brasero
-Name[kn]=Brasero
-Name[ko]=브라세로
-Name[lt]=Brasero
-Name[lv]=Brasero
-Name[ml]=ബ്രസേറോ 
-Name[mr]=ब्रसेरो
-Name[nb]=Brasero
-Name[nds]=Brasero
-Name[nl]=Brasero
-Name[nn]=Brasero
-Name[oc]=Brasero
-Name[or]=Brasero
-Name[pa]=ਬਰਾਸੀਰੋ
-Name[pl]=Brasero
-Name[pt]=Brasero
-Name[pt_BR]=Brasero
-Name[ro]=Brasero
-Name[ru]=Запись и копирование дисков Brasero
-Name[sk]=Brasero - napaľovanie diskov
-Name[sl]=Brasero
-Name[sr]=Бразеро
-Name[sr@latin]=Brazero
-Name[sv]=Brasero
-Name[ta]=Brasero
-Name[te]=బ్రాసెరో
-Name[th]=Brasero
-Name[tr]=Brasero
-Name[ug]=Brasero
-Name[uk]=Brasero
-Name[zh_CN]=Brasero
-Name[zh_HK]=Brasero
-Name[zh_TW]=Brasero
-GenericName=Disc Burner and Copier
-GenericName[ar]=كاتب وناسخ للأقراص
-GenericName[bg]=Запис и копиране на дискове
-GenericName[ca]=Enregistrador i copiador de discs
-GenericName[ca@valencia]=Enregistrador i copiador de discs
-GenericName[cs]=Aplikace na vypalování a kopírování disků
-GenericName[da]=Diskbrænding og -kopiering
-GenericName[de]=CD/DVD-Brenn- und Kopierprogramm
-GenericName[el]=Εγγραφή και αντιγραφή δίσκων
-GenericName[en_GB]=Disc Burner and Copier
-GenericName[es]=Grabador y copiador de discos
-GenericName[et]=Plaadikirjutaja ja -kopeerija
-GenericName[eu]=Disko grabatzailea eta kopiatzailea
-GenericName[fi]=Levyjen kirjoittaja ja kopioija
-GenericName[fr]=Gravure et copie de disque
-GenericName[gl]=Gravador e copiador de discos
-GenericName[he]=צורב ומעתיק תקליטורים
-GenericName[hu]=Lemezíró és -másoló
-GenericName[id]=Pembakar dan Penyalin Diska
-GenericName[it]=Masterizzatore dischi
-GenericName[ja]=ディスクの書き込みとコピー
-GenericName[ko]=디스크 굽기 및 복사 프로그램
-GenericName[lt]=Diskų rašymas ir kopijavimas
-GenericName[nb]=Skriv og kopier plater
-GenericName[nl]=Cd's en dvd's maken en kopiëren
-GenericName[nn]=Platebrennar og -kopierar
-GenericName[pa]=ਡਿਸਕ ਬਰਨਰ ਤੇ ਕਾਪੀਅਰ
-GenericName[pl]=Nagrywanie i kopiowanie płyt
-GenericName[pt]=Gravação e Cópia de Discos
-GenericName[pt_BR]=Gravador e copiador de discos
-GenericName[ro]=Scriere și copiere de discuri
-GenericName[ru]=Запись и копирование дисков
-GenericName[sk]=Napaľovanie a kopírovanie diskov
-GenericName[sl]=Zapisovalnik in kopirnik diskov
-GenericName[sr]=Програм за резање и копирање дискова
-GenericName[sr@latin]=Program za rezanje i kopiranje diskova
-GenericName[sv]=Skivbrännare och -kopierare
-GenericName[ta]=வட்டு எழுதி மற்றும் நகல் எடுப்பி
-GenericName[ug]=دىسكا يازغۇ ۋە كۆچۈرگۈ
-GenericName[zh_CN]=光盘刻录和复制器
-GenericName[zh_HK]=光碟燒錄與複製程式
-GenericName[zh_TW]=光碟燒錄與複製程式
-Comment=Create and copy CDs and DVDs
-Comment[af]=Skep en kopieer CD's en DVD's
-Comment[ar]=أنشئ وانسخ الاسطوانات والدي‌ڤي‌ديات
-Comment[as]=নতুন CD আৰু DVD সৃষ্টি কৰক অথবা নকল কৰক
-Comment[ast]=Crear y copiar CD y DVD
-Comment[be]=Стварэньне і капіяваньне дыскаў CD і DVD
-Comment[bg]=Създаване и копиране на CD и DVD дискове
-Comment[bn]=CD ও DVD তৈরি এবং অনুলিপি করুন
-Comment[bn_IN]=নতুন CD ও DVD তৈরি করুন অথবা কপি করুন
-Comment[br]=Krouiñ hag eilañ CDoù ha DVDoù
-Comment[ca]=Crea i copia CD i DVD
-Comment[ca@valencia]=Crea i copia CD i DVD
-Comment[cs]=Vytvořit a kopírovat CD a DVD
-Comment[da]=Opret og kopiér cd/dvd'er
-Comment[de]=CDs/DVDs schreiben und kopieren
-Comment[el]=Εγγραφή και αντιγραφή CD και DVD
-Comment[en@shaw]=𐑒𐑮𐑦𐑱𐑑 𐑯 𐑒𐑪𐑐𐑦 CD𐑟 𐑯 DVD𐑟
-Comment[en_GB]=Create and copy CDs and DVDs
-Comment[es]=Cree y copie CD y DVD
-Comment[et]=Loo ja kopeeri CD- ja DVD-plaate
-Comment[eu]=Sortu eta kopiatu CD eta DVDak
-Comment[fi]=Luo ja kopioi CD- ja DVD-levyjä
-Comment[fr]=Créer et copier des CD ou des DVD
-Comment[ga]=Cruthaigh agus cóipeáil CDanna agus DVDanna
-Comment[gl]=Grave e copie CDs e DVDs
-Comment[gu]=CDs અને DVDs ને બનાવો અને નકલ કરો
-Comment[he]=יצירה והעתקה של תקליטורי CD ו־DVD
-Comment[hi]=सीडी और डीवीडी बनाएँ और नक़ल लें
-Comment[hu]=CD-k és DVD-k írása és másolása
-Comment[id]=Membuat dan menyalin CD/DVD
-Comment[it]=Crea e copia CD e DVD
-Comment[ja]=CD や DVD の作成やコピーができます
-Comment[kn]=CD ಮತ್ತು DVDಗಳನ್ನು ಸೃಷ್ಟಿಸಿ ಮತ್ತು ಬರೆಯಿರಿ
-Comment[ko]=CD나 DVD를 만들고 복사합니다
-Comment[ku]=CD û DVDyan biafirînin û ji ber bigirin
-Comment[lt]=Įrašyti ir kopijuoti CD bei DVD diskus
-Comment[lv]=Ierakstīt un kopēt CD un DVD
-Comment[ml]=സിഡികളും ഡിവിഡികളും തയ്യാറാക്കി പകര്‍ത്തുക
-Comment[mr]=CDs व DVDs बनवा व प्रतिकृत करा
-Comment[nb]=Skriv og kopier CDer eller DVDer
-Comment[nl]=Cd's en dvd's maken en kopiëren
-Comment[nn]=Lag og kopier CD-ar og DVD-ar
-Comment[oc]=Crear e copiar de CD e de DVD
-Comment[or]=CD ଏବଂ DVDଗୁଡ଼ିକୁ ନିର୍ମାଣ କରି ନକଲ କରନ୍ତୁ
-Comment[pa]=CD ਅਤੇ DVD ਬਣਾਓ ਅਤੇ ਕਾਪੀ ਕਰੋ
-Comment[pl]=Nagrywanie i kopiowanie płyt CD/DVD
-Comment[pt]=Crie e copie CDs e DVDs
-Comment[pt_BR]=Crie e copie CDs e DVDs
-Comment[ro]=Creează și copiază CD-uri și DVD-uri
-Comment[ru]=Запись и копирование CD и DVD
-Comment[sk]=Vytvárať a kopírovať CD a DVD
-Comment[sl]=CD/DVD ustvarjanje in kopiranje
-Comment[sr]=Прави и клонира ЦД и ДВД дискове
-Comment[sr@latin]=Pravi i klonira CD i DVD diskove
-Comment[sv]=Skapa och kopiera cd- och dvd-skivor
-Comment[ta]=சிடி க்கள் மற்றும் டிவிடி க்கள் உருவாக்க மற்றும் நகல் எடுக்க
-Comment[te]=CDలు మరియు DVDలను సృష్టించుము మరియు నకలుతీయుము
-Comment[th]=สร้างและคัดลอกซีดี/ดีวีดี
-Comment[tr]=CD/DVD yaz ve kopyala
-Comment[ug]=CD ياكى DVD نى كۆچۈرگىلى ياكى يېڭىدىن ياسىغىلى بولىدۇ
-Comment[uk]=Запис та копіювання CD чи DVD
-Comment[vi]=Tạo và sao chép đĩa CD và DVD
-Comment[zh_CN]=创建及复制 CD/DVD
-Comment[zh_HK]=建立與複製 CD 和 DVD
-Comment[zh_TW]=建立與複製 CD 和 DVD
-Categories=GNOME;AudioVideo;DiscBurning;
-MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-cue;application/x-toc;audio/x-scpls;audio/x-ms-asx;audio/x-mp3-playlist;audio/x-mpegurl;application/x-brasero;x-content/audio-cdda;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-content/image-picturecd;
-Exec=brasero %U
-TryExec=brasero %U
-Icon=brasero
-StartupNotify=true
-Terminal=false
-Type=Application
-X-GNOME-FullName=Brasero Disc Burner
-X-GNOME-FullName[af]=Brasero-skyfskrywer
-X-GNOME-FullName[ar]=حارق الأقراص براسيرو
-X-GNOME-FullName[as]=Brasero ডিস্ক বাৰ্ন ব্যৱস্থা
-X-GNOME-FullName[ast]=Grabador de discos Braseru
-X-GNOME-FullName[be]=Brasero, праграма запісу дыскаў
-X-GNOME-FullName[bg]=Запис на диск (Brasero)
-X-GNOME-FullName[bn]=ব্রাসেরো ডিস্ক বার্নার
-X-GNOME-FullName[bn_IN]=Brasero ডিস্ক বার্ন ব্যবস্থা
-X-GNOME-FullName[br]=Engraverez kantennoù Brasero
-X-GNOME-FullName[ca]=Enregistrador de discs Brasero
-X-GNOME-FullName[ca@valencia]=Enregistrador de discs Brasero
-X-GNOME-FullName[cs]=Vypalovací software Brasero
-X-GNOME-FullName[da]=Brasero diskbrænder
-X-GNOME-FullName[de]=Brasero CD/DVD-Brennprogramm
-X-GNOME-FullName[el]=Εγγραφή δίσκων CD/DVD
-X-GNOME-FullName[en@shaw]=·𐑚𐑮𐑩𐑟𐑽𐑴 𐑛𐑦𐑕𐑒 𐑚𐑻𐑯𐑼
-X-GNOME-FullName[en_GB]=Brasero Disc Burner
-X-GNOME-FullName[es]=Grabador de discos Brasero
-X-GNOME-FullName[et]=Brasero plaadikirjutaja
-X-GNOME-FullName[eu]=Brasero, diskoak grabatzea
-X-GNOME-FullName[fi]=Brasero-levynkirjoittaja
-X-GNOME-FullName[fr]=Gravure de disque Brasero
-X-GNOME-FullName[ga]=Dóire Dioscaí Brasero
-X-GNOME-FullName[gl]=Gravador de discos Brasero
-X-GNOME-FullName[gu]=Brasero ડિસ્ક બનાવનાર
-X-GNOME-FullName[he]=צורב התקליטורים Brasero
-X-GNOME-FullName[hi]=ब्रेसेरो डिस्क बर्नर
-X-GNOME-FullName[hu]=Brasero lemezíró
-X-GNOME-FullName[id]=Brasero Pembakar Diska
-X-GNOME-FullName[it]=Masterizzatore dischi Brasero
-X-GNOME-FullName[ja]=Brasero ディスク作成ツール
-X-GNOME-FullName[kn]=Brasero ಡಿಸ್ಕ್ ಬರಹಗಾರ
-X-GNOME-FullName[ko]=브라세로 디스크 굽기 프로그램
-X-GNOME-FullName[ku]=Brasero Nivîskarê Dîskan
-X-GNOME-FullName[lt]=CD/DVD rašymas bei kopijavimas
-X-GNOME-FullName[lv]=Brasero disku rakstītājs
-X-GNOME-FullName[ml]=ബ്രസേറോ ഡിസ്ക് ബര്‍ണര്‍
-X-GNOME-FullName[mr]=ब्रेसेरो डिस्क बर्नर
-X-GNOME-FullName[nb]=Brasero brenneprogram
-X-GNOME-FullName[nds]=Brasero Diskbrenner
-X-GNOME-FullName[nl]=Brasero cd's branden
-X-GNOME-FullName[nn]=Brasero brenneprogram
-X-GNOME-FullName[oc]=Gravadura de disc Brasero
-X-GNOME-FullName[or]=Brasero ଡିସ୍କ ଲେଖକ
-X-GNOME-FullName[pa]=ਬਰਾਸੀਰੋ ਡਿਸਕ ਬਰਨਰ
-X-GNOME-FullName[pl]=Nagrywanie płyt Brasero
-X-GNOME-FullName[pt]=Aplicação de Gravação de Discos Brasero
-X-GNOME-FullName[pt_BR]=Gravador de discos Brasero
-X-GNOME-FullName[ro]=Scriere de discuri Brasero
-X-GNOME-FullName[ru]=Приложение для записи дисков Brasero
-X-GNOME-FullName[sk]=Brasero - napaľovanie diskov
-X-GNOME-FullName[sl]=Brasero zapisovalnik
-X-GNOME-FullName[sr]=Бразеро писач дискова
-X-GNOME-FullName[sr@latin]=Brazero pisač diskova
-X-GNOME-FullName[sv]=Skivbrännaren Brasero
-X-GNOME-FullName[ta]=ப்ராஸரோ வட்டு எழுதி
-X-GNOME-FullName[te]=బ్రసెరో డిస్కు బర్నర్
-X-GNOME-FullName[th]=โปรแกรมเขียนแผ่น Brasero
-X-GNOME-FullName[tr]=Brasero Disk Yazma Programı
-X-GNOME-FullName[ug]=Brasero دىسكىغا يازغۇ
-X-GNOME-FullName[uk]=Програма для запису дисків Brasero
-X-GNOME-FullName[vi]=Công cụ chép ra đĩa Brasero
-X-GNOME-FullName[zh_CN]=Brasero 光盘刻录器
-X-GNOME-FullName[zh_HK]=Brasero 光碟燒錄程式
-X-GNOME-FullName[zh_TW]=Brasero 光碟燒錄程式
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=brasero
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.32.1
diff --git a/menu/applications/calc.desktop b/menu/applications/calc.desktop
deleted file mode 100644
index 05c02bd..0000000
--- a/menu/applications/calc.desktop
+++ /dev/null
@@ -1,69 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Icon=libreoffice-calc.png
-Type=Application
-Categories=Application;Office;Spreadsheet;
-Exec=localc %U
-TryExec=localc %U
-InitialPreference=7
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;
-Name=LibreOffice Calc
-Name[ru]=LibreOffice Электронные таблицы
-GenericName=Spreadsheets
-GenericName[ru]=Электронная таблица
-GenericName[tt_RU]=Электронн таблица
-Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-Comment[en]=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-Comment[de]=Berechnungen ausführen, Informationen analysieren und Listen in Tabellen verwalten - Calc macht's möglich.
-Comment[af]=Doen berekening, analiseer inligting en bestuur lyste in sigblaaie met Calc.
-Comment[be_BY]=Праводзьце вылічэнні, аналізуйце інфармацыю і кіруйце спісамі ў разліковых аркушах з дапамогаю Calc-а.
-Comment[bg]=Calc служи за изчисления, анализи и управление на списъци чрез електронни таблици.
-Comment[bs]=Obavljanje proračuna, analiza informacija i upravljanje listama u tablicama koristeći Calc.
-Comment[ca]=Feu càlculs, analitzeu informació i gestioneu llistes a fulls de càlcul amb el Calc.
-Comment[cs]=Provádějte výpočty, analyzujte informace a ovládejte seznamy v sešitech pomocí Calcu.
-Comment[cy]=Cyfrifo, dadansoddi data a rheoli rhestrau mewn taenlenni gan ddefnyddio Calc.
-Comment[da]=Udfør beregning, analyser information og administrer lister i regneark ved brug af Calc.
-Comment[el]=Υπολογισμός, ανάλυση πληροφοριών και διαχείριση λιστών σε λογιστικά φύλλα με τη χρήση του Calc.
-Comment[en_GB]=Perform calculation, analyse information and manage lists in spreadsheets using Calc.
-Comment[en_ZA]=Perform calculation, analyse information and manage lists in spreadsheets by using Calc.
-Comment[es]=Realizar cálculos, analizar información y editar listas en hojas de cálculo con Calc.
-Comment[et]=Calc aitab teostada arvutusi, analüüsida infot ja hallata nimekirju.
-Comment[fi]=Suorittaa laskentaa sekä analysoi ja hallitsee Calc:in käyttämissä laskentataulukoissa olevia tietoja.
-Comment[fr]=Calc - Calculs, analyses et gestion de listes dans des feuilles de calcul
-Comment[gu_IN]=ગણતરી કરો, જાણકારીનું વિશ્લેષ કરો અને કેલ્ક્યુલેટરની મદદથી સ્પ્રેડશીટમાં યાદીઓની વ્યવસ્થા કરો.
-Comment[hi_IN]=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-Comment[hr]=Izvedite proračune, analizirajte informacije i upravljajte popisima u proračunskim tablicama koristeći Calc.
-Comment[hu]=Számítások végrehajtása, adatok elemzése és listák kezelése munkafüzetekben a Calc használatával.
-Comment[it]=Calc può essere usato per eseguire calcoli, analizzare informazioni e gestire elenchi in un foglio elettronico.
-Comment[ja]=Calc を使用して、表計算ドキュメントで計算を実行し、情報を分析し、リストを管理します。
-Comment[km]=គណនា​ វិភាគ​ព័ត៌មាន និង គ្រប់គ្រង​បញ្ជី​ក្នុង​សៀវភៅ​បញ្ជី ដោយ​ប្រើ Calc ។
-Comment[ko]=Calc를 사용하여 스프레드시트에서 계산, 정보 분석 및 목록 관리를 수행합니다.
-Comment[lt]=Skaičiuokle galima atlikti įvairius skaičiavimus, analizuoti informaciją, tvarkyti sąrašus lentelėse.
-Comment[nb]=Utfør beregninger, analyser informasjon og håndter lister i regneark ved å bruke Calc.
-Comment[nl]=Met Calc kunt u in werkbladen berekeningen uitvoeren, gegevens analyseren en lijsten beheren.
-Comment[nn]=Med Calc kan du gjera utrekningar, analysera informasjon og handtera lister i rekneark.
-Comment[nr]=Enza imbalo, ukucozulula ilwazi nokuphatha amarhemo akumaspredtjhiti ngokusebenzisa i-Calc.
-Comment[ns]=Hlakantšha, fetleka tshedimošo le go laola malokelelo ao a lego go matlakala a go ala tsebišo ka go diriša Calc.
-Comment[pa_IN]=ਸਾਰਣੀਕਾਰ ਨਾਲ ਸਾਰਣੀ ਵਿੱਚ ਗਣਨਾ, ਜਾਣਕਾਰੀ ਦੀ ਸਮੀਖਿਆ ਅਤੇ ਸੂਚੀਆਂ ਨੂੰ ਰੱਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।
-Comment[pl]=Dokonuj obliczeń, analizuj informacje i zarządzaj listami danych w arkuszach kalkulacyjnych używając programu Calc.
-Comment[pt_BR]=Fazer cálculos, analisar informações e gerenciar listas em planilhas por meio do Calc.
-Comment[ru]=Выполнение вычислений, анализ информации и управление листами в электронных таблицах с помощью Calc.
-Comment[rw]=Gukora imibare, gutondagura amakuru no kuyobora amarisiti mu mpapurozisesuye ukoresheje Calc
-Comment[sh_YU]=Izvodi proračune, analizira podatke i upravlja listama u unakrsnim tabelama koristeći Račun.
-Comment[sk]=Vykonávajte kalkulácie, analyzujte informácie a spravujte zoznamy v zošitoch s použitím Calc.
-Comment[sl]=S Calcom izvajajte računske operacije, analizirajte podatke in upravljajte s seznami v preglednicah.
-Comment[sr_CS]=Изводи прорачуне, анализира податке и управља листама у унакрсним табелама користећи Рачун.
-Comment[st]=Etsa ho kopanya, batlisisa tlhahisoleseding le ho laola mathathamo maqepheng a ho ala boitsebiso ka ho sebedisa ho Kopanya.
-Comment[sv]=Beräkna, anaysera information och hantera listor i kalkylblad med hjälp av Calc.
-Comment[sw_TZ]=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-Comment[th]=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-Comment[tr]=LibreOffice Hesap Tablosu
-Comment[ts]=Hlayela tinhlayo, u hlahluva rungula ni ku tirhisa minxaxamelo ya Swipredxiti hi ku tirhisa Calc.
-Comment[tt_RU]=Исәпләмәләрне башкару, Calc ярдәмендә электрон таблицаларда битләр белән идарә итү һәм мәгълүмат белән идарә итү.
-Comment[uk]=Виконуйте розрахунки, аналізуйте інформацію та управляйте списками в електронних таблицях використовуючи Calc.
-Comment[vi]=Thực hiện tính toán, phân tích thông tin và quản lý danh sách trong bảng tính bằng Calc.
-Comment[xh]=Yenza isibalo, hlalutya ulwazi uze ulawule izindwe kumacwecwe eeseli ngokusebenzisa u-Calc.
-Comment[zh_CN]=使用 Calc 进行计算、分析信息以及管理电子表格中的列表。
-Comment[zh_TW]=使用 Calc 可在工作表中執行計算、分析資訊與管理清單。
-Comment[zu]=Yenza izibalo, hlaziya ukwaziswa futhi ulawule izinhlu kumaspredshithi ngokusebenzisa i-Calc.
diff --git a/menu/applications/celestia.desktop b/menu/applications/celestia.desktop
index 827aa30..01c307e 100644
--- a/menu/applications/celestia.desktop
+++ b/menu/applications/celestia.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Name=Space simulator Celestia
 Name[ru]=Симуляция космоса Celestia
-GenericName=Space simulation
+GenericName=Space simulation Celestia
+GenericName[ru]=Симуляция космоса Celestia
 Encoding=UTF-8
 Comment=A real-time visual space simulation
 Exec=celestia %f
diff --git a/menu/applications/chestnut-dialer-gtk2.desktop b/menu/applications/chestnut-dialer-gtk2.desktop
deleted file mode 100644
index 3a0cb0c..0000000
--- a/menu/applications/chestnut-dialer-gtk2.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Chestnut Dialer
-Name[ru]=Дозвон по PPP Chestnut Dialer
-GenericName=PPP dialing program
-GenericName[ru]=Программа дозвона по протоколу PPP
-GenericName[uk]=Програма дозвону за протоколом PPP
-Comment=Connect to the Internet
-Comment[ru]=Подключится к Интернет
-Comment[uk]=Підключитися до Інтернет
-Exec=/usr/bin/chestnut-dialer -i gtk2
-TryExec=/usr/bin/chestnut-dialer -i gtk2
-NotShowIn=KDE;
-Terminal=false
-Type=Application
-Icon=chestnut-dialer.png
-Categories=Application;Network;Dialup;
-Encoding=UTF-8
-Version=0.9.4
diff --git a/menu/applications/defaults.list b/menu/applications/defaults.list
index 3fe65a8..538977b 100644
--- a/menu/applications/defaults.list
+++ b/menu/applications/defaults.list
@@ -11,8 +11,8 @@ image/png=gthumb.desktop
 image/gif=gthumb.desktop
 image/tiff=gthumb.desktop
 image/bmp=gthumb.desktop
-audio/mpeg=gnome-mplayer.desktop
-video/x-flv=gnome-mplayer.desktop
-video/quicktime=gnome-mplayer.desktop
-video/x-msvideo=gnome-mplayer.desktop
-audio/x-scpls=gnome-mplayer.desktop
+audio/mpeg=smplayer.desktop
+video/x-flv=smplayer.desktop
+video/quicktime=smplayer.desktop
+video/x-msvideo=smplayer.desktop
+audio/x-scpls=smplayer.desktop
diff --git a/menu/applications/draw.desktop b/menu/applications/draw.desktop
deleted file mode 100644
index ed1fd1f..0000000
--- a/menu/applications/draw.desktop
+++ /dev/null
@@ -1,68 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Icon=libreoffice-draw.png
-Type=Application
-Categories=Application;Office;Chart;
-Exec=lodraw %U
-TryExec=lodraw %U
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
-Name=LibreOffice Draw
-Name[ru]=LibreOffice Векторная графика
-GenericName=Vector Graphics
-GenericName[ru]=Векторная графика
-GenericName[tt_RU]=Векторлы графика
-Comment=Create and edit drawings, flow charts, and logos by using Draw.
-Comment[en]=Create and edit drawings, flow charts, and logos by using Draw.
-Comment[de]=Zeichnungen erstellen und bearbeiten, Flussdiagramme entwerfen und Logos kreieren - Draw macht's möglich.
-Comment[af]=Skep en redigeer tekeninge, vloeigrafieke en logo's met Draw.
-Comment[be_BY]=Стварайце і рэдагуйце рысункі, схемы і лагатыпы з дапамогаю Draw-а.
-Comment[bg]=С Draw можете да създавате и редактирате рисунки, блок-схеми и емблеми.
-Comment[bs]=Kreiranje i uređivanje crteža, dijagrama toka i amblema koristeći Draw.
-Comment[ca]=Creeu i editeu dibuixos, diagrames de flux i logotips amb el Draw.
-Comment[cs]=Vytvářejte a upravujte kresby, bloková schémata a loga pomocí Draw.
-Comment[cy]=Creu a golygu darluniau, siartiau llif a logos drwy ddefnyddio Draw.
-Comment[da]=Opret og rediger tegninger, rutediagrammer og logoer ved brug af Draw.
-Comment[el]=Δημιουργία και επεξεργασία σχεδίων, διαγραμμάτων ροής, και λογοτύπων με τη χρήση του Draw.
-Comment[en_GB]=Create and edit drawings, flow charts, and logos using Draw.
-Comment[en_ZA]=Create and edit drawings, flow charts, and logos by using Draw.
-Comment[es]=Crear y editar dibujos, gráficos de flujo y logotipos con Draw.
-Comment[et]=Draw võimaldab luua ja redigeerida joonistusi, vooskeeme ning logosid.
-Comment[fi]=Luo ja muokkaa piirroksia, vuokaavioita ja logoja Draw-ohjelmalla.
-Comment[fr]=Draw - Création et édition de dessins, d'organigrammes et de logos
-Comment[gu_IN]=ચિત્રો, ફ્લો ચાર્ટો, અને લોગોમાં ચિત્રકામની મદદથી ચિત્રો બનાવો અને તેમાં ફેરફાર કરો.
-Comment[hi_IN]=Create and edit drawings, flow charts, and logos by using Draw.
-Comment[hr]=Stvorite i uredite crteže, dijagrame toka i logo-e koristeći Draw.
-Comment[hu]=Rajzok, folyamatábrák és logók létrehozása és szerkesztése a Draw használatával.
-Comment[it]=Con Draw potete creare e modificate disegni, diagrammi di flusso e logo.
-Comment[ja]=Draw を使用して、図形描画、フローチャート、およびロゴを作成および編集します。
-Comment[km]=បង្កើត និង កែ​សម្រួល​គំនូរ គំនូស​តាង​លំហូរ និង រូបសញ្ញា​ដោយ​ប្រើ Draw ។
-Comment[ko]=그리기를 사용하여 그리기, 순서도 및 로고를 만들고 편집합니다.
-Comment[lt]=Grafikos rengykle galima braižyti brėžinius, blokines schemas, kurti logotipus.
-Comment[nb]=Opprett og rediger tegninger, flytdiagrammer og logoer ved å bruke Draw.
-Comment[nl]=Met Draw kunt u tekeningen, stroomdiagrammen en logo's maken en bewerken.
-Comment[nn]=Med Draw kan du laga og redigera teikningar, flytdiagram og logoar.
-Comment[nr]=Enza nokuhlela imigwalo, amaflowtjhati namalogo ngokusebenzisa i-Draw.
-Comment[ns]=Hlama le go rulaganya dithalwa, ditšhate tša go elela, le maswao ka go diriša Draw.
-Comment[pa_IN]=ਚਿੱਤਰਕਾਰ ਨਾਲ ਸ਼ਕਲਾਂ, ਵਹਾ-ਚਾਰਟ ਅਤੇ ਲੋਗੋ ਬਣਾਏ ਅਤੇ ਸੋਧੇ ਜਾ ਸਕਦੇ ਹਨ।
-Comment[pl]=Twórz i edytuj rysunki, wykresy i znaki graficzne używając programu Draw.
-Comment[pt_BR]=Criar e ditar desenhos, fluxogramas e logotipos por meio do Draw.
-Comment[ru]=Создание и редактирование рисунков, блок-схем и логотипов.
-Comment[rw]=Kurema no guhindura ibishushanyo, ibishushanyo by'ikurikirana, n'ikirango ukoresheje Draw
-Comment[sh_YU]=Pravi i uređuje crteže, dijagrame toka, i logotipe korišćenjem Draw-a.
-Comment[sk]=Vytvárajte a upravujte obrázky, postupové diagramy a logá s použitím Draw.
-Comment[sl]=Z Drawom ustvarjajte in urejajte slike, diagrame in logotipe.
-Comment[sr_CS]=Прави и уређује цртеже, дијаграме тока, и логотипе коришћењем Draw-а.
-Comment[st]=Bopa le ho lokisa tse torowilweng, ditjhate tse elellang, le matshwao ka ho sebedisa Torowa.
-Comment[sv]=Skapa och redigera teckningar, flödesdiagram och logotyper med hjälp av Draw.
-Comment[sw_TZ]=Create and edit drawings, flow charts, and logos by using Draw.
-Comment[th]=Create and edit drawings, flow charts, and logos by using Draw.
-Comment[tr]=Draw kullanarak akış çizelgeleri ve logolar oluştur ve düzenle.
-Comment[ts]=Endla ni ku lulamisa Vudirowi, tichati ta ntlhandlamano ni mimfungho hi ku tirhisa Draw.
-Comment[tt_RU]=Рәсемнәрне, блок-схемаларны һәм логотипларны башкару һәм төзәтү.
-Comment[uk]=Створюйте та редагуйте малюнки, діаграми та логотипи використовуючи Draw.
-Comment[vi]=Tạo và chỉnh bản vẽ, lưu đồ, và biểu tượng dùng Draw.
-Comment[xh]=Dala uze uhlele imizobo, iitshati zomqukuqelo, kunye nee-logo ngokusebenza u-Draw.
-Comment[zh_CN]=使用 Draw 创建并编辑图形、流程图和徽标。
-Comment[zh_TW]=使用 Draw 可建立與編輯繪圖、流程圖以及標誌。
-Comment[zu]=Yenza futhi ulungise imidwebo, amaflowchadi, namalogo ngokusebenzisa into yokuDweba.
diff --git a/menu/applications/dropbox.desktop b/menu/applications/dropbox.desktop
index 1594a9c..a13e387 100644
--- a/menu/applications/dropbox.desktop
+++ b/menu/applications/dropbox.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
-Name=Dropbox
+Name=Dropbox File Synchronizer
 Name[ru]=Синхронизация файлов Dropbox
-GenericName=File Synchronizer
+GenericName=Dropbox File Synchronizer
+GenericName[ru]=Синхронизация файлов Dropbox
 Comment=Sync your files across computers and to the web
 Exec=dropbox-wrapper
 TryExec=dropbox-wrapper
diff --git a/menu/applications/easytag.desktop b/menu/applications/easytag.desktop
index 1ac230b..e397562 100644
--- a/menu/applications/easytag.desktop
+++ b/menu/applications/easytag.desktop
@@ -2,6 +2,7 @@
 Name=EasyTAG
 Name[ru]=Редактор тегов EasyTAG
 GenericName=Audio File Tag Viewer/Editor
+GenericName[ru]=Редактор тегов EasyTAG
 Comment=EasyTAG is an utility for viewing and editing tags for MP3, MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files, with a GTK+ GUI.
 Comment[cs]=EasyTAG je utilita na prohlížení, editaci a zápis tagů do vašich MP3, MP2, FLAC, Ogg Vorbis, MusePack a Monkey Audio souborů.
 Comment[da]=Et program til at vise/redigere MP3 og Ogg Vorbis tags med et GTK+ interface.
diff --git a/menu/applications/eiskaltdcpp-gtk.desktop b/menu/applications/eiskaltdcpp-gtk.desktop
deleted file mode 100644
index 5b0ab32..0000000
--- a/menu/applications/eiskaltdcpp-gtk.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=EiskaltDC++ Gtk
-Name[ru]=Клиент сетей DC++
-Type=Application
-Exec=eiskaltdcpp-gtk
-TryExec=eiskaltdcpp-gtk
-Icon=eiskaltdcpp
-Terminal=false
-GenericName=DC++ client
-GenericName[ru]=Клиент сетей DC++
-GenericName[en]=DC++ client
-GenericName[be]=Кліент сеткі DC++
-Comment=Share files over the DC++ network
-Comment[ru]=Делитесь файлами с помощью сетей DC++
-Comment[en]=Share files over the DC++ network
-Comment[be]=Паздяляйцеся файламі праз сетку DC++
-Categories=Network;FileTransfer;P2P;Qt;
-GenericName[ru_RU]=Клиент сетей DC++
-GenericName[be_BY]=Кліент сеткі DC++
diff --git a/menu/applications/exo-mail-reader.desktop b/menu/applications/exo-mail-reader.desktop
deleted file mode 100644
index 593d13d..0000000
--- a/menu/applications/exo-mail-reader.desktop
+++ /dev/null
@@ -1,93 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=exo-open --launch MailReader %u
-TryExec=exo-open --launch MailReader %u
-Icon=internet-mail
-StartupNotify=false
-Terminal=false
-Categories=Network;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-MimeType=x-scheme-handler/mailto;
-Name=Mail Reader
-Name[ar]=قارء البريد الالكتروني
-Name[ast]=Llector de corréu
-Name[be]=Паштовы кліент
-Name[bn]=মেইল রিডার
-Name[ca]=Client de correu
-Name[cs]=E-mailový klient
-Name[cy]=Darllenydd Post
-Name[da]=Postprogram
-Name[de]=E-Mail-Programm
-Name[dz]=ཡིག་འཕྲིན་ལྷག་མི།
-Name[el]=Αναγνώστης αλληλογραφίας
-Name[en_GB]=Mail Reader
-Name[es]=Lector de correo
-Name[et]=E-posti lugeja
-Name[eu]=Posta bezeroa
-Name[fi]=Sähkopostiohjelma
-Name[fr]=Client de messagerie
-Name[gl]=Lector de correo
-Name[he]=קורא דואר
-Name[hr]=Čitač mailova
-Name[hu]=Levelező
-Name[id]=Pembaca Surat
-Name[it]=Lettore di email
-Name[ja]=メーラー
-Name[kk]=Пошта қолданбасы
-Name[lv]=Pasta lasītājs
-Name[mk]=Читач на пошта
-Name[nb]=Epostleser
-Name[nl]=E-mailprogramma
-Name[pa]=ਮੇਲ ਰੀਡਰ
-Name[pl]=Program pocztowy
-Name[pt]=Leitor de correio electrónico
-Name[pt_BR]=Cliente de e-mail
-Name[ro]=Client de mail
-Name[ru]=Почтовая программа
-Name[sk]=E-mailový klient
-Name[sl]=Bralnik pošte
-Name[sq]=Lexues Poste
-Name[sv]=E-postklient
-Name[tl_PH]=Pambasa ng Sulat
-Name[tr]=Eposta Okuyucusu
-Name[ug]=ئېلخەت ئوقۇغۇ
-Name[uk]=Поштовий клієнт
-Name[ur]=میل ریڈر
-Name[ur_PK]=میل ریڈر
-Name[zh_CN]=邮件阅读器
-Name[zh_TW]=郵件讀取程式
-Comment=Read your email
-Comment[ar]=إقرء بريدك الإلكتروني
-Comment[bn]=ইমেইল পড়ুন
-Comment[ca]=Llegiu el vostre correu electrònic
-Comment[cs]=Číst poštu
-Comment[da]=Læs din e-post
-Comment[de]=E-Mails lesen
-Comment[el]=Διαβάστε τα ηλεκτρονικά σας μηνύματα
-Comment[en_GB]=Read your email
-Comment[es]=Leer correo
-Comment[eu]=Irakurri zure posta
-Comment[fi]=Käytä sähköpostiasi
-Comment[fr]=Lire ses mails
-Comment[gl]=Ler o correo electrónico
-Comment[he]=קריאת הדוא״ל שלך
-Comment[hr]=Čitaj svoju poštu
-Comment[hu]=E-mail olvasása
-Comment[id]=Baca email anda
-Comment[is]=Lesa tölvupóstinn
-Comment[it]=Leggi le e-mail
-Comment[ja]=電子メールを読みます
-Comment[kk]=Поштаңызды оқу
-Comment[nb]=Les epost
-Comment[pa]=ਆਪਣੀ ਈਮੇਲ ਪੜ੍ਹੋ
-Comment[pt]=Ler o seu correio
-Comment[pt_BR]=Ler seu e-mail
-Comment[ro]=Citiți-vă mailul
-Comment[ru]=Прочитать вашу почту
-Comment[sv]=Läs din e-post
-Comment[tr]=E-postanızı okuyun
-Comment[ug]=ئېلخەت ئوقۇيدۇ
-Comment[uk]=Перегляньте Вашу пошту
-Comment[zh_CN]=阅读邮件
-Comment[zh_TW]=讀取您的電子郵件
diff --git a/menu/applications/exo-preferred-applications.desktop b/menu/applications/exo-preferred-applications.desktop
deleted file mode 100644
index 9b6aa6d..0000000
--- a/menu/applications/exo-preferred-applications.desktop
+++ /dev/null
@@ -1,109 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Exec=exo-preferred-applications
-TryExec=exo-preferred-applications
-Icon=preferences-desktop-default-applications
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-OnlyShowIn=XFCE;
-Terminal=false
-StartupNotify=true
-Name=Preferred Applications
-Name[ar]=تطبيقات المفضلة
-Name[ast]=Aplicaciones preferíes
-Name[be]=Пераважныя дастасаваньні
-Name[bn]=পছন্দসই অ্যাপ্লিকেশন
-Name[ca]=Aplicacions preferides
-Name[cs]=Upřednostňované aplikace
-Name[cy]=Rhalgenni Dewisedig
-Name[da]=Foretrukne programmer
-Name[de]=Bevorzugte Anwendungen
-Name[dz]=དགའ་གདམ་བརྐྱབ་ཡོད་པའི་འཇུག་སྤྱོད་ཚུ།
-Name[el]=Προτιμώμενες εφαρμογές
-Name[en_GB]=Preferred Applications
-Name[es]=Aplicaciones preferidas
-Name[et]=Eelistatavad rakendused
-Name[eu]=Hobetsiriko aplikazioak
-Name[fi]=Oletussovellukset
-Name[fr]=Applications favorites
-Name[gl]=Aplicativos preferidos
-Name[he]=יישומים מועדפים
-Name[hr]=Preferirane aplikacije
-Name[hu]=Alapértelmezett alkalmazások
-Name[id]=Aplikasi Kesukaan
-Name[it]=Applicazioni preferite
-Name[ja]=お気に入りのアプリケーション
-Name[kk]=Таңдамалы қолданбалар
-Name[ku]=Sepanên Tercihkirî
-Name[lv]=Vēlamās lietotnes
-Name[mk]=Преферирани апликации
-Name[nb]=Prefererte programmer
-Name[nl]=Voorkeur-programma's
-Name[pa]=ਪਸੰਦੀਦਾ ਐਪਲੀਕੇਸ਼ਨ
-Name[pl]=Preferowane programy
-Name[pt]=Aplicações preferidas
-Name[pt_BR]=Aplicativos preferidos
-Name[ro]=Programe preferate
-Name[ru]=Предпочитаемые приложения
-Name[sk]=Uprednostňované aplikácie
-Name[sl]=Zaželeni programi
-Name[sq]=Zbatime të Parapëlqyera
-Name[sv]=Föredragna program
-Name[tl_PH]=Mas Piling Mga Application
-Name[tr]=Tercih Edilen Uygulamalar
-Name[ug]=ئامراق پروگراممىلار
-Name[uk]=Типові програми
-Name[ur]=مجوزہ اطلاقیے
-Name[ur_PK]=مجوزہ اطلاقیے
-Name[zh_CN]=首选应用程序
-Name[zh_TW]=偏好的應用程式
-Comment=Preferred Applications (Web Browser, Mail Reader and Terminal Emulator)
-Comment[ar]=التطبيقات المفضلة (متصفح الوب, قارئ البريد الإلكتروني و محاكي الطرفية)
-Comment[ast]=Aplicaciones preferíes (restolador web, llector de corréu y emulador de terminal)
-Comment[be]=Пераважныя дастасаваньні (Гартач Сеціва, паштовы кліент і эмулятар тэрмінала)
-Comment[bn]=পছন্দসই অ্যাপ্লিকেশন (ওয়েব ব্রাউজার, মেইল রিডার এবং টার্মিনাল ইম্যুলেটর)
-Comment[ca]=Aplicacions preferides (navegador web, lector de correu i emulador de terminal)
-Comment[cs]=Upřednostňované aplikace (webový prohlížeč, e-mailový klient a emulátor terminálu)
-Comment[cy]=Rhaglenni Dewisiedig (Porydd Gwê, Darllenydd Post ac Efelychydd Terfynell)
-Comment[da]=Foretrukne programmer (Webbrowser, postprogram og terminal-emulering)
-Comment[de]=Bevorzugte Anwendungen (Webbrowser, E-Mail-Programm und Terminal)
-Comment[dz]=དགའ་གདམ་བརྐྱབ་ཡོད་པའི་འཇུག་སྤྱོད་ཚུ་ (ཝེབ་བརྡ་འཚོལ་པ་, ཡིག་འཕྲིན་ལྷག་མི་དང་ཊལ་མི་ནཱལ་ནུས་འཕྲུལ།)
-Comment[el]=Προτιμώμενες εφαρμογές (περιηγητής διαδικτύου, αναγνώστης αλληλογραφίας και εξομοιωτής τερματικό)
-Comment[en_GB]=Preferred Applications (Web Browser, Mail Reader and Terminal Emulator)
-Comment[es]=Aplicaciones preferidas (navegador web, lector de correo y emulador de terminal)
-Comment[et]=Eelistatavad rakendused (veebibrauser, e-posti lugeja ja terminaliemulaator)
-Comment[eu]=Hobetsiriko aplikazioa (web nabigatzailea, eposta bezero eta terminal emuladorea)
-Comment[fi]=Oletussovellukset (web-selain, sähköposti ja pääteohjelma)
-Comment[fr]=Applications favorites (navigateur Web, client de messagerie et émulateur de terminal)
-Comment[gl]=Aplicativos preferidos (Navegador web, Lector de correo e Emulador de terminal)
-Comment[he]=יישומים מועדפים (דפדפנים, קוראי דואר ומסופים)
-Comment[hr]=Željeni programi (Web preglednik,čitač pošte i emulator terminala)
-Comment[hu]=Alapértelmezett alkalmazások (webböngésző, levelező, terminálemulátor)
-Comment[id]=Aplikasi Kesukaan (Peramban Web, Pembaca Surat dan Emulator Terminal)
-Comment[it]=Applicazioni preferite (browser web, lettore di email ed emulatore di terminale)
-Comment[ja]=お気に入りのアプリケーション (ブラウザ、メーラーやターミナルエミュレータ)
-Comment[kk]=Таңдамалы қолданбалар (веб браузер, пошта қолданбасы мен терминал эмуляторы)
-Comment[lv]=Vēlamās lietotnes (tīmekļa pārlūks, pasta lasītājs un termināla emulators)
-Comment[mk]=Преферирани апликации (Web пргледувач, читач на пошта и емулатор на терминал)
-Comment[nb]=Prefererte programmer (Nettleser, epostleser og terminalemulering)
-Comment[nl]=Voorkeurs-programma's (webbrowser, emailprogramma en terminal-emulator)
-Comment[pa]=ਪਸੰਦੀਦਾ ਐਪਲੀਕੇਸ਼ਨ (ਵੈੱਬ ਬਰਾਊਜ਼ਰ, ਮੇਲ ਰੀਡਰ ਅਤੇ ਟਰਮੀਨਲ ਈਮੁਲੇਟਰ)
-Comment[pl]=Wybiera domyślne programy dla różnych usług
-Comment[pt]=Aplicações preferidas (Navegador web, Leitor de correio e Emulador de terminal)
-Comment[pt_BR]=Aplicativos preferidos (navegador web, cliente de e-mail, e emulador de terminal)
-Comment[ro]=Programe preferate (navigator, client de mail, manager de fișiere, emulator de terminal)
-Comment[ru]=Предпочтительные приложения (Веб-браузер, почтовая программа, эмулятор терминала)
-Comment[sk]=Uprednostňované aplikácie (webový prehliadač, e-mailový klient a emulátor terminálu)
-Comment[sq]=Zbatime të Parapëlqyer (Shfletues Web, Lexues Poste dhe Emulues Terminali)
-Comment[sv]=Föredragna program (webbläsare, e-postklient och terminalemulator)
-Comment[tl_PH]=Preferred Applications (Web Browser, Mail Reader and Terminal Emulator)
-Comment[tr]=Tercih Edilen Uygulamalar (İnternet Tarayıcısı, Eposta Okuyucusu ve Uçbirim Öykünücüsü)
-Comment[ug]=ئامراق پروگراممىلار (توركۆرگۈ، خەت ئوقۇغۇ، تېرمىنال تەقلىدلىگۈ)
-Comment[uk]=Улюблені програми (переглядач Web, переглядач пошти та емулятор терміналу)
-Comment[ur]=مجوزہ اطلاقیے (ویب براؤزر، ای میل ریڈر، اور ٹرمنل ایمولیٹر)
-Comment[ur_PK]=مجوزہ اطلاقیے (ویب براؤزر، ای میل ریڈر، اور ٹرمنل ایمولیٹر)
-Comment[zh_CN]=首选应用程序(网络浏览器、邮件阅读器、以及终端模拟器)
-Comment[zh_TW]=偏好應用程式 (網路瀏覽器、郵件閱讀器、終端機模擬器等)
-X-XfcePluggable=true
-X-XfceHelpFile=exo-preferred-applications.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/exo-terminal-emulator.desktop b/menu/applications/exo-terminal-emulator.desktop
deleted file mode 100644
index d163f6a..0000000
--- a/menu/applications/exo-terminal-emulator.desktop
+++ /dev/null
@@ -1,93 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=exo-open --launch TerminalEmulator
-TryExec=exo-open --launch TerminalEmulator
-Icon=utilities-terminal
-StartupNotify=false
-Terminal=false
-Categories=Utility;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-Name=Terminal Emulator
-Name[ar]=محاكي الطرفية
-Name[ast]=Emulador de terminal
-Name[be]=Эмулятар тэрмінала
-Name[bn]=টার্মিনাল ইম্যুলেটর
-Name[ca]=Emulador de terminal
-Name[cs]=Emulátor terminálu
-Name[cy]=Efelychydd Terfynell
-Name[da]=Terminal-emulering
-Name[de]=Terminal
-Name[dz]=ཊལ་མི་ནཱལ་ནུས་འཕྲུལ།
-Name[el]=Εξομοιωτής τερματικού
-Name[en_GB]=Terminal Emulator
-Name[es]=Emulador de terminal
-Name[et]=Terminaliemulaator
-Name[eu]=Terminal emuladorea
-Name[fi]=Pääteohjelma
-Name[fr]=Émulateur de Terminal
-Name[gl]=Emulador de terminal
-Name[he]=מסוף
-Name[hr]=Emulator terminala
-Name[hu]=Terminálemulátor
-Name[id]=Emulator Terminal
-Name[it]=Emulatore di terminale
-Name[ja]=ターミナルエミュレータ
-Name[kk]=Терминал эмуляторы
-Name[ku]=Emûlatorê Termînalê
-Name[lv]=Termināla emulators
-Name[mk]=Емулатор на терминал
-Name[nb]=Terminalemulator
-Name[nl]=Terminal-emulator
-Name[pa]=ਟਰਮੀਨਲ ਈਮੂਲੇਟਰ
-Name[pl]=Emulator terminala
-Name[pt]=Emulador de terminal
-Name[pt_BR]=Emulador de terminal
-Name[ro]=Emulator de terminal
-Name[ru]=Терминал
-Name[sk]=Emulátor terminálu
-Name[sl]=Terminalski emulator
-Name[sq]=Emulues Terminali
-Name[sv]=Terminalemulator
-Name[tl_PH]=Terminal Emulator
-Name[tr]=Uçbirim Öykünücüsü
-Name[ug]=تېرمىنال تەقلىدلىگۈ
-Name[uk]=Емулятор терміналу
-Name[ur]=ٹرمنل ایمولیٹر
-Name[ur_PK]=ٹرمنل ایمولیٹر
-Name[zh_CN]=终端模拟器
-Name[zh_TW]=終端機模擬程式
-Comment=Use the command line
-Comment[ar]=إستعمل سطر الأوامر
-Comment[bn]=কমান্ড লাইন ব্যবহার করুন
-Comment[ca]=Empra la línia d'ordres
-Comment[cs]=Použít příkazový řádek
-Comment[da]=Brug kommandolinjen
-Comment[de]=Befehlszeile verwenden
-Comment[el]=Χρησιμοποιείστε την γραμμή εντολών
-Comment[en_GB]=Use the command line
-Comment[es]=Usar la línea de comandos
-Comment[eu]=Erabili komando lerroa
-Comment[fi]=Käytä komentoriviä
-Comment[fr]=Utiliser la ligne de commande
-Comment[gl]=Usar a liña de ordes
-Comment[he]=שימוש בשורת הפקודה
-Comment[hr]=Koristi naredbeni redak
-Comment[hu]=Parancssor használata
-Comment[id]=Gunakan baris perintah
-Comment[is]=Nota skipanalínuna
-Comment[it]=Usa la linea di comando
-Comment[ja]=コマンドラインを使用します
-Comment[kk]=Командалық жолды қолдану
-Comment[nb]=Bruk kommandlinjen
-Comment[pa]=ਕਮਾਂਡ ਲਾਈਨ ਵਰਤੋਂ
-Comment[pt]=Utilizar a linha de comandos
-Comment[pt_BR]=Usar a linha de comando
-Comment[ro]=Utilizați linia de comandă
-Comment[ru]=Использовать командную строку
-Comment[sv]=Använd kommandoraden
-Comment[tr]=Komut satırını kullan
-Comment[ug]=بۇيرۇق قۇرىنى ئىشلىتىدۇ
-Comment[uk]=Використовуєте командну стрічку
-Comment[zh_CN]=使用命令行
-Comment[zh_TW]=使用指令列
diff --git a/menu/applications/exo-web-browser.desktop b/menu/applications/exo-web-browser.desktop
deleted file mode 100644
index 0e3ea9d..0000000
--- a/menu/applications/exo-web-browser.desktop
+++ /dev/null
@@ -1,95 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=exo-open --launch WebBrowser %u
-TryExec=exo-open --launch WebBrowser %u
-Icon=web-browser
-StartupNotify=false
-Terminal=false
-Categories=Network;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-MimeType=x-scheme-handler/http;x-scheme-handler/https;
-Name=Web Browser
-Name[ar]=متصفّح وِب
-Name[ast]=Restolador web
-Name[be]=Гартач Сеціва
-Name[bn]=ওয়েব ব্রাউজার
-Name[ca]=Navegador web
-Name[cs]=Webový prohlížeč
-Name[cy]=Porydd Gwê
-Name[da]=Webbrowser
-Name[de]=Webbrowser
-Name[dz]=ཝེབ་བརྡ་འཚོལ་པ།
-Name[el]=Περιηγητής διαδικτύου
-Name[en_GB]=Web Browser
-Name[es]=Navegador web
-Name[et]=Veebibrauser
-Name[eu]=Web nabigatzailea
-Name[fi]=Web-selain
-Name[fr]=Navigateur Web
-Name[gl]=Navegador web
-Name[he]=דפדפן אינטרנט
-Name[hr]=Web preglednik
-Name[hu]=Webböngésző
-Name[id]=Peramban Web
-Name[it]=Browser web
-Name[ja]=ウェブブラウザ
-Name[kk]=Веб браузері
-Name[ku]=Geroka Torê
-Name[lv]=Tīmekļa pārlūks
-Name[mk]=Web пребарувач
-Name[nb]=Nettleser
-Name[nl]=Webbrowser
-Name[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
-Name[pl]=Przeglądarka internetowa
-Name[pt]=Navegador web
-Name[pt_BR]=Navegador web
-Name[ro]=Navigator
-Name[ru]=Веб-браузер
-Name[sk]=Webový prehliadač
-Name[sl]=Spletni brskalnik
-Name[sq]=Shfletues Web
-Name[sv]=Webbläsare
-Name[tl_PH]=Web Browser
-Name[tr]=İnternet Tarayıcısı
-Name[ug]=توركۆرگۈ
-Name[uk]=Переглядач Web
-Name[ur]=ویب براؤزر
-Name[ur_PK]=ویب براؤزر
-Name[zh_CN]=网络浏览器
-Name[zh_TW]=網路瀏覽器
-Comment=Browse the web
-Comment[ar]=تصفح الوِب
-Comment[bn]=ওয়েব ব্রাউজ করুন
-Comment[ca]=Navega la web
-Comment[cs]=Procházet web
-Comment[da]=Gennemse internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Περιηγηθείτε στον ιστό
-Comment[en_GB]=Browse the web
-Comment[es]=Navegar por la web
-Comment[eu]=Nabigatu web-a
-Comment[fi]=Selaa verkkosivuja
-Comment[fr]=Naviguer sur internet
-Comment[gl]=Navegar pola web
-Comment[he]=גלישה באינטרנט
-Comment[hr]=Pregledaj web
-Comment[hu]=Webböngészés
-Comment[id]=Ramban web
-Comment[is]=Flakka á vefnum
-Comment[it]=Naviga in rete
-Comment[ja]=ウェブを閲覧します
-Comment[kk]=Интернетті шолу
-Comment[nb]=Surfe på nettet
-Comment[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ ਕਰੋ
-Comment[pt]=Navegar na web
-Comment[pt_BR]=Navegar pela web
-Comment[ro]=Navigați pe net
-Comment[ru]=Смотреть в интернете
-Comment[sv]=Surfa på webben
-Comment[tr]=Web'de gezin
-Comment[ug]=تور كۆرىدۇ
-Comment[uk]=Мандруйте Інтернетом
-Comment[zh_CN]=浏览网页
-Comment[zh_TW]=瀏覽網路
-
diff --git a/menu/applications/file-roller.desktop b/menu/applications/file-roller.desktop
deleted file mode 100644
index 8214f9c..0000000
--- a/menu/applications/file-roller.desktop
+++ /dev/null
@@ -1,204 +0,0 @@
-[Desktop Entry]
-Name=Archive Manager
-Name[af]=Argiefbestuurder
-Name[am]=የመዝገብ ቤት መቆጣጠሪያ
-Name[ar]=مدير الأرشيفات
-Name[as]=আৰ্কাইভ ম্যানেজাৰ
-Name[ast]=Xestor d'archivadores
-Name[az]=Arxiv İdarəçisi
-Name[be]=Кіраўнік архіваў
-Name[be@latin]=Archivaryjus
-Name[bg]=Работа с архиви
-Name[bn]=আর্কাইভ ম্যানেজার
-Name[bn_IN]=আর্কাইভ পরিচালন ব্যবস্থা
-Name[br]=Ardoer dielloù
-Name[bs]=Upravitelj arhivama
-Name[ca]=Gestor d'arxius
-Name[ca@valencia]=Gestor d'arxius
-Name[cs]=Správce archivů
-Name[cy]=Rheolydd Archifau
-Name[da]=Arkivhåndtering
-Name[de]=Archivmanager
-Name[dz]=ཡིག་མཛོད་འཛིན་སྐྱོང་པ།
-Name[el]=Διαχειριστής συμπιεσμένων αρχείων
-Name[en@shaw]=𐑸𐑒𐑲𐑝 𐑥𐑨𐑯𐑩𐑡𐑼
-Name[en_CA]=Archive Manager
-Name[en_GB]=Archive Manager
-Name[eo]=Arkivo-administrilo
-Name[es]=Gestor de archivadores
-Name[et]=Arhiivihaldur
-Name[eu]=Artxibo-kudeatzailea
-Name[fa]=مدیر آرشیو
-Name[fi]=Pakettienkäsittelyohjelma
-Name[fr]=Gestionnaire d'archives
-Name[fur]=Gjestôr di archivis
-Name[fy]=Triemûnthâldbehear
-Name[ga]=Bainisteoir Cartlann
-Name[gl]=Xestor de arquivos
-Name[gu]=પેટીનો વ્યવસ્થાપક
-Name[he]=מנהל הארכיון
-Name[hi]=अभिलेख प्रबंधक
-Name[hr]=Upravljanje arhivom
-Name[hu]=Archívumkezelő
-Name[hy]=Արխիվի մենեջեր
-Name[id]=Manajer Arsip
-Name[is]=Skráarsafnstjóri
-Name[it]=Gestore di archivi
-Name[ja]=書庫マネージャ
-Name[ka]=არქივატორი
-Name[kk]=Архивтер басқарушысы
-Name[kn]=ಆರ್ಕೈವ್ ನಿರ್ವಾಹಕ
-Name[ko]=압축 관리자
-Name[ku]=Rêveberê Arşîvê
-Name[lt]=Archyvų tvarkymo programa
-Name[lv]=Arhīvu pārvaldnieks
-Name[mai]=अभिलेख प्रबंधक
-Name[mg]=Mpandrindra arsiva
-Name[mk]=Менаџер на архиви
-Name[ml]=ശേഖരപാലകന്‍
-Name[mn]=Архив Менежер
-Name[mr]=आर्काइव्ह व्यवस्थापक
-Name[ms]=Pengurus Arkib
-Name[nb]=Arkivhåndtering
-Name[nds]=Archivoppasser
-Name[ne]=सङ्ग्रह प्रबन्धक
-Name[nl]=Archiefbeheer
-Name[nn]=Arkivhandsamar
-Name[oc]=Gestionari d'archius
-Name[or]=ଅଭିଲେଖ ପରିଚାଳକ
-Name[pa]=ਅਕਾਇਵ ਮੈਨੇਜਰ
-Name[pl]=Menedżer archiwów
-Name[ps]=ارشيو سمبالګر
-Name[pt]=Gestor de Arquivos
-Name[pt_BR]=Gerenciador de pacotes
-Name[ro]=Administrator de arhive
-Name[ru]=Менеджер архивов
-Name[si]=සංරක්‍ෂණ කළමණාකරු
-Name[sk]=Správca archívov
-Name[sl]=Upravljalnik arhivov
-Name[sq]=Menazhues arkivësh
-Name[sr]=Управљач архивом
-Name[sr@ije]=Управљање архивом
-Name[sr@latin]=Upravljač arhivom
-Name[sv]=Arkivhanterare
-Name[ta]=காப்பு மேலாளர்
-Name[te]=సంగ్రహ అభికర్త
-Name[th]=โปรแกรมจัดการแฟ้มจัดเก็บ
-Name[tk]=Arşiw Mudyry
-Name[tr]=Arşiv Yöneticisi
-Name[ug]=ئارخىپ باشقۇرغۇچ
-Name[uk]=Менеджер архівів
-Name[ur]=محفوظہ منیجر
-Name[ur_PK]=محفوظہ منیجر
-Name[vi]=Bộ quản lý kho
-Name[xh]=Umphathi Kavimba
-Name[zh_CN]=归档管理器
-Name[zh_HK]=壓縮檔管理員
-Name[zh_TW]=壓縮檔管理員
-Comment=Create and modify an archive
-Comment[af]=Skep en wysig 'n argief
-Comment[ar]=أنشئ و عدّل أرشيفا
-Comment[as]=আৰ্কাইভ নিৰ্মাণ ও পৰিবৰ্তন কৰক
-Comment[ast]=Crea y modifica un archivador
-Comment[az]=Arxiv yaradın və açın
-Comment[be]=Стварыць ці зьмяніць архіў
-Comment[be@latin]=Stvaraj i madyfikuj archivy
-Comment[bg]=Създаване и промяна на архив
-Comment[bn]=নতুন আর্কাইভ তৈরি ও পরিবর্ধন করা হবে
-Comment[bn_IN]=আর্কাইভ নির্মাণ ও পরিবর্তন করুন
-Comment[br]=Krouiñ ha daskemmañ un diell
-Comment[bs]=Napravi i promijeni arhiv
-Comment[ca]=Crea i modifica un arxiu
-Comment[ca@valencia]=Crea i modifica un arxiu
-Comment[cs]=Vytvářet a upravovat archivy
-Comment[cy]=Creu a newid archif
-Comment[da]=Opret og ændr et arkiv
-Comment[de]=Archive anlegen und verändern
-Comment[dz]=ཡིག་མཛོད་གསར་བསྐྲུན་འབད་ནི་དང་ ལེགས་བཅོས་འབད་ནི།
-Comment[el]=Δημιουργία και τροποποίηση ενός συμπιεσμένου αρχείου
-Comment[en@shaw]=𐑒𐑮𐑦𐑱𐑑 𐑯 𐑥𐑪𐑛𐑦𐑓𐑲 𐑩𐑯 𐑸𐑒𐑲𐑝
-Comment[en_CA]=Create and modify an archive
-Comment[en_GB]=Create and modify an archive
-Comment[eo]=Krei kaj modifi arkivon
-Comment[es]=Cree y modifique un archivador
-Comment[et]=Arhiivi loomine ja muutmine
-Comment[eu]=Sortu eta aldatu artxibo bat
-Comment[fa]=ایجاد و تغییر آرشیو 
-Comment[fi]=Luo arkisto tai muokkaa arkistoa
-Comment[fr]=Créer et modifier des archives
-Comment[fur]=Cree e modifiche un archivi
-Comment[fy]=Foarmje in triemûnthâld
-Comment[ga]=Cruthaigh agus athraigh cartlann
-Comment[gl]=Crear e modificar un arquivo
-Comment[gu]=પેટી બનાવો અને સુધારો
-Comment[he]=יצירה ועדכון של ארכיונים
-Comment[hi]=अभिलेख बनाएँ तथा परिवर्धित करें
-Comment[hr]=Stvori i izmijeni arhivu
-Comment[hu]=Archívum létrehozása és módosítása
-Comment[hy]=Կերտել և մոդիֆիկացնել արխիվը
-Comment[id]=Membuat dan memodifikasi arsip
-Comment[it]=Crea e modifica un archivio
-Comment[ja]=書庫を作成したり修正します
-Comment[ka]=არქივის შექმნა და რედაქტირება
-Comment[kk]=Архивті жасау және түзету
-Comment[kn]=ಒಂದು ಆರ್ಕೈವನ್ನು ನಿರ್ಮಿಸು ಹಾಗು ಮಾರ್ಪಡಿಸು
-Comment[ko]=압축 파일을 만들고 수정합니다
-Comment[ku]=Arşîvekê çêbike an jî biguherîne
-Comment[lt]=Kurti ir modifikuoti archyvą
-Comment[lv]=Izveidot arhīvus un mainīt to saturu
-Comment[mai]=अभिलेख बनाबू आओर परिवर्धित करू
-Comment[mg]=Mamorona sy manova arsiva
-Comment[mk]=Креирај и измени архива
-Comment[ml]=ഒരു പുതിയ ശേഖരം നിര്‍മ്മിക്കുകയോ മാറ്റം വരുത്തുകയോ ചെയ്യുക
-Comment[mn]=Архив үүсгэх ба өөрчилөх
-Comment[mr]=आर्काइव्ह निर्माण व संपादीत करा
-Comment[ms]=Cipta dan ubahsuai arkib
-Comment[nb]=Opprett og endre arkiv
-Comment[ne]=एउटा सङ्ग्रह सिर्जना गर्नुहोस् र परिमार्जन गर्नुहोस्
-Comment[nl]=Archieven maken en wijzigen
-Comment[nn]=Lag og endra arkiv
-Comment[oc]=Crear e modificar un archiu
-Comment[or]=ଗୋଟିଏ ଅଭିଲେଖକୁ ସ୍ରୁଷ୍ଟି ଏବଂ ରୂପାନ୍ତରିତ କରନ୍ତୁ
-Comment[pa]=ਇੱਕ ਅਕਾਇਵ ਬਣਾਓ ਅਤੇ ਸੋਧੋ
-Comment[pl]=Tworzenie i modyfikowanie archiwów
-Comment[ps]=ارشيو جوړول او بدلول
-Comment[pt]=Criar e alterar um arquivo
-Comment[pt_BR]=Crie e modifique um pacote
-Comment[ro]=Creează și modifică o arhivă
-Comment[ru]=Создать или изменить архив
-Comment[si]=සංරක්‍ෂණයක් නිර්මාණය කරන්න සහ වෙනස් කරන්න
-Comment[sk]=Vytvoriť a upraviť archív
-Comment[sl]=Ustvari in spremeni arhiv
-Comment[sq]=Krijo dhe ndrysho një arkiv
-Comment[sr]=Направите нове и распакујте постојеће архиве
-Comment[sr@ije]=Направите и измјените архиву
-Comment[sr@latin]=Napravite nove i raspakujte postojeće arhive
-Comment[sv]=Skapa och ändra ett arkiv
-Comment[ta]=காப்பு உருவாக்குதல் அல்லது திருத்துதல்
-Comment[te]=సంగ్రహమును సృష్టించు మరియు మార్చు
-Comment[th]=สร้างและแก้ไขแฟ้มจัดเก็บ
-Comment[tk]=Bir arşiwi bejerip üýtget
-Comment[tr]=Bir arşiv yarat ve değiştir
-Comment[ug]=ئارخىپ قۇرۇپ ئۆزگەرت
-Comment[uk]=Програма створення та зміни архівів
-Comment[ur]=محفوظہ بنائیں اور تبدیل کریں
-Comment[ur_PK]=محفوظہ بنائیں اور تبدیل کریں
-Comment[vi]=Tạo và sửa đổi kho
-Comment[xh]=Yakha uze ulungise uvimba
-Comment[zh_CN]=创建并修改归档文件
-Comment[zh_HK]=建立及更改壓縮檔
-Comment[zh_TW]=建立及更改壓縮檔
-TryExec=file-roller
-Exec=file-roller %U
-TryExec=file-roller %U
-StartupNotify=true
-Terminal=false
-Type=Application
-Icon=file-roller
-Categories=GTK;GNOME;Utility;Archiving;
-MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;
-X-GNOME-DocPath=file-roller/file-roller.xml
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=file-roller
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.32.2
diff --git a/menu/applications/firefox.desktop b/menu/applications/firefox.desktop
deleted file mode 100644
index 243e596..0000000
--- a/menu/applications/firefox.desktop
+++ /dev/null
@@ -1,84 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=firefox %u
-TryExec=firefox %u
-Icon=firefox
-Type=Application
-Name=Mozilla Firefox
-Name[ar]=موزيلَا فاير فكس
-Name[bn]=মোজিলা ফায়ারফক্স
-Name[cy]=Llwynog Tân Mozilla
-Name[hi]=मोज़िला फ़ायरफॉक्स
-Name[ko]=모질라 파이어폭스
-Name[ta]=மொசில்லா ஃபயர்பாக்ஸ்
-Name[ru]=Веб-браузер Firefox
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Netsøger
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web Arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[ga]=Brabhsálaí Lín
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Интернет прелистувач
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Webkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[xx]=xxWeb Browserxx
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-MimeType=text/html;text/xml;application/x-xpinstall;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-X-KDE-StartupNotify=true
-StartupNotify=true
-Categories=GTK;WebBrowser;Network;
diff --git a/menu/applications/gcompris-edit.desktop b/menu/applications/gcompris-edit.desktop
index 4a3cf37..395efa6 100644
--- a/menu/applications/gcompris-edit.desktop
+++ b/menu/applications/gcompris-edit.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=GCompris
 Name[ru]=Настройки Gcompris
-GenericName=Administration
-GenericName[ru]=Административный интерфейс
+GenericName=Gcompris Settings
+GenericName[ru]=Настройки Gcompris
 Comment=Administration for gcompris
 Comment[ru]=Административный интерфейс для gcompris
 Exec=gcompris -a --nolockcheck
diff --git a/menu/applications/gcompris.desktop b/menu/applications/gcompris.desktop
deleted file mode 100644
index 68b8343..0000000
--- a/menu/applications/gcompris.desktop
+++ /dev/null
@@ -1,51 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GCompris
-Name[ru]=Образовательная программа GCompris
-GenericName=Multi-activity educational game
-GenericName[ru]=Образовательная программа для детей
-GenericName[af]=Opvoedkundige speletjie met klomp aktiwiteite
-GenericName[ar]=لعبة تعليمية متعدة الأنشطة
-GenericName[ar_TN]=لعبة تربوية متعددة التمرينات
-GenericName[bg]=Игра с много занимания с образователна цел
-GenericName[ca]=Joc educatiu amb múltiples activitats
-GenericName[da]=Fleraktivitets-undervisningsspil
-GenericName[de]=Lernspiel mit vielen Aktivitäten
-GenericName[dz]=སྣ་མང་-ལཱ་གི་ཤེས་ཡོན་རྩེདམོ་
-GenericName[el]=Εκπαιδευτικό παιχνίδι πολλαπλών δραστηριοτήτων
-GenericName[en_CA]=Multi-activity educational game
-GenericName[en_GB]=Multi-activity educational game
-GenericName[es]=Juego educativo de actividades variadas
-GenericName[et]=Miteid mänge sisaldav õppeprogramm
-GenericName[eu]=Ariketa anitzeko joku hezigarria
-GenericName[fi]=Kokoelma erilaisia opetuspelejä
-GenericName[fr]=Jeu éducatif multi-activités
-GenericName[gl]=Xogo educativo de múltiplas actividades
-GenericName[hi]=विविध शैक्षिक खेल
-GenericName[hr]=Obrazovna igra s više aktivnosti
-GenericName[id]=Permainan pendidikan berbagai kegiatan
-GenericName[it]=Gioco didattico multi-attività
-GenericName[ko]=여러가지 교육 활동 게임
-GenericName[lt]=Daugialypis mokomasis žaidimas
-GenericName[mr]=विविघ शैक्षणिक खेळ
-GenericName[nb]=Et lek og lær-spill med mange aktiviteter
-GenericName[nl]=Educatief spel met meerdere activiteiten
-GenericName[nn]=Eit leik og lær-spel med mange aktivitetar
-GenericName[pt]=Jogo educativo com múltiplas actividades
-GenericName[pt_BR]=Jogo educacional com várias atividades
-GenericName[sk]=Mnoho aktivitová edukačná hra
-GenericName[so]=Cayaaro waxbarasho kala gedisan
-GenericName[sr]=Разноврсне образовне игре
-GenericName[sr@Latn]=Raznovrsne obrazovne igre
-GenericName[ta]=கற்பிக்கும் பல் வித செயல்கள்
-GenericName[th]=เกมการศึกษาพร้อมด้วยกิจกรรมหลากหลาย
-GenericName[vi]=Trò chơi giáo dục đa hoạt động
-GenericName[zh_CN]=多样的教育游戏
-Comment=Educational game for ages 2 to 10
-Exec=gcompris
-TryExec=gcompris
-Icon=gcompris
-Terminal=false
-Type=Application
-Categories=Game;KidsGame;
-StartupNotify=true
diff --git a/menu/applications/gdmflexiserver-xnest.desktop b/menu/applications/gdmflexiserver-xnest.desktop
deleted file mode 100644
index da9930d..0000000
--- a/menu/applications/gdmflexiserver-xnest.desktop
+++ /dev/null
@@ -1,168 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=New Login in a Window
-Name[ar]=ولوج جديد في نافذة
-Name[bg]=Ново влизане в прозорец
-Name[bn]=উইন্ডোর মধ্যে নতুন লগ-ইন
-Name[bn_IN]=উইন্ডোর মধ্যে নতুন লগ-ইন
-Name[ca]=Nova entrada a una finestra
-Name[cs]=Nové přihlášení v okně
-Name[da]=Nyt logind i et vindue
-Name[de]=In einem Fenster neu anmelden
-Name[dz]=སྒོ་སྒྲིག་ཅིག་ནང་ ནང་བསྐྱོད་གསརཔ
-Name[el]=Νέα είσοδος σε παράθυρο
-Name[en_CA]=New Login in a Window
-Name[en_GB]=New Login in a Window
-Name[es]=Nuevo acceso en una ventana
-Name[et]=Uus sisselogimine aknas
-Name[eu]=Saio berria leiho batean
-Name[fi]=Uusi kirjautuminen ikkunassa
-Name[fr]=Nouvelle connexion dans une fenêtre
-Name[ga]=Logáil Isteach Nua i bhFuinneog
-Name[gl]=Novo inicio de sesión nunha ventá
-Name[gu]=વિન્ડોમાં નવો પ્રવેશ
-Name[hi]=विंडो में नया लॉगइन
-Name[hu]=Új bejelentkezés egy ablakban
-Name[it]=Nuovo accesso in una finestra
-Name[ja]=ウィンドウから新しいログイン
-Name[kn]=ಒಂದು ವಿಂಡೋದಲ್ಲಿ ಹೊಸ ಪ್ರವೇಶ
-Name[ko]=창에서 새로 로그인
-Name[lt]=Naujas prisijungimas lange
-Name[mk]=Ново најавување во прозорец
-Name[ml]=ജാലകത്തില്‍ ഉളള പുതിയ ലോഗിന്‍
-Name[nb]=Ny innlogging i et vindu
-Name[ne]=सञ्झ्यालमा नयाँ लगइन
-Name[nl]=Aanmelden in een venster
-Name[nn]=Ny innlogging i eit vindauge
-Name[or]=ଗୋଟିଏ ୱିଣ୍ଡୋରେ ନୂତନ ଲଗଇନ
-Name[pa]=ਇੱਕ ਵਿੰਡੋ ਵਿੱਚ ਨਵਾਂ ਲਾਗਇਨ
-Name[pl]=Nowe logowanie w oknie
-Name[pt]=Nova Sessão numa Janela
-Name[pt_BR]=Nova Sessão em uma Janela
-Name[ro]=Autentificare nouă într-o fereastră
-Name[ru]=Новый сеанс во встроенном окне
-Name[sk]=Nové prihlásenie v okne
-Name[sl]=Nova prijava v oknu
-Name[sq]=Login i ri në një dritare
-Name[sv]=Ny inloggning i ett fönster
-Name[ta]=சாளரத்தில் புதிய நுழைவு
-Name[te]=ఒక గవాక్షం లో కొత్త ప్రవేశద్వారం
-Name[th]=การเข้าระบบใหม่ในหน้าต่าง
-Name[tr]=İçiçe Perncerede Yeni Giriş
-Name[uk]=Новий сеанс у вікні
-Name[vi]=Đăng nhập mới trong cửa sổ
-Name[zh_CN]=窗口中的新登录
-GenericName=New Login in a Window
-GenericName[ar]=ولوج جديد في نافذة
-GenericName[bg]=Ново влизане в прозорец
-GenericName[bn]=উইন্ডোর মধ্যে নতুন লগ-ইন
-GenericName[bn_IN]=উইন্ডোর মধ্যে নতুন লগ-ইন
-GenericName[ca]=Nova entrada a una finestra
-GenericName[cs]=Nové přihlášení v okně
-GenericName[da]=Nyt logind i et vindue
-GenericName[de]=In einem Fenster neu anmelden
-GenericName[dz]=སྒོ་སྒྲིག་ཅིག་ནང་ ནང་བསྐྱོད་གསརཔ
-GenericName[el]=Νέα είσοδος σε παράθυρο
-GenericName[en_CA]=New Login in a Window
-GenericName[en_GB]=New Login in a Window
-GenericName[es]=Nuevo acceso en una ventana
-GenericName[et]=Uus sisselogimine aknas
-GenericName[eu]=Saio berria leiho batean
-GenericName[fi]=Uusi kirjautuminen ikkunassa
-GenericName[fr]=Nouvelle connexion dans une fenêtre
-GenericName[ga]=Logáil Isteach Nua i bhFuinneog
-GenericName[gl]=Novo inicio de sesión nunha ventá
-GenericName[gu]=વિન્ડોમાં નવો પ્રવેશ
-GenericName[hi]=विंडो में नया लॉगइन
-GenericName[hu]=Új bejelentkezés egy ablakban
-GenericName[it]=Nuovo accesso in una finestra
-GenericName[ja]=ウィンドウから新しいログイン
-GenericName[kn]=ಒಂದು ವಿಂಡೋದಲ್ಲಿ ಹೊಸ ಪ್ರವೇಶ
-GenericName[ko]=창에서 새로 로그인
-GenericName[lt]=Naujas prisijungimas lange
-GenericName[mk]=Ново најавување во прозорец
-GenericName[ml]=ജാലകത്തില്‍ ഉളള പുതിയ ലോഗിന്‍
-GenericName[nb]=Ny innlogging i et vindu
-GenericName[ne]=सञ्झ्यालमा नयाँ लगइन
-GenericName[nl]=Aanmelden in een venster
-GenericName[nn]=Ny innlogging i eit vindauge
-GenericName[or]=ଗୋଟିଏ ୱିଣ୍ଡୋରେ ନୂତନ ଲଗଇନ
-GenericName[pa]=ਇੱਕ ਵਿੰਡੋ ਵਿੱਚ ਨਵਾਂ ਲਾਗਇਨ
-GenericName[pl]=Nowe logowanie w oknie
-GenericName[pt]=Nova Sessão numa Janela
-GenericName[pt_BR]=Nova Sessão em uma Janela
-GenericName[ro]=Autentificare nouă într-o fereastră
-GenericName[ru]=Новый сеанс во встроенном окне
-GenericName[sk]=Nové prihlásenie v okne
-GenericName[sl]=Nova prijava v oknu
-GenericName[sq]=Login i ri në një dritare
-GenericName[sv]=Ny inloggning i ett fönster
-GenericName[ta]=சாளரத்தில் புதிய நுழைவு
-GenericName[te]=ఒక గవాక్షం లో కొత్త ప్రవేశద్వారం
-GenericName[th]=การเข้าระบบใหม่ในหน้าต่าง
-GenericName[tr]=İçiçe Perncerede Yeni Giriş
-GenericName[uk]=Новий сеанс у вікні
-GenericName[vi]=Đăng nhập mới trong cửa sổ
-GenericName[zh_CN]=窗口中的新登录
-Comment=Login as another user in a window
-Comment[ar]=لُجْ كمستخدم آخر في نافذة
-Comment[bg]=Влизане в системата като друг потребител в прозорец
-Comment[bn]=লগ-আউট না করে পৃথক ব্যবহারকারীরূপে উইন্ডোর মধ্যে লগ-ইন করুন
-Comment[bn_IN]=লগ-আউট না করে পৃথক ব্যবহারকারীরূপে উইন্ডোর মধ্যে লগ-ইন করুন
-Comment[ca]=Entreu com un usuari diferent dins d'una finestra imbricada
-Comment[cs]=Přihlásit se jako jiný uživatel v okně
-Comment[da]=Log ind som en anden bruger i et vindue
-Comment[de]=Als anderer Benutzer in einem Fenster anmelden
-Comment[dz]=སྒོ་སྒྲིག་ གཞན་ཅིག་གི་ནང་ན་ ལག་ལེན་པ་ གཞན་བཟུམ་སྦེ་ ནང་བསྐྱོད་འབད
-Comment[el]=Είσοδος ως διαφορετικός χρήστης μέσα σε ένα παράθυρο
-Comment[en_CA]=Log in as another user in a window
-Comment[en_GB]=Log in as another user in a window
-Comment[es]=Acceda como un usuario distinto dentro de una ventana
-Comment[et]=Teise kasutaja alt aknas sisselogimine
-Comment[eu]=Sartu beste erabiltzaile baten moduan habiaratutako leiho batean
-Comment[fi]=Kirjaudu muuna käyttäjänä ikkunassa
-Comment[fr]=Se connecter sous une autre identité à l'intérieur d'une fenêtre
-Comment[gl]=Iniciar a sesión como outro usuario nunha ventá
-Comment[gu]=વિન્ડોમાં બીજા વપરાશકર્તા તરીકે પ્રવેશ કરો
-Comment[hi]=विंडो के भीतर अन्य उपयोक्ता के रूप में लॉगइन करें
-Comment[hu]=Bejelentkezés más felhasználóként egy ablakban
-Comment[it]=Accede come un altro utente in una finestra
-Comment[ja]=任意のウィンドウから別のユーザでログインします
-Comment[kn]=ಒಂದು ವಿಂಡೋದಲ್ಲಿ ಬೇರೆ ಬಳಕೆದಾರನಾಗಿ ಪ್ರವೇಶಿಸು
-Comment[ko]=창에서 다른 사용자로 로그인
-Comment[lt]=Prisijungti kitu naudojotu lange
-Comment[mk]=Најави се како друг корисник во прозорец
-Comment[ml]=ജാലകത്തില്‍ മറ്റൊരു ഉപയോക്താവായി പ്രവേശിക്കുക
-Comment[nb]=Logg inn som en annen bruker i et vindu
-Comment[ne]=अर्को प्रयोगकर्ताको रूपमा सञ्झ्याल भित्र लगइन गर्नुहोस्
-Comment[nl]=Als een andere gebruiker aanmelden in een venster
-Comment[nn]=Logg inn som ein annan brukar i eit vindauge
-Comment[or]=ଗୋଟିଏ ୱିଣ୍ଡୋରେ ଅନ୍ଯ ଗୋଟିଏ ଚାଳକ ଭାବରେ ଲଗଇନ କରନ୍ତୁ
-Comment[pa]=ਇੱਕ ਵਿੰਡੋ ਵਿੱਚ ਹੋਰ ਯੂਜ਼ਰ ਵਾਂਗ ਲਾਗਇਨ ਕਰੋ
-Comment[pl]=Logowanie jako inny użytkownik w oknie
-Comment[pt]=Iniciar sessão como outro utilizador dentro de uma janela
-Comment[pt_BR]=Iniciar uma sessão como outro usuário dentro de uma janela
-Comment[ro]=Autentificare cu un alt cont într-o fereastră
-Comment[ru]=Войти в окне под другим пользователем
-Comment[sk]=Prihlásiť sa ako iný používateľ v okne
-Comment[sl]=Prijavi se kot drug uporabnik znotraj okna
-Comment[sq]=Hyrje si një përdorues tjetër në një dritare
-Comment[sv]=Logga in som en annan användare i ett fönster
-Comment[ta]=சாளரத்தில் வேறொரு பயனராக நுழை
-Comment[te]=ఒక గవాక్షం లో మరియొక వినియోగదారు లాగా ప్రవేశద్వారం
-Comment[th]=เข้าระบบในนามผู้ใช้อื่นในหน้าต่าง
-Comment[tr]=Diğer bir pencerede farklı kullanıcı ile giriş
-Comment[uk]=Вхід як інший користувач у вікні
-Comment[vi]=Đăng nhập vào cửa sổ với tên người dùng khác
-Comment[zh_CN]=在窗口中以其他用户登录
-TryExec=
-Exec=gdmflexiserver --xnest
-TryExec=gdmflexiserver --xnest
-Icon=gdm-xnest
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;System;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gdm
-X-GNOME-Bugzilla-Component=general
-Hidden=true
diff --git a/menu/applications/gimp.desktop b/menu/applications/gimp.desktop
deleted file mode 100644
index 3783d8c..0000000
--- a/menu/applications/gimp.desktop
+++ /dev/null
@@ -1,136 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=GIMP
-Name[ru]=Редактор изображений GIMP
-GenericName=Image Editor
-GenericName[ar]=محرر صور
-GenericName[ast]=Editor d'imaxe
-GenericName[be]=Рэдактар відарысаў
-GenericName[bg]=Редактор на изображения
-GenericName[ca]=Editor d'imatges
-GenericName[ca@valencia]=Editor d'imatges
-GenericName[cs]=Editor obrázků
-GenericName[da]=Billedredigering
-GenericName[de]=Bildeditor
-GenericName[dz]=གཟུགས་བརྙན་ ཞུན་དག་པ།
-GenericName[el]=Επεξεργαστής εικόνων
-GenericName[en_CA]=Image Editor
-GenericName[en_GB]=Image Editor
-GenericName[eo]=Bilada Redaktilo
-GenericName[es]=Editor de imagen
-GenericName[et]=Pildiredaktor
-GenericName[eu]=Irudi-editorea
-GenericName[fa]=ویرایشگر تصویر
-GenericName[fi]=Kuvankäsittely
-GenericName[fr]=Éditeur d'image
-GenericName[gl]=Editor de imaxes
-GenericName[gu]=ચિત્ર સંપાદક
-GenericName[hu]=Képszerkesztő
-GenericName[is]=Myndvinnsluforrit
-GenericName[it]=Editor immagine
-GenericName[ja]=画像エディタ
-GenericName[ka]=გამოსახულებების რედაქტორი
-GenericName[km]=កម្មវិធី​និពន្ធ​រូបភាព
-GenericName[kn]=ಚಿತ್ರ ಸಂಪಾದಕ
-GenericName[ko]=이미지 편집기
-GenericName[lt]=Paveikslėlių rengyklė
-GenericName[lv]=Attēla redaktors
-GenericName[mk]=Уредник за слики
-GenericName[mr]=प्रतिमा संपादक
-GenericName[my]=ရုပ်ပုံ တည်းဖြတ်ကိရိယာ
-GenericName[nb]=Bildebehandler
-GenericName[nds]=Billbewarker
-GenericName[ne]=छवि सम्पादक
-GenericName[nl]=Afbeeldingsbewerker
-GenericName[nn]=Biletbehandlar
-GenericName[or]=ପ୍ରତିଛବି ସମ୍ପାଦକ
-GenericName[pa]=ਚਿੱਤਰ ਐਡੀਟਰ
-GenericName[pl]=Edytor obrazu
-GenericName[pt]=Editor de Imagens
-GenericName[pt_BR]=Editor de Imagens
-GenericName[ro]=Editor de imagine
-GenericName[ru]=Редактор изображений
-GenericName[sk]=Editor obrázkov
-GenericName[sl]=Urejevalnik slik
-GenericName[sr]=Обрада слика
-GenericName[sr@latin]=Obrada slika
-GenericName[sv]=Bildredigerare
-GenericName[ta]=பிம்ப திருத்தி
-GenericName[th]=ตัวแก้ไขภาพ
-GenericName[tr]=Resim Düzenleyici
-GenericName[tt]=Sürät Tözätkeç
-GenericName[uk]=Редактор зображень
-GenericName[vi]=Bộ biên soạn ảnh
-GenericName[xh]=UmHleli woMfanekiso
-GenericName[zh_CN]=图像编辑器
-GenericName[zh_HK]=圖片編輯器
-GenericName[zh_TW]=圖片編輯器
-Comment=Create images and edit photographs
-Comment[ar]=أنشئ صورا وحرّر لقطات
-Comment[ast]=Cree imáxenes y edite semeyes
-Comment[be]=Стварэньне відарысаў і рэдагаваньне фатаграфій
-Comment[bg]=Създаване на изображения и редакция на снимки
-Comment[ca]=Creeu imatges i editeu fotografies
-Comment[ca@valencia]=Creeu imatges i editeu fotografies
-Comment[cs]=Vytvářet obrázky a upravovat fotografie
-Comment[da]=Opret billeder og redigér fotografier
-Comment[de]=Bilder erstellen und Fotografien bearbeiten
-Comment[dz]=གཟུགས་བརྙན་ཚུ་ གསར་བསྐྲུན་འབད་ནི་དང་ དཔར་ཚུ་ཞུན་དག་འབད།
-Comment[el]=Δημιουργία εικόνων και επεξεργασία φωτογραφιών
-Comment[en_CA]=Create images and edit photographs
-Comment[en_GB]=Create images and edit photographs
-Comment[eo]=Kreu bildojn aŭ redaktu fotojn
-Comment[es]=Cree imágenes y edite fotografías
-Comment[et]=Loo pilte ja redigeeri fotosid
-Comment[eu]=Sortu irudiak eta editatu argazkiak
-Comment[fi]=Luo kuvia ja muokkaa valokuvia
-Comment[fr]=Créer des images et modifier des photographies
-Comment[gl]=Crear imaxes e editar fotografías
-Comment[gu]=ચિત્રો બનાવો અને ફોટાઓમાં ફેરફાર કરો
-Comment[hu]=Képek létrehozása és fotók szerkesztése
-Comment[it]=Crea immagini o modifica fotografie
-Comment[ja]=画像の作成と写真の編集を行います
-Comment[km]=បង្កើត​រូបភាព និង កែសម្រួល​រូបថត
-Comment[kn]=ಚಿತ್ರಗಳನ್ನು ರಚಿಸಿ ಹಾಗು ಫೋಟೋಗ್ರಾಫ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಿ
-Comment[ko]=이미지를 만들거나 사진을 편집합니다.
-Comment[lt]=Kurti paveikslėlius ir redaguoti fotografijas
-Comment[lv]=Veido attēlus vai rediģē fotogrāfijas
-Comment[mk]=Направи слики и уреди фотографии
-Comment[mr]=प्रतिमा बनवा व फोटोग्राफ संपादीत करा
-Comment[my]=ရုပ်ပုံများကို ဖန်တီးပြီး ဓါတ်ပုံများကို တည်းဖြတ်ပါ
-Comment[nb]=Lag bilder og rediger fotografier
-Comment[ne]=छवि सिर्जना गर्नुहोस् र फोटोग्राफ सम्पादन गर्नुहोस्
-Comment[nl]=Afbeeldingen of foto's aanmaken en bewerken
-Comment[nn]=Lag teikningar eller rediger foto
-Comment[or]=ପ୍ରତିଛବି ନିର୍ମାଣ କରନ୍ତୁ ଏବଂ ଫୋଟଗ୍ରାଫଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
-Comment[pa]=ਚਿੱਤਰ ਬਣਾਓ ਅਤੇ ਤਸਵੀਰਾਂ ਸੋਧੋ
-Comment[pl]=Program do tworzenia oraz obróbki obrazów i fotografii
-Comment[pt]=Criar imagens e editar fotografias
-Comment[pt_BR]=Crie e edite imagens ou fotografias
-Comment[ro]=Creează imagini și editează fotografii
-Comment[ru]=Создание изображений и редактирование фотографий
-Comment[sl]=Ustvari slike in uredi fotografije
-Comment[sr]=Направите слике и уредите фотографије
-Comment[sr@latin]=Napravite slike i uredite fotografije
-Comment[sv]=Skapa bilder och redigera fotografier
-Comment[ta]=பிம்பங்களை உருவாக்கவும் மற்றும் படங்களை திருத்தவும்
-Comment[tr]=Resim ya da fotoğrafları oluşturun ve düzenleyin
-Comment[uk]=Створення зображень та редагування фотографій
-Comment[vi]=Tạo và biên soạn ảnh hay ảnh chụp
-Comment[zh_CN]=创建图像或编辑照片
-Comment[zh_HK]=建立圖像與編輯照片
-Comment[zh_TW]=建立圖像與編輯照片
-Exec=gimp %U
-TryExec=gimp %U
-TryExec=gimp
-Icon=gimp
-Terminal=false
-Categories=Graphics;2DGraphics;RasterGraphics;GTK;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=GIMP
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=2.6.11
-X-GNOME-Bugzilla-OtherBinaries=gimp
-StartupNotify=true
-MimeType=application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/tiff;image/jpeg;image/x-psp;image/png;image/x-icon;image/x-xpixmap;image/svg+xml;image/x-wmf;
diff --git a/menu/applications/gksu-properties.desktop b/menu/applications/gksu-properties.desktop
deleted file mode 100644
index 0b3f63b..0000000
--- a/menu/applications/gksu-properties.desktop
+++ /dev/null
@@ -1,30 +0,0 @@
-[Desktop Entry]
-Name=Privilege granting
-Name[ru]=Предоставление привилегий
-Name[cs]=Přidělování práv
-Name[es]=Obteniendo privilegios
-Name[eu]=Pribilegioa ematea
-Name[hu]=Jogosultság megadása
-Name[it]=Concessione privilegi
-Name[ko]=관리 권한 부여
-Name[sv]=Rättighetstilldelning
-Name[th]=การอนุญาตสิทธิ์พิเศษ
-Name[zh_CN]=权限授予
-Comment=Configure behavior of the privilege-granting tool
-Comment[cs]=Nastavuje chování nástroje pro přidělování práv
-Comment[es]=Configurar el comportamiento de la herramienta para la obtención de privilegios
-Comment[eu]=Konfiguratu pribilegioak emateko tresnaren portaera
-Comment[hu]=A jogosultságmegadó eszköz viselkedésének beállítása
-Comment[it]=Configura il comportamento dello strumento di concessione privilegi
-Comment[ko]=관리 권한 부여 프로그램의 동작을 설정합니다
-Comment[sv]=Konfigurera beteendet för verktyget för rättighetstilldelning
-Comment[th]=ตั้งค่าพฤติกรรมของเครื่องมืออนุญาตสิทธิ์พิเศษ
-Comment[zh_CN]=配置权限授予工具的行为
-Exec=gksu-properties
-TryExec=gksu-properties
-Icon=gksu
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Settings;X-AdvancedSettings;X-GNOME-SystemSettings;
-OnlyShowIn=GNOME;XFCE;
diff --git a/menu/applications/glchess.desktop b/menu/applications/glchess.desktop
new file mode 100644
index 0000000..d395465
--- /dev/null
+++ b/menu/applications/glchess.desktop
@@ -0,0 +1,194 @@
+[Desktop Entry]
+Name=Chess
+Name[af]=Skaak
+Name[ar]=شطرنج
+Name[as]=Chess
+Name[ast]=Chess
+Name[be]=Шахматы
+Name[bg]=Шах
+Name[bn]=দাবা
+Name[bn_IN]=দাবা
+Name[br]=Echedoù
+Name[ca]=Escacs
+Name[ca@valencia]=Escacs
+Name[cs]=Šachy
+Name[cy]=Gwyddbwyll
+Name[da]=Skak
+Name[de]=Schach
+Name[dz]=ཅེསི་
+Name[el]=Σκάκι
+Name[en@shaw]=𐑗𐑧𐑕
+Name[en_CA]=Chess
+Name[en_GB]=Chess
+Name[eo]=Ŝako
+Name[es]=Ajedrez
+Name[et]=Male
+Name[eu]=Xakea
+Name[fa]=شطرنج
+Name[fi]=Shakki
+Name[fr]=Jeu d'échecs
+Name[ga]=Ficheall
+Name[gl]=Xadrez
+Name[gu]=શતરંજ
+Name[he]=שחמט
+Name[hi]=शतरंज
+Name[hu]=Sakk
+Name[id]=Catur
+Name[it]=Scacchi
+Name[ja]=チェス
+Name[km]=អុក
+Name[kn]=ಚೆಸ್
+Name[ko]=체스
+Name[lt]=Šachmatai
+Name[lv]=Šahs
+Name[mai]=सतरंज
+Name[mk]=Шах
+Name[ml]=ചെസ്സ്
+Name[mr]=बुध्दिबळ
+Name[nb]=Sjakk
+Name[ne]=चेस
+Name[nl]=Schaken
+Name[nn]=Sjakk
+Name[or]=ଚେସ
+Name[pa]=ਸ਼ਤਰੰਜ
+Name[pl]=Szachy
+Name[pt]=Xadrez
+Name[pt_BR]=Xadrez
+Name[ro]=Șah
+Name[ru]=Шахматы
+Name[si]=චෙස්
+Name[sk]=Šach
+Name[sl]=Šah
+Name[sr]=Шах
+Name[sr@latin]=Šah
+Name[sv]=Schack
+Name[ta]=சதுரங்கம்
+Name[te]=చదరంగం
+Name[tg]=Шоҳмот
+Name[th]=หมากรุก
+Name[tr]=Satranç
+Name[ug]=شاھمات
+Name[uk]=Шахи
+Name[vi]=Cờ
+Name[zh_CN]=国际象棋
+Name[zh_HK]=國際象棋
+Name[zh_TW]=國際象棋
+Comment=Play the classic two-player boardgame of chess
+Comment[af]=Speel die klassieke tweespelerskaakspel
+Comment[ar]=العب لعبة الشطرنج الكلاسيكية للاعبَيْن
+Comment[as]=দুই সৰ্বমোট
+Comment[ast]=Xugar el clásicu xuegu d'axedré de dos xugadores
+Comment[be]=Класічная настольная гульня ў шахматы для двух гульцоў
+Comment[bg]=Класическата игра на шах за двама
+Comment[bn]=দুইজন খেলোয়াড় দ্বারা খেলা পারম্পরিক দাবার খেলা খেলুন
+Comment[bn_IN]=দুইজন খেলোয়াড় দ্বারা খেলা পারম্পরিক দাবার খেলা খেলুন
+Comment[ca]=Jugueu al clàssic joc dels escacs entre dues persones
+Comment[ca@valencia]=Jugueu al clàssic joc dels escacs entre dues persones
+Comment[cs]=Hrát klasickou šachovou hru pro dva hráče
+Comment[da]=Spil det klassiske to-spillers brætspil skak
+Comment[de]=Das klassische 2-Spieler-Brettspiel Schach spielen
+Comment[dz]=ཅེསི་གི་ སྔོན་སྲོལ་ རྩེ་མི་གཉིས་པང་དེབ་རྩེདམོ་འདི་རྩེ
+Comment[el]=Παίξτε το κλασικό σκάκι με δύο παίχτες
+Comment[en@shaw]=𐑐𐑤𐑱 𐑞 𐑒𐑤𐑨𐑕𐑦𐑒 𐑑𐑵-𐑐𐑤𐑱𐑼 𐑚𐑪𐑮𐑛𐑜𐑱𐑥 𐑝 𐑗𐑧𐑕
+Comment[en_CA]=Play the classic two-player boardgame of chess
+Comment[en_GB]=Play the classic two-player boardgame of chess
+Comment[eo]=Ludi la klasikan du-lundantan tabulludon ŝakon
+Comment[es]=Juegue una partida clásica de ajedrez de dos jugadores
+Comment[et]=Klassikalise malemängu mängimine 
+Comment[eu]=Jokatu bi jokalarirentzako xake-taula klasikoan
+Comment[fa]=بازی کلاسیک دونفره‌ی شطرنج
+Comment[fi]=Pelaa shakkia, klassista lautapeliä
+Comment[fr]=Jouer au jeu d'échecs classique à deux joueurs
+Comment[gl]=Xogar unha partida clásica de xadrez de dous xogadores
+Comment[gu]=શાસ્ત્રિય બે-ખેલાડી શતરંજની રમત રમો
+Comment[he]=שחמט - משחק לוח קלסי לשני שחקנים
+Comment[hi]=शतरंज का क्लासिक दो खिलाडियो वाला बोर्डगेम खेलें
+Comment[hu]=A klasszikus kétszemélyes sakk játék
+Comment[id]=Mainkan permainan catur klasik dengan dua pemain
+Comment[it]=Gioca al classico gioco degli scacchi
+Comment[ja]=古典的な対戦型のチェスゲームをお楽しみください
+Comment[km]=លេង​​ល្បែង​ក្ដារ​អុក​ដែល​មាន​អ្នក​លេង​ពីរ​អ្នក​របៀប classic
+Comment[kn]=ಸಾಂಪ್ರದಾಯಿಕವಾದ ಇಬ್ಬರು ಆಟಗಾರರು ಆಡುವಂತಹ ಚೆಸ್ಸನ್ನು ಆಡಿ
+Comment[ko]=전통적인 2인 체스 보드 게임을 플레이합니다
+Comment[lt]=Žaisti klasikinius dviejų žaidėjų šachmatus
+Comment[lv]=Spēlēt klasisko divu spēlētāju šaha spēli
+Comment[mk]=Играј класичен шах со два играчи 
+Comment[ml]=രണ്ടു പേര്‍ക്ക് കളിക്കാവുന്ന ക്ലാസ്സിക്‌ ചെസ്സ്‌ കളി കളിക്കൂ
+Comment[mr]=दोन-खेळाडू बुध्दिबळ खेळ खेळा
+Comment[nb]=Spill det klassiske tomannsbrettspillet sjakk
+Comment[ne]=चेसको पुरानो दुइ खेलाडीको बोर्ड खेल खेल्नुहोस्
+Comment[nl]=Het klassieke schaakspel voor twee spelers spelen
+Comment[nn]=Spel det klassiske tomannsbrettspelet sjakk
+Comment[or]=ଚେସର କ୍ଲାସିକ ଦୁଇଜଣ ଚାଳକ ବିଶିଷ୍ଟ ବୋର୍ଡ ଖେଳ ଖେଳନ୍ତୁ
+Comment[pa]=ਸਤਰੰਜ਼ ਦੀ ਦੋ ਖਿਡਾਰੀਆਂ ਵਾਲੀ ਕਲਾਸੀਕਲ ਖੇਡ ਖੇਡੋ
+Comment[pl]=Klasyczne szachy dla dwóch graczy
+Comment[pt]=Jogue o clássico jogo de tabuleiro de xadrez para duas pessoas
+Comment[pt_BR]=Jogue o clássico jogo de tabuleiro de xadrez para dois jogadores
+Comment[ro]=Jucați jocul de șah clasic cu doi jucători
+Comment[ru]=Сыграть в классические шахматы
+Comment[sk]=Hrajte klasický stolný šach pre dvoch hráčov
+Comment[sl]=Igranje običajne partije šaha.
+Comment[sr]=Играјте класичан шах на табли са два играча
+Comment[sr@latin]=Igrajte klasičan šah na tabli sa dva igrača
+Comment[sv]=Spela det klassiska tvåmanna brädspelet Schack
+Comment[ta]=வழக்கமான இரண்டு வீரர் சதுரங்க ஆட்டத்தை ஆடுக
+Comment[te]=సాంప్రదాయ ఇద్దరు-ఆటగాళ్ళ చదరంగం బోర్డుఆటను ఆడుము
+Comment[th]=เล่นหมากรุกสากล หมากกระดานอมตะสำหรับผู้เล่นสองคน
+Comment[tr]=Klasik iki oyunculu satranç oyununu oyna
+Comment[ug]=كلاسسىك ئىككى كىشىلىك شاھمات ئويۇنىنى پروگراممىسى
+Comment[uk]=Зіграти у класичні шахи
+Comment[vi]=Chơi cờ hai người truyền thống
+Comment[zh_CN]=经典的国际象棋对战游戏
+Comment[zh_HK]=玩傳統的兩人制國際象棋
+Comment[zh_TW]=玩傳統的兩人制國際象棋
+Keywords=game;strategy;
+Keywords[be]=гульня;стратэгія;
+Keywords[ca]=joc;estratègia;
+Keywords[ca@valencia]=joc;estratègia;
+Keywords[cs]=hra;strategická;
+Keywords[da]=spil;strategi;
+Keywords[de]=Spiel;Strategie;
+Keywords[el]=παιχνίδι;στρατηγική;
+Keywords[es]=juego;estrategia;
+Keywords[et]=mäng;strateegia;
+Keywords[eu]=jokoa;estrategia;
+Keywords[fa]=بازی;استراتژی;
+Keywords[fr]=jeu;stratégie;
+Keywords[gl]=xogo;estratexia;
+Keywords[he]=משחק;אסטרטגיה;
+Keywords[hi]=game;strategy;
+Keywords[hu]=játék;stratégia;
+Keywords[it]=gioco;giochi;strategia;
+Keywords[ko]=game;게임;strategy;전략;
+Keywords[lt]=žaidimas;strategija;
+Keywords[lv]=spēle;stratēģija;
+Keywords[ml]=കളി;തന്ത്രം;
+Keywords[nb]=spill;strategi;
+Keywords[pl]=gra;gierka;strategiczna;strategia;
+Keywords[pt]=jogo;estratégia;
+Keywords[pt_BR]=game;jogo;estratégia;
+Keywords[sk]=hra;strategická;stratégia;šach;
+Keywords[sl]=igra;strategija;tabla;figure;
+Keywords[sr]=игра;стратегија;
+Keywords[sr@latin]=igra;strategija;
+Keywords[ta]=விளையாட்டு;திட்டம்;
+Keywords[ug]=game;strategy;ئويۇن;تەدبىر‏;
+Keywords[zh_HK]=game;strategy;遊戲;策略;
+Keywords[zh_TW]=game;strategy;遊戲;策略;
+Version=1.0
+Exec=gnome-chess
+TryExec=gnome-chess
+Terminal=false
+Type=Application
+Categories=GNOME;Game;BoardGame;
+StartupNotify=true
+Icon=gnome-chess
+MimeType=application/x-chess-pgn;
+GenericName=3D Chess Game
+GenericName[ru]=Шахматы
+GenericName[be]=Шахматы
+GenericName[uk]=Шахи
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-games
+X-GNOME-Bugzilla-Component=BugBuddyBugs
+X-GNOME-Bugzilla-Version=3.8.0
diff --git a/menu/applications/gnome-mplayer.desktop b/menu/applications/gnome-mplayer.desktop
deleted file mode 100644
index 85a5e7b..0000000
--- a/menu/applications/gnome-mplayer.desktop
+++ /dev/null
@@ -1,41 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GNOME MPlayer
-Name[el]=GNOME MPlayer
-Name[fr]=GNOME MPlayer
-Name[ja]=GNOME MPlayer
-Name[sr]=Гномов Мплејер
-Name[sr@latin]=Gnomov Mplejer
-Name[tr]=GNOME MPlayer
-Name[ru]=Проигрыватель GNOME MPlayer
-GenericName=Media Player
-GenericName[el]=Αναπαραγωγέας Πολυμέσων
-GenericName[es]=Reproductor multimedia
-GenericName[fi]=Multimediasoitin
-GenericName[fr]=Lecteur multimédia
-GenericName[ja]=メディアプレイヤー
-GenericName[pl]=Odtwarzacz multimediów
-GenericName[tr]=Çokluortam Oynatıcı
-GenericName[ru]=Мультимедийный проигрыватель
-GenericName[zh_CN]=媒体播放器
-GenericName[zh_TW]=媒體播放器
-Comment=Play your media
-Comment[el]=Παίξτε οποιοδήποτε αρχείο ήχου ή βίντεο
-Comment[es]=Reproduce tus archivos multimedia
-Comment[fi]=Toista multimediatiedostoja
-Comment[fr]=Lire vos média
-Comment[ja]=動画や楽曲のメディアファイルを再生します
-Comment[pl]=Odtwarzaj swoje multimedia
-Comment[sr]=Пуштање мултимедијалних датотека
-Comment[sr@latin]=Puštanje multimedijalnih datoteka
-Comment[tr]=Ses ve görüntü oynatıcı
-Comment[ru]=Воспроизведение мультимедиа
-Comment[zh_CN]=播放常见格式媒体文件
-Exec=gnome-mplayer %U
-TryExec=gnome-mplayer %U
-Icon=gnome-mplayer
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=AudioVideo;Audio;Video;Player;TV;
-MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audio/mp3;audio/mp4;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;application/x-vorbis+ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;audio/x-pn-realaudio;application/vnd.rn-realmedia;application/vnd.rn-realaudio;video/vnd.rn-realvideo;audio/x-realaudio;audio/x-pn-realaudio-plugin;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;audio/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;audio/x-ms-wax;audio/x-ms-wma;application/x-drm-v2;audio/wav;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;audio/mpeg2;audio/x-mpeg2;video/mp4;video/3gpp;audio/x-mpeg3;audio/x-mpegurl;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;audio/basic;audio/x-basic;audio/midi;audio/x-scpls;video/x-matroska;video/matroska;video/x-mng;audio/webm;video/webm;audio/x-webm;video/x-webm;video/mp2t;video/vnd.mpegurl;
diff --git a/menu/applications/gnome-screensaver-preferences.desktop b/menu/applications/gnome-screensaver-preferences.desktop
deleted file mode 100644
index 2ebcc77..0000000
--- a/menu/applications/gnome-screensaver-preferences.desktop
+++ /dev/null
@@ -1,164 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Screensaver
-Name[ar]=حافظة الشاشة
-Name[as]=স্ক্ৰীনছেভাৰ
-Name[ast]=Curiapantalles
-Name[be]=Ахоўнік экрана
-Name[be@latin]=Źbierahalnik ekranu
-Name[bg]=Предпазител на екрана
-Name[bn]=স্ক্রীনসেভার
-Name[bn_IN]=স্ক্রিন-সেভার
-Name[ca]=Estalvi de pantalla
-Name[crh]=Ekran qoruyıcısı
-Name[cs]=Šetřič obrazovky
-Name[cy]=Arbedwr sgrin
-Name[da]=Pauseskærm
-Name[de]=Bildschirmschoner
-Name[dz]=གསལ་གཞི་ཉེན་སྲུང་།
-Name[el]=Προστασία οθόνης
-Name[en_CA]=Screensaver
-Name[en_GB]=Screensaver
-Name[es]=Salvapantallas
-Name[et]=Ekraanisäästja
-Name[eu]=Pantaila-babeslea
-Name[fa]=محافظ صفحهٔ نمایش
-Name[fi]=Näytönsäästäjä
-Name[fr]=Économiseur d'écran
-Name[ga]=Spárálaí Scáileáin
-Name[gl]=Protector de pantalla
-Name[gu]=સ્ક્રીનસેવર
-Name[he]=שומר מסך
-Name[hi]=स्क्रीनसेवर
-Name[hr]=Čuvar zaslona
-Name[hu]=Képernyővédő
-Name[id]=Screensaver
-Name[is]=Skjáhvíla
-Name[it]=Salvaschermo
-Name[ja]=スクリーンセーバー
-Name[ka]=ეკრანმზოგი
-Name[kn]=ಸ್ಕ್ರೀನ್‌ಸೇವರ್
-Name[ko]=화면 보호기
-Name[ku]=Dîmenderparêz
-Name[lt]=Ekrano užsklanda
-Name[lv]=Ekrānsaudzētājs
-Name[mg]=Sary mitsitsy
-Name[mk]=Чувар на екранот
-Name[ml]=സ്ക്രീന്‍സേവര്‍
-Name[mn]=Дэлгэц гамнагч
-Name[mr]=स्क्रीनसेवर
-Name[nb]=Skjermsparer
-Name[ne]=स्क्रिनसेभर
-Name[nl]=Schermbeveiliging
-Name[nn]=Skjermsparar
-Name[oc]=Estalviaire d'ecran
-Name[or]=Screensaver
-Name[pa]=ਸਕਰੀਨ-ਸੇਵਰ
-Name[pl]=Wygaszacz ekranu
-Name[ps]=پرده ساتونکی
-Name[pt]=Protecção de Ecrã
-Name[pt_BR]=Proteção de tela
-Name[ro]=Economizor de ecran
-Name[ru]=Хранитель экрана
-Name[si]=තිරආවරකය
-Name[sk]=Šetrič obrazovky
-Name[sl]=Ohranjevalnik zaslona
-Name[sq]=Ruajtës ekrani
-Name[sr]=Чувар екрана
-Name[sr@latin]=Čuvar ekrana
-Name[sv]=Skärmsläckare
-Name[ta]=திரை சேமிப்பி
-Name[te]=తెరకాపరి
-Name[th]=โปรแกรมรักษาหน้าจอ
-Name[tr]=Ekran koruyucu
-Name[uk]=Збереження екрану
-Name[vi]=Bộ bảo vệ màn hình
-Name[zh_CN]=屏幕保护程序
-Name[zh_HK]=螢幕保護程式
-Name[zh_TW]=螢幕保護程式
-Comment=Set your screensaver preferences
-Comment[ar]=اضبط خصائص حافظة الشاشة
-Comment[as]=আপোনাৰ স্ক্ৰীনছেভাৰেৰ পছন্দসমূহ নিৰ্ধাৰণ কৰক
-Comment[ast]=Afite les sos preferencies pal curiapantalles
-Comment[be]=Вызначэньне пераваг ахоўніка экрана
-Comment[be@latin]=Nałady źbierahalnika ekranu
-Comment[bg]=Настройване на предпазителя на екрана
-Comment[bn]=আরনার স্ক্রীনসেভারের পছন্দসমূহ সেট করুন
-Comment[bn_IN]=স্ক্রিন-সেভার সংক্রান্ত পছন্দ নির্ধারণ করুন
-Comment[ca]=Establiu les preferències de l'estalvi de pantalla
-Comment[crh]=Ekran qoruyıcısı tercihleriñizni tesbit etiñiz
-Comment[cs]=Nastaví šetřič obrazovky
-Comment[cy]=Gosod eich hoffterau arbedwr sgrin
-Comment[da]=Sæt dine indstillinger for pauseskærm
-Comment[de]=Einstellungen des Bildschirmschoners ändern
-Comment[dz]=ཁྱོད་རའི་གསལ་གཞི་ཉེནསྲུང་གི་དགའ་གདམ་ཚུ་ གཞི་སྒྲིག་འབད།
-Comment[el]=Ρύθμιση των προτιμήσεων σας για την προστασία οθόνης
-Comment[en_CA]=Set your screensaver preferences
-Comment[en_GB]=Set your screensaver preferences
-Comment[es]=Configure su salvapantallas
-Comment[et]=Ekraanisäästja eelistuste seadmine
-Comment[eu]=Ezarri pantaila-babeslearen hobespenak
-Comment[fa]=ترجیحات محافظ صفحهٔ نمایش خود را تنظیم کنید
-Comment[fi]=Aseta näytönsäästäjän asetukset
-Comment[fr]=Définir vos préférences pour l'économiseur d'écran
-Comment[ga]=Socraigh do chuid sainroghanna spárálaí scáileáin
-Comment[gl]=Definir as súas preferencias para o protector de pantalla
-Comment[gu]=તમારી સ્ક્રીનસેવર પસંદગીઓ સુયોજિત કરો
-Comment[he]=קבע את העדפות שומר המסך
-Comment[hi]=अपना स्क्रीनसेवर पसंद सेट करें
-Comment[hr]=Podesite postavke čuvara zaslona
-Comment[hu]=A képernyővédő tulajdonságainak beállítása
-Comment[id]=Tentukan setingan screensaver anda
-Comment[is]=Stilltu valmöguleika fyrir skjávhvíluna
-Comment[it]=Imposta le preferenze del salvaschermo
-Comment[ja]=お使いのスクリーンセーバーを設定します
-Comment[ka]=ეკრანმზოგის პარამეტრების მითითება
-Comment[kn]=ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ಸೇವರ್ ಆದ್ಯತೆಗಳನ್ನು ಅಣಿಗೊಳಿಸಿ
-Comment[ko]=화면 보호기를 설정합니다
-Comment[ku]=Vebijêrkên dîmenderparezê mîheng bike
-Comment[lt]=Nurodykite ekrano užsklandos nustatymus
-Comment[lv]=Uzstādīt sava ekrānsaudzētāja uzstādījumus
-Comment[mg]=Mamaritra ny safidy manokan'ny sary mitsitsy
-Comment[mk]=Поставете ги преференциите за чуварот на екранот
-Comment[ml]=നിങ്ങളുടെ സ്ക്രീന്‍സേവറിന്റെ മുന്‍ഗണനകള്‍ സജ്ജീകരിയ്ക്കുക
-Comment[mn]=Дэлгэц гамнагчийн тохиргоонуудыг байрлуул.
-Comment[mr]=तुमची स्क्रीनसेवर प्राधान्यता निश्चित करा
-Comment[nb]=Sett brukervalg for skjermspareren
-Comment[ne]=स्क्रिनसेभर प्राथमिकता सेट गर्नुहोस्
-Comment[nl]=Uw schermbeveiliging-voorkeuren instellen
-Comment[nn]=Set brukarval for skjermspararen
-Comment[oc]=Definir vòstras preferéncias per l'estalviaire d'ecran
-Comment[or]=ଆପଣଙ୍କର ସ୍କ୍ରିନସେଭର ପସନ୍ଦଗୁଡିକୁ ସ୍ଥିର କରନ୍ତୁ
-Comment[pa]=ਸਕਰੀਨ-ਸੇਵਰ ਲਈ ਆਪਣੀ ਪਸੰਦ ਦਿਓ
-Comment[pl]=Ustawienia wygaszacza ekranu
-Comment[ps]=د خپل پرده ساتونکي غوراوي وټاکئ
-Comment[pt]=Defina as suas preferências de protecção de ecrã
-Comment[pt_BR]=Defina suas preferências de proteção de tela
-Comment[ro]=Schimbați opțiunile economizorului de ecran
-Comment[ru]=Параметры хранителя экрана
-Comment[si]=ඔබගේ තිරආවරක අභිප්‍රේත සකසන්න
-Comment[sk]=Nastaviť predvoľby vášho šetriča obrazovky
-Comment[sl]=Nastavitve ohranjevalnika zaslona
-Comment[sq]=Përcakto preferimet e ruajtësit tuaj të ekranit
-Comment[sr]=Сопствене поставке чувара екрана
-Comment[sr@latin]=Sopstvene postavke čuvara ekrana
-Comment[sv]=Ställ in dina skärmsläckarinställningar
-Comment[ta]=உங்கள் திரை சேமிப்பி முன்னுரிமைகளை அமைக்கவும்
-Comment[te]=మీ  తెరకాపరి యొక్క అభీష్టాలు అమర్చుకొను
-Comment[th]=ปรับแต่งโปรแกรมรักษาหน้าจอของคุณ
-Comment[tr]=Ekran koruyucunuzun tercihlerini belirtin
-Comment[uk]=Встановити параметри збереження екрану
-Comment[vi]=Lập các tùy thích cho trình bảo vệ màn hình
-Comment[zh_CN]=设定您的屏幕保护程序首选项
-Comment[zh_HK]=設定螢幕保護程式
-Comment[zh_TW]=設定螢幕保護程式
-Icon=preferences-desktop-screensaver
-Exec=gnome-screensaver-preferences
-TryExec=gnome-screensaver-preferences
-Terminal=false
-Type=Application
-Categories=GTK;Settings;DesktopSettings;X-XFCE;
-StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-screensaver
-X-GNOME-Bugzilla-Component=general
diff --git a/menu/applications/gparted.desktop b/menu/applications/gparted.desktop
deleted file mode 100644
index fed204f..0000000
--- a/menu/applications/gparted.desktop
+++ /dev/null
@@ -1,188 +0,0 @@
-[Desktop Entry]
-Name=GParted
-Name[ar]=مُقسِّم‌ج
-Name[bg]=GParted
-Name[br]=GParted
-Name[ca]=GParted
-Name[ca@valencia]=GParted
-Name[cs]=GParted
-Name[da]=GParted
-Name[de]=GParted
-Name[dz]=ཇི་པར་ཊེཊི།
-Name[el]=GParted
-Name[en_CA]=GParted
-Name[en_GB]=GParted
-Name[es]=GParted
-Name[et]=GParted
-Name[eu]=GParted
-Name[fi]=GParted
-Name[fr]=GParted
-Name[gl]=GParted
-Name[gu]=GParted
-Name[he]=GParted
-Name[hu]=GParted
-Name[id]=GParted
-Name[is]=GParted
-Name[it]=GParted
-Name[ja]=GParted
-Name[kk]=GParted
-Name[ko]=GParted
-Name[lt]=GParted
-Name[lv]=GParted
-Name[mk]=Гпартед
-Name[nb]=GParted
-Name[ne]=जिपार्टेड
-Name[nl]=GParted
-Name[oc]=GParted
-Name[pa]=GParted
-Name[pl]=GParted
-Name[pt]=GParted
-Name[pt_BR]=GParted
-Name[ro]=GParted
-Name[ru]=Редактор разделов GParted
-Name[si]=GParted
-Name[sk]=GParted
-Name[sl]=GParted
-Name[sr]=ГПартед
-Name[sr@latin]=GParted
-Name[sv]=GParted
-Name[th]=GParted
-Name[tr]=GParted
-Name[uk]=GParted
-Name[vi]=GParted
-Name[zh_CN]=GParted
-Name[zh_HK]=GParted
-Name[zh_TW]=GParted
-GenericName=Partition Editor
-GenericName[ar]=محرر الأقسام
-GenericName[bg]=Редактор на дялове
-GenericName[br]=Embanner parzhad
-GenericName[cs]=Editor oddílů
-GenericName[da]=Partitioneringsprogram
-GenericName[de]=Partitionierungswerkzeug
-GenericName[el]=Επεξεργαστής κατατμήσεων
-GenericName[en_GB]=Partition Editor
-GenericName[es]=Editor de particiones
-GenericName[et]=Partitsiooniredaktor
-GenericName[eu]=Partizio-editorea
-GenericName[fi]=Levyosioiden muokkain
-GenericName[fr]=Éditeur de partitions
-GenericName[gl]=Editor de particións
-GenericName[he]=עורך המחיצות
-GenericName[hu]=Partíciószerkesztő
-GenericName[id]=Penyunting Partisi
-GenericName[it]=Editor di partizioni
-GenericName[ja]=パーティション・エディタ
-GenericName[kk]=Қатты диск бөлімдерін басқару
-GenericName[lt]=Skirsnių redaktorius
-GenericName[lv]=Sadaļu redaktors
-GenericName[nb]=Partisjonsredigering
-GenericName[pa]=ਪਾਰਟੀਸ਼ਨ ਐਡੀਟਰ
-GenericName[pl]=Edytor partycji
-GenericName[pt]=Editor de Partições
-GenericName[pt_BR]=Editor de Partições
-GenericName[ro]=Editor de partiții
-GenericName[ru]=Редактор разделов
-GenericName[sl]=Urejevalnik razdelkov
-GenericName[sr]=Уређивач партиција
-GenericName[sr@latin]=Uređivač particija
-GenericName[sv]=Partitionsredigerare
-GenericName[uk]=Редактор Розділів
-GenericName[zh_CN]=分区编辑器
-GenericName[zh_HK]=分割區編輯器
-GenericName[zh_TW]=分割區編輯器
-X-GNOME-FullName=GParted Partition Editor
-X-GNOME-FullName[ar]=محرر الأقسام مقسّم‌ج
-X-GNOME-FullName[bg]=Редактор на дялове на дискове за GNOME
-X-GNOME-FullName[ca]=Editor de particions GParted
-X-GNOME-FullName[ca@valencia]=Editor de particions GParted
-X-GNOME-FullName[cs]=Editor oddílů GParted
-X-GNOME-FullName[da]=GParted - partitioneringsprogram
-X-GNOME-FullName[de]=GParted Partitionierungswerkzeug
-X-GNOME-FullName[el]=Επεξεργαστής κατατμήσεων GParted
-X-GNOME-FullName[en_GB]=GParted Partition Editor
-X-GNOME-FullName[es]=Editor de particiones GParted
-X-GNOME-FullName[et]=GParted partitsioonihaldur
-X-GNOME-FullName[eu]=GParted partizio-editorea
-X-GNOME-FullName[fi]=GParted - levyosioiden muokkain
-X-GNOME-FullName[fr]=Éditeur de partitions GParted
-X-GNOME-FullName[gl]=Editor de particións GParted
-X-GNOME-FullName[gu]=GParted પાર્ટીશન સંપાદક
-X-GNOME-FullName[he]=עורך המחיצות GParted
-X-GNOME-FullName[hu]=GParted partíciószerkesztő
-X-GNOME-FullName[id]=GParted Penyunting Partisi
-X-GNOME-FullName[is]=GNOME disksneiðastjórinn
-X-GNOME-FullName[it]=Editor di partizioni GParted
-X-GNOME-FullName[ja]=GParted パーティション編集ツール
-X-GNOME-FullName[kk]=GParted бөлімдерді басқарушысы
-X-GNOME-FullName[lt]=Skirsnių redaktorius „GParted“
-X-GNOME-FullName[lv]=Gparted sadaļu redaktors
-X-GNOME-FullName[nb]=GNOME partisjonsredigering
-X-GNOME-FullName[nl]=Gparted partitiebewerker
-X-GNOME-FullName[pa]=ਜੀਪਾਰਟਡ ਪਾਰਟੀਸ਼ਨ ਐਡੀਟਰ
-X-GNOME-FullName[pl]=Edytor partycji GParted
-X-GNOME-FullName[pt]=Editor de Partições GParted
-X-GNOME-FullName[pt_BR]=Editor de partições GParted
-X-GNOME-FullName[ro]=GParted - Editor de partiții
-X-GNOME-FullName[ru]=Редактор разделов GParted
-X-GNOME-FullName[sk]=GParted editor oddielov
-X-GNOME-FullName[sl]=GParted urejevalnik razdelkov
-X-GNOME-FullName[sr]=ГПартед — Уређивач партиција
-X-GNOME-FullName[sr@latin]=GParted — Uređivač particija
-X-GNOME-FullName[sv]=Partitionsredigeraren GParted
-X-GNOME-FullName[th]=เครื่องมือแก้ไขพาร์ทิชัน GParted
-X-GNOME-FullName[uk]=GParted Редактор Розділів
-X-GNOME-FullName[zh_CN]=GParted 分区编辑器
-X-GNOME-FullName[zh_HK]=GParted 分割區編輯器
-X-GNOME-FullName[zh_TW]=GParted 分割區編輯器
-Comment=Create, reorganize, and delete partitions
-Comment[ar]=أنشئ ونظم واحذف الأقراص
-Comment[bg]=Създаване, подреждане и изтриване на дялове
-Comment[br]=Krouiñ, adaozañ ha dilemel ar parzhadoù
-Comment[ca]=Creeu, reorganitzeu i suprimiu particions
-Comment[ca@valencia]=Creeu, reorganitzeu i suprimiu particions
-Comment[cs]=Vytvořit, znovu uspořádat a odstranit oddíly
-Comment[da]=Opret, omorganisér og slet partitioner
-Comment[de]=Partitionen erzeugen, reorganisieren und löschen
-Comment[el]=Δημιουργία, επεξεργασία και διαγραφή κατατμήσεων
-Comment[en_GB]=Create, reorganise, and delete partitions
-Comment[es]=Cree, reorganice y elimine particiones
-Comment[et]=Partitsioonide loomine, muutmine ja kustutamine
-Comment[eu]=Sortu, berrantolatu eta ezabatu partizioak
-Comment[fi]=Luo, järjestele ja poista osioita
-Comment[fr]=Crée, réorganise et supprime des partitions
-Comment[gl]=Crear, reorganizar e eliminar particións
-Comment[he]=יצירה, ארגון מחדש ומחיקה של מחיצות
-Comment[hu]=Partíciók létrehozása, újraszervezése és törlése
-Comment[id]=Membuat, mengorganisasi ulang, serta menghapus partisi
-Comment[is]=Búa til, raða og eyða disksneiðum
-Comment[it]=Crea, riorganizza ed elimina partizioni
-Comment[ja]=パーティションを作成／再構成／削除する
-Comment[kk]=Бөлімдерді жасау, басқару және өшіру
-Comment[lt]=Kurkite, pertvarkykite ir ištrinkite skirsnius
-Comment[lv]=Veido, pārkārto un dzēš disku sadaļas
-Comment[nb]=Lag, omorganiser og slett partisjoner
-Comment[nl]=Partities aanmaken, ordenen en verwijderen
-Comment[pa]=ਪਾਰਟੀਸ਼ਨ ਬਣਾਓ, ਪਰਬੰਧ ਕਰੋ ਅਤੇ ਹਟਾਓ
-Comment[pl]=Tworzenie, reorganizacja i usuwanie partycji
-Comment[pt]=Criar, reorganizar e apagar partições
-Comment[pt_BR]=Crie, reorganize e exclua partições
-Comment[ro]=Creează, reorganizează și șterge partiții
-Comment[ru]=Создать, перераспределить или удалить разделы
-Comment[sk]=Vytvoriť, preorganizovať a odstrániť oddiely
-Comment[sl]=Ustvarjanje, urejanje in brisanje razdelkov
-Comment[sr]=Стварајте, реорганизујте и бришите партиције
-Comment[sr@latin]=Stvarajte, reorganizujte i brišite particije
-Comment[sv]=Skapa, organisera om och ta bort partitioner
-Comment[th]=สร้าง ปรับโครงสร้าง และลบพาร์ทิชัน
-Comment[uk]=Створити, перемістити чи видалити розділ
-Comment[zh_CN]=创建、重新组织或删除分区
-Comment[zh_HK]=建立、編輯或刪除分割區
-Comment[zh_TW]=建立、編輯或刪除分割區
-Exec=gparted %f
-TryExec=gparted %f
-Icon=gparted
-Terminal=false
-Type=Application
-Categories=GTK;System;Filesystem;
-StartupNotify=true
diff --git a/menu/applications/gthumb.desktop b/menu/applications/gthumb.desktop
deleted file mode 100644
index 111d7c8..0000000
--- a/menu/applications/gthumb.desktop
+++ /dev/null
@@ -1,235 +0,0 @@
-[Desktop Entry]
-Name=gThumb
-Name[am]=gThumb
-Name[az]=gThumb
-Name[be]=gThumb
-Name[bg]=gThumb
-Name[ca]=gThumb
-Name[ca@valencia]=gThumb
-Name[cs]=gThumb
-Name[da]=gThumb
-Name[de]=gThumb
-Name[dz]=ཇི་ཐམཔ།
-Name[el]=gThumb
-Name[en_CA]=gThumb
-Name[en_GB]=gThumb
-Name[es]=gThumb
-Name[et]=gThumb
-Name[eu]=gThumb
-Name[fa]=gThumb
-Name[fi]=gThumb
-Name[fr]=gThumb
-Name[gl]=gThumb
-Name[gu]=જીથમ્બ
-Name[he]=gThumb
-Name[hr]=gThumb
-Name[hu]=gThumb
-Name[id]=gThumb
-Name[it]=gThumb
-Name[ja]=gThumb
-Name[kn]=gThumb
-Name[ko]=gThumb
-Name[lt]=gThumb
-Name[lv]=gThumb
-Name[mk]=gThumb
-Name[ms]=gThumb
-Name[nb]=gThumb
-Name[nds]=gThumb
-Name[ne]=जीथम्ब
-Name[nl]=gThumb
-Name[oc]=gThumb
-Name[pa]=ਜੀ-ਥੰਮ
-Name[pl]=gThumb
-Name[ps]=gThumb
-Name[pt]=gThumb
-Name[pt_BR]=gThumb
-Name[ro]=gThumb
-Name[ru]=Просмотр изображений
-Name[sk]=gThumb
-Name[sl]=gThumb
-Name[sr]=gThumb
-Name[sr@Latn]=gThumb
-Name[sv]=gThumb
-Name[th]=gThumb
-Name[tr]=gThumb
-Name[uk]=gThumb
-Name[vi]=gThumb
-Name[xh]=i-gThumb
-Name[zh_CN]=gThumb
-Name[zh_HK]=gThumb
-Name[zh_TW]=gThumb
-GenericName=Image Viewer
-GenericName[ar]=عارض الصّور
-GenericName[ca]=Visualitzador d'imatges
-GenericName[ca@valencia]=Visualitzador d'imatges
-GenericName[cs]=Prohlížeč obrázků
-GenericName[da]=Billedfremviser
-GenericName[de]=gThumb Bildbetrachter
-GenericName[dz]=གཟུགས་བརྙན་མཐོང་བྱེད།
-GenericName[el]=Εφαρμογή προβολής εικόνων
-GenericName[en_CA]=Image Viewer
-GenericName[en_GB]=Image Viewer
-GenericName[es]=Visor de imágenes
-GenericName[et]=Pildinäitaja
-GenericName[eu]=Irudi ikustailea
-GenericName[fi]=Kuvakatselin
-GenericName[fr]=Visionneur d'image
-GenericName[gl]=Visor de imaxes
-GenericName[gu]=ઈમેજ દર્શક
-GenericName[he]=מציג תמונות
-GenericName[hu]=Képmegjelenítő
-GenericName[id]=Penampil Gambar
-GenericName[it]=Visualizzatore immagini
-GenericName[ja]=画像ビューア
-GenericName[kn]=ಚಿತ್ರ ನೋಡುಗ
-GenericName[lt]=Paveikslėlių peržiūros programa
-GenericName[lv]=Attēlu skatītājs
-GenericName[mk]=Прегледувач на слики
-GenericName[nb]=Bildeviser
-GenericName[nds]=Billopwieser
-GenericName[ne]=छवि दर्शक
-GenericName[nl]=Afbeeldingsweergave
-GenericName[pa]=ਚਿੱਤਰ ਦਰਸ਼ਕ
-GenericName[pl]=Przeglądarka obrazów
-GenericName[ps]=انځور ليدونی
-GenericName[pt]=Visualizador de Imagens
-GenericName[pt_BR]=Visualizador de Imagens
-GenericName[ro]=Vizualizator imagini
-GenericName[ru]=Просмотр изображений
-GenericName[sk]=Prehliadač obrázkov
-GenericName[sl]=Pregledovalnik slik
-GenericName[sv]=Bildvisare
-GenericName[th]=โปรแกรมดูภาพ
-GenericName[uk]=Перегляд зображень
-GenericName[vi]=Bộ xem ảnh
-GenericName[zh_CN]=图像浏览器
-GenericName[zh_HK]=圖片檢視工具
-GenericName[zh_TW]=圖片檢視工具
-X-GNOME-FullName=gThumb Image Viewer
-X-GNOME-FullName[am]=የgThumb ምስል ተመልካች
-X-GNOME-FullName[az]=gThumb Rəsm Nümayişçisi
-X-GNOME-FullName[be]=Зьбіральнік відарысаў
-X-GNOME-FullName[bg]=Преглед на изображения (gThumb)
-X-GNOME-FullName[ca]=Visualitzador d'imatges gThumb
-X-GNOME-FullName[ca@valencia]=Visualitzador d'imatges gThumb
-X-GNOME-FullName[cs]=Prohlížeč obrázků gThumb
-X-GNOME-FullName[da]=gThumb - billedfremviseren
-X-GNOME-FullName[de]=gThumb Bildbetrachter
-X-GNOME-FullName[dz]=ཇི་ཐམཔ་ གཟུགས་བརྙན་ མཐོང་བྱེད།
-X-GNOME-FullName[el]=Προβολή εικόνων gThumb
-X-GNOME-FullName[en_CA]=gThumb Image Viewer
-X-GNOME-FullName[en_GB]=gThumb Image Viewer
-X-GNOME-FullName[es]=Visor de imágenes gThumb
-X-GNOME-FullName[et]=gThumb Pildivaataja
-X-GNOME-FullName[eu]=gThumb irudi ikustailea
-X-GNOME-FullName[fa]=نمایش‌دهنده‌ی تصویر gThumb
-X-GNOME-FullName[fi]=gThumb-kuvakatselin
-X-GNOME-FullName[fr]=Visionneur d'images gThumb
-X-GNOME-FullName[gl]=Visor de imaxes gThumb
-X-GNOME-FullName[gu]=જીથમ્બ ઈમેજ દર્શક
-X-GNOME-FullName[he]=מציג התמונות GThumb
-X-GNOME-FullName[hr]=gThumb preglednik slika
-X-GNOME-FullName[hu]=gThumb képmegjelenítő
-X-GNOME-FullName[id]=gThumb Penampil Gambar
-X-GNOME-FullName[it]=Visualizzatore immagini gThumb
-X-GNOME-FullName[ja]=gThumb 画像ビューア
-X-GNOME-FullName[kn]=gThumb ಚಿತ್ರ ನೋಡುಗ
-X-GNOME-FullName[ko]=gThumb 그림 보기
-X-GNOME-FullName[lt]=Paveikslėlių peržiūros programa gThumb
-X-GNOME-FullName[lv]=gThumb Attēlu Skatītājs
-X-GNOME-FullName[mk]=gThumb прегледувач на слики
-X-GNOME-FullName[ms]=Pelihat Imej gThumb
-X-GNOME-FullName[nb]=gThumb bildeviser
-X-GNOME-FullName[nds]=gThumb Billopwieser
-X-GNOME-FullName[ne]=जीथम्ब छवि दर्शक
-X-GNOME-FullName[nl]=gThumb afbeeldingsweergave
-X-GNOME-FullName[pa]=ਜੀ-ਥੰਮ ਚਿੱਤਰ ਦਰਸ਼ਕ
-X-GNOME-FullName[pl]=Przeglądarka obrazów gThumb
-X-GNOME-FullName[ps]=انځور ليدونی gThumb
-X-GNOME-FullName[pt]=Visualizador de Imagens gThumb
-X-GNOME-FullName[pt_BR]=Visualizador de Imagens gThumb
-X-GNOME-FullName[ro]=gThumb vizualizator de imagini
-X-GNOME-FullName[ru]=Просмотр изображений gThumb
-X-GNOME-FullName[sk]=Prehliadač obrázkov gThumb
-X-GNOME-FullName[sl]=gThumb pregledovalnik slik
-X-GNOME-FullName[sr]=gThumb Прегледач слика
-X-GNOME-FullName[sr@Latn]=gThumb Pregledač slika
-X-GNOME-FullName[sv]=Bildvisaren gThumb
-X-GNOME-FullName[th]=โปรแกรมดูภาพ gThumb
-X-GNOME-FullName[tr]=gThumb Resim Gösterici
-X-GNOME-FullName[uk]=Переглядач зображень GThumb
-X-GNOME-FullName[vi]=Bộ xem ảnh gThumb
-X-GNOME-FullName[xh]=IsiBonakalisi soMfanekiso i-gThumb
-X-GNOME-FullName[zh_CN]=gThumb 图像浏览器
-X-GNOME-FullName[zh_HK]=gThumb 圖片管理工具
-X-GNOME-FullName[zh_TW]=gThumb 圖片管理工具
-Comment=View and organize your images
-Comment[az]=Rəsmlərinizi nümayiş və idarə edin
-Comment[be]=Дазваляе праглядаць і ўтвараць зборы відарысаў
-Comment[bg]=Преглед и организиране на вашите изображения
-Comment[ca]=Visualitzeu i organitzeu les vostres imatges
-Comment[ca@valencia]=Visualitzeu i organitzeu les vostres imatges
-Comment[cs]=Prohlížejte a organizujte své obrázky
-Comment[da]=Vis og organiser dine billeder
-Comment[de]=Ihre Bilder betrachten und katalogisieren
-Comment[dz]=ཁྱོད་རའི་གཟུགས་བརྙན་ཚུ་ སྟོན་བཞིནམ་ལས་  འགོ་འདྲེན་འཐབ།
-Comment[el]=Προβάλλετε και οργανώστε τις εικόνες σας
-Comment[en_CA]=View and organize your images
-Comment[en_GB]=View and organise your images
-Comment[es]=Muestre y organice sus imágenes
-Comment[et]=Vaata ja korrasta oma pilte
-Comment[eu]=Ikusi eta antolatu zure irudiak
-Comment[fa]=تصاویر خود را ببنینید و سازمان‌دهی کنید
-Comment[fi]=Katsele ja järjestä kuviasi
-Comment[fr]=Afficher et organiser vos images
-Comment[gl]=Ver e organizar as túas imaxes
-Comment[gu]=તમારી ઈમેજો જુઓ અને આયોજિત કરો
-Comment[he]=צפייה וארגון התמונות שלכם
-Comment[hr]=Prikazujte i organizirajte vaše slike
-Comment[hu]=Képek megtekintése és rendszerezése
-Comment[id]=Tampilkan dan atur gambar-gambar Anda
-Comment[it]=Mostra e organizza le proprie immagini
-Comment[ja]=画像を表示し管理するツールです
-Comment[kn]=ನಿಮ್ಮ ಚಿತ್ರಗಳನ್ನು ನೋಡಿ ಹಾಗು ಜೋಡಿಸಿ
-Comment[ko]=그림을 보고 관리도 하세요
-Comment[lt]=Peržiūrėti ir tvarkyti paveikslėlius
-Comment[lv]=Skatīt un organizēt savus attēlus
-Comment[mk]=Гледајте ги и организирајте ги Вашите слики
-Comment[ms]=Lihat dan pelihara imej anda
-Comment[nb]=Vis og organiser dine bilder
-Comment[ne]=तपाईँको छविहरू हेर्नुहोस् र संगठित गर्नुहोस्
-Comment[nl]=Uw afbeeldingen weergeven en beheren
-Comment[pa]=ਆਪਣੇ ਚਿੱਤਰ ਵੇਖੋ ਤੇ ਇਹਨਾਂ ਦੀ ਸੰਭਾਲ ਕਰੋ
-Comment[pl]=Widok i organizacja obrazów
-Comment[ps]=خپل انځورونه وګورﺉ او سم يې کړﺉ
-Comment[pt]=Ver e organizar as suas imagens
-Comment[pt_BR]=Veja e organize as suas imagens
-Comment[ro]=Vizualizează și organizează imagini
-Comment[ru]=Просмотр изображений и ведение альбомов
-Comment[sk]=Pozerajte a organizujte svoje obrázky
-Comment[sl]=Oglejte in uredite svoje slike
-Comment[sq]=Shfaq dhe organizon imazhet tuaja
-Comment[sr]=Погледај и организуј своје слике
-Comment[sr@Latn]=Pogledaj i organizuj svoje slike
-Comment[sv]=Visa och organisera dina bilder
-Comment[th]=ดูและจัดการรูปภาพ
-Comment[tr]=Resimleri düzenle ve göster
-Comment[uk]=Перегляд зображень та ведення альбомів
-Comment[vi]=Xem và tổ chức các ảnh của bạn
-Comment[xh]=Buka uze ulungise imifanekiso yakho
-Comment[zh_CN]=查看及管理图像
-Comment[zh_HK]=管理數碼相片和圖片
-Comment[zh_TW]=管理數位相片和圖片
-Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;
-Exec=gthumb %U
-TryExec=gthumb %U
-Icon=gthumb
-MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;
-StartupNotify=true
-Terminal=false
-Type=Application
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gthumb
-X-GNOME-Bugzilla-Component=general
-X-GNOME-DocPath=gthumb/gthumb.xml
-X-GNOME-Bugzilla-Version=2.12.2
diff --git a/menu/applications/impress.desktop b/menu/applications/impress.desktop
deleted file mode 100644
index 91e7d74..0000000
--- a/menu/applications/impress.desktop
+++ /dev/null
@@ -1,68 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Icon=libreoffice-impress.png
-Type=Application
-Categories=Application;Office;Presentation;
-Exec=loimpress %U
-TryExec=loimpress %U
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
-Name=LibreOffice Impress
-Name[ru]=LibreOffice Презентации
-GenericName=Presentations
-GenericName[ru]=Презентация
-GenericName[tt_RU]=Презентация
-Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-Comment[en]=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-Comment[de]=Erstellen und bearbeiten von Präsentationen für Dia-Vorführungen, Meetings und Web-Auftritte - Impress macht's möglich.
-Comment[af]=Skep en redigeer voorleggings vir skyfievertonings, vergaderings en webbladsye met Impress.
-Comment[be_BY]=Стварайце і рэдагуйце прэзентацыі для слайдавых паказаў, сустрэч і старонак Сеціва з дапамогаю Impress-а.
-Comment[bg]=С Impress можете да създавате и редактирате презентации за прожекции, събрания и уебстраници.
-Comment[bs]=Kreiranje i uređivanje prezentacija za prikaze, sastanke i Web stranice koristeći Impress.
-Comment[ca]=Creeu i editeu presentacions per a diapositives, pàgines web i conferències amb l'Impress.
-Comment[cs]=Vytvářejte a upravujte prezentace pro ukázky, porady a webové stránky pomocí Impressu.
-Comment[cy]=Creu a golygu cyflwyniadau ar gyfer sioeau tryloywderau, cyfarfodydd a thudalennau Gwe gan ddefnyddio Impress.
-Comment[da]=Opret og rediger præsentationer til oplæg, møder og websider ved brug af Impress.
-Comment[el]=Δημιουργία και επεξεργασία παρουσιάσεων για διαφάνειες, συναντήσεις και ιστοσελίδες με τη χρήση του Impress.
-Comment[en_GB]=Create and edit presentations for slideshows, meeting and Web pages using Impress.
-Comment[en_ZA]=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-Comment[es]=Crear y editar presentaciones para charlas o reuniones y páginas Web con Impress.
-Comment[et]=Impress võimaldab luua ja redigeerida kohtumiste ning veebilehtede jaoks esitlusi.
-Comment[fi]=Luo ja muokkaa esitys- ja kokouskalvoja sekä web-sivuja käyttämällä Impress -ohjelmaa.
-Comment[fr]=Impress - Création et édition de présentations pour diaporamas, réunions et pages Web
-Comment[gu_IN]=સ્લાઈડશો, મંત્રણા અને વેબ પાનાંઓ માટે ઈમ્પ્રેસની મદદથી રજૂઆતો બનાવો અને તેમાં ફેરફાર કરો.
-Comment[hi_IN]=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-Comment[hr]=Stvorite i uredite prezentacije za prikazivanje i web stranice koristeći Impress.
-Comment[hu]=Bemutatók készítése és szerkesztése diavetítésekhez vagy a webre az Impress használatával.
-Comment[it]=Impress vi permette di creare e modificare presentazioni, diapositive e pagine Web.
-Comment[ja]=Impress を使用して、スライドショー、ミーティングおよび Web ページ用のプレゼンテーションを作成して編集します。
-Comment[km]=បង្កើត និង កែ​សម្រួល​ការ​បង្ហាញ​សម្រាប់​បង្ហាញ​ស្លាយ កិច្ច​ប្រជុំ និង ទំព័រ​បណ្តាញ​ដោយ​ប្រើ Impress ។
-Comment[ko]=Impress를 사용하여 슬라이드 쇼, 회의 및 웹 페이지에 대한 프레젠테이션을 만들고 편집합니다.
-Comment[lt]=Pateikčių rengykle rengiamos pateiktys pranešimams, pateiktis galima įkelti į tinklalapį.
-Comment[nb]=Opprett og rediger presentasjoner for lysbildeframvisning, møter og nettsider ved å bruke Impress.
-Comment[nl]=Met Impress kunt u presentaties voor diavoorstellingen, vergaderingen en webpagina's maken en bewerken.
-Comment[nn]=Med Impress kan du laga og redigera presentasjonar for framvisingar, møte og nettsider.
-Comment[nr]=Enza nokuhlela amphrizentheyitjhini wamaslayidishowu, imihlangano namakahsi we-Webh ngokusebenzisa i-Impress.
-Comment[ns]=Hlama le go rulaganya ditlhagišo tša dipontšho tša selaete, dikopano le matlakala a Wepe ka go diriša Impress.
-Comment[pa_IN]=ਪੇਸ਼ਕਾਰ ਨਾਲ ਸਲਾਈਡ-ਸ਼ੋ, ਮੀਟਿੰਗ ਅਤੇ ਵੈੱਬਸਫ਼ੇ ਨੂੰ ਬਣਾਇਆ ਅਤੇ ਸੋਧਿਆ ਜਾ ਸਕਦਾ ਹੈ।
-Comment[pl]=Twórz i edytuj prezentacje, które będziesz mógł wykorzystać podczas pokazów, spotkań oraz na stronach www przy pomocy programu Impress.
-Comment[pt_BR]=Criar e editar apresentações para slides, reuniões e páginas da Web por meio do Impress.
-Comment[ru]=Создание и редактирование презентаций для слайдшоу, встреч и веб-страниц.
-Comment[rw]=Kurema no guhindura amayerekana y'amagaragazabice, inama n'impapuro Rubuga ukoresheje Impress.
-Comment[sh_YU]=Pravi i uređuje prezentacije za prikazivanja, sastanke i veb stranice korišćenjem Prezentacije.
-Comment[sk]=Vytvárajte a upravujte prezentácie pre porady s stretnutia s použitím Impress.
-Comment[sl]=Z Impressom ustvarjajte in urejajte prosojnice za predstavitve in spletne strani.
-Comment[sr_CS]=Прави и уређује презентације за приказивања, састанке и веб странице коришћењем Презентације.
-Comment[st]=Bopa le ho lokisa dinehelano bakeng sa dipontsho tsa diselaete, dikopano le maqephe a Wepe ka ho sebedisa Impress.
-Comment[sv]=Skapa och redigera presentationer för bildskärmspresentationer, möten och webbsidor med hjälp av Impress.
-Comment[sw_TZ]=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-Comment[th]=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-Comment[tr]=Impress kullanarak sunum, toplantı, belge ve Web sayfalarını oluştur ve düzenle.
-Comment[ts]=Endla ni ku lulamisa Minkombiso ya tislayidi, tipheji ta minhlangani ni ta Web hi ku tirhisa Impress.
-Comment[tt_RU]=Слайдшоулар, очрашулар һәм веб-битләр презентацияләрен башкару һәм төзәтү.
-Comment[uk]=Створюйте та редагуйте презентації для слайдшоу, зустрічей та Web-сторінках використовуючи Impress.
-Comment[vi]=Tạo và chỉnh sửa trình diễn cho chiếu bóng, hội họp và trang mạng dùng Impress.
-Comment[xh]=Dala uze uhlele iinkcazelo-mboniso yemiboniso yezlayidi, iintlanganiso namakhasi Othungelwano ngokusebenzisa i-Impress.
-Comment[zh_CN]=使用 Impress 创建并编辑幻灯片、会议和网页中使用的演示文稿。
-Comment[zh_TW]=使用 Impress 可建立與編輯用於投影片、會議和網頁的簡報。
-Comment[zu]=Yenza futhi ulungise imiboniso amaslaydi, amakhasi emihlangano naweWebhu ngokusebenzisa i-Impress.
diff --git a/menu/applications/inkscape.desktop b/menu/applications/inkscape.desktop
deleted file mode 100644
index 6a5f7f2..0000000
--- a/menu/applications/inkscape.desktop
+++ /dev/null
@@ -1,172 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Inkscape
-Name[be]=Inkscape
-Name[br]=Inkscape
-Name[ca]=Inkscape
-Name[ca@valencia]=Inkscape
-Name[cs]=Inkscape
-Name[de]=Inkscape
-Name[en_GB]=Inkscape
-Name[en_US@piglatin]=Inkscape
-Name[es]=Inkscape
-Name[eu]=Inkscape
-Name[fr]=Inkscape
-Name[gl]=Inkscape
-Name[he]=אינקסקייפ
-Name[hu]=Inkscape
-Name[id]=Inkscape
-Name[it]=Inkscape
-Name[ja]=Inkscape
-Name[km]=Inkscape
-Name[ko]=Inkscape
-Name[nl]=Inkscape
-Name[pl]=Inkscape
-Name[ro]=Inkscape
-Name[ru]=Редактор векторной графики Inkscape
-Name[sk]=Inkscape
-Name[sl]=Inkscape
-Name[te_IN]=ఇంక్‌స్కేప్
-Name[tr]=Inkscape
-Name[uk]=Inkscape
-Name[zh_CN]=Inkscape
-Name[zh_TW]=Inkscape
-GenericName=Vector Graphics Editor
-GenericName[be]=Рэдактар вэктарнай ґрафікі
-GenericName[br]=Embanner kevregadoù sturiadel
-GenericName[ca]=Editor de gràfics vectorials
-GenericName[ca@valencia]=Editor de gràfics vectorials
-GenericName[cs]=editor vektorové grafiky
-GenericName[de]=Vektorgrafik-Editor
-GenericName[en_GB]=Vector Graphics Editor
-GenericName[en_US@piglatin]=Ectorvay Aphicsgray Editorway
-GenericName[es]=Editor de gráficos vectoriales
-GenericName[eu]=Bektore-grafikoen editorea
-GenericName[fr]=Éditeur d’images vectorielles SVG Inkscape
-GenericName[gl]=Editor de imaxes vectoriais
-GenericName[he]=עורך גרפיקה וקטורית
-GenericName[hu]=Vektorgrafikai szerkesztő
-GenericName[id]=Editor Grafis Vektor
-GenericName[it]=Grafica vettoriale SVG
-GenericName[ja]=ベクターグラフィックエディタ
-GenericName[km]=កម្មវិធី​កែ​សម្រួល​ក្រាហ្វិក​វ៉ិចទ័រ
-GenericName[ko]=벡터 그래픽 편집기
-GenericName[nl]=Vector tekenpakket
-GenericName[pl]=Edytor grafiki wektorowej
-GenericName[ro]=Editor de grafică vectorială
-GenericName[ru]=Редактор векторной графики
-GenericName[sk]=editor vektorovej grafiky
-GenericName[sl]=Urejevalnik vektorskih slik
-GenericName[te_IN]=సదిశ రేఖాచిత్రాల కూర్పరి
-GenericName[tr]=Vektörel Grafik Düzenleyici
-GenericName[uk]=Редактор векторної графіки
-GenericName[zh_CN]=矢量图形编辑器
-GenericName[zh_TW]=向量繪圖軟體
-X-GNOME-FullName=Inkscape Vector Graphics Editor
-X-GNOME-FullName[ar]=إنكسكايب محرر الرسومات الشعاعية
-X-GNOME-FullName[be]=Рэдактар вэктарнай ґрафікі Inkscape
-X-GNOME-FullName[bg]=Inkscape илюстратор за векторна графика
-X-GNOME-FullName[br]=Inkscape Embanner kevregadoù sturiadel
-X-GNOME-FullName[ca]=Editor de gràfics vectorials Inkscape
-X-GNOME-FullName[ca@valencia]=Editor de gràfics vectorials Inkscape
-X-GNOME-FullName[cs]=Inkscape - editor vektorové grafiky
-X-GNOME-FullName[de]=Inkscape SVG-Vektorgrafik-Editor
-X-GNOME-FullName[en_GB]=Inkscape Vector Graphics Editor
-X-GNOME-FullName[en_US@piglatin]=Inkscape Ectorvay Aphicsgray Editorway
-X-GNOME-FullName[eo]=Inkscape: Ilustrilo por Vektoraj Bildoj
-X-GNOME-FullName[es]=Editor de gráficos vectoriales Inkscape
-X-GNOME-FullName[et]=Inkscape, vektorgraafika redaktor
-X-GNOME-FullName[eu]=Inkscape bektore-grafikoen editorea
-X-GNOME-FullName[fi]=Inkscape vektorigrafiikkatyökalu
-X-GNOME-FullName[fr]=Éditeur d’images vectorielles SVG Inkscape
-X-GNOME-FullName[gl]=Editor de imaxes vectoriais Inkscape
-X-GNOME-FullName[he]=אינקסקייפ — עורך גרפיקה וקטורית
-X-GNOME-FullName[hr]=Inkscape - program za vektorsko crtanje
-X-GNOME-FullName[hu]=Inkscape - vektorgrafikai szerkesztő
-X-GNOME-FullName[hy]=Inkscape Վեկտորային Գրաֆիկայի Խմբագիր
-X-GNOME-FullName[id]=Editor Grafis Vektor Inkscape
-X-GNOME-FullName[it]=Inkscape - Grafica vettoriale SVG
-X-GNOME-FullName[ja]=Inkscape ベクターグラフィックエディタ
-X-GNOME-FullName[km]=កម្មវិធី​កែ​សម្រួល​ក្រាហ្វិក​វ៉ិចទ័រ Inkscape
-X-GNOME-FullName[ko]=Inkscape 벡터 그래픽 편집기
-X-GNOME-FullName[lt]=Inkscape vektorinės grafikos rengyklė
-X-GNOME-FullName[nb]=Inkscape vektor-tegneprogram
-X-GNOME-FullName[nl]=Inkscape vector tekenpakket
-X-GNOME-FullName[pl]=Inkscape - edytor grafiki wektorowej
-X-GNOME-FullName[pt]=Inkscape Editor de Imagem Vectorial
-X-GNOME-FullName[pt_BR]=Editor de Imagens Vetoriais Inkscape
-X-GNOME-FullName[ro]=Inkscape – Editor de grafică vectorială
-X-GNOME-FullName[ru]=Редактор векторной графики Inkscape
-X-GNOME-FullName[sk]=Inkscape - editor vektorovej grafiky
-X-GNOME-FullName[sl]=Urejevalnik vektorskih slik Inkscape
-X-GNOME-FullName[sr]=Inkscape програм за векторско цртање
-X-GNOME-FullName[sr@latin]=Inkscape program za vektorsko crtanje
-X-GNOME-FullName[sv]=Vektorillustratören Inkscape
-X-GNOME-FullName[te_IN]=ఇంక్‌స్కేప్ సదిశ రేఖాచిత్రాల కూర్పరి
-X-GNOME-FullName[tr]=Inkscape Vektörel Grafik Düzenleyici
-X-GNOME-FullName[uk]=Редактор векторної графіки Inkscape
-X-GNOME-FullName[vi]=Inkscape - Trình Xử lý Ảnh Véc-tơ
-X-GNOME-FullName[zh_CN]=Inkscape矢量绘图软件
-X-GNOME-FullName[zh_TW]=Inkscape 向量繪圖軟體
-Comment=Create and edit Scalable Vector Graphics images
-Comment[ar]=إنشاء و تحرير الرسومات الشعاعية
-Comment[be]=Стварэньне й зьмяненьне відарысаў вэктарнай ґрафікі (SVG)
-Comment[bg]=Създаване и редакция на изображения Scalable Vector Graphics
-Comment[bn]=স্কেলেবল ভেক্টর গ্রাফিক্স ছবি তৈরী ও সম্পাদনা করুন
-Comment[br]=Krouiñ hag embann skeudennoù mod SVG (Scalable Vector Graphics)
-Comment[ca]=Creeu i editeu imatges de gràfics de vectors escalables
-Comment[ca@valencia]=Creeu i editeu imatges de gràfics de vectors escalables
-Comment[cs]=Vytvářejte a upravujte vektorovou grafiku (SVG)
-Comment[da]=Opret og redigér SVG-billeder
-Comment[de]=Skalierbare Vektorgrafiken (SVG) erzeugen und bearbeiten
-Comment[dz]=ཆ་ཚད་འཇལ་བཏུབ་པའི་མཉམ་ཐིག་ཚད་རིས་ཀྱི་གཟུགས་བརྙན་ཚུ་གསར་བསྐྲུན་དང་ཞུན་དག་འབད།
-Comment[el]=Δημιουργήστε και τροποποιήστε διανυσματικές εικόνες τύπου Scalable Vector Graphics
-Comment[en_AU]=Create and edit Scalable Vector Graphics images
-Comment[en_GB]=Create and edit Scalable Vector Graphics images
-Comment[en_US@piglatin]=Eatecray andway editway Alablescay Ectorvay Aphicsgray imagesway
-Comment[eo]=Kreu kaj redaktu bildoj en formato SVG (Scalable Vector Graphics)
-Comment[es]=Cree y edite Gráficos Vectoriales Escalables (SVG)
-Comment[et]=SVG-vektorgraafikas piltide joonistamine ja muutmine
-Comment[eu]=Sortu eta editatu Grafiko Bektorial Eskalakor (SVG) irudiak
-Comment[fi]=Luo ja muokkaa Scalable Vector Graphics -piirroksia
-Comment[fr]=Créer et éditer des images Scalable Vector Graphics
-Comment[gl]=Cree e edite imaxes Scalable Vector Graphics
-Comment[he]=יצירה ועריכה של תמונות בגרפיקת וקטורים נמתחת
-Comment[hr]=Stvaranje i uređivanje vektorskih crteža
-Comment[hu]=Scalable Vector Graphics (méretezhető vektorgrafika, SVG)-képek létrehozása és szerkesztése
-Comment[id]=Membuat dan mengedit gambar Scalable Vector Graphics
-Comment[it]=Crea e modifica immagini Scalable Vector Graphics
-Comment[ja]=Scalable Vector Graphics (SVG) イメージの作成と編集を行います
-Comment[km]=បង្កើត និង​កែសម្រួល​​​រូបភាព​ក្រាហ្វិក​វ៉ិចទ័រ​ដែល​អាច​ធ្វើ​មាត្រដ្ឋាន​បាន​​
-Comment[ko]=SVG 이미지  생성 및 편집
-Comment[lt]=Kurti ir redaguoti vektorinius grafinius piešinius
-Comment[nb]=Lag og rediger Skalerbar VektorGrafikk-bilder
-Comment[ne]=स्केलेबुल भेक्टर ग्राफिक्स छविहरू सिर्जना गर्नुहोस् र सम्पादन गर्नुहोस्
-Comment[nl]=SVG-tekeningen (Scalable Vector Graphics) maken en bewerken
-Comment[nn]=Lag og rediger skalerbare vektorbilete (SVG)
-Comment[pa]=ਸਕੇਲੇਬਲ ਵੈਕਟਰ ਗਰਾਫਿਕਸ ਚਿੱਤਰ ਬਣਾਓ ਅਤੇ ਸੋਧੋ
-Comment[pl]=Tworzenie i edycja grafiki wektorowej SVG
-Comment[pt]=Crie e edite imagens Gráficas Vectoriais Escalaveis
-Comment[pt_BR]=Crie e edite desenhos vetoriais escaláveis (SVG)
-Comment[ro]=Creează și editează imagini în format Scalable Vector Graphics
-Comment[ru]=Создание и редактирование масштабируемой векторной графики в формате SVG
-Comment[sk]=Tvorba a úprava obrázkov Scalable Vector Graphics
-Comment[sl]=Ustvarjajte in urejajte vektorske slike SVG
-Comment[sr]=Прављење и уређивање SVG векторских слика
-Comment[sr@latin]=Pravljenje i uređivanje SVG vektorskih slika
-Comment[sv]=Skapa och redigera SVG-bilder
-Comment[te_IN]=సదిశ రేఖాచిత్రాలని సృష్టించండి మరియు దిద్దుబాటు చేయండి
-Comment[th]=สร้างและแก้ไขภาพ Scalable Vector Graphics
-Comment[tr]=Ölçeklenebilir Vektör İmgeleri oluşturur ve düzenler
-Comment[uk]=Створення та редагування зображень у форматі SVG
-Comment[vi]=Tạo và sửa ảnh véc-tơ co giãn được
-Comment[zh_CN]=创建并编辑可缩放矢量图形图像
-Comment[zh_TW]=建立和編輯可縮放向量繪圖圖形
-Type=Application
-Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;
-Exec=inkscape %F
-TryExec=inkscape
-Terminal=false
-StartupNotify=true
-Icon=inkscape
diff --git a/menu/applications/math.desktop b/menu/applications/math.desktop
deleted file mode 100644
index 2a9df5c..0000000
--- a/menu/applications/math.desktop
+++ /dev/null
@@ -1,68 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Icon=libreoffice-math.png
-Type=Application
-Categories=Application;Office;WordProcessor;
-Exec=lomath %U
-TryExec=lomath %U
-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
-Name=LibreOffice Math
-Name[ru]=LibreOffice Редактор формул
-GenericName=Formula editor
-GenericName[ru]=Редактор формул
-GenericName[tt_RU]=Формула редакторы
-Comment=Create and edit scientific formulas and equations by using Math.
-Comment[en]=Create and edit scientific formulas and equations by using Math.
-Comment[de]=Wissenschaftliche Formeln erstellen und bearbeiten - Math macht's möglich.
-Comment[af]=Skep en redigeer wetenskaplike formules en vergelykings met Math.
-Comment[be_BY]=Стварайце і рэдагуйце навуковыя формулы і ўраўненні з дапамогаю Math-а.
-Comment[bg]=С Math можете да създавате и редактирате математически формули и уравнения.
-Comment[bs]=Kreiranje i uređivanje naučnih formula i jednačina koristeći Math.
-Comment[ca]=Creeu i editeu fòrmules científiques i equacions amb el Math.
-Comment[cs]=Vytvářejte a upravujte vědecké výpočty a vzorce pomocí Math.
-Comment[cy]=Creu a golygu fformiwlâu gwyddonol a hafaliadau gan ddefnyddio Math
-Comment[da]=Opret og rediger videnskabelige formler ved brug af Math.
-Comment[el]=Δημιουργία και επεξεργασία επιστημονικών τύπων με τη χρήση του Math.
-Comment[en_GB]=Create and edit scientific formulae and equations using Maths.
-Comment[en_ZA]=Create and edit scientific formulae and equations by using Math.
-Comment[es]=Crear y editar fórmulas científicas y ecuaciones con Math.
-Comment[et]=Math võimaldab luua ja redigeerida teaduslikke valemeid ning võrrandeid.
-Comment[fi]=Luo ja muokkaa tieteellisiä kaavioita ja yhtälöitä käyttämällä Math -ohjelmaa.
-Comment[fr]=Math - Création et édition de formules scientifiques et d'équations
-Comment[gu_IN]=ગણિતની મદદથી વૈજ્ઞાનિક સૂત્રો અને સમીકરણો બનાવો અને તેમાં ફેરફાર કરો.
-Comment[hi_IN]=Create and edit scientific formulas and equations by using Math.
-Comment[hr]=Stvorite i uredite znanstvene formule i jednadžbe koristeći Math.
-Comment[hu]=Képletek és egyenletek létrehozása és szerkesztése a Math használatával.
-Comment[it]=Math vi permette di creare e modificare formule scientifiche ed equazioni.
-Comment[ja]=Math を使用して、科学の公式や方程式を作成し、編集します。
-Comment[km]=បង្កើត និង កែ​សម្រួល​រូបមន្ត​វិទ្យាសាស្ត្រ និង សមីការ​ដោយ​ប្រើ Math ។
-Comment[ko]=Math를 사용하여 수식 및 공학용 수식을 만들고 편집합니다.
-Comment[lt]=Matematinė rengyklė skirta formulėms ir lygtims rašyti.
-Comment[nb]=Opprett og rediger vitenskapelige formler og ligninger ved bruk av Math.
-Comment[nl]=Met Math kunt u wiskundige formules en vergelijkingen maken en bewerken.
-Comment[nn]=Med Math kan du laga og redigera vitskaplege formlar og likningar.
-Comment[nr]=Enza nokuhlela amafomula namakhotheyitjhini ngokusebenzisa i-Math.
-Comment[ns]=Hlama le go rulaganya difomula tša saense le diekhoišene ka go diriša Math.
-Comment[pa_IN]=ਗਣਿਤ ਨਾਲ ਵਿਗਿਆਨਕ ਫਾਰਮੂਲੇ ਅਤੇ ਸਮੀਕਰਨ ਬਣਾਓ।
-Comment[pl]=Twórz i edytuj wzory matematyczne i naukowe używając programu Math.
-Comment[pt_BR]=Criar e editar fórmulas científicas e equações por meio do Math.
-Comment[ru]=Создание и редактирование научных формул и уравнений.
-Comment[rw]=Kurema no guhindura inzira n'inganyagaciro bya gihanga ukoresheje Math.
-Comment[sh_YU]=Pravi i uređuje naučne formule i jednačine korišćenjem Matemetike.
-Comment[sk]=Vytvárajte a upravujte vedecké vzorce a výrazy s použitím Math.
-Comment[sl]=Z Mathom ustvarjajte in urejajte znanstvene formule in enačbe.
-Comment[sr_CS]=Прави и уређује научне формуле и једначине коришћењем Матеметике.
-Comment[st]=Bopa le ho lokisa difomula tsa saense le diekweishene ka ho sebedisa Dipalo.
-Comment[sv]=Skapa och redigera vetenskapliga formler och ekvationer med hjälp av Math.
-Comment[sw_TZ]=Create and edit scientific formulas and equations by using Math.
-Comment[th]=Create and edit scientific formulas and equations by using Math.
-Comment[tr]=Math kullanarak bilimsel formülleri ve eşitlikleri oluştur ve düzenle.
-Comment[ts]=Endla ni ku lulamisa Tifomula ta vutshila bya sayense ni tinhlayo hi ku tirhisa Math.
-Comment[tt_RU]=Фәнни формуларны һәм тигезләмәләрне башкару һәм төзәтү.
-Comment[uk]=Створюйте та редагуйте наукові формули та рівності використовуючи Math.
-Comment[vi]=Tạo và chỉnh sửa công thức khoa học và phương trình dùng Math.
-Comment[xh]=Dala uze uhlele iindlela zokusebenzisa inzululwazi nongqinelaniso ngokusebenzisa u-Math.
-Comment[zh_CN]=使用 Math 创建并编辑科学公式和方程式。
-Comment[zh_TW]=使用 Math 可建立與編輯科學公式與方程式。
-Comment[zu]=Yenza futhi ulungise amafomula ezesayensi nama-ikhuweyjini ngokusebenzisa into yeziBalo.
diff --git a/menu/applications/panel-preferences.desktop b/menu/applications/panel-preferences.desktop
deleted file mode 100644
index ae508f7..0000000
--- a/menu/applications/panel-preferences.desktop
+++ /dev/null
@@ -1,71 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Exec=xfce4-panel -p
-TryExec=xfce4-panel -p
-Icon=xfce4-panel
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;
-OnlyShowIn=XFCE;
-Terminal=false
-StartupNotify=true
-Name=Panel
-Name[ca]=Quadre
-Name[cs]=Panel
-Name[da]=Panel
-Name[de]=Leiste
-Name[el]=Ταμπλό
-Name[en_GB]=Panel
-Name[eu]=Panela
-Name[fi]=Paneeli
-Name[fr]=Tableau de bord
-Name[gl]=Panel
-Name[he]=לוח
-Name[hr]=Ploča
-Name[hu]=Panel
-Name[id]=Panel
-Name[it]=Pannello
-Name[ja]=パネル
-Name[kk]=Панель
-Name[lt]=Skydelis
-Name[nb]=Panel
-Name[pl]=Panel
-Name[pt]=Painel
-Name[pt_BR]=Painel
-Name[ro]=Panou
-Name[ru]=Панель
-Name[sk]=Panel
-Name[sv]=Panel
-Name[tr]=Panel
-Name[uk]=Панель
-Name[zh_CN]=面板
-Name[zh_TW]=面板
-Comment=Customize the panel
-Comment[ca]=Personalitzar el quadre
-Comment[cs]=Přizpůsobit panel
-Comment[da]=Tilpas panelet
-Comment[de]=Leiste einrichten
-Comment[el]=Προσαρμογή του ταμπλό
-Comment[en_GB]=Customise the panel
-Comment[eu]=Pertsonalizatu panela
-Comment[fi]=Muokkaa paneelin asetuksia
-Comment[fr]=Modifier le tableau de bord
-Comment[gl]=Personalizar o panel
-Comment[he]=התאמת הלוח
-Comment[hr]=Prilagodi ploču
-Comment[hu]=A panel személyre szabása
-Comment[id]=Sesuaikan panel
-Comment[it]=Personalizzazione del pannello
-Comment[ja]=パネルをカスタマイズします
-Comment[kk]=Панельді баптау
-Comment[lt]=Tinkinti skydelį
-Comment[nb]=Tilpass panelet
-Comment[pt]=Personalizar o painel
-Comment[pt_BR]=Personalizar o painel
-Comment[ro]=Personalizați panoul
-Comment[ru]=Настройка панели
-Comment[sv]=Anpassa panelen
-Comment[tr]=Paneli özelleştir
-Comment[uk]=Упорядкувати панель
-Comment[zh_CN]=定制面板
-Comment[zh_TW]=自訂面板
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/pavucontrol.desktop b/menu/applications/pavucontrol.desktop
index bd90791..4980457 100644
--- a/menu/applications/pavucontrol.desktop
+++ b/menu/applications/pavucontrol.desktop
@@ -62,7 +62,7 @@ GenericName[pa]=ਵਾਲੀਅਮ ਕੰਟਰੋਲ
 GenericName[pl]=Kontrola głośności
 GenericName[pt]=Controlo de Volume
 GenericName[pt_BR]=Controle de volume
-GenericName[ru]=Громкость
+GenericName[ru]=Настройка звука PulseAudio
 GenericName[sk]=Ovládanie hlasitosti
 GenericName[sr]=Контрола јачине звука
 GenericName[sr@latin]=Kontrola jačine zvuka
diff --git a/menu/applications/printeradmin.desktop b/menu/applications/printeradmin.desktop
deleted file mode 100644
index c1227d1..0000000
--- a/menu/applications/printeradmin.desktop
+++ /dev/null
@@ -1,65 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Hidden=true
-Icon=libreoffice-printeradmin.png
-Type=Application
-Categories=Settings;Application;HardwareSettings;
-Exec=/usr/lib/libreoffice/program/spadmin
-TryExec=/usr/lib/libreoffice/program/spadmin
-Name=LibreOffice Printer Administration
-Name[en]=LibreOffice Printer Administration
-Name[de]=LibreOffice Drucker Verwaltung
-Name[af]=LibreOffice-drukkeradministrasie
-Name[ar]=LibreOffice Drucker Verwaltung
-Name[be_BY]=Кіраванне прынтэрам LibreOffice
-Name[bg]=Администрация на принтера за LibreOffice
-Name[bs]=LibreOffice administracija štampača
-Name[ca]=Administració d'impressió de l'LibreOffice
-Name[cs]=Administrace tiskáren LibreOffice
-Name[cy]=Gweinyddu Argraffu LibreOffice
-Name[da]=LibreOffice-printeradministration
-Name[el]=Διαχείριση εκτυπωτή LibreOffice
-Name[en_GB]=LibreOffice Printer Administration
-Name[en_ZA]=LibreOffice Printer Administration
-Name[es]=Administración de la impresora de LibreOffice 
-Name[et]=LibreOffice-i printerite haldamine
-Name[fi]=LibreOffice - Tulostimen hallinta
-Name[fr]=Gestion des imprimantes de LibreOffice
-Name[gu_IN]=LibreOffice પ્રિન્ટરનો વહીહટકર્તા
-Name[he]=LibreOffice Drucker Verwaltung
-Name[hi_IN]=LibreOffice Drucker Verwaltung
-Name[hr]=LibreOffice aAdministracija pisača
-Name[hu]=LibreOffice Nyomtatókezelés
-Name[it]=LibreOffice Gestione stampanti
-Name[ja]=LibreOffice プリンタの管理
-Name[km]=ការ​គ្រប់គ្រង​ម៉ាស៊ីន​បោះពុម្ព​ LibreOffice
-Name[ko]=LibreOffice 프린터 관리
-Name[lt]=„LibreOffice“ spausdintuvo tvarkymas
-Name[nb]=LibreOffice-skriveradministrasjon
-Name[nl]=LibreOffice-printerbeheer
-Name[nn]=LibreOffice Printer Administration
-Name[nr]=LibreOffice Ukuphathwa Kwesigadangisi
-Name[ns]=LibreOffice Taolo ya Segatiši
-Name[pa_IN]=LibreOffice ਛਪਾਈ ਪ੍ਰਬੰਧਨ
-Name[pl]=LibreOffice - Zarządzanie drukarką
-Name[pt]=LibreOffice Drucker Verwaltung
-Name[pt_BR]=Administrador de impressoras LibreOffice
-Name[ru]=LibreOffice Управление принтером
-Name[rw]=Ubugenzuzi bwa Mucapyi LibreOffice
-Name[sh_YU]=LibreOffice podešavanje štampača
-Name[sk]=Správa tlačiarní LibreOffice
-Name[sl]=Nastavitve tiskalnika LibreOffice
-Name[sr_CS]=LibreOffice подешавање штампача
-Name[sv]=LibreOffice-skrivaradministration
-Name[sw_TZ]=LibreOffice Utawala wa Printa
-Name[th]=LibreOffice ดูแลเครื่องพิมพ์
-Name[tn]=LibreOffice Printer Administration
-Name[tr]=LibreOffice Yazıcı Yönetimi
-Name[ts]=Vukongomisi bya Printa LibreOffice
-Name[uk]=Налаштування друкарки LibreOffice
-Name[vi]=Quản lý Máy in %TÊNSẢNPHẨM
-Name[xh]=Ulawulo Lwesishicileli lwe-LibreOffice
-Name[zh_CN]=LibreOffice 打印机管理
-Name[zh_TW]=LibreOffice 印表機管理
-Name[zu]=LibreOffice Ukuphathwa komshicileli
diff --git a/menu/applications/remmina.desktop b/menu/applications/remmina.desktop
new file mode 100644
index 0000000..9d35110
--- /dev/null
+++ b/menu/applications/remmina.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Name=Remmina
+GenericName=Remote Desktop Client
+GenericName[ru]=Удалённый доступ к рабочему столу
+X-GNOME-FullName=Remmina Remote Desktop Client
+Comment=Connect to remote desktops
+Comment[ru]=Удалённый доступ к рабочему столу
+TryExec=remmina
+Exec=remmina
+Icon=remmina
+Terminal=false
+Type=Application
+Actions=
+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
+Actions=Profile;Tray;
diff --git a/menu/applications/scribus.desktop b/menu/applications/scribus.desktop
deleted file mode 100644
index 1f2ea54..0000000
--- a/menu/applications/scribus.desktop
+++ /dev/null
@@ -1,110 +0,0 @@
-
-[Desktop Entry]
-Name=Scribus
-Name[ru]=Настольная издательская система Scribus
-Type=Application
-Icon=scribus
-Comment=Page Layout and Publication
-Comment[ar]=سكريبس
-Comment[fa]=اسکریباس
-#Comment[lo]=ສະຄຣີບັດສ໌
-Comment[ta]=ஸ்கிரிபஸ்
-Comment[af]=Werkskerm Publisering
-Comment[bg]=Издателска програма
-Comment[bs]=Stono izdavaštvo (DTP)
-Comment[ca]=Publicació d'escriptori
-Comment[cs]=Publikační systém (DTP)
-Comment[cy]=Cyhoeddi Penbwrdd
-Comment[da]=Dtp
-Comment[eo]=DTP-programo
-Comment[es]=Publicación de escritorio
-Comment[et]=Küljendusrakendus
-#Comment[fa]=نشر میزکار
-Comment[fi]=Julkaisuohjelma
-Comment[fr]=Publication assistée par ordinateur (PAO)
-Comment[he]=הוצאה לאור שולחנית
-Comment[hr]=Stolno izdavaštvo
-Comment[hu]=Kiadványszerkesztés
-Comment[it]=Pubblicazioni
-Comment[ja]=デスクトップパブリッシング
-Comment[lo]=ເດດທອບພັລບບີດຊິງ
-Comment[lt]=Darbastalio leidykla
-Comment[nb]=Datatrykkeprogram
-Comment[nn]=Datatrykk
-Comment[nso]=Kwalakwatso ya Desktop
-Comment[pl]=Program do składu tekstu
-Comment[pt]=Edição electrónica
-Comment[pt_BR]=Editoração eletrônica
-Comment[ru]=Настольное издательство
-Comment[sl]=Namizno založništvo
-Comment[sr]=Стоно издаваштво
-Comment[ss]=Kushicelela ku desktop
-Comment[sv]=Desktop Publishing
-Comment[th]=เดสก์ทอปพับลิชชิง
-Comment[tr]=Masaüstü Yayıncılık
-Comment[uk]=Видавнича система
-Comment[uz]=Кичик нашриёт
-Comment[ven]=U andadza Desikithopo
-Comment[xh]=Upapasho lwe Desktop
-Comment[zh_CN]=桌面出版
-Comment[zh_TW]=桌面出版
-Comment[zu]=Ukushicilelwa kwe-Desktop
-#Comment[ru]=Настольная издательская система
-GenericName=Page Layout (Development)
-GenericName[af]=Werkskerm Publisering
-GenericName[bg]=Издателска програма
-GenericName[bs]=Stono izdavaštvo (DTP)
-GenericName[ca]=Publicació d'escriptori
-GenericName[cs]=Publikační systém (DTP)
-GenericName[cy]=Cyhoeddi Penbwrdd
-GenericName[da]=Dtp
-GenericName[eo]=DTP-programo
-GenericName[es]=Publicación de escritorio
-GenericName[et]=Küljendusrakendus
-GenericName[fa]=نشر میزکار
-GenericName[fi]=Julkaisuohjelma
-GenericName[fr]=Publication assistée par ordinateur (PAO)
-GenericName[he]=הוצאה לאור שולחנית
-GenericName[hr]=Stolno izdavaštvo
-GenericName[hu]=Kiadványszerkesztés
-GenericName[it]=Pubblicazioni
-GenericName[ja]=デスクトップパブリッシング
-GenericName[lo]=ເດດທອບພັລບບີດຊິງ
-GenericName[lt]=Darbastalio leidykla
-GenericName[nb]=Datatrykkeprogram
-GenericName[nn]=Datatrykk
-GenericName[nso]=Kwalakwatso ya Desktop
-GenericName[pl]=Program do składu tekstu
-GenericName[pt]=Edição Electrónica
-GenericName[pt_BR]=Editoração eletrônica
-GenericName[ru]=Настольная издательская система
-GenericName[sl]=Namizno založništvo
-GenericName[sr]=Стоно издаваштво
-GenericName[ss]=Kushicelela ku desktop
-GenericName[sv]=Desktop Publishing
-GenericName[th]=เดสก์ทอปพับลิชชิง
-GenericName[tr]=Masaüstü Yayıncılık
-GenericName[tt]=Өстәл нәшрияты
-GenericName[uk]=Видавнича система
-GenericName[uz]=Кичик нашриёт
-GenericName[ven]=U andadza Desikithopo
-GenericName[xh]=Upapasho lwe Desktop
-GenericName[zh_CN]=桌面出版
-GenericName[zh_TW]=桌面出版
-GenericName[zu]=Ukushicilelwa kwe-Desktop
-TryExec=scribus
-Exec=scribus %f
-Terminal=false
-MimeType=application/vnd.scribus;
-Categories=Qt;Graphics;Publishing;
-StartupWMClass=scribus
-StartupNotify=false
-X-AppInstall-Package=scribus
-X-AppInstall-Section=main
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-X-Desktop-File-Install-Version=0.19
-
-[X-Property::X-KDE-NativeExtension]
-Type=QString
-Value=.sla
diff --git a/menu/applications/shotwell.desktop b/menu/applications/shotwell.desktop
index d52a12e..ad76cd5 100644
--- a/menu/applications/shotwell.desktop
+++ b/menu/applications/shotwell.desktop
@@ -63,7 +63,7 @@ X-GNOME-FullName[el]=Shotwell Photo Manager
 GenericName[el]=Photo Manager
 Comment[el]=Organize your photos
 X-GNOME-FullName[ru]=Shotwell Photo Manager
-GenericName[ru]=Photo Manager
+GenericName[ru]=Программа управления фотографиями Shotwell
 Comment[ru]=Organize your photos
 X-GNOME-FullName[pa]=Shotwell Photo Manager
 GenericName[pa]=Photo Manager
diff --git a/menu/applications/stardict-gtk.desktop b/menu/applications/stardict-gtk.desktop
deleted file mode 100644
index 62c1909..0000000
--- a/menu/applications/stardict-gtk.desktop
+++ /dev/null
@@ -1,25 +0,0 @@
-[Desktop Entry]
-Name=StarDict GTK version
-Name[cs]=StarDict GTK
-Name[de]=StarDict GTK
-Name[hr]=StarDict GTK
-Name[hu]=StarDict GTK
-Name[ku]=StarDict GTK
-Name[mk]=StarDict GTK
-Name[nl]=StarDict GTK
-Name[ru]=Словарь StarDict
-Name[sk]=StarDict GTK
-Name[tt]=StarDict GTK
-Name[uk]=Зоряний словник :: StarDict GTK
-Name[vi]=StarDict GTK
-Name[zh_CN]=星际译王 GTK
-Name[zh_TW]=星際譯王 GTK
-Comment=Lookup words
-Exec=stardict-gtk
-TryExec=stardict-gtk
-Terminal=false
-Type=Application
-Icon=stardict
-StartupNotify=true
-Categories=GTK;Office;TextTools;Dictionary;
-X-GNOME-DocPath=stardict/stardict.xml
diff --git a/menu/applications/stardict.desktop b/menu/applications/stardict.desktop
new file mode 100644
index 0000000..f453d89
--- /dev/null
+++ b/menu/applications/stardict.desktop
@@ -0,0 +1,58 @@
+[Desktop Entry]
+Name=StarDict
+Name[ar]=StarDict
+Name[be]=StarDict
+Name[cs]=StarDict
+Name[de]=StarDict
+Name[es]=StarDict
+Name[fr]=StarDict
+Name[ga]=StarDict
+Name[hr]=StarDict
+Name[hu]=StarDict
+Name[kk]=StarDict
+Name[ku]=StarDict
+Name[lt]=StarDict
+Name[mk]=StarDict
+Name[nl]=StarDict
+Name[pt_BR]=StarDict
+Name[ru]=Словарь StarDict
+Name[sk]=StarDict
+Name[sv]=StarDict
+Name[tr]=Stardict
+Name[tt]=StarDict
+Name[uk]=Зоряний словник :: StarDict
+Name[vi]=StarDict
+Name[zh_CN]=星际译王
+Name[zh_TW]=星際譯王
+Comment=Lookup words
+Comment[ar]=البحث عن الكلمات
+Comment[be]=Пошук словаў
+Comment[cs]=Slovník s pokročilými funkcemi
+Comment[de]=Wörter nachschlagen
+Comment[es]=Buscar palabras
+Comment[fr]=Recherche de mots
+Comment[ga]=Déan cuardach ar fhocail
+Comment[hr]=Pogledaj  riječi
+Comment[hu]=Szavak keresése
+Comment[kk]=Сөздерді іздеу
+Comment[lt]=Žodžių paieška
+Comment[mk]=Барај зборови
+Comment[nl]=Woorden opzoeken
+Comment[pt_BR]=Procure palavras
+Comment[ru]=Поиск слова
+Comment[sk]=Vyhľadávané slová
+Comment[sv]=Slå upp ord
+Comment[tr]=Kelime arama
+Comment[tt]=Süzlär küzläp toru
+Comment[uk]=Шукати слова
+Comment[vi]=Tra từ
+Comment[zh_CN]=查询单词
+Comment[zh_TW]=查詢單字
+Exec=stardict
+TryExec=stardict
+Terminal=false
+Type=Application
+Icon=stardict
+StartupNotify=true
+Categories=GTK;GNOME;Office;TextTools;Dictionary;
+X-GNOME-DocPath=stardict/stardict.xml
diff --git a/menu/applications/thunar-settings.desktop b/menu/applications/thunar-settings.desktop
deleted file mode 100644
index 45080c6..0000000
--- a/menu/applications/thunar-settings.desktop
+++ /dev/null
@@ -1,103 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=File Manager
-Name[ar]=مدير الملفات
-Name[ast]=Alministrador de ficheros
-Name[be]=Кіраўнік файлаў
-Name[bn]=ফাইল ব্যবস্থাপক
-Name[ca]=Gestor de fitxers
-Name[cs]=Správce souborů
-Name[da]=Filhåndtering
-Name[de]=Dateimanager
-Name[dz]=ཡིག་སྣོད་འཛིན་སྐྱོང་པ།
-Name[el]=Διαχειριστής αρχείων
-Name[en_GB]=File Manager
-Name[eo]=Dosier-administrilo
-Name[es]=Administrador de archivos
-Name[et]=Failihaldur
-Name[eu]=Fitxategi kudeatzailea
-Name[fi]=Tiedostonhallinta
-Name[fr]=Gestionnaire de fichiers
-Name[gl]=Xestor de ficheiros
-Name[he]=מנהל קבצים
-Name[hr]=Upravitelj datotekama
-Name[hu]=Fájlkezelő
-Name[id]=Manajer Berkas
-Name[it]=Gestore di file
-Name[ja]=ファイルマネージャ
-Name[kk]=Файлдар басқарушысы
-Name[ko]=화일 관리자
-Name[ku]=Gerinendeyê Pelan
-Name[lt]=Failų tvarkyklė
-Name[lv]=Failu pārvaldnieks
-Name[mk]=Менаџер на датотеки
-Name[nb]=Filbehandler
-Name[nl]=Bestandsbeheerder
-Name[nn]=Filhandsamar
-Name[pa]=ਫਾਇਲ ਮੈਨੇਜਰ
-Name[pl]=Menedżer plików
-Name[pt]=Gestor de ficheiros
-Name[pt_BR]=Gerenciador de arquivos
-Name[ro]=Manager de fișiere
-Name[ru]=Файловый менеджер
-Name[sk]=Správca súborov
-Name[sq]=Përgjegjës Kartelash 
-Name[sr]=Разгледач датотека
-Name[sv]=Filhanterare
-Name[tr]=Dosya Yöneticisi
-Name[ug]=ھۆججەت باشقۇرغۇچ
-Name[uk]=Файловий менеджер
-Name[ur]=فائل منیجر
-Name[ur_PK]=فائل منیجر
-Name[zh_CN]=文件管理器
-Name[zh_TW]=檔案管理員
-Comment=Configure the Thunar file manager
-Comment[ar]=إعداد مدير الملفات سونار
-Comment[ast]=Configure l'alministrador de ficheros Thunar
-Comment[be]=Наладзіць Кіраўнік файлаў
-Comment[bn]=Thunar ফাইল ম্যানেজার কনফিগার করুন
-Comment[ca]=Configura el gestor de fitxers Thunar
-Comment[cs]=Konfigurace správce souborů Thunar
-Comment[da]=Indstil Thunar-filhåndteringen
-Comment[de]=Dateimanager Thunar einrichten
-Comment[el]=Ρύθμιση του διαχειριστή αρχείων Thunar
-Comment[en_GB]=Configure the Thunar file manager
-Comment[es]=Configure el administrador de archivos Thunar
-Comment[et]=Seadistada Thunar-failihaldurit
-Comment[eu]=Konfiguratu Thunar fitxategi kudeatzailea
-Comment[fi]=Thunar-tiedostonhallinnan asetukset
-Comment[fr]=Configurer le gestionnaire de fichiers Thunar
-Comment[gl]=Configurar o xestor de ficheiros Thunar
-Comment[he]=הגדרת מנהל הקבצים Thunar
-Comment[hr]=Podesi Thunar upravitelja datoteka
-Comment[hu]=A Thunar fájlkezelő beállítása
-Comment[id]=Konfigurasi manajer berkas Thunar
-Comment[it]=Configura il gestore di file Thunar
-Comment[ja]=Thunar ファイルマネージャを設定します
-Comment[kk]=Thunar файлдар басқарушысын баптау
-Comment[lv]=Konfigurēt Thunar failu pārvaldnieku
-Comment[nb]=Konfigurer Thunar Filbehandler
-Comment[pl]=Konfiguruje preferencje menedżera plików Thunar
-Comment[pt]=Configurar o gestor de ficheiros Thunar
-Comment[pt_BR]=Configurar o gerenciador de arquivos Thunar
-Comment[ro]=Schimbați opțiunile managerului de fișiere Thunar
-Comment[ru]=Настроить файловый менеджер Thunar
-Comment[sk]=Nastavenia správcu súborov Thunar
-Comment[sq]=Formësoni përgjegjësin e kartelave Thunar
-Comment[sr]=Подеси Тунара за разгледање датотека
-Comment[sv]=Konfigurera Filhanteraren Thunar
-Comment[tr]=Thunar dosya yöneticisini yapılandır
-Comment[ug]=Thunar ھۆججەت باشقۇرغۇنى تەڭشەش
-Comment[uk]=Налаштувати файловий менеджер Thunar
-Comment[ur]=تھنر فائل منیجر مرتب کریں
-Comment[ur_PK]=تھنر فائل منیجر مرتب کریں
-Comment[zh_CN]=配置 Thunar 文件管理器
-Comment[zh_TW]=設定 Thunar 檔案管理員
-Exec=thunar-settings
-TryExec=thunar-settings
-Icon=file-manager
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/thunar-volman-settings.desktop b/menu/applications/thunar-volman-settings.desktop
deleted file mode 100644
index b243cad..0000000
--- a/menu/applications/thunar-volman-settings.desktop
+++ /dev/null
@@ -1,79 +0,0 @@
-[Desktop Entry]
-Name=Removable Drives and Media
-Name[ast]=Preseos y soportes estrayíbles
-Name[ca]=Dispositius i mitjans extraïble
-Name[cs]=Vyměnitelné jednotky a média
-Name[da]=Fjernbare drev og medier
-Name[de]=Wechseldatenträger- und Medieneinstellungen
-Name[el]=Αφαιρούμενοι οδηγοί και μέσα
-Name[en_GB]=Removable Drives and Media
-Name[es]=Dispositivos y soportes extraíbles
-Name[eu]=Gailu eta Euskarri Aldagarriak
-Name[fi]=Irrotettavat asemat ja taltiot
-Name[fr]=Disques amovibles et médias
-Name[gl]=Unidades e dispositivos extraíbles
-Name[hu]=Cserélhető meghajtók és adathordozók
-Name[id]=Media dan Penggerak Dapat Dilepas
-Name[it]=Unità rimovibili e dischi
-Name[ja]=リムーバブルドライブとメディア
-Name[kk]=Ауыстырмалы дисктер мен тасушылар
-Name[lv]=Noņemamie diski un datu nesēji
-Name[nb]=Avmonterbare Enheter og media
-Name[nl]=Verwisselbare apparaten en media
-Name[pl]=Napędy i nośniki wymienne
-Name[pt]=Drives Removíveis
-Name[pt_BR]=Mídias e Unidades removíveis
-Name[ru]=Съемные устройства и носители данных
-Name[sk]=Vymeniteľné zariadenia a médiá
-Name[sq]=Media dhe Pajisje të Heqshme
-Name[sv]=Flyttbara enheter och media
-Name[tr]=Kaldırılabilir Sürücüler ve Ortam
-Name[ug]=Removable ئۈسكىنە ۋە Media
-Name[uk]=Переносні Пристрої і Медіа
-Name[ur]=قابلِ فصل ڈرئیوز اور میڈیا
-Name[ur_PK]=قابلِ فصل ڈرئیوز اور میڈیا
-Name[zh_CN]=可移动驱动器和介质
-Name[zh_TW]=可移除裝置與媒體
-Comment=Configure management of removable drives and media
-Comment[ast]=Configurar la xestión de preseos y soportes estrayíbles
-Comment[ca]=Configura la gestió dels dispositius i mitjans extraïbles
-Comment[cs]=Správa nastavení vyměnitelných jednotek a médií
-Comment[da]=Indstillingshåndtering af fjernbare drev og medie
-Comment[de]=Handhabung von Wechseldatenträgern und -medien konfigurieren
-Comment[el]=Ρύθμιση διαχείρισης των αφαιρούμενων συσκευών και μέσων
-Comment[en_GB]=Configure management of removable drives and media
-Comment[es]=Configurar la gestión de dispositivos y soportes extraíbles
-Comment[eu]=Konfiguratu gailu eta euskarri aldagarrien kudeaketa
-Comment[fi]=Muokkaa irrotettavien asemien ja taltioiden hallinta-asetuksia
-Comment[fr]=Configurer la gestion de disques amovibles et de médias
-Comment[gl]=Configurar a xestión da unidades e dispositivos extraíbles
-Comment[hu]=Cserélhető meghajtók és adathordozók kezelésének beállítása
-Comment[id]=Pengaturan manajemen dari media dan penggerak dapat dilepas
-Comment[it]=Configurazione della gestione delle unità rimovibili e dei dischi
-Comment[ja]=リムーバブルドライブとメディアの取扱いを設定します
-Comment[kk]=Ауыстырмалы тасушылар мен дисктерді басқару
-Comment[lv]=Konfigurēt noņemamo disku un datu nesēju pārvaldību
-Comment[nb]=Konfigurer oppsett for avmonterbare stasjoner og media
-Comment[nl]=Beheer van verwisselbare stations en media instellen
-Comment[pl]=Konfiguruje zarządzanie wymiennymi nośnikami oraz urządzeniami
-Comment[pt]=Configurar gestão de drives amovíveis
-Comment[pt_BR]=Configurar o gerenciamento de drives e mídias removíveis
-Comment[ru]=Настроить управление томами
-Comment[sk]=Nastavenie správy vymeniteľných zariadení a médií
-Comment[sq]=Formësoni administrimin e pajisjeve dhe mediave të heqshme
-Comment[sv]=Konfigurera hanteringen av flyttbara enheter och media
-Comment[tr]=Kaldırılabilir sürücü ve ortam yönetimi yapılandırması
-Comment[uk]=Налаштувати керування змінними дисками і пристроями
-Comment[ur]=قابلِ فصل ڈرائیوز اور میڈیا کی ادارت وضع کریں
-Comment[ur_PK]=قابلِ فصل ڈرائیوز اور میڈیا کی ادارت وضع کریں
-Comment[zh_CN]=配置可移动驱动器和介质管理
-Comment[zh_TW]=管理可移除裝置與媒體的設定值
-Exec=thunar-volman-settings
-TryExec=thunar-volman-settings
-Icon=drive-removable-media
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-Hidden=true
-# vi:set encoding=UTF-8:
diff --git a/menu/applications/thunderbird.desktop b/menu/applications/thunderbird.desktop
deleted file mode 100644
index 915dd5e..0000000
--- a/menu/applications/thunderbird.desktop
+++ /dev/null
@@ -1,89 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=thunderbird
-TryExec=thunderbird
-Icon=thunderbird
-Type=Application
-Name=Mozilla Thunderbird
-Name[bn]=মোজিলা থাণ্ডারবার্ড
-Name[cy]=Aderyn Taran (Mozilla Thunderbird)
-Name[eo]=Mozilo Thunderbird
-Name[hi]=मोज़िला थंडरबर्ड
-Name[ko]=모질라 썬더버드
-Name[mn]=Мозилла түндэрбөрд
-Name[ta]=மொசில்லா தண்டர்பேர்ட்
-Name[tg]=Мозиллаи Thunderbird
-Name[xx]=xxMozilla Thunderbirdxx
-Name[ru]=Почтовая программа Thunderbird
-GenericName=Mail Client
-GenericName[af]=Pos Kliënt
-GenericName[ar]=البريد الألكتروني
-GenericName[az]=Poçt Alıcısı
-GenericName[be]=Паштовы кліент
-GenericName[bg]=Пощенски клиент
-GenericName[bn]=ইমেইল ক্লায়েন্ট
-GenericName[br]=Arval postel
-GenericName[bs]=Program za čitanje elektronske pošte
-GenericName[ca]=Client de correu electrònic
-GenericName[cs]=Klient pro čtení elektronické pošty
-GenericName[cy]=Dibynnydd Ebost
-GenericName[da]=E-mail-klient
-GenericName[de]=E-Mail-Programm
-GenericName[el]=Πελάτης mail
-GenericName[eo]=Legi kaj sendi retpoŝton
-GenericName[es]=Cliente de correo electrónico
-GenericName[et]=Meiliklient
-GenericName[eu]=Posta Bezeroa
-GenericName[fa]=کارگیر پست الکترونیکی
-GenericName[fi]=Sähköpostiohjelma
-GenericName[fo]=Postforrit
-GenericName[fr]=Logiciel de messagerie électronique
-GenericName[gl]=Cliente de correo
-GenericName[he]=תוכנית דואר
-GenericName[hi]=डाक क्लाएंट
-GenericName[hr]=Program za čitanje elektronske pošte
-GenericName[hsb]=Emailowy program
-GenericName[hu]=Levelezőprogram
-GenericName[id]=Klien Mail
-GenericName[is]=Póstforrit
-GenericName[it]=Programma di posta elettronica
-GenericName[ja]=メールクライアント
-GenericName[ko]=편지를 주고 받는 프로그램
-GenericName[lo]=ໄຄແເອັນຈົດຫມາຍເອເລັກໂຕນິກ
-GenericName[lt]=Pašto klientas
-GenericName[lv]=Pasta Klients
-GenericName[mk]=Програма за електронска пошта
-GenericName[mn]=Э-Захиа-Програм
-GenericName[mt]=Klijent tal-imejl
-GenericName[nb]=E-postklient
-GenericName[nds]=Mailprogramm
-GenericName[nl]=E-mailcliënt
-GenericName[nn]=Lesing og sending av e-post
-GenericName[nso]=Moreki wa Poso
-GenericName[oc]=Programari de correu electrònic
-GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
-GenericName[pt]=Client de E-mail
-GenericName[pt_BR]=Cliente de E-mail
-GenericName[ro]=Program de poştă electronică
-GenericName[ru]=Клиент электронной почты
-GenericName[sk]=Klient elektronickej pošty
-GenericName[sl]=Program za e-pošto
-GenericName[sr]=Програм за e-пошту
-GenericName[sr@Latn]=Program za e-poštu
-GenericName[ss]=Likhasimende leliposi
-GenericName[sv]=E-postklient
-GenericName[ta]=அஞ்சல் உறுப்பினர்
-GenericName[tg]=Коргири почтаи эллектроникӣ
-GenericName[th]=ไคลเอนต์จดหมายอิเล็กทรอนิกส์
-GenericName[tr]=Posta İstemcisi
-GenericName[uk]=Клієнт електронної пошти
-GenericName[uz]=Хат-хабар клиенти
-GenericName[ven]=Mushumisani na poso
-GenericName[wa]=Cliyint d' emilaedje
-GenericName[xh]=Umxhasi Weposi
-GenericName[xx]=xxMail Clientxx
-GenericName[zh_CN]=邮件程序
-GenericName[zh_TW]=郵件處理程式
-GenericName[zu]=Umxhasi weposi
-X-KDE-StartupNotify=true
-Categories=GTK;Email;Network;
diff --git a/menu/applications/timidity.desktop b/menu/applications/timidity.desktop
deleted file mode 100644
index 197fba0..0000000
--- a/menu/applications/timidity.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=TiMidity++
-Name[ru]=MIDI-плеер TiMidity++
-Icon=timidity
-Exec=timidity -igt
-TryExec=timidity -igt
-Comment=A midi to wav converter and midi file player
-Comment[de]=Ein Midi-zu-Wav-Konverter und Midi-Player
-Comment[ru]=Плейер/конвертор MIDI-файлов
-GenericName=midi file player
-GenericName[de]=Midi-Player
-GenericName[ru]=MIDI-плейер
-Terminal=false
-Type=Application
-Categories=AudioVideo;Audio;Player;
-MimeType=audio/x-midi;
diff --git a/menu/applications/transmission.desktop b/menu/applications/transmission.desktop
deleted file mode 100644
index c726583..0000000
--- a/menu/applications/transmission.desktop
+++ /dev/null
@@ -1,237 +0,0 @@
-[Desktop Entry]
-Name=Transmission
-Name[ar]=ترانزميشن
-Name[ast]=Transmission
-Name[be]=Transmission
-Name[be@latin]=Transmisija
-Name[bg]=BitTorrent клиент (Transmission)
-Name[ca]=Transmission
-Name[ckb]=Transmission
-Name[cs]=Transmission
-Name[da]=Transmission
-Name[de]=Transmission
-Name[el]=Transmission
-Name[en_AU]=Transmission
-Name[en_CA]=Transmission
-Name[en_GB]=Transmission
-Name[eo]=Transmission
-Name[es]=Transmission
-Name[et]=Transmission
-Name[eu]=Transmission
-Name[fi]=Transmission
-Name[fo]=Transmission
-Name[fr]=Transmission
-Name[gl]=Transmission
-Name[he]=Transmission
-Name[hr]=Transmission
-Name[hu]=Transmission
-Name[id]=Transmission
-Name[is]=Torrent flutningur
-Name[it]=Transmission
-Name[ja]=Transmission
-Name[kk]=Transmission
-Name[ko]=트랜스미션
-Name[ku]=Transmission
-Name[li]=Transmission
-Name[lt]=Transmission
-Name[lv]=Transmission
-Name[mk]=Transmission
-Name[ms]=Transmission
-Name[nb]=Transmission
-Name[nl]=Transmission
-Name[nn]=Transmission
-Name[oc]=Transmission
-Name[pl]=Transmission
-Name[pt]=Transmission
-Name[pt_BR]=Transmission
-Name[ro]=Transmission
-Name[ru]=BitTorrent клиент Transmission
-Name[sk]=Transmission
-Name[sl]=Transmission
-Name[sq]=Transmission
-Name[sr]=Трансмисија
-Name[sv]=Transmission
-Name[te]=ట్రాన్స్ మిషన్
-Name[th]=Transmission
-Name[tr]=Transmission
-Name[uk]=Transmission
-Name[vi]=Transmission
-Name[zh_CN]=Transmission
-Name[zh_TW]=Transmission
-GenericName=BitTorrent Client
-GenericName[ar]=عميل «بت تورنت»
-GenericName[ast]=Cliente BitTorrent
-GenericName[be]=Кліент BitTorrent
-GenericName[be@latin]=Klijent BitTorrent
-GenericName[bg]=BitTorrent клиент
-GenericName[br]=Arval BitTorrent
-GenericName[ca]=Client de BitTorrent
-GenericName[cs]=BitTorrent klient
-GenericName[da]=BitTorrent-klient
-GenericName[de]=BitTorrent-Programm
-GenericName[el]=Πελάτης BitTorrent
-GenericName[en_AU]=BitTorrent Client
-GenericName[en_CA]=BitTorrent Client
-GenericName[en_GB]=BitTorrent Client
-GenericName[eo]=BitTorrent-Kliento
-GenericName[es]=Cliente de BitTorrent
-GenericName[et]=BitTorrenti klient
-GenericName[eu]=BitTorrent bezeroa
-GenericName[fi]=BitTorrent-asiakas
-GenericName[fo]=BitTorrent-viðskiftari
-GenericName[fr]=Client BitTorrent
-GenericName[gl]=Cliente de BitTorrent
-GenericName[he]=תוכנת ביטורנט
-GenericName[hr]=BitTorrent klijent
-GenericName[hu]=BitTorrent kliens
-GenericName[id]=Aplikasi BitTorrent
-GenericName[is]=BitTorrent forrit
-GenericName[it]=Client BitTorrent
-GenericName[ja]=BitTorrent クライアント
-GenericName[kk]=BitTorrent қолданбасы
-GenericName[ko]=비트토렌트 클라이언트
-GenericName[ku]=Daxwazkera BitTorrent
-GenericName[li]=BitTorrent-client
-GenericName[lt]=BitTorrent klientas
-GenericName[lv]=BitTorrent klients
-GenericName[mk]=Клиент за BitTorrent
-GenericName[ms]=Klient BitTorrent
-GenericName[nb]=BitTorrent-klient
-GenericName[nl]=BitTorrent-client
-GenericName[nn]=BitTorrent-klient
-GenericName[pl]=Klient sieci BitTorrent
-GenericName[pt]=Cliente de BitTorrent
-GenericName[pt_BR]=Cliente BitTorrent
-GenericName[ro]=Client BitTorrent
-GenericName[ru]=Клиент BitTorrent
-GenericName[sk]=BitTorrent klient
-GenericName[sl]=BitTorrent odjemalec
-GenericName[sq]=BitTorrent Klient
-GenericName[sr]=БитТорент програм
-GenericName[sv]=BitTorrent-klient
-GenericName[te]=బిట్ టోరెంట్ క్లైంట్
-GenericName[th]=โปรแกรม BitTorrent
-GenericName[tr]=BitTorrent İstemcisi
-GenericName[uk]=Клієнт BitTorrent
-GenericName[vi]=Trình khách BitTorrent
-GenericName[zh_CN]=BitTorrent 客户端
-GenericName[zh_TW]=BitTorrent 用戶端
-X-GNOME-FullName=Transmission BitTorrent Client
-X-GNOME-FullName[ar]=ترانزميشن، عميل «بت تورنت»
-X-GNOME-FullName[ast]=Cliente BitTorrent Transmission
-X-GNOME-FullName[be]=BitTorrent-кліент Transmission
-X-GNOME-FullName[be@latin]=Transmisija, klijent BitTorrent
-X-GNOME-FullName[bg]=BitTorrent клиент (Transmission)
-X-GNOME-FullName[br]=Arval BitTorrent Transmission
-X-GNOME-FullName[ca]=Client de BitTorrent Transmission
-X-GNOME-FullName[cs]=BitTorrent klient Transmission
-X-GNOME-FullName[da]=Transmission BitTorrent-klient
-X-GNOME-FullName[de]=Transmission BitTorrent-Programm
-X-GNOME-FullName[el]=Transmission πελάτης BitTorrent
-X-GNOME-FullName[en_AU]=Transmission BitTorrent Client
-X-GNOME-FullName[en_CA]=Transmission BitTorrent Client
-X-GNOME-FullName[en_GB]=Transmission BitTorrent Client
-X-GNOME-FullName[eo]=Transmission BitTorrent-Kliento
-X-GNOME-FullName[es]=Cliente de BitTorrent Transmission
-X-GNOME-FullName[et]=Transmission, BitTorrenti klient
-X-GNOME-FullName[eu]=Transmission BitTorrent bezeroa
-X-GNOME-FullName[fi]=Transmission – BitTorrent-asiakas
-X-GNOME-FullName[fo]=Transmission BitTorrent-viðskiftari
-X-GNOME-FullName[fr]=Client BitTorrent Transmission
-X-GNOME-FullName[gl]=Cliente de BitTorrent Transmission
-X-GNOME-FullName[he]=Transmission - תוכנת ביטורנט
-X-GNOME-FullName[hr]=Transmission BitTorrent klijent
-X-GNOME-FullName[hu]=Transmission Bittorrent kliens
-X-GNOME-FullName[is]=Torrent flutningur
-X-GNOME-FullName[it]=Client BitTorrent Transmission
-X-GNOME-FullName[ja]=Transmission BitTorrent クライアント
-X-GNOME-FullName[kk]=Transmission BitTorrent қолданбасы
-X-GNOME-FullName[ko]=트랜스미션 비트토렌트 클라이언트
-X-GNOME-FullName[ku]=Daxwazkera BitTorrent Transmission
-X-GNOME-FullName[li]=Transmission BitTorrent-client
-X-GNOME-FullName[lt]=Transmission – „BitTorrent“ klientas
-X-GNOME-FullName[lv]=Transmission BitTorrent klients
-X-GNOME-FullName[mk]=Transmission клиент за BitTorrent
-X-GNOME-FullName[ms]=Klien BitTorrent Transmission
-X-GNOME-FullName[nb]=Transmission BitTorrent-klient
-X-GNOME-FullName[nl]=Transmission BitTorrent-client
-X-GNOME-FullName[nn]=Transmission BitTorrent-klient
-X-GNOME-FullName[pl]=Klient sieci BitTorrent Transmission
-X-GNOME-FullName[pt]=Transmission, Cliente BitTorrent
-X-GNOME-FullName[pt_BR]=Cliente BitTTorrent Transmission
-X-GNOME-FullName[ro]=Client BitTorrent Transmission
-X-GNOME-FullName[ru]=BitTorrent-клиент Transmission
-X-GNOME-FullName[sk]=Transmission - klient siete BitTorrent
-X-GNOME-FullName[sl]=Transmission BitTorrent odjemalec
-X-GNOME-FullName[sq]=Transmission BitTorrent Klient
-X-GNOME-FullName[sr]=Трансмисија — БитТорент програм
-X-GNOME-FullName[sv]=BitTorrent-klienten Transmission
-X-GNOME-FullName[te]=ట్రాన్స్ మిషన్ బిట్ టోరెంట్ క్లైంట్
-X-GNOME-FullName[th]=Transmission โปรแกรม BitTorrent
-X-GNOME-FullName[tr]=Transmission BitTorrent İstemcisi
-X-GNOME-FullName[uk]=BitTorrent-клієнт Transmission
-X-GNOME-FullName[vi]=Trình khách BitTorrent Transmission
-X-GNOME-FullName[zh_CN]=Transmission BitTorrent 客户端
-X-GNOME-FullName[zh_TW]=Transmission BitTorrent 用戶端
-Comment=Download and share files over BitTorrent
-Comment[ar]=نزّل وشارك ملفات عبر «بت تورنت»
-Comment[ast]=Baxar y compartir ficheros per aciu de BitTorrent
-Comment[be]=Запампоўка і абмен файламі ў сеткі BitTorrent
-Comment[be@latin]=Ściahvaj i rassyłaj fajły praz BitTorrent
-Comment[bg]=Изтегляне и споделяне на файлове чрез BitTorrent
-Comment[ca]=Baixeu i compartiu fitxers mitjançant el BitTorrent
-Comment[cs]=Stahovat a sdílet soubory přes BitTorrent
-Comment[da]=Download og del filer via BitTorrent
-Comment[de]=Dateien über BitTorrent herunterladen und verteilen
-Comment[el]=Λήψη και διαμοιρασμός των αρχείων μέσω του BitTorrent
-Comment[en_AU]=Download and share files over BitTorrent
-Comment[en_CA]=Download and share files over BitTorrent
-Comment[en_GB]=Download and share files over BitTorrent
-Comment[eo]=Elŝuti kaj kunhavigi dosierojn per BitTorrent
-Comment[es]=Descargue y comparta archivos mediante BitTorrent
-Comment[et]=Laadi alla ja levita faile BitTorrenti kaudu
-Comment[eu]=Deskargatu eta partekatu fitxategiak BitTorrent bidez
-Comment[fi]=Lataa ja jaa tiedostoja BitTorrentin avulla
-Comment[fr]=Reçoit et partage des fichiers via BitTorrent
-Comment[gl]=Descargue e comparta ficheiros a través da rede BitTorrent
-Comment[he]=הורדה ושיתוף קבצים ברשת ביטורנט
-Comment[hr]=Preuzimajte i dijelite datoteke preko BitTorrenta
-Comment[hu]=Fájlok letöltése és megosztása BitTorrenten keresztül
-Comment[id]=Unduh dan berbagi berkas melalui BitTorrent
-Comment[is]=Sækja og deila skrám með BitTorrent
-Comment[it]=Scarica e condivide i file via BitTorrent
-Comment[ja]=BitTorrentでファイルをダウンロードおよび共有します
-Comment[kk]=BitTorrent желісінде файлдарды жүктеңіз және бөлісіңіз
-Comment[ko]=비트토렌트를 이용하여 파일을 다운로드 및 공유합니다
-Comment[li]=Bestanje binnehoalen en deilen via BitTorrent
-Comment[lt]=Atsiųskite ir dalinkitės failais internetu per BitTorrent
-Comment[lv]=Lejupielādēt un dalīties ar failiem caur BitTorrent
-Comment[mk]=Преземете и споделувајте датотеки преку BitTorrent
-Comment[ms]=Muat turun dan kongsi fail melalui BitTorrent
-Comment[nb]=Last ned og del filer med BitTorrent
-Comment[nl]=Bestanden downloaden en delen via BitTorrent
-Comment[nn]=Last ned og del filer over BitTorrent
-Comment[pl]=Pobieranie i udostępnianie plików przez sieć BitTorrent
-Comment[pt]=Transfira e partilhe ficheiros através de BitTorrent
-Comment[pt_BR]=Baixar e compartilhar arquivos pelo BitTorrent
-Comment[ro]=Descarcă și partajează fișiere prin BitTorrent
-Comment[ru]=Загружайте и обменивайтесь файлами в сети BitTorrent
-Comment[sk]=Sťahujte a zdieľajte súbory cez BitTorrent
-Comment[sl]=Prenašaj in deli datoteke preko BitTorrent
-Comment[sq]=Shkarko dhe shpërnda skedarët me BitTorrent
-Comment[sr]=Преузимајте и размењујте датотеке преко БитТорент протокола
-Comment[sv]=Hämta och dela ut filer över BitTorrent
-Comment[te]=దిగుమతిచేయి మరియు ఫైళ్ళను బిట్ టోరెంట్ మీదుగా పంచుకో
-Comment[th]=ดาวน์โหลดและแลกเปลี่ยนแฟ้มผ่าน BitTorrent
-Comment[tr]=Dosyaları BitTorrent üzerinden indir ve paylaş
-Comment[uk]=Завантажуйте та розповсюджуйте файли через BitTorrent
-Comment[vi]=Tải và chia sẻ tập tin qua BitTorrent
-Comment[zh_CN]=通过 BitTorrent 下载和共享文件
-Comment[zh_TW]=透過 BitTorrent 協定來下載和分享檔案
-Exec=transmission %U
-TryExec=transmission %U
-Icon=transmission
-Terminal=false
-Type=Application
-MimeType=application/x-bittorrent;x-scheme-handler/magnet;
-Categories=Network;FileTransfer;P2P;
diff --git a/menu/applications/virtualbox.desktop b/menu/applications/virtualbox.desktop
new file mode 100644
index 0000000..10c5f48
--- /dev/null
+++ b/menu/applications/virtualbox.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Version=1.0
+Name=VM VirtualBox OSE
+Name[ru]=Виртуализатор VirtualBox
+GenericName=Virtual Machine
+GenericName[ru]=Виртуальная машина
+Type=Application
+Exec=VirtualBox %U
+TryExec=VirtualBox
+MimeType=application/x-virtualbox-vbox;application/x-virtualbox-vbox-extpack;application/x-virtualbox-ovf;application/x-virtualbox-ova;
+DocPath=file:///usr/share/doc/virtualbox-doc-4.2.12/UserManual.pdf
+Icon=virtualbox
+Categories=Emulator;System;X-MandrivaLinux-System;
+Comment=Run several virtual systems on a single host computer
+Comment[de]=Mehrere virtuelle Maschinen auf einem einzigen Rechner ausführen
+Comment[it]=Esegui più macchine virtuali su un singolo computer
+Comment[pl]=Uruchamianie wielu systemów wirtualnych na jednym komputerze gospodarza
+Comment[ru]=Позволяет запускать несколько виртуальных систем на одном компьютере
+Comment[sv]=Kör flera virtuella system på en enda värddator
+Comment[ko]=가상 머신
diff --git a/menu/applications/wine-notepad.desktop b/menu/applications/wine-notepad.desktop
index e5cd35a..14485dd 100644
--- a/menu/applications/wine-notepad.desktop
+++ b/menu/applications/wine-notepad.desktop
@@ -3,8 +3,8 @@ Name=Wine Notepad
 Name[ru]=Блокнот Wine
 Comment=Wine Text Editor
 Comment[ru]=Текстовый редактор Wine
-GenericName=Windows environment
-GenericName[ru]=Запуск Windows-программ
+GenericName=Wine Notepad
+GenericName[ru]=Блокнот Wine
 Exec=notepad
 TryExec=notepad
 Terminal=false
diff --git a/menu/applications/wine-regedit.desktop b/menu/applications/wine-regedit.desktop
index 6e11aab..a910661 100644
--- a/menu/applications/wine-regedit.desktop
+++ b/menu/applications/wine-regedit.desktop
@@ -3,8 +3,8 @@ Name=Wine RegEdit
 Name[ru]=Редактор реестра
 Comment=Wine Registry Editor
 Comment[ru]=Редактор реестра Wine
-GenericName=Windows environment
-GenericName[ru]=Запуск Windows-программ
+GenericName=Wine RegEdit
+GenericName[ru]=Редактор реестра
 Exec=regedit
 TryExec=regedit
 Terminal=false
diff --git a/menu/applications/wine-uninstaller.desktop b/menu/applications/wine-uninstaller.desktop
index 5032226..6c86f49 100644
--- a/menu/applications/wine-uninstaller.desktop
+++ b/menu/applications/wine-uninstaller.desktop
@@ -3,8 +3,8 @@ Name=Wine Software Uninstaller
 Name[ru]=Удаление программ
 Comment=Uninstall software from Wine
 Comment[ru]=Удаление программ из Wine
-GenericName=Windows environment
-GenericName[ru]=Запуск Windows-программ
+GenericName=Wine Software Uninstaller
+GenericName[ru]=Удаление программ
 Exec=wine uninstaller
 TryExec=wine uninstaller
 Terminal=false
diff --git a/menu/applications/wine-winecfg.desktop b/menu/applications/wine-winecfg.desktop
index 7816ee6..08108a4 100644
--- a/menu/applications/wine-winecfg.desktop
+++ b/menu/applications/wine-winecfg.desktop
@@ -3,8 +3,8 @@ Name=Wine Configuration
 Name[ru]=Настройки Wine
 Comment=Setup the compatibility layer for Windows programs
 Comment[ru]=Программа для настройки параметров Wine
-GenericName=Windows environment
-GenericName[ru]=Запуск Windows-программ
+GenericName=Wine Configuration
+GenericName[ru]=Настройки Wine
 Exec=winecfg
 TryExec=winecfg
 Terminal=false
diff --git a/menu/applications/wine-wineconsole.desktop b/menu/applications/wine-wineconsole.desktop
index c0354a1..8223c31 100644
--- a/menu/applications/wine-wineconsole.desktop
+++ b/menu/applications/wine-wineconsole.desktop
@@ -3,8 +3,8 @@ Name=Wine Command Prompt
 Name[ru]=Командная строка Wine
 Comment=Wine Command Prompt
 Comment[ru]=Командная строка Wine
-GenericName=Windows environment
-GenericName[ru]=Запуск Windows-программ
+GenericName=Wine Command Prompt
+GenericName[ru]=Командная строка Wine
 Exec=wineconsole cmd
 TryExec=wineconsole cmd
 Terminal=false
diff --git a/menu/applications/wine-winefile.desktop b/menu/applications/wine-winefile.desktop
index 4966a21..828f1f7 100644
--- a/menu/applications/wine-winefile.desktop
+++ b/menu/applications/wine-winefile.desktop
@@ -3,8 +3,8 @@ Name=Wine File
 Name[ru]=Менеджер файлов
 Comment=Wine File Browser
 Comment[ru]=Файловый менеджер Wine
-GenericName=Windows environment
-GenericName[ru]=Запуск Windows-программ
+GenericName=Wine File
+GenericName[ru]=Менеджер файлов Wine
 Exec=winefile
 TryExec=winefile
 Terminal=false
diff --git a/menu/applications/writer.desktop b/menu/applications/writer.desktop
deleted file mode 100644
index f312073..0000000
--- a/menu/applications/writer.desktop
+++ /dev/null
@@ -1,69 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Terminal=false
-Icon=libreoffice-writer.png
-Type=Application
-Categories=Application;Office;WordProcessor;
-Exec=lowriter %U
-TryExec=lowriter %U
-InitialPreference=7
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
-Name=LibreOffice Writer
-Name[ru]=LibreOffice Текстовый процессор
-GenericName=Text Documents
-GenericName[ru]=Текстовый процессор
-GenericName[tt_RU]=Текст процессоры
-Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-Comment[en]=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-Comment[de]=Erstellen und bearbeiten von Text und Grafiken in Briefen, Reports, Dokumenten und Web-Seiten - Writer macht's möglich.
-Comment[af]=Skep en redigeer teks en grafika in briewe, verslae, dokumente en webbladsye met Writer.
-Comment[be_BY]=Стварайце і рэдагуйце тэкст і графіку ў лістах, справаздачах, дакументах і старонках Сеціва з дапамогаю Writer-а.
-Comment[bg]=С Writer можете да създавате и редактирате текст и графики в писма, отчети, документи и уебстраници.
-Comment[bs]=Kreiranje i uređivanje teksta i grafike u pismima, izvještajima, dokumentima i Web stranicama koristeći Writer.
-Comment[ca]=Creeu i editeu text i gràfics a cartes, informes, documents i pàgines web amb el Writer.
-Comment[cs]=Vytvářejte a upravujte text a obrázky v dopisech, sestavách, dokumentech a webových stránkách pomocí Writeru.
-Comment[cy]=Creu a golygu testun a graffigau mewn llythyron, adroddiadau, dogfennau a thudalennau Gwe gyda Writer.
-Comment[da]=LibreOffice-tekstdokument
-Comment[el]=Δημιουργία και επεξεργασία κειμένου και γραφικών σε επιστολές, αναφορές, έγγραφα και ιστοσελίδες με τη χρήση του Writer.
-Comment[en_GB]=Create and edit text and graphics in letters, reports, documents and Web pages using Writer.
-Comment[en_ZA]=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-Comment[es]=Crear y editar texto y gráficos de cartas, informes, documentos y páginas Web con Writer.
-Comment[et]=Writer võimaldab luua ja redigeerida kirjade, aruannete, dokumentide ning veebilehtede teksti ja pilte.
-Comment[fi]=Luo ja muokkaa tekstiä ja grafiikkaa kirjeisiin, raportteihin, tekstiasiakirjoihin ja internet-sivuihin Writer-ohjelmalla.
-Comment[fr]=Writer - Création et édition de textes et d'images pour courrier, rapports, documents et pages Web
-Comment[gu_IN]=લખાણો અને ગ્રાફિક્સોને લેટરોમાં, અહેવાલોમાં, દસ્તાવેજોમાં અને વેબ પાનાંઓમાં લેખકની મદદથી બનાવો અને તેમાં ફેરફાર કરો.
-Comment[hi_IN]=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-Comment[hr]=Stvorite i uredite takst i slike u pisma, izvješćima, dokumentima i web stranicama koristeći Writer.
-Comment[hu]=Levelek, jelentések, dokumentumok és weboldalak szövegének és grafikájának létrehozása és szerkesztése a Writer használatával.
-Comment[it]=Usando Writer, potete creare e modificare il testo e le immagini di lettere, rapporti, documenti e pagine Web.
-Comment[ja]=Writer を使用して、レター、レポート、ドキュメントおよび Web ページのテキストおよび図を作成および編集します。
-Comment[km]=បង្កើត និង កែ​សម្រួល​អត្ថបទ និង ក្រាហ្វិក​ក្នុង​សំបុត្រ របាយការណ៍ ឯកសារ និង ទំព័រ​បណ្តាញ​ដោយ​ប្រើ Writer ។
-Comment[ko]=Writer를 사용하여 편지, 보고서, 문서 및 웹 페이지에서 텍스트와 그림을 만들고 편집할 수 있습니다.
-Comment[lt]=Tekstų rengykle galima kurti laiškus, ataskaitas, kitus dokumentus ir tinklalapius, įterpti į juos paveikslus.
-Comment[nb]=Opprett og rediger tekst og bilder i brev, rapporter, dokumenter og nettsider ved å bruke Writer.
-Comment[nl]=Met Writer kunt u tekst en afbeeldingen in brieven, rapporten, documenten en webpagina's maken en bewerken.
-Comment[nn]=Med Writer kan du laga og redigera tekst og bilete i brev, rapportar, dokument og nettsider.
-Comment[nr]=Enza nokuhlela itheksti neentjengiso eziseencwadini, emibikweni, emitlolweni nemakhasini weWebh ngokusebenzisa i-Writer.
-Comment[ns]=Hlama le go rulaganya sengwalwa le diswantšho mangwalong, dipegong, ditokumenteng le matlakaleng a Wepe ka go diriša Writer.
-Comment[pa_IN]=ਲੇਖਕ ਨਾਲ ਪੱਤਰਾਂ, ਰਿਪੋਰਟਾਂ, ਦਸਤਾਵੇਜ਼ਾਂ ਅਤੇ ਵੈੱਬ ਸਫ਼ਿਆਂ ਵਿੱਚ ਪਾਠ ਅਤੇ ਚਿੱਤਰ ਬਣਾਏ ਤੇ ਸੋਧੇ ਜਾ ਸਕਦੇ ਹਨ।
-Comment[pl]=Twórz i edytuj listy, raporty, dokumenty i strony www wykorzystując program Writer.
-Comment[pt_BR]=Criar e editar texto e figuras em cartas, relatórios, documentos e páginas da Web por meio do Writer.
-Comment[ru]=Создание и редактирование текста и рисунков в письмах, отчетах, документах или веб-страницах.
-Comment[rw]=Kurema no guhindura umwandiko n'ibishushanyo mu mabaruwa, raporo, inyandiko n'amapaji Rubuga ukoresheje Writer.
-Comment[sh_YU]=Pravi i uređuje tekst i grafiku u pismima, izveštajima i veb stranicama korišćenjem Pisca.
-Comment[sk]=Vytvárajte a upravujte textové a grafické listy, správy, dokumenty a webové stránky s použitím Writer.
-Comment[sl]=Z Writerjem ustvarjajte in urejajte besedilo in slike v pismih, poročilih, dokumentih in spletnih straneh.
-Comment[sr_CS]=Прави и уређује текст и графику у писмима, извештајима и веб страницама коришћењем Писца.
-Comment[st]=Bopa le ho lokisa mongolo le ditshwantsho mangolong, ditlalehong, ditokomaneng le maqepheng a Wepe ka ho sebedisa Mongodi.
-Comment[sv]=Skapa och redigera text och grafik i brev, rapporter, dokument och webbsidor med hjälp av Writer.
-Comment[sw_TZ]=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-Comment[th]=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
-Comment[tr]=Writer kullanarak mektuplardaki metin ve grafikleri, rapor, belge ve Web sayfalarını oluştur ve düzenle.
-Comment[ts]=Cinca ni ku lulamisa marito ni vudirowi eka mapapila, swiviko, tidokumente ni tipheji ta Web hi ku tirhisa Writer.
-Comment[tt_RU]=Хатларда, хисапларда, документларда һәм веб-битләрдә текст һәм рәсемнәрне башкару һәм төзәтү.
-Comment[uk]=Створюйте та редагуйте текст та графіку в листах, звітах, документах та Web-сторінках використовуючи Writer.
-Comment[vi]=Tạo và chỉnh sửa văn bản và đồ họa trong thư, báo cáo, tài liệu và trang mạng dùng Writer.
-Comment[xh]=Dala uze uhlele isiqendu nezazobe zegrafu ezileteni, iingxelo, amaxwebhu namakhasi Othungelwano ngokusebenzisa i-Writer.
-Comment[zh_CN]=使用 Writer 创建并编辑信函、报表、文档和网页中的文本和图形。
-Comment[zh_TW]=使用 Writer 可以在信件、報告、文件和網頁中建立與編輯文字和圖形。
-Comment[zu]=Yenza futhi ulungise umbhalo nemidwebo esezinhlamvini zamagama, emibikweni, emafayelini nasemakhasini eWebhu ngokusebenzisa i-Writer.
diff --git a/menu/applications/xfce-backdrop-settings.desktop b/menu/applications/xfce-backdrop-settings.desktop
deleted file mode 100644
index 2472141..0000000
--- a/menu/applications/xfce-backdrop-settings.desktop
+++ /dev/null
@@ -1,96 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Desktop 
-Name[ast]=Escritoriu
-Name[bg]=Плот
-Name[bn]=ডেস্কটপ
-Name[ca]=Escriptori 
-Name[cs]=Pracovní plocha
-Name[da]=Skrivebord 
-Name[de]=Schreibtisch
-Name[el]=Επιφάνεια εργασίας
-Name[en_GB]=Desktop 
-Name[es]=Escritorio
-Name[et]=Töölaud
-Name[eu]=Idazmahaia 
-Name[fi]=Työpöytä 
-Name[fr]=Bureau
-Name[gl]=Escritorio
-Name[he]=שולחן עבודה
-Name[hr]=Radna površina
-Name[hu]=Asztal
-Name[id]=Desktop 
-Name[it]=Scrivania
-Name[ja]=デスクトップ 
-Name[kk]=Жұмыс үстелі
-Name[lv]=Darbvirsma
-Name[nb]=Skrivebord 
-Name[pa]=ਡੈਸਕਟਾਪ 
-Name[pl]=Pulpit
-Name[pt]=Ambiente de trabalho
-Name[pt_BR]=Área de trabalho 
-Name[ro]=Desktop 
-Name[ru]=Рабочий стол
-Name[si]=වැඩතලය
-Name[sk]=Plocha 
-Name[sv]=Skrivbord 
-Name[tr]=Masaüstü
-Name[ug]=ئۈستەليۈزى 
-Name[uk]=Стільниця
-Name[ur]=ڈیسک ٹاپ
-Name[ur_PK]=ڈیسک ٹاپ
-Name[zh_CN]=桌面
-Name[zh_TW]=桌面
-Comment=Set desktop background and menu and icon behaviour
-Comment[ast]=Configura'l fondu d'escritoriu y el comportamientu de menús ya iconos
-Comment[bg]=Задаване на фон, менюта и поведение на иконите
-Comment[bn]=ডেস্কটপ পটভূমি এবং মেনু ও আইকনের আচরণ নির্ধারণ করুন 
-Comment[ca]=Fixa el fons de l'escriptori i el comportament del menú i les icones
-Comment[cs]=Nastavení pozadí pracovní plochy a chování nabídky ikon
-Comment[da]=Indstil skrivebordsbaggrund og menu- samt ikonopførsel
-Comment[de]=Stellen Sie den Hintergrund des Schreibtischs sowie das Menü- und Symbolverhalten ein
-Comment[el]=Ρύθμιση φόντου και συμπεριφοράς μενού και εικονιδίων
-Comment[en_GB]=Set desktop background and menu and icon behaviour
-Comment[es]=Configure el fondo de escritorio y el comportamiento de menús e iconos
-Comment[et]=Määra töölaua taust ja menüüde ja ikoonide käitumisviis
-Comment[eu]=Ezarri idazmahaieko atzeko plano eta menua eta ikono ingurunea
-Comment[fi]=Säädä työpöydän taustakuvaa, valikkoa ja kuvakkeita
-Comment[fr]=Régler le fond d'écran, le menu et le comportement des icônes
-Comment[gl]=Definir o comportamento do fondo do escritorio, do menú e das iconas
-Comment[he]=הגדרת התנהגות הרקע, התפריט והסמלים
-Comment[hr]=Postavi ponašanje pozadine i izbornika i ikona radne poveršine
-Comment[hu]=Az asztalháttér, valamint a menü- és ikonviselkedés beállítása
-Comment[id]=Atur latar belakang desktop dan menu serta perilaku ikon
-Comment[it]=Impostazione dello sfondo della scrivania, del menu e del comportamento delle icone
-Comment[ja]=デスクトップの背景およびメニューとアイコンの振る舞いを設定します
-Comment[kk]=Жұмыс үстел суреті, мәзір мен таңбашалардың әрекеттерін баптау
-Comment[lt]=Nustatyti darbalaukio fono, meniu ir piktogramų elgseną
-Comment[lv]=Uzstādīt darbvirsmas fonu un izvēlnes, un ikonas uzvedību
-Comment[nb]=Sett bakgrunnsbilde og tilpass innstillinger for meny og ikoner
-Comment[pa]=ਡੈਸਕਟਾਪ ਬੈਕਗਰਾਊਂਡ ਅਤੇ ਮੇਨੂ ਤੇ ਆਈਕਾਨ ਰਵੱਈਆ ਸੈੱਟ ਕਰੋ
-Comment[pl]=Konfiguruje tło pulpitu oraz ustawienia menu programów i ikon
-Comment[pt]=Definir o fundo do ambiente e o comportamento do menu e ícones
-Comment[pt_BR]=Definir o comportamento do segundo plano, menu e ícones
-Comment[ro]=Schimbați fundalul desktopului și funcționalitatea meniului și iconițelor sale
-Comment[ru]=Установить фон рабочего стола, меню и режим иконок
-Comment[si]=ඩෙස්ක්ටොප් පසුතල සහ මෙනු සහ අයිකන හැසිරීම සකසන්න
-Comment[sk]=Nastavenie pracovnej plochy, ponúk a správanie ikon
-Comment[sv]=Ange skrivbordsbakgrund samt meny- och ikonbeteende
-Comment[tr]=Masaüstü arkaplan görüntüsü ile menü ve simge davranışlarını belirle
-Comment[ug]=ئۈستەليۈزى تېگى، تىزىملىك ۋە سىنبەلگە ھەرىكىتىنى بەلگىلەش
-Comment[uk]=Призначити фонове зображення стільниці, меню і значок заголовку
-Comment[ur]=ڈیسک ٹاپ پس منظر، مینیو اور آئکن کا انداز متعین کریں
-Comment[ur_PK]=ڈیسک ٹاپ پس منظر، مینیو اور آئکن کا انداز متعین کریں
-Comment[zh_CN]=设置桌面背景，菜单，及图标属性
-Comment[zh_TW]=設定桌面背景、選單與圖示行為
-Exec=xfdesktop-settings
-TryExec=xfdesktop-settings
-Icon=preferences-desktop-wallpaper
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-OnlyShowIn=XFCE;
-StartupNotify=true
-X-XfcePluggable=true
-X-XfceHelpFile=xfdesktop.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-display-settings.desktop b/menu/applications/xfce-display-settings.desktop
deleted file mode 100644
index 4a521ce..0000000
--- a/menu/applications/xfce-display-settings.desktop
+++ /dev/null
@@ -1,94 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Display
-Name[ar]=العرض
-Name[ast]=Pantalla
-Name[bn]=প্রদর্শন
-Name[ca]=Pantalla
-Name[cs]=Displej
-Name[da]=Skærm
-Name[de]=Anzeige
-Name[el]=Οθόνη
-Name[en_GB]=Display
-Name[es]=Pantalla
-Name[eu]=Bistaratu
-Name[fi]=Näyttö
-Name[fr]=Affichage
-Name[gl]=Pantalla
-Name[he]=תצוגה
-Name[hr]=Zaslon
-Name[hu]=Kijelző
-Name[id]=Tampilan
-Name[it]=Schermo
-Name[ja]=ディスプレイ
-Name[kk]=Дисплей
-Name[lv]=Displejs:
-Name[nb]=Skjerm
-Name[nl]=Beeldscherm
-Name[pa]=ਡਿਸਪਲੇਅ
-Name[pl]=Ekran
-Name[pt]=Ecrã
-Name[pt_BR]=Vídeo
-Name[ro]=Display
-Name[ru]=Дисплей
-Name[si]=සංදර්ශකය
-Name[sk]=Monitor
-Name[sv]=Skärm
-Name[tr]=Görüntü
-Name[ug]=كۆرسەت
-Name[uk]=Дисплей
-Name[ur]=ڈسپلے
-Name[ur_PK]=ڈسپلے
-Name[zh_CN]=显示
-Name[zh_TW]=顯示
-Comment=Configure screen settings and layout
-Comment[ar]=إعداد إعدادات الشاشة و التصميم
-Comment[ast]=Configura les opciones y la xeometría de la pantalla
-Comment[bn]=পর্দার সেটিংসমূহ ও বহির্বিন্যাস কনফিগার
-Comment[ca]=Configureu els paràmetres i format de la pantalla
-Comment[cs]=Konfiguruje nastavení obrazovky a rozložení
-Comment[da]=Konfigurér skærm-indstillinger og -udseende
-Comment[de]=Stellen Sie Ihre Bildschirme und deren Anordnung ein
-Comment[el]=Ρύθμιση επιλογών οθόνης και διάταξης
-Comment[en_GB]=Configure screen settings and layout
-Comment[es]=Configure las opciones y la geometría de la pantalla
-Comment[eu]=Konfiguratu pantaila ezarpen eta ingurunea
-Comment[fi]=Muokkaa näyttöasetuksia ja asettelua
-Comment[fr]=Configurer les paramètres de l'écran et la disposition
-Comment[gl]=Configurar as opcións e a disposición da pantalla
-Comment[he]=ניהול הגדרות מסך ופרישה
-Comment[hr]=Konfigurirajte postavke i raspored ekrana
-Comment[hu]=Képernyő-beállítások és -elrendezés megadása
-Comment[id]=Atur pengaturan layar dan tata letak
-Comment[it]=Configurazione delle impostazioni e della disposizione dello schermo
-Comment[ja]=画面の解像度とレイアウトを設定します
-Comment[kk]=Экран баптауларын мен жаймасын баптау
-Comment[lv]=Konfigurēt ekrāna uzstādījumus un izkārtojumu
-Comment[nb]=Sett opp skjerminnstillinger
-Comment[nl]=Scherminstellingen en -lay-out bewerken
-Comment[pa]=ਸਕਰੀਨ ਸੈਟਿੰਗ ਅਤੇ ਲੇਆਉਟ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguruje ustawienia i układ ekranu
-Comment[pt]=Configurar definições e disposição do ecrã
-Comment[pt_BR]=Defina as configurações e a disposição da tela
-Comment[ro]=Configurați opțiunile de ecran și monitor
-Comment[ru]=Настроить дисплей
-Comment[sk]=Nastavenia konfigurácie obrazovky a rozloženia
-Comment[sv]=Konfigurera skärminställningar och -layout
-Comment[tr]=Ekran ayarlarını ve yerleşimini yapılandırın
-Comment[ug]=ئېكراننىڭ ئورۇنلاشتۇرۇلۇشى ۋە ئېنىقلىقىنى تەڭشەش
-Comment[uk]=Налаштувати параметри екрану та клавіатури
-Comment[ur]=سکرین کی ترتیبات اور خاکہ مرتب کریں
-Comment[ur_PK]=سکرین کی ترتیبات اور خاکہ مرتب کریں
-Comment[zh_CN]=设置屏幕参数及布局
-Comment[zh_TW]=調整螢幕設定值與配置
-Exec=xfce4-display-settings
-TryExec=xfce4-display-settings
-Icon=video-display
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-settings.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-keyboard-settings.desktop b/menu/applications/xfce-keyboard-settings.desktop
deleted file mode 100644
index 646b2a7..0000000
--- a/menu/applications/xfce-keyboard-settings.desktop
+++ /dev/null
@@ -1,91 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Keyboard
-Name[ar]=لوحة المفاتيح
-Name[ast]=Tecláu
-Name[bn]=কীবোর্ড
-Name[ca]=Teclat
-Name[cs]=Klávesnice
-Name[da]=Tastatur
-Name[de]=Tastatur
-Name[el]=Πληκτρολόγιο
-Name[en_GB]=Keyboard
-Name[es]=Teclado
-Name[eu]=Teklatua
-Name[fi]=Näppäinkartta
-Name[fr]=Clavier
-Name[gl]=Teclado
-Name[he]=מקלדת
-Name[hr]=Tipkovnica
-Name[hu]=Billentyűzet
-Name[id]=Papan ketik 
-Name[it]=Tastiera
-Name[ja]=キーボード
-Name[kk]=Пернетақта
-Name[lv]=Klaviatūra
-Name[nb]=Tastatur
-Name[nl]=Toetsenbord
-Name[pa]=ਕੀਬੋਰਡ
-Name[pl]=Klawiatura
-Name[pt]=Teclado
-Name[pt_BR]=Teclado
-Name[ro]=Tastatură
-Name[ru]=Клавиатура
-Name[sk]=Klávesnica
-Name[sv]=Tangentbord
-Name[tr]=Klavye
-Name[ug]=باستاختا
-Name[uk]=Клавіатура
-Name[ur]=کیبورڈ
-Name[ur_PK]=کیبورڈ
-Name[zh_CN]=键盘
-Name[zh_TW]=鍵盤
-Comment=Edit keyboard settings and application shortcuts
-Comment[ast]=Edita la configuración del tecláu y los atayos d'aplicación
-Comment[bn]=কীবোর্ড সেটিংসমূহ ও অ্যাপ্লিকেশন শর্টকাট সম্পাদনা
-Comment[ca]=Editeu els ajustaments del teclat i les dreceres d'aplicacions
-Comment[cs]=Úprava nastavení klávesnice a klávesových zkratek
-Comment[da]=Redigér tastaturindstillinger og programgenveje
-Comment[de]=Bearbeiten Sie die Tastatureinstellungen und Tastenkürzel für Anwendungen
-Comment[el]=Επεξεργασία ρυθμίσεων πληκτρολογίου και συντομεύσεων εφαρμογών
-Comment[en_GB]=Edit keyboard settings and application shortcuts
-Comment[es]=Edite la configuración del teclado y los atajos de aplicación
-Comment[eu]=Editatu teklatu ezarpenak eta aplikazio lasterbideak
-Comment[fi]=Näppäimistön asetukset ja sovellusten pikanäppäimet
-Comment[fr]=Éditer les paramètres du clavier et raccourcis des applications
-Comment[gl]=Modificar as preferencias de teclado e os atallos das aplicacións
-Comment[he]=עריכת הגדרות מקלדת וקיצורי יישומים
-Comment[hr]=Uredi postavke tipkovnice i prečace programa
-Comment[hu]=Billentyűzet-beállítások és alkalmazás-gyorsbillentyűk szerkesztése
-Comment[id]=Sunting pengaturan papan ketik dan jalan pintas aplikasi
-Comment[it]=Configurazione della tastiera e delle scorciatoie per le applicazioni
-Comment[ja]=キーボード設定とアプリケーションショートカットキーを編集します
-Comment[kk]=Пернетақта баптауларын мен қолданбалар жарлықтарын түзету
-Comment[lv]=Rediģēt klaviatūras uzstādījumus un lietotnes īsceļus
-Comment[nb]=Rediger tastaturinnstillinger og programhurtigtaster
-Comment[nl]=Toetsenbordinstellingen en sneltoetsen bewerken
-Comment[pl]=Konfiguruje ustawienia klawiatury oraz skróty klawiszowe programów
-Comment[pt]=Editar definições do teclado e atalhos das aplicações
-Comment[pt_BR]=Edite configurações de teclado e atalhos de aplicativos
-Comment[ro]=Editați opțiunile de tastatură și combinațiile de taste
-Comment[ru]=Изменить настройки клавиатуры и горячих клавиш
-Comment[sk]=Úprava nastavení klávesnice a klávesových skratiek
-Comment[sv]=Redigera tangentbordsinställningar och programgenvägar
-Comment[tr]=Klavye ayarlarını ve uygulama kısayollarını düzenleyiniz
-Comment[ug]=باستاختا تەڭشىكى ۋە پروگرامما تېزلەتمە كۇنۇپكىسىنى تەھرىرلەيدۇ
-Comment[uk]=Редагувати властивості клавіатури та ярликів запуску програм
-Comment[ur]=کیبورڈ کی ترتیبات اور اطلاقیوں کے شارٹ کٹس مدون کریں
-Comment[ur_PK]=کیبورڈ کی ترتیبات اور اطلاقیوں کے شارٹ کٹس مدون کریں
-Comment[zh_CN]=编辑键盘设置和应用程序快捷键
-Comment[zh_TW]=編輯鍵盤設定值與應用程式捷徑
-Exec=xfce4-keyboard-settings
-TryExec=xfce4-keyboard-settings
-Icon=preferences-desktop-keyboard
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-settings.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-mouse-settings.desktop b/menu/applications/xfce-mouse-settings.desktop
deleted file mode 100644
index 5e686fc..0000000
--- a/menu/applications/xfce-mouse-settings.desktop
+++ /dev/null
@@ -1,91 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Mouse
-Name[ar]=الفأرة
-Name[ast]=Mur
-Name[bn]=মাউস
-Name[ca]=Ratolí
-Name[cs]=Myš
-Name[da]=Mus
-Name[de]=Maus
-Name[el]=Ποντίκι
-Name[en_GB]=Mouse
-Name[es]=Ratón
-Name[eu]=Sagua
-Name[fi]=Hiiri
-Name[fr]=Souris
-Name[gl]=Rato
-Name[he]=עכבר
-Name[hr]=Miš
-Name[hu]=Egér
-Name[id]=Tetikus
-Name[it]=Mouse
-Name[ja]=マウス
-Name[kk]=Тышқан
-Name[lv]=Pele
-Name[nb]=Mus
-Name[nl]=Muis
-Name[pa]=ਮਾਊਂਸ
-Name[pl]=Mysz
-Name[pt]=Rato
-Name[pt_BR]=Mouse
-Name[ro]=Maus
-Name[ru]=Мышь
-Name[sk]=Myš
-Name[sv]=Mus
-Name[tr]=Fare
-Name[ug]=چاشقىنەك
-Name[uk]=Миша
-Name[ur]=ماؤس
-Name[ur_PK]=ماؤس
-Name[zh_CN]=鼠标
-Name[zh_TW]=滑鼠
-Comment=Configure pointer device behavior and appearance
-Comment[ast]=Configura'l comportamientu y aspeutu del preséu del punteru
-Comment[bn]=পয়েন্টার ডিভাইসের আচরণ ও অবয়ব কনফিগার
-Comment[ca]=Configura el comportament i aparença del punter del dispositiu
-Comment[cs]=Konfiguruje chování a vzhled ukazatele zařízení
-Comment[da]=Indstil markør-enhedsopførsel og -udseende
-Comment[de]=Stellen Sie das Verhalten und Aussehen der Zeigegeräte ein
-Comment[el]=Ρύθμιση συμπεριφοράς και εμφάνισης της συσκευής δείκτη
-Comment[en_GB]=Configure pointer device behaviour and appearance
-Comment[es]=Configure el comportamiento y apariencia del dispositivo de puntero
-Comment[eu]=Konfiguratu markatzaile gailu ingurunea eta itxura
-Comment[fi]=Säädä osoitinlaitteen käytöstä ja osoittimen ulkonäköä
-Comment[fr]=Configurer le comportement et style de la souris
-Comment[gl]=Configurar o comportamento e maila aparencia do dispositivo de punteiro
-Comment[he]=תצורת התנהגות ומראה מכשיר הצבעה
-Comment[hu]=Mutatóeszköz viselkedésének és megjelenésének beállítása
-Comment[id]=Atur perilaku divais penunjuk dan penampilan
-Comment[it]=Configurazione del comportamento e dell'aspetto del dispositivo di puntamento
-Comment[ja]=ポインティングデバイスの振る舞いや外観を設定します
-Comment[kk]=Көрсету құрылғысының мінез-құлығын мен сыртқы түрін баптау
-Comment[lv]=Konfigurēt kursora ierīču uzvedību un izskatu
-Comment[nb]=Tilpass oppførsel og utseende for musepekeren
-Comment[nl]=Gedrag en weergave van muisaanwijzer instellen
-Comment[pa]=ਪੁਆਇੰਟਰ ਜੰਤਰ ਰਵੱਈਆ ਅਤੇ ਦਿੱਖ ਸੰਰਚਨਾ
-Comment[pl]=Konfiguruje zachowanie i wygląd kursora myszy
-Comment[pt]=Configurar comportamento e aparência do ponteiro
-Comment[pt_BR]=Configure o comportamento e a aparência do dispositivo de ponteiro
-Comment[ro]=Configurați aspectul și comportamentul mausului
-Comment[ru]=Настроить курсор
-Comment[sk]=Konfiguruje správanie a vzhľad kurzora
-Comment[sv]=Konfigurera muspekarens beteende och utseende
-Comment[tr]=Fare davranışını ve görünümünü yapılandırır
-Comment[ug]=pointer ئۈسكۈنىسىنىڭ ھەرىكىتى ۋە كۆرۈنۈشىنى تەڭشەش
-Comment[uk]=Налаштувати поведінку і зовнішній вигляд вказівника миші
-Comment[ur]=پؤائینٹر ڈیوائس کا سلوک اور مظہر متعین کریں
-Comment[ur_PK]=پؤائینٹر ڈیوائس کا سلوک اور مظہر متعین کریں
-Comment[zh_CN]=设置定位设备（比如鼠标）行为和外观
-Comment[zh_TW]=調整指標裝置行為與外觀
-Exec=xfce4-mouse-settings
-TryExec=xfce4-mouse-settings
-Icon=preferences-desktop-peripherals
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-settings.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-session-settings.desktop b/menu/applications/xfce-session-settings.desktop
deleted file mode 100644
index 5ef4d50..0000000
--- a/menu/applications/xfce-session-settings.desktop
+++ /dev/null
@@ -1,88 +0,0 @@
-[Desktop Entry]
-Name=Session and Startup
-Name[ar]=الجلسة والبدء التشغيل
-Name[ast]=Sesión y entamu
-Name[be]=Сэансы й запуск
-Name[bn]=সেশন এবং আরম্ভ
-Name[ca]=Sessió i engegada
-Name[cs]=Relace a spouštění
-Name[da]=Session og opstart
-Name[de]=Sitzung und Startverhalten
-Name[el]=Συνεδρία και Εκκίνηση
-Name[en_GB]=Session and Startup
-Name[es]=Sesión e inicio
-Name[eu]=Saioa eta abiaraztea
-Name[fi]=Istunto ja käynnistys
-Name[fr]=Session et démarrage
-Name[gl]=Sesión e inicio
-Name[hr]=Sesija i pokretanje
-Name[hu]=Munkamenet és indítás
-Name[id]=Sesi dan Hidupkan
-Name[it]=Sessione e avvio
-Name[ja]=セッションと起動
-Name[kk]=Сессия мен қосылу
-Name[lv]=Sesijas uz palaišanās
-Name[nb]=Økt og oppstart
-Name[pl]=Sesja i uruchamianie
-Name[pt]=Sessão e arranque
-Name[pt_BR]=Sessão e Inicialização
-Name[ro]=Sesiuni și pornire
-Name[ru]=Сеансы и запуск
-Name[sk]=Sedenia a spúšťanie
-Name[sq]=Sesion dhe Nisje
-Name[sv]=Session och uppstart
-Name[tr]=Oturum ve Başlangıç
-Name[ug]=ئەڭگىمە ۋە قوزغىتىش
-Name[uk]=Сеанси та запуск
-Name[ur]=نشست اور سٹارٹ اپ
-Name[ur_PK]=نشست اور سٹارٹ اپ
-Name[zh_CN]=会话和启动
-Name[zh_TW]=工作階段與起始
-Comment=Customize desktop startup and splash screen
-Comment[ast]=Personalice la pantalla d'entamu de sesión del escritoriu
-Comment[be]=Індывідуалізаваць запуска асяродзьдзя й застаўку на ўваход
-Comment[bn]=ডেস্কটপ আরম্ভ এবং স্প্ল্যাশ স্ক্রীন স্বনির্ধারণ
-Comment[ca]=Personalitza l'inici de l'escriptori així com llur pantalla de presentació
-Comment[cs]=Přizpůsobte si spouštění pracovního prostředí a uvítací obrazovky
-Comment[da]=Tilpas skrivebordsopstart- og opstartsbilled-skærm
-Comment[de]=Passen Sie das Startverhalten der Arbeitsumgebung und den Startbildschirm an Ihre Bedürfnisse an
-Comment[el]=Παραμετροποίηση της επιφάνειας εκκίνησης και της οθόνης εισόδου
-Comment[en_GB]=Customise desktop startup and splash screen
-Comment[es]=Personalice la pantalla de inicio de sesión del escritorio
-Comment[eu]=Pertsonalizatu idazmahai abiarazte eta abiarazpen pantaila
-Comment[fi]=Mukauta työpöydän käynnistystä ja käynnistyskuvaa
-Comment[fr]=Personnaliser le démarrage du bureau et l'écran splash
-Comment[gl]=Personalizar o inicio e a pantalla de benvida do escritorio
-Comment[hr]=Podesite detalja pokretanja sustava
-Comment[hu]=A környezet indításának és az indítókép személyre szabása
-Comment[id]=Sesuaikan hidupkan destop dan layar splash
-Comment[it]=Personalizzazione dell'avvio e della relativa schermata
-Comment[ja]=デスクトップの起動と起動画面をカスタマイズします
-Comment[kk]=Жұмыс үстелінің қосылу мен сплэш экраның баптау
-Comment[lv]=Pielāgot darbvirsmas palaišanos un uzplaiksnījuma ekrānu
-Comment[nb]=Tilpass skrivebordsoppstart og velkomstbilde
-Comment[pl]=Konfiguruje uruchamianie środowiska graficznego i ekran powitalny
-Comment[pt]=Personalizar arranque do ambiente e ecrã inicial
-Comment[pt_BR]=Personaliza a inicialização de área de trabalho e a tela de abertura
-Comment[ro]=Personalizați inițializarea desktopului și tema de pornire
-Comment[ru]=Настроить параметры запуска рабочего стола и заставки
-Comment[sq]=Përshtasni desktopin dhe skenën e siglës
-Comment[sv]=Anpassa skrivbordsuppstart och startbild
-Comment[tr]=Masaüstü başlangıcını ve açılış ekranını özelleştir
-Comment[ug]=ئۈستەليۈزىنى قوزغىتىش ۋە قوزغىلىش ئېكراننى ئۆزلەشتۈرۈش
-Comment[uk]=Налаштувати запуск стільниці і екран заставки
-Comment[ur]=ڈیسک ٹاپ سٹارٹ اپ اور سپلیش سکرین وضع کریں
-Comment[ur_PK]=ڈیسک ٹاپ سٹارٹ اپ اور سپلیش سکرین وضع کریں
-Comment[zh_CN]=自定义桌面启动和启动闪屏
-Comment[zh_TW]=自訂桌面起始與開機畫面
-Exec=xfce4-session-settings
-TryExec=xfce4-session-settings
-Icon=xfce4-session
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-session.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-ui-settings.desktop b/menu/applications/xfce-ui-settings.desktop
deleted file mode 100644
index 2fde9b4..0000000
--- a/menu/applications/xfce-ui-settings.desktop
+++ /dev/null
@@ -1,95 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Appearance
-Name[ar]=مظهر
-Name[ast]=Aspeutu
-Name[bn]=অবয়ব
-Name[ca]=Aparença
-Name[cs]=Vzhled
-Name[da]=Udseende
-Name[de]=Erscheinungsbild
-Name[el]=Εμφάνιση
-Name[en_GB]=Appearance
-Name[es]=Apariencia
-Name[eu]=Itxura
-Name[fi]=Ulkoasu
-Name[fr]=Apparence
-Name[gl]=Aparencia
-Name[he]=מראה
-Name[hr]=Izgled
-Name[hu]=Megjelenés
-Name[id]=Tampilan
-Name[is]=Útlit
-Name[it]=Aspetto
-Name[ja]=外観
-Name[kk]=Сыртқы түрі
-Name[lv]=Izskats
-Name[nb]=Utseende
-Name[nl]=Weergave
-Name[pa]=ਦਿੱਖ
-Name[pl]=Wygląd
-Name[pt]=Aparência
-Name[pt_BR]=Aparência
-Name[ro]=Aspect
-Name[ru]=Внешний вид
-Name[sk]=Vzhľad
-Name[sv]=Utseende
-Name[tr]=Görünüm
-Name[ug]=كۆرۈنۈشى
-Name[uk]=Зовнішній вигляд
-Name[ur]=مظہر
-Name[ur_PK]=مظہر
-Name[zh_CN]=外观
-Name[zh_TW]=外觀
-Comment=Customize the look of your desktop
-Comment[ar]=خصص مظهر سطح مكتبك
-Comment[ast]=Personaliza l'aspeutu del to escritoriu
-Comment[bn]=আপনার ডেস্কটপের অবয়ব স্বনির্ধারণ করুন
-Comment[ca]=Personalitza l'aparença del vostre escriptori
-Comment[cs]=Nastavení vzhledu vašeho pracovního prostředí
-Comment[da]=Tilpas udseendet på dit skrivebord
-Comment[de]=Passen Sie das Aussehen der Arbeitsoberfläche an
-Comment[el]=Προσαρμογή της εμφάνισης της επιφάνειας εργασίας
-Comment[en_GB]=Customise the look of your desktop
-Comment[es]=Personalice la apariencia de su escritorio
-Comment[eu]=Pertsonalizatu zure idazmahaiaren itxura
-Comment[fi]=Muokkaa työpöytäsi ulkoasua
-Comment[fr]=Changer l'apparence du bureau
-Comment[gl]=Personalizar a aparencia do escritorio
-Comment[he]=התאמת המראה של שולחן העבודה
-Comment[hr]=Prilagodite izgled vaše radne površine
-Comment[hu]=Az asztali környezet megjelenésének személyre szabása
-Comment[id]=Sesuaikan tampilan destop anda
-Comment[it]=Personalizzazione dell'aspetto della scrivania
-Comment[ja]=デスクトップの外観をカスタマイズします
-Comment[kk]=Жұмыс үстеліңіздің сыртқы түрін баптаңыз
-Comment[lv]=Pielāgot savas darbvirsmas izskatu
-Comment[nb]=Tilpass utseendet til skrivebordet
-Comment[nl]=Pas het uiterlijk van uw werkomgeving aan
-Comment[pa]=ਆਪਣੇ ਡੈਸਕਟਾਪ ਦੀ ਦਿੱਖ ਬਦਲੋ
-Comment[pl]=Konfiguruje wygląd środowiska graficznego
-Comment[pt]=Personalizar a aparência do seu ambiente
-Comment[pt_BR]=Personalize a aparência do seu ambiente Xfce
-Comment[ro]=Personalizați aspectul propriului desktop
-Comment[ru]=Настройте внешний вид вашего рабочего стола
-Comment[si]=ඔබගේ වැඩතලයේ පෙනුම අභිමතකරණය කරන්න
-Comment[sk]=Nastavenie vzhľadu vášho pracovného prostredia
-Comment[sv]=Anpassa utseendet för ditt skrivbord
-Comment[tr]=Masaüstünüzün görünümünü değiştirin
-Comment[ug]=ئۈستەليۈزىنىڭ كۆرۈنۈشىنى Customize قىل
-Comment[uk]=Налаштуйте зовнішній вигляд вашої стільниці
-Comment[ur]=اپنے ڈیسک ٹاپ کا حلیہ مرتب کریں
-Comment[ur_PK]=اپنے ڈیسک ٹاپ کا حلیہ مرتب کریں
-Comment[zh_CN]=设置桌面外观
-Comment[zh_TW]=自訂您桌面的外觀
-Exec=xfce4-appearance-settings
-TryExec=xfce4-appearance-settings
-Icon=preferences-desktop-theme
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-settings.html
-Hidden=true
diff --git a/menu/applications/xfce-wm-settings.desktop b/menu/applications/xfce-wm-settings.desktop
deleted file mode 100644
index 0cc2d4c..0000000
--- a/menu/applications/xfce-wm-settings.desktop
+++ /dev/null
@@ -1,112 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Window Manager
-Name[am]=ማስኮት አስተዳዳሪ
-Name[ar]=مدير النوافذ
-Name[ast]=Xestor de ventanes
-Name[az]=Pəncərə İdarəçisi
-Name[be]=Кіраўнік вокнаў
-Name[bg]=Мениджър на прозорци
-Name[bn]=উইন্ডো ব্যবস্থাপক
-Name[bn_IN]=উইন্ডো পরিচালন ব্যবস্থা
-Name[ca]=Gestor de finestres
-Name[cs]=Správce oken
-Name[da]=Vindueshåndtering
-Name[de]=Fensterverwaltung
-Name[dz]=སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ།
-Name[el]=Διαχειριστής παραθύρων
-Name[en_GB]=Window Manager
-Name[eo]=Administradilo de Fenestroj
-Name[es]=Gestor de ventanas
-Name[es_MX]=Gestor de Ventanas
-Name[et]=Aknahaldur
-Name[eu]=Leiho kudeatzailea
-Name[fa]=مدیر پنجره‌
-Name[fi]=Ikkunamanageri
-Name[fr]=Gestionnaire de fenêtres
-Name[gl]=Xestor de xanelas
-Name[gu]=વિન્ડો વ્યવસ્થાપક
-Name[he]=מנהל חלונות
-Name[hi]=विन्डो प्रबंधक
-Name[hr]=Upravitelj prozora
-Name[hu]=Ablakkezelő
-Name[id]=Manajer Jendela
-Name[it]=Gestore delle finestre
-Name[ja]=ウィンドウマネージャ
-Name[kk]=Терезелер басқарушы
-Name[ko]=창 관리자
-Name[lt]=Langų tvarkyklė
-Name[lv]=Logu pārvaldnieks
-Name[mk]=Менаџер за прозорци
-Name[mr]=विण्डो व्यवस्थापक
-Name[ms]=Pengurus Tetingkap
-Name[nb]=Vindusbehandler
-Name[nl]=Window Manager
-Name[pa]=ਵਿੰਡੋ ਪ੍ਰਬੰਧਕ
-Name[pl]=Okna
-Name[pt]=Gestor de janelas
-Name[pt_BR]=Gerenciador de Janelas
-Name[ro]=Manager de ferestre
-Name[ru]=Окна 
-Name[si]=කවුළු කළමනාකරු
-Name[sk]=Správca okien
-Name[sq]=Përgjegjës Dritaresh
-Name[sv]=Fönsterhanterare
-Name[ta]=சாளரமேலாளர்
-Name[tr]=Pencere Yöneticisi
-Name[ug]=كۆزنەك باشقۇرغۇ
-Name[uk]=Менеджер вікон
-Name[ur]=ونڈو منیجر
-Name[ur_PK]=ونڈو منیجر
-Name[vi]=Trình quản lí cửa sổ
-Name[zh_CN]=窗口管理器
-Name[zh_TW]=視窗管理程式
-Comment=Configure window behavior and shortcuts
-Comment[ast]=Configura'l comportamientu de ventanes y atayos
-Comment[bn]=উইন্ডোর আচরণ ও শর্টকাট কনফিগার
-Comment[ca]=Configura el comportament de les finestres i de les dreceres
-Comment[cs]=Konfigurace chování okna a klávesových zkratek
-Comment[da]=Indstil vindueopførsel og genveje
-Comment[de]=Passen Sie das Fensterverhalten und die Fenstertastenkürzel an
-Comment[el]=Ρύθμιση συμπεριφοράς παραθύρων και συντομεύσεων
-Comment[en_GB]=Configure window behaviour and shortcuts
-Comment[es]=Configure el comportamiento de ventanas y atajos
-Comment[eu]=Leiho portaera eta lastre-teklak konfiguratu
-Comment[fi]=Muokkaa ikkunoiden käytöstä ja pikanäppäimiä
-Comment[fr]=Configurer le comportement des fenêtres et les raccourcis
-Comment[gl]=Configurar o comportamento e os atallos das xanelas
-Comment[hr]=Postavi ponašanje prozora i prečica
-Comment[hu]=Ablakviselkedés és gyorsbillentyűk beállítása
-Comment[id]=Atur perilaku jendela dan jalan pintas
-Comment[it]=Configurazione del comportamento della finestra e delle scorciatoie
-Comment[ja]=ウィンドウの振る舞いとショートカットキーを設定します
-Comment[kk]=Терезе әрекеттерін мен жарлықтарды баптау
-Comment[lv]=Konfigurēt loga uzvedību un īsceļus
-Comment[nb]=Sett opp vindusoppførsel og hurtigtaster
-Comment[pl]=Konfiguruje ustawienia okien i skróty klawiszowe
-Comment[pt]=Configurar comportamento e atalhos das janelas
-Comment[pt_BR]=Configurar o comportamento da janela e atalhos
-Comment[ro]=Schimbați comportamentul ferestrelor și combinațiile de taste asociate
-Comment[ru]=Настройка поведения окна и горячих клавиш 
-Comment[si]=කවුළු හැසිරීම් හා කෙටිමං වින්‍යාස කරන්න 
-Comment[sk]=Konfigurácia správania okna a klávesových skratiek
-Comment[sq]=Formësoni sjellje dhe shkurtore dritareje
-Comment[sv]=Konfigurera fönsterbeteende och genvägar
-Comment[tr]=Pencere davranışı ve kısayollarını yapılandır
-Comment[ug]=كۆزنەك ھەرىكىتى ۋە تېزلەتمىنى سەپلەش
-Comment[uk]=Налаштувати заголовок вікна і ярлик запуску
-Comment[ur]=ونڈو کا سلوک اور شارٹ کٹ وضع کریں
-Comment[ur_PK]=ونڈو کا سلوک اور شارٹ کٹ وضع کریں
-Comment[zh_CN]=配置窗口行为及快捷方式
-Comment[zh_TW]=調整視窗行為與捷徑
-Exec=xfwm4-settings
-TryExec=xfwm4-settings
-Icon=xfwm4
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfwm4.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-wmtweaks-settings.desktop b/menu/applications/xfce-wmtweaks-settings.desktop
deleted file mode 100644
index 737b47a..0000000
--- a/menu/applications/xfce-wmtweaks-settings.desktop
+++ /dev/null
@@ -1,100 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Window Manager Tweaks
-Name[am]=የመስኮት አስተዳዳሪ ማሰማመር
-Name[ar]=تضبيطات لمدير النوافذ
-Name[ast]=Axustes del xestor de ventanes
-Name[be]=Наладкі Кіраўніка вокнаў
-Name[bn]=উইন্ডো ব্যবস্থাপক টুইক
-Name[ca]=Ajustaments avançats del gestor de finestres
-Name[cs]=Vyladění správce oken
-Name[da]=Vindueshåndtering tweaks
-Name[de]=Feineinstellungen des Fensterverhaltens
-Name[dz]=སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་གཅུཝ་ཨིན།
-Name[el]=Προσαρμογή διαχειριστή παραθύρων
-Name[en_GB]=Window Manager Tweaks
-Name[eo]=Rafina Agordo de la Administradilo de Fenestroj
-Name[es]=Ajustes del gestor de ventanas
-Name[et]=Aknahalduri ülehäälestamine
-Name[eu]=Leiho kudeatzaile ezarpenak
-Name[fi]=Ikkunamanagerin viritys
-Name[fr]=Peaufinage des fenêtres
-Name[gl]=Axustes do xestor de xanelas
-Name[he]=הגדרות נוספות של מנהל החלונות
-Name[hr]=Postavke Upravitelja Prozora
-Name[hu]=Ablakkezelő hangolása
-Name[id]=Tweak Manajer Jendela
-Name[it]=Regolazioni del gestore delle finestre
-Name[ja]=ウィンドウマネージャ (詳細)
-Name[kk]=Терезелер басқарушының қу баптаулары
-Name[ko]=창 관리자 기능향상
-Name[lv]=Logu pārvaldnieka piedares
-Name[mk]=Подобрувања на менаџерот за прозорци
-Name[nb]=Vindusbehandler Tweaks
-Name[nl]=Venster Beheer Bijstellen
-Name[pa]=ਵਿੰਡੋ ਮੈਨੇਜਰ ਟਵੀਕ
-Name[pl]=Menedżer okien
-Name[pt]=Ajustes do gestor de janelas
-Name[pt_BR]=Ajustes do Gerenciador de Janelas
-Name[ro]=Ajustări pentru managerul de ferestre
-Name[ru]=Оконный менеджер 
-Name[sk]=Pokročilé nastavenie správcu okien
-Name[sq]=Rregullime të Imta për Përgjegjës Dritaresh
-Name[sv]=Justeringar för fönsterhanterare
-Name[tr]=Pencere Yöneticisi İnce Ayarları
-Name[ug]=كۆزنەك باشقۇرغۇ (Tweaks)
-Name[uk]=Налаштування менеджера вікон
-Name[ur]=ونڈو منیجر کار کردگی
-Name[ur_PK]=ونڈو منیجر کار کردگی
-Name[vi]=Tinh chỉnh của trình quản lí cửa sổ
-Name[zh_CN]=窗口管理器调整
-Name[zh_TW]=視窗管理程式調校
-Comment=Fine-tune window behaviour and effects
-Comment[ast]=Axuste finu de comportamientu y efeutos de ventanes
-Comment[bn]=ফাইন-টিউন উইন্ডো আচরণ ও প্রভাব
-Comment[ca]=Ajusta el comportament i els efectes de les finestres
-Comment[cs]=Doladění chování okna a efektů
-Comment[da]=Fin-indstil vindueopførsel og effekter
-Comment[de]=Nehmen Sie Feineinstellungen am Fensterverhalten und den Fenstereffekten vor
-Comment[el]=Ρύθμιση συμπεριφοράς παραθύρων και φαινόμενων
-Comment[en_GB]=Fine-tune window behaviour and effects
-Comment[es]=Ajuste fino de comportamiento y efectos de ventanas
-Comment[eu]=Leiho portaera eta efektuak doitu
-Comment[fi]=Hienosäädä ikkunoiden käytöstä ja tehosteita
-Comment[fr]=Ajuster le comportement des fenêtres et leurs effets
-Comment[gl]=Afinar o comportamento e os efectos das xanelas
-Comment[hr]=Detaljno postavljanje ponašanja prozora i efekata
-Comment[hu]=Ablakviselkedés és -effektusok finomhangolása
-Comment[id]=Atur perilaku jendela dah efek
-Comment[it]=Regolazione del comportamento della finestra e delle scorciatoie
-Comment[ja]=ウィンドウの振る舞いと効果を微調整します
-Comment[kk]=Терезе әрекеттерін мен жарлықтарды туралау
-Comment[lv]=Noskaņot logu uzvedību un efektus
-Comment[nb]=Finjuster vindusoppførsel og effekter
-Comment[pl]=Konfiguruje ustawienia menedżera okien oraz efekty wizualne
-Comment[pt]=Configurar comportamento e efeitos das janelas
-Comment[pt_BR]=Configure o comportamento da janela
-Comment[ro]=Optimizați comportamentul ferestrelor și efectele asociate
-Comment[ru]=Дополнительная настройка поведения окна и эффектов 
-Comment[si]=Fine-tune window behaviour and effects
-Comment[sk]=Doladenie správania okna a efektov
-Comment[sq]=Rregulloni më imët efekte dhe sjellje dritaresh
-Comment[sv]=Finjustera fönsterbeteende och effekter
-Comment[tr]=Pencere davranışı ve olaylarını ayarla
-Comment[ug]=كۆزنەك ھەرىكىتى ۋە ئۈنۈمىنى ئىنچىكە تەڭشەش
-Comment[uk]=Тонке налаштування заголовку вікна і ефектів
-Comment[ur]=ونڈو کا سلوک اور ایفیکٹ مرتب کریں
-Comment[ur_PK]=ونڈو کا سلوک اور ایفیکٹ مرتب کریں
-Comment[zh_CN]=微调窗口行为及效果
-Comment[zh_TW]=微調視窗視窗行為與效果
-Exec=xfwm4-tweaks-settings
-TryExec=xfwm4-tweaks-settings
-Icon=wmtweaks
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfwm4.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce-workspaces-settings.desktop b/menu/applications/xfce-workspaces-settings.desktop
deleted file mode 100644
index c9ec130..0000000
--- a/menu/applications/xfce-workspaces-settings.desktop
+++ /dev/null
@@ -1,110 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Workspaces
-Name[am]=የስራ ገበታ
-Name[ar]=مساحات العمل
-Name[ast]=Estayes de trabayu
-Name[az]=İş Sahələri
-Name[be]=Працоўныя прасторы
-Name[bn]=কর্মপরিসর
-Name[bn_IN]=কর্মক্ষেত্র
-Name[ca]=Espais de treball
-Name[cs]=Pracovní plochy
-Name[da]=Arbejdsområder
-Name[de]=Arbeitsflächen
-Name[dz]=ལཱ་གི་ས་སྒོ་ཚུ།
-Name[el]=Χώροι εργασίας
-Name[en_GB]=Workspaces
-Name[eo]=Laborspacoj
-Name[es]=Áreas de trabajo
-Name[es_MX]=Escritorios
-Name[et]=Tööruumid
-Name[eu]=Idazmahaiak
-Name[fa]=فضاهای کاری
-Name[fi]=Työtilat
-Name[fr]=Espaces de travail
-Name[gl]=Espazos de traballo
-Name[gu]=કામ કરવાની જગ્યાઓ
-Name[he]=סביבות עבודה
-Name[hr]=Radni prostori
-Name[hu]=Munkaterületek
-Name[id]=Ruang Kerja
-Name[it]=Spazi di lavoro
-Name[ja]=ワークスペース
-Name[kk]=Жұмыс орындары
-Name[ko]=작업공간
-Name[lt]=Darbo laukai
-Name[lv]=Darbavietas
-Name[mk]=Работни површи
-Name[mr]=कार्यक्षेत्रे
-Name[ms]=Ruangkerja
-Name[nb]=Arbeidsområde
-Name[nl]=Werkbladen
-Name[pa]=ਵਰਕਸਪੇਸ
-Name[pl]=Obszary robocze
-Name[pt]=Áreas de trabalho
-Name[pt_BR]=Espaços de Trabalho
-Name[ro]=Spații de lucru
-Name[ru]=Рабочие места 
-Name[si]=වැඩ අවකාශ
-Name[sk]=Pracovné plochy
-Name[sq]=Hapësira pune
-Name[sv]=Arbetsytor
-Name[tr]=Çalışma Alanları
-Name[ug]=خىزمەت مۇھىتلىرى
-Name[uk]=Робочі області
-Name[ur]=مقام کار
-Name[ur_PK]=مقام کار
-Name[vi]=Vùng làm việc
-Name[zh_CN]=工作区
-Name[zh_TW]=工作區
-Comment=Set number and names of workspaces
-Comment[ar]=حدد عدد و إسماء مساحات العمل
-Comment[ast]=Configura'l númberu y los nomes de les estayes de trabayu
-Comment[bn]=কর্মপরিসরের সংখ্যা ও নাম নির্ধারণ করুন
-Comment[ca]=Fixa el nombre i noms dels espais de treball
-Comment[cs]=Nastavte počet a názvy pracovních ploch
-Comment[da]=Indstil antal og navne for arbejdsområder
-Comment[de]=Stellen Sie Anzahl und Namen von Arbeitsflächen ein
-Comment[el]=Ορισμός αριθμού και όνομα του χώρου εργασίας
-Comment[en_GB]=Set number and names of workspaces
-Comment[es]=Configure el número y los nombres de las áreas de trabajo
-Comment[eu]=Ezarri idazmahai kopurua eta izenak
-Comment[fi]=Muokkaa työtilojen määrää ja nimiä
-Comment[fr]=Régler le nombre et les noms des espaces de travail
-Comment[gl]=Definir o número e os nomes dos espazos de traballo
-Comment[hr]=Postavi broj i imena radnih prostora
-Comment[hu]=Munkaterületek számának és neveinek beállítása
-Comment[id]=Atur jumlah dan nama ruang kerja
-Comment[it]=Impostazione del numero e del nome degli spazi di lavoro
-Comment[ja]=ワークスペースの数と名前を設定します
-Comment[kk]=Жұмыс орындарының нөмірлерін мен аттарын орнату
-Comment[ko]=작업공간의 수 및 이름 설정
-Comment[lv]=Uzstādīt darbavietu skaitu un nosaukumus
-Comment[nb]=Sett antallet og navn på arbeidsområder:
-Comment[pl]=Konfiguruje ilość oraz nazwy obszarów roboczych
-Comment[pt]=Definir número e nomes das áreas de trabalho
-Comment[pt_BR]=Defina o número e os nomes dos espaços de trabalho:
-Comment[ro]=Schimbați numărul și numele spațiilor de lucru
-Comment[ru]=Укажите количество рабочих мест и их названия 
-Comment[sk]=Nastavte počet pracovných plôch
-Comment[sq]=Caktoni numrat dhe emrat e hapësirave të punës
-Comment[sv]=Ange antalet och namn för arbetsytor
-Comment[tr]=Çalışma alanlarının isim ve sayılarını belirt
-Comment[ug]=خىزمەت مۇھىتىنىڭ ئاتى ۋە سانىنى بەلگىلەش
-Comment[uk]=Визначити кількість і назви робочих областей
-Comment[ur]=مقام کاروں کی تعداد اور نام متعین کریں
-Comment[ur_PK]=مقام کاروں کی تعداد اور نام متعین کریں
-Comment[zh_CN]=设置工作区数目：
-Comment[zh_TW]=設定工作區數目與名稱：
-Exec=xfwm4-workspace-settings
-TryExec=xfwm4-workspace-settings
-Icon=xfce4-workspaces
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfwm4.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce4-about.desktop b/menu/applications/xfce4-about.desktop
deleted file mode 100644
index 2b41e09..0000000
--- a/menu/applications/xfce4-about.desktop
+++ /dev/null
@@ -1,78 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=xfce4-about
-TryExec=xfce4-about
-Icon=xfce4-panel-menu
-StartupNotify=false
-Terminal=false
-Categories=Utility;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-Name=About Xfce
-Name[ca]=Quant a Xfce
-Name[cs]=O prostředí Xfce
-Name[da]=Om Xfce
-Name[de]=Über Xfce 4
-Name[el]=Περί Xfce
-Name[en_GB]=About Xfce
-Name[es]=Acerca de Xfce
-Name[eu]=Xfce-ri buruz
-Name[fi]=Tietoja Xfce:stä
-Name[fr]=À propos de Xfce
-Name[gl]=Acerca de Xfce
-Name[he]=על אודות Xfce 4
-Name[hr]=O Xfce
-Name[hu]=Az Xfce névjegye
-Name[id]=Tentang Xfce
-Name[it]=Informazioni su Xfce
-Name[ja]=Xfce について
-Name[kk]=Xfce 4 туралы
-Name[nb]=Om Xfce 
-Name[nl]=Over Xfce
-Name[pl]=O środowisku Xfce
-Name[pt]=Sobre o Xfce
-Name[pt_BR]=Sobre o Xfce
-Name[ro]=Despre Xfce
-Name[ru]=О Xfce 4
-Name[sk]=O prostredí Xfce 4
-Name[sv]=Om Xfce
-Name[te]=Xfce గురించి
-Name[tr]=Xfce Hakkında
-Name[ug]=Xfce 4 ھەققىدە
-Name[uk]=Про Xfce
-Name[zh_CN]=关于 Xfce
-Name[zh_TW]=關於 Xfce
-Comment=Information about the Xfce Desktop Environment
-Comment[ca]=Informació sobre l'entorn d'escriptori Xfce
-Comment[cs]=Informace o pracovním prostředí Xfce
-Comment[da]=Information om skrivebordsmiljøet Xfce
-Comment[de]=Informationen über die Xfce-Desktopumgebung
-Comment[el]=Πληροφορίες σχετικά με το περιβάλλον εργασίας Xfce
-Comment[en_GB]=Information about the Xfce Desktop Environment
-Comment[es]=Información sobre el entorno de escritorio Xfce
-Comment[eu]=Xfce mahaigain inguruneari buruzko argibideak
-Comment[fi]=Tietoja Xfce-työpöytäympäristöstä
-Comment[fr]=Information au sujet de l'environnement de bureau Xfce
-Comment[gl]=Información sobre o Ambiente de Escritorio Xfce
-Comment[he]=מידע על אודות סביבת שולחן העבודה Xfce
-Comment[hr]=Informacije o Xfce radnom okruženju
-Comment[hu]=Információk az Xfce asztali környezetről
-Comment[id]=Informasi tentang Lingkungan Desktop Xfce
-Comment[it]=Informazioni sull'ambiente grafico Xfce
-Comment[ja]=Xfce デスクトップ環境に関する情報です
-Comment[kk]=Xfce жұмыс үстел ортасы туралы ақпарат
-Comment[nb]=Informasjon om Xfce skrivebordsmiljø.
-Comment[nl]=Informatie over de Xfce-werkomgeving
-Comment[pl]=Wyświetla informacje o środowisku graficznym Xfce
-Comment[pt]=Informações sobre o ambiente de trabalho Xfce
-Comment[pt_BR]=Informação sobre o ambiente de trabalho Xfce
-Comment[ro]=Informații despre mediul desktop Xfce
-Comment[ru]=Сведения о среде Xfce
-Comment[sk]=Informácie o pracovnom prostredie Xfce
-Comment[sv]=Information om skrivbordsmiljön Xfce
-Comment[te]=Xfce డెస్క్‍టాప్ పరిసరం గురించిన సమాచారం
-Comment[tr]=Xfce Masaüstü Ortamı hakkında bilgi
-Comment[ug]=Xfce 桌面环境信息
-Comment[uk]=Інформація про середовище стільниці Xfce
-Comment[zh_CN]=Xfce 桌面环境信息
-Comment[zh_TW]=Xfce 桌面環境的相關資訊
diff --git a/menu/applications/xfce4-accessibility-settings.desktop b/menu/applications/xfce4-accessibility-settings.desktop
deleted file mode 100644
index aabaad0..0000000
--- a/menu/applications/xfce4-accessibility-settings.desktop
+++ /dev/null
@@ -1,92 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Accessibility
-Name[ar]=الإتاحة
-Name[ast]=Accesibilidá
-Name[bn]=স্বাচ্ছন্দ্যকরণ
-Name[ca]=Accessibilitat
-Name[cs]=Přístupnost
-Name[da]=Tilgængelighed
-Name[de]=Barrierefreiheit
-Name[el]=Προσβασιμότητα
-Name[en_GB]=Accessibility
-Name[es]=Accesibilidad
-Name[eu]=Erabilerraztasuna
-Name[fi]=Esteettömyys
-Name[fr]=Accessibilité
-Name[gl]=Accesibilidade
-Name[he]=נגישות
-Name[hr]=Pristupačnost
-Name[hu]=Akadálymentesítés
-Name[id]=Aksesibilitas
-Name[is]=Aðgengi
-Name[it]=Accessibilità
-Name[ja]=アクセシビリティ
-Name[kk]=Қолжетерлілік
-Name[lv]=Pieejamība
-Name[nb]=Tilgjengelighet
-Name[nl]=Toegankelijkheid
-Name[pa]=ਅਸੈਸਬਿਲਟੀ
-Name[pl]=Dostępność
-Name[pt]=Acessibilidade
-Name[pt_BR]=Acessibilidade
-Name[ro]=Accesibilitate
-Name[ru]=Доступность
-Name[si]=ප්‍රවේශ්‍යතාව
-Name[sk]=Prístupnosť
-Name[sv]=Hjälpmedelsfunktioner
-Name[tr]=Erişilebilirlik
-Name[uk]=Доступність
-Name[ur]=قابلیت رسائی
-Name[ur_PK]=قابلیت رسائی
-Name[zh_CN]=辅助功能
-Name[zh_TW]=輔助功能
-Comment=Improve keyboard and mouse accessibility
-Comment[ast]=Meyora l'accesibilidá de tecláu y mur
-Comment[bn]=কীবোর্ড ও মাউসের স্বাচ্ছন্দ্যকরণ উন্নত করুন
-Comment[ca]=Millora l'accessibilitat del teclat i ratolí
-Comment[cs]=Vylepšete přístupnost klávesnice a myši
-Comment[da]=Forbedr tastatur- og mustilgængelighed
-Comment[de]=Erleichtern Sie sich die Verwendung von Tastatur und Maus
-Comment[el]=Βελτίωση προσβασιμότητας πληκτρολογίου και ποντικιού
-Comment[en_GB]=Improve keyboard and mouse accessibility
-Comment[es]=Mejore la accesibilidad de teclado y ratón
-Comment[eu]=Gaitu teklatu eta sagu erabilerraztasuna
-Comment[fi]=Helpota näppäimistön ja hiiren käyttöä
-Comment[fr]=Améliorer l'accessibilité du clavier et de la souris
-Comment[gl]=Mellorar a accesibilidade do teclado e do rato
-Comment[he]=שיפור נגישות של עכבר ומקלדת
-Comment[hr]=Poboljšajte pristupačnost tipkovnice i miša
-Comment[hu]=Billentyűzet és egér akadálymentesítésének javítása
-Comment[id]=Tingkatkan aksesibilitas papan ketik dan tetikus
-Comment[it]=Impostazione dell'accessibilità di mouse e tastiera
-Comment[ja]=キーボードとマウスのユーザ補助機能を向上させます
-Comment[kk]=Пернетақта мен тышқан қолжетерлілігін жақсарту
-Comment[lv]=Uzlabo klaviatūras un peles pieejamību
-Comment[nb]=Forbedre tilgjengeligheten med tastatur og mus
-Comment[nl]=Toegankelijkheid van muis en toetsenbord verbeteren
-Comment[pl]=Ulepsza dostępność klawiatury i myszy
-Comment[pt]=Melhorar a acessibilidade do teclado e do rato
-Comment[pt_BR]=Melhore a acessibilidade do teclado e do mouse
-Comment[ro]=Îmbunătățiți accesibilitatea tastaturii și a mausului
-Comment[ru]=Улучшение доступности клавиатуры и мыши
-Comment[sk]=Zlepšite prístupnosť klávesnice a myši
-Comment[sv]=Förbättra hjälpfunktioner för tangentbord och mus
-Comment[tr]=Klavye ve fare erişilebilirliklerini düzenleyiniz
-Comment[ug]=باستاختا ۋە چاشقىنەك accessibility نى ياخشىلاش
-Comment[uk]=Покращення доступності миші і клавіатури
-Comment[ur]=کیبورڈ اور ماؤس کی قابلیت رسائی بہتر کریں
-Comment[ur_PK]=کیبورڈ اور ماؤس کی قابلیت رسائی بہتر کریں
-Comment[zh_CN]=使您的键盘和鼠标更好用
-Comment[zh_TW]=改善鍵盤與滑鼠的輔助能力
-Exec=xfce4-accessibility-settings
-TryExec=xfce4-accessibility-settings
-Icon=preferences-desktop-accessibility
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-StartupNotify=true
-OnlyShowIn=XFCE;
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-settings.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce4-mixer.desktop b/menu/applications/xfce4-mixer.desktop
index 0f14ddf..4e6fd57 100644
--- a/menu/applications/xfce4-mixer.desktop
+++ b/menu/applications/xfce4-mixer.desktop
@@ -70,3 +70,4 @@ Type=Application
 StartupNotify=true
 Terminal=false
 Categories=X-XFCE;Audio;AudioVideo;
+NoDisplay=true
diff --git a/menu/applications/xfce4-notifyd-config.desktop b/menu/applications/xfce4-notifyd-config.desktop
deleted file mode 100644
index d9d3a4a..0000000
--- a/menu/applications/xfce4-notifyd-config.desktop
+++ /dev/null
@@ -1,84 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Notifications
-Name[ast]=Notificaciones
-Name[ca]=Notificacions
-Name[cs]=Oznámení
-Name[da]=Beskeder
-Name[de]=Benachrichtigungen
-Name[el]=Ειδοποιήσεις
-Name[en_GB]=Notifications
-Name[es]=Notificaciones
-Name[eu]=Berri-emateak
-Name[fi]=Huomautukset
-Name[fr]=Notifications
-Name[gl]=Notificacións
-Name[hu]=Értesítések
-Name[id]=Notifikasi
-Name[it]=Notifiche
-Name[ja]=通知
-Name[kk]=Хабарламалар
-Name[lv]=Paziņojumi
-Name[nb]=Varsling
-Name[nl]=Notificaties
-Name[pa]=ਨੋਟੀਫਿਕੇਸ਼ਨ
-Name[pl]=Powiadomienia
-Name[pt]=Notificações
-Name[pt_BR]=Notificações
-Name[pt_PT]=Notificações
-Name[ro]=Notificări
-Name[ru]=Оповещения
-Name[sk]=Oznámenia
-Name[sq]=Njoftime
-Name[sv]=Notifieringar
-Name[tr]=Bildiriler
-Name[ug]=ئەسكەرتمىلەر
-Name[uk]=Повідомлення
-Name[zh_CN]=通知
-Name[zh_TW]=通知
-Comment=Customize how notifications appear on your screen
-Comment[ast]=Personalice cómo aparecen les notificaciones na pantalla
-Comment[ca]=Personalitza com es mostren les notificacions
-Comment[cs]=Upravte způsob, jakým se budou oznámení zobrazovat
-Comment[da]=Tilpas hvordan beskeder fremkommer på din skærm
-Comment[de]=Das Erscheinungsbild von Benachrichtigungen anpassen
-Comment[el]=Προσαρμογή του τρόπου εμφάνισης των ειδοποιήσεων στην οθόνη
-Comment[en_GB]=Customise how notifications appear on your screen
-Comment[es]=Personalice cómo aparecen las notificaciones en la pantalla
-Comment[eu]=Pertsonalizatu berri-emateak zure pantailan nola agertuko diren
-Comment[fi]=Mukauta näytöllesi ilmestyvien huomautusten toimintaa
-Comment[fr]=Personnaliser les notifications système
-Comment[gl]=Personalice como se mostran as notificacións na súa pantalla
-Comment[hu]=A képernyőn megjelenő értesítések megjelenésének személyre szabása
-Comment[id]=Sesuaikan bagaimana notifikasi tampak di layar anda
-Comment[it]=Personalizzazione del modo in cui le notifiche appaiono sullo schermo
-Comment[ja]=画面上にどのように通知するか設定します
-Comment[kk]=Хабарламалар көрсетілуін таңдаңыз
-Comment[lv]=Pielāgojiet, kā paziņojumu parādās uz jūsu ekrāna
-Comment[nb]=Tilpass visning av varsler på skjermen din
-Comment[nl]=Weergave van notificaties instellen
-Comment[pa]=ਕਸਟਮਾਈਜ਼ ਕਰੋ ਕਿ ਤੁਹਾਡੀ ਸਕਰੀਨ ਉੱਤੇ ਨੋਟੀਫਿਕੇਸ਼ਨ ਕਿੰਝ ਵੇਖਾਈ ਦੇਣ
-Comment[pl]=Konfiguruje ustwienia powiadamiania
-Comment[pt]=Personalizar o modo como as notificações aparecem no monitor 
-Comment[pt_BR]=Personalize como as notificações devem aparecer na sua tela
-Comment[pt_PT]=Personalizar como as notificações aparecem no monitor 
-Comment[ro]=Personalizați cum apar pe ecran notificările
-Comment[ru]=Настройка поведения сервиса оповещений
-Comment[sk]=Prispôsobiť spôsob upozornenia na obrazovke
-Comment[sq]=Përshtasni mënyrën se si shfaqen njoftimet në ekranin tuaj
-Comment[sv]=Anpassa hur notifieringar ska visas på din skärm
-Comment[tr]=Bildirilerin görünümünü özelleştirin
-Comment[ug]=ئەسكەرتمىلەرنىڭ كۆرۈنۈش ئۇسۇلىنى Customize قىل
-Comment[uk]=Налаштуйте показ повідомлень на Вашому екрані
-Comment[zh_CN]=自定义通知在您屏幕上的显示方式
-Comment[zh_TW]=自訂通知該如何在您螢幕上顯示
-Exec=xfce4-notifyd-config
-TryExec=xfce4-notifyd-config
-Icon=xfce4-notifyd
-Terminal=false
-StartupNotify=true
-Type=Application
-OnlyShowIn=XFCE;
-Categories=X-XFCE;Settings;DesktopSettings;
-X-XfcePluggable=true
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce4-power-manager-settings.desktop b/menu/applications/xfce4-power-manager-settings.desktop
deleted file mode 100644
index 020123d..0000000
--- a/menu/applications/xfce4-power-manager-settings.desktop
+++ /dev/null
@@ -1,92 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Power Manager
-Name[ast]=Alministrador d'enerxía
-Name[ca]=Gestor d'energia
-Name[cs]=Správce napájení
-Name[da]=Strømstyring
-Name[de]=Energieverwaltung
-Name[el]=Διαχειριστής ρεύματος
-Name[en_GB]=Power Manager
-Name[es]=Administrador de energía
-Name[et]=Vooluhaldur
-Name[eu]=Energia kudeaketa
-Name[fi]=Virranhallinta
-Name[fr]=Gestionnaire d'alimentation
-Name[gl]=Xestor de enerxía
-Name[hu]=Energiakezelő
-Name[id]=Manajer Daya
-Name[it]=Gestore di energia
-Name[ja]=電源管理
-Name[kk]=Электр қоректендіру басқарушысы
-Name[nb]=Strømstyring
-Name[pa]=ਪਾਵਰ ਮੈਨੇਜਰ
-Name[pt]=Gestão de energia
-Name[pt_BR]=Gerenciador de energia
-Name[ru]=Менеджер питания 
-Name[si]=ශක්ති කළමනාකාරකය
-Name[sk]=Správca napájania
-Name[sv]=Strömhanterare
-Name[tr]=Güç Yöneticisi
-Name[ug]=مەنبە باشقۇرغۇ
-Name[uk]=Менеджер живлення
-Name[ur]=توانائی منیجر
-Name[ur_PK]=توانائی منیجر
-Name[zh_CN]=电源管理器
-GenericName=Power Manager
-GenericName[ast]=Alministrador d'enerxía
-GenericName[ca]=Gestor d'energia
-GenericName[cs]=Správce napájení
-GenericName[da]=Strømstyring
-GenericName[de]=Energieverwaltung
-GenericName[el]=Διαχειριστής ρεύματος
-GenericName[en_GB]=Power Manager
-GenericName[es]=Administrador de energía
-GenericName[et]=Vooluhaldur
-GenericName[eu]=Energia kudeaketa
-GenericName[fi]=Virranhallinta
-GenericName[fr]=Gestionnaire d'alimentation
-GenericName[gl]=Xestor de enerxía
-GenericName[hu]=Energiakezelő
-GenericName[id]=Manajer Daya
-GenericName[it]=Gestore di energia
-GenericName[ja]=電源管理
-GenericName[kk]=Электр қоректендіру басқарушысы
-GenericName[nb]=Strømstyring
-GenericName[pa]=ਪਾਵਰ ਮੈਨੇਜਰ
-GenericName[pt]=Gestão de energia
-GenericName[pt_BR]=Gerenciador de energia
-GenericName[ru]=Менеджер питания 
-GenericName[si]=ශක්ති කළමනාකාරකය
-GenericName[sk]=Správca napájania
-GenericName[sv]=Strömhanterare
-GenericName[tr]=Güç Yöneticisi
-GenericName[ug]=مەنبە باشقۇرغۇ
-GenericName[uk]=Менеджер живлення
-GenericName[ur]=توانائی منیجر
-GenericName[ur_PK]=توانائی منیجر
-GenericName[zh_CN]=电源管理器
-Comment=Settings for the Xfce Power Manager
-Comment[da]=Indstillinger til strømstyring til Xfce
-Comment[de]=Einstellungen für die Xfce Energieverwaltung
-Comment[el]=Ρυθμίσεις για τον διαχειριστή ενέργειας του xfce
-Comment[en_GB]=Settings for the Xfce Power Manager
-Comment[fi]=Xfce:n virrankäyttöasetukset
-Comment[fr]=Configuration du gestionnaire d'alimentation Xfce
-Comment[gl]=Configuración do Xestor de enerxía de Xfce
-Comment[it]=Impostazioni per il gestore di energia di Xfce
-Comment[ja]=Xfce 電源管理を設定します
-Comment[pt]=Definições para a gestão de energia Xfce
-Comment[ru]=Настройка менеджера питания Xfce
-Comment[zh_CN]=Xfce 电源管理器设置
-Exec=xfce4-power-manager-settings
-TryExec=xfce4-power-manager-settings
-Icon=xfpm-ac-adapter
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-OnlyShowIn=XFCE;
-StartupNotify=true
-X-XfcePluggable=true
-X-XfceHelpFile=xfce4-power-manager.html
-Hidden=true
\ No newline at end of file
diff --git a/menu/applications/xfce4-settings-editor.desktop b/menu/applications/xfce4-settings-editor.desktop
deleted file mode 100644
index d291d23..0000000
--- a/menu/applications/xfce4-settings-editor.desktop
+++ /dev/null
@@ -1,88 +0,0 @@
-[Desktop Entry]
-Name=Settings Editor
-Name[ar]=محرر الإعدادات
-Name[ast]=Editor de configuración
-Name[bn]=সেটিংস সম্পাদক
-Name[ca]=Editor de paràmetres
-Name[cs]=Editor nastavení
-Name[da]=Indstillingsredigering
-Name[de]=Einstellungseditor
-Name[el]=Επεξεργαστής ρυθμίσεων
-Name[en_GB]=Settings Editor
-Name[es]=Editor de configuración
-Name[eu]=Ezarpen editorea
-Name[fi]=Asetukset
-Name[fr]=Éditeur de paramètres
-Name[gl]=Editor de configuración
-Name[he]=עורך הגדרות
-Name[hr]=Uređivač postavki
-Name[hu]=Beállításszerkesztő
-Name[id]=Penyunting Pengaturan
-Name[it]=Editor delle impostazioni
-Name[ja]=設定エディタ
-Name[kk]=Баптаулар түзетуші
-Name[lv]=Uzstādījumu redaktors
-Name[nb]=Innstillingsredigering
-Name[nl]=Xfconf-instellingenbeheer
-Name[pa]=ਸੈਟਿੰਗ ਐਡੀਟਰ
-Name[pl]=Edytor ustawień
-Name[pt]=Editor de definições
-Name[pt_BR]=Editor de Configurações
-Name[ro]=Editor de opțiuni
-Name[ru]=Редактор экспертных настроек
-Name[sk]=Editor nastavení
-Name[sv]=Inställningsredigerare
-Name[tr]=Ayarlar Düzenleyicisi
-Name[ug]=تەڭشەك تەھرىرلىگۈ
-Name[uk]=Редактор параметрів
-Name[ur]=ترتیبات ایڈیٹر
-Name[ur_PK]=ترتیبات ایڈیٹر
-Name[zh_CN]=设置编辑器
-Name[zh_TW]=設定值編輯器
-Comment=Graphical settings editor for Xfconf
-Comment[ar]=محرر إعدادات رسومي لـXfce 4
-Comment[ast]=Editor gráficu de configuración pa Xfconf
-Comment[bn]=Xfconf-র জন্য গ্রাফিকাল সেটিংস সম্পাদক
-Comment[ca]=Editor gràfic de paràmetres de Xfconf
-Comment[cs]=Grafický editor nastavení služby Xfconf
-Comment[da]=Grafisk indstillingredigering til Xfconf
-Comment[de]=Grafischer Einstellungseditor für Xfconf
-Comment[el]=Γραφικός επεξεργαστής ρυθμίσεων για το xfconf
-Comment[en_GB]=Graphical settings editor for Xfconf
-Comment[es]=Editor gráfico de configuración para Xfconf
-Comment[eu]=Xfconf-ren ezarpen editore grafikoa
-Comment[fi]=Graafinen Xfconf-asetusten muokkain
-Comment[fr]=Éditeur graphique des paramètres Xfconf
-Comment[gl]=Editor gráfico de configuración para Xfconf
-Comment[he]=עורך הגדרות גרפי עבור Xfconf
-Comment[hr]=Grafički uređivač postavki za Xfconf
-Comment[hu]=Grafikus beállításszerkesztő az Xfconf-hoz
-Comment[id]=Penyunting pengaturan grafis untuk Xfconf
-Comment[it]=Editor grafico delle impostazioni per Xfconf
-Comment[ja]=Xfconf のグラフィカル設定エディタです
-Comment[kk]=Xfconf үшін баптауларды графикалық түзетуші
-Comment[lv]=Grafiskais uzstādījumu redaktors priekš Xfconf
-Comment[nb]=Grafisk innstillingsredigering for Xfconf
-Comment[nl]=Grafisch Xfconf-instellingenbeheer
-Comment[pl]=Graficzny edytor ustawień dla programu Xconf
-Comment[pt]=Editor gráfico de definições para o Xfconf
-Comment[pt_BR]=Editor de configurações gráficas para o Xfconf
-Comment[ro]=Editor grafic al opțiunilor Xfconf
-Comment[ru]=Графический редактор настроек для Xfconf
-Comment[sk]=Grafický editor nastavení pre Xfconf
-Comment[sv]=Grafisk inställningsredigerare för Xfconf
-Comment[tr]=Xfconf için grafik ayarlar düzenleyicisi
-Comment[ug]=Xfconf نىڭ گرافىكىلىق تەڭشەك تەھرىرلىگۈسى
-Comment[uk]=Графічний редактор параметрів для Xfconf
-Comment[ur]=تصویری ترتیبات مدون کار برائے Xfconf
-Comment[ur_PK]=تصویری ترتیبات مدون کار برائے Xfconf
-Comment[zh_CN]=Xfconf 的图形界面设置编辑器
-Comment[zh_TW]=Xfconf 的圖形化設定值編輯器
-Exec=xfce4-settings-editor
-TryExec=xfce4-settings-editor
-Icon=preferences-system
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;
-OnlyShowIn=XFCE;
-X-XfceSettingsManagerHidden=true
diff --git a/menu/applications/xfhelp4.desktop b/menu/applications/xfhelp4.desktop
deleted file mode 100644
index abd87e2..0000000
--- a/menu/applications/xfhelp4.desktop
+++ /dev/null
@@ -1,75 +0,0 @@
-[Desktop Entry]
-Hidden=true
-Version=1.0
-Type=Application
-Exec=xfhelp4
-TryExec=xfhelp4
-Icon=help-contents
-StartupNotify=false
-Terminal=false
-Categories=Utility;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-Name=Help
-Name[ca]=Ajuda
-Name[cs]=Nápověda
-Name[da]=Hjælp
-Name[de]=Hilfe
-Name[el]=Βοήθεια
-Name[en_GB]=Help
-Name[es]=Ayuda
-Name[eu]=Laguntza
-Name[fi]=Ohje
-Name[fr]=Aide
-Name[gl]=Axuda
-Name[he]=עזרה
-Name[hr]=Pomoć
-Name[hu]=Súgó
-Name[id]=Bantuan
-Name[it]=Aiuto
-Name[ja]=ヘルプ
-Name[kk]=Көмек
-Name[nb]=Hjelp
-Name[nl]=Hulp
-Name[pl]=Pomoc
-Name[pt]=Ajuda
-Name[pt_BR]=Ajuda
-Name[ro]=Ajutor
-Name[ru]=Справка
-Name[sk]=Pomocník
-Name[sv]=Hjälp
-Name[ug]=يادەم
-Name[uk]=Допомога
-Name[zh_CN]=帮助
-Name[zh_TW]=幫助
-Comment=Help using Xfce
-Comment[ca]=Ajuda de Xfce
-Comment[cs]=Nápověda o používání prostředí Xfce
-Comment[da]=Hjælp til brug af Xfce
-Comment[de]=Hilfe zur Nutzung von Xfce
-Comment[el]=Βοήθεια για τη χρήση του Xfce
-Comment[en_GB]=Help using Xfce
-Comment[es]=Ayuda usando Xfce
-Comment[eu]=Lagundu Xfce erabiltzen
-Comment[fi]=Ohjeita Xfce:n käyttöön
-Comment[fr]=Aide Xfce
-Comment[gl]=Axuda sobre o uso de Xfce
-Comment[he]=עזרה בשימוש ב־Xfce
-Comment[hr]=Pomoć pri  korištenju Xfce
-Comment[hu]=Segítség az Xfce használatához
-Comment[id]=Bantuan menggunakan Xfce
-Comment[it]=Aiuto per l'utilizzo di Xfce
-Comment[ja]=Xfce の使用に関するヘルプです
-Comment[kk]=Xfce қолдану көмегі
-Comment[nb]=Hjelp til å bruke Xfce
-Comment[nl]=Hulp bij het gebruik van Xfce
-Comment[pl]=Pomoc dla środowiska Xfce
-Comment[pt]=Ajuda de utilização Xfce
-Comment[pt_BR]=Ajuda usando Xfce
-Comment[ro]=Ajutor pentru utilizarea Xfce
-Comment[ru]=Справка по использованию Xfce
-Comment[sk]=Pomocník pre používanie Xfce
-Comment[sv]=Hjälp hur man använder Xfce
-Comment[ug]=Xfce ياردەملىرى
-Comment[uk]=Допомога про використання Xfce
-Comment[zh_CN]=使用 Xfce 的帮助
-Comment[zh_TW]=幫助您使用 Xfce
diff --git a/menu/applications/xsane.desktop b/menu/applications/xsane.desktop
deleted file mode 100644
index 72d9307..0000000
--- a/menu/applications/xsane.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=XSane Image scanning program
-Name[ru]=Программа для сканирования изображений
-Name[ca]=Programa d'escaneig d'imatges XSane
-Name[es]=Programa de escaneo de imágenes XSane
-Name[fr]=Programme d'acquisition d'images XSane
-Comment=A program to work with scanner. Can be used as a scanning, copier, OCR, fax tools.
-Comment[ru]=Программа для работы со сканером. Может быть использована в качестве копировального аппарата, факса, и др.
-Comment[ca]=Un programa per a treballar amb escànners. Es pot utilitzar com una eina d'escanejat, copiat, OCR i fax.
-Comment[es]=Un programa para trabajar con escáners. Se puede utilizar como una herramienta para escanear, copiar, OCR y fax.
-Comment[fr]=Un programme d'acquisition d'images pour votre scanner. Peut également photocopier, faxer ou faire de la reconnaissance de caractères.
-Exec=xsane
-TryExec=xsane
-Icon=xsane
-Terminal=false
-Type=Application
-Categories=GTK;Application;Graphics;RasterGraphics;Scanning;
-StartupNotify=true
diff --git a/notes/Makefile b/notes/Makefile
index e33a276..0bf7dd5 100644
--- a/notes/Makefile
+++ b/notes/Makefile
@@ -2,4 +2,7 @@
 install:
 	install -d $(datadir)/alt-notes
 	cp -a *.html $(datadir)/alt-notes
-	ln -s release-notes.ru.html $(datadir)/alt-notes/livecd-finish.ru.html
+	for relnotes in release-notes.*.html; do \
+		suffix="$${relnotes#release-notes.}"; \
+		ln -s $$relnotes $(datadir)/alt-notes/livecd-finish.$$suffix; \
+	done
diff --git a/notes/license.all.html.in b/notes/license.all.html.in
index 26e5ba3..a15d849 100644
--- a/notes/license.all.html.in
+++ b/notes/license.all.html.in
@@ -6,12 +6,12 @@
 <body>
 
 <h2>License agreement</h2>
-<h3>for Informika 6.0 School Junior and included software applications</h3>
+<h3>for @PRODUCT_NAME@ and included software applications</h3>
 
 <p><b>1. Agreement information</b></p>
 <p>1.1 Parties to the contract</p>
 
-<p>This Software License Agreement ("Agreement") is made and effective by and between ALT Linux Ltd. ("DEVELOPER"), which owns rights for <strong>@NAME@ @VERSION@ @STATUS@</strong> ("Distribution") and you ("Licensee"), end-user of the Distribution.</p>
+<p>This Software License Agreement ("Agreement") is made and effective by and between ALT Linux Ltd. ("DEVELOPER"), which owns rights for <strong>@PRODUCT_NAME@</strong> ("Distribution") and you ("Licensee"), end-user of the Distribution.</p>
 
 <p>1.2 Agreement object</p>
 
@@ -84,8 +84,8 @@
 
 <hr/>
 <p>
-<em>
-http://www.simplylinux.ru
+<em>ALT Linux Ltd. Moscow, 5th Donskoy proezd, 15/6<br>
+http://www.altlinux.com
 </em>
 </p>
 </body>
diff --git a/notes/license.ru.html.in b/notes/license.ru.html.in
index 7610dc7..edb4d7c 100644
--- a/notes/license.ru.html.in
+++ b/notes/license.ru.html.in
@@ -6,14 +6,19 @@
 <body>
 
 <h2>Лицензионный договор</h2>
-<h3>на программное обеспечение Информика 6.0 Школьный Юниор и включенные в него программы для ЭВМ</h3>
+<h3>на программное обеспечение @PRODUCT_NAME_RU@ и включенные в него программы для ЭВМ</h3>
 
 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>
 
 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
+<<<<<<< HEAD
 <strong>Информика 6.0 Школьный Юниор</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, пользователь ДИСТРИБУТИВА.</p>
+=======
+<strong>@PRODUCT_NAME_RU@</strong> 
+(далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
+>>>>>>> school-teacher
 
 <p>1.2 Предмет договора</p>
 <p>Настоящий лицензионный договор регулирует права пользователя ДИСТРИБУТИВА на использование ДИСТРИБУТИВА, а также включенных в состав ДИСТРИБУТИВА отдельных программ для ЭВМ (далее — ПРОГРАММЫ) и других результатов интеллектуальной деятельности и средств индивидуализации в объеме, указанном в настоящем договоре.</p>
diff --git a/notes/license.uk.html.in b/notes/license.uk.html.in
deleted file mode 120000
index 91a56c0..0000000
--- a/notes/license.uk.html.in
+++ /dev/null
@@ -1 +0,0 @@
-license.ru.html.in
\ No newline at end of file
diff --git a/notes/livecd-start.ru.html b/notes/livecd-start.ru.html
index 2be0538..17f361d 100644
--- a/notes/livecd-start.ru.html
+++ b/notes/livecd-start.ru.html
@@ -7,8 +7,9 @@
 <BODY>
 <P ALIGN=JUSTIFY>
 Перед тем, как начать установку, пожалуйста, закройте все открытые окна приложений.
-<br><br>
+</p>
+<P ALIGN=JUSTIFY>
 Во время работы все устройства будут отмонтированы, а все разделы подкачки отключены.
 </P>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/notes/livecd-start.uk.html b/notes/livecd-start.uk.html
deleted file mode 120000
index 6e9aebf..0000000
--- a/notes/livecd-start.uk.html
+++ /dev/null
@@ -1 +0,0 @@
-livecd-start.ru.html
\ No newline at end of file
diff --git a/notes/livecd-start.uk.html b/notes/livecd-start.uk.html
new file mode 100644
index 0000000..5ba581d
--- /dev/null
+++ b/notes/livecd-start.uk.html
@@ -0,0 +1,14 @@
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+</HEAD>
+<BODY>
+<P ALIGN=JUSTIFY>
+Будь ласка, зачиніть усі вікна додатків, що відкриті, до початку встановлення.
+</p>
+<P ALIGN=JUSTIFY>
+Під час роботи усі пристрої будуть відмонтовані, а swap-підрозділи відключені.
+</P>
+</BODY>
+</HTML>
diff --git a/notes/release-notes.all.html.in b/notes/release-notes.all.html.in
index c67a7e5..40fdde1 100644
--- a/notes/release-notes.all.html.in
+++ b/notes/release-notes.all.html.in
@@ -1,20 +1,43 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-    <meta http-equiv="content-type" value="text/html;charset=utf-8"/>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 </head>
 <body>
-    <H2>Thank you for choosing Informika 6.0 School Junior!</H2>
+    <center><p>
+        Thank you for choosing @PRODUCT_NAME@!
+    </p></center>
     <p>
     You can learn more about features of this product at our official site:
     <a href="http://www.altlinux.ru">www.altlinux.ru</a>.
     </p>
     <p>
+    You can start working right now: creating and editing office documents,
+    browsing Internet sites, processing audio and images, and a lot of
+    other activities. Look through the menu to find many new useful
+    programs.
+    </p>
+    <p>
     <em>Hint</em>: if you visit
     <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>, you'll find the
     whole assortment of ALT Linux products and services, with useful,
     interesting, and even exclusive items for IT professionals, users and
     connosseurs of ALT Linux products.
     </p>
+    <p>Other userful resources:</p>
+    <dl>
+        <dt><strong>Distribution Welcome Page</strong> (make this page as web-browser start page)
+            <dd><a href="file:/usr/share/doc/indexhtml/index.html">file:/usr/share/doc/indexhtml/index.html</a>
+        <dt>Online Documentation
+            <dd><a href="http://docs.altlinux.org">http://docs.altlinux.org</a>
+        <dt>Wiki
+            <dd><a href="http://altlinux.org/">http://altlinux.org/</a>
+        <dt>FAQ
+            <dd><a href="http://altlinux.org/FAQ">http://altlinux.org/FAQ</a>
+        <dt>Community Forum
+            <dd><a href="http://forum.altlinux.org">http://forum.altlinux.org</a>
+    </dl>
+    <p>This page is available after installation in System Control Center (<tt>acc</tt>) - Release Notes.
+    <p><i>Free Software for Free People</i></p>
 </body>
 </html>
diff --git a/notes/release-notes.ru.html.in b/notes/release-notes.ru.html.in
index 4cafc4f..1afe86f 100644
--- a/notes/release-notes.ru.html.in
+++ b/notes/release-notes.ru.html.in
@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 </HEAD>
 <BODY>
-    <H2>Спасибо Вам за выбор Информика 6.0 Школьный Юниор!</H2>
+    <H2>Спасибо Вам за выбор @PRODUCT_NAME_RU@!</H2>
     <p>
     На нашем официальном сайте
     <a href="http://www.altlinux.ru">www.altlinux.ru</a> вы можете
@@ -18,5 +18,20 @@
     полезного, интересного и даже эксклюзивного для специалистов,
     пользователей и ценителей системы.
     </p>
+    <p>Другие полезные ресурсы:</p>
+    <dl>
+        <dt><strong>Страница дистрибутива</strong> (можете сделать её домашней страницей веб-браузера)
+            <dd><a href="file:/usr/share/doc/indexhtml/index.html">file:/usr/share/doc/indexhtml/index.html</a>
+        <dt>Онлайновая документация
+            <dd><a href="http://docs.altlinux.org">http://docs.altlinux.org</a>
+        <dt>Wiki
+            <dd><a href="http://altlinux.org/">http://altlinux.org/</a>
+        <dt>FAQ
+            <dd><a href="http://altlinux.org/FAQ">http://altlinux.org/FAQ</a>
+        <dt>Форум сообщества
+            <dd><a href="http://forum.altlinux.org">http://forum.altlinux.org</a>
+    </dl>
+    <p>Эта страница доступна после установки в Центре управления системой (<tt>acc</tt>) → Информация о дистрибутиве.
+    <p><i>Свободные программы для свободных людей</i></p>
 </BODY>
 </HTML>
diff --git a/notes/release-notes.uk.html.in b/notes/release-notes.uk.html.in
new file mode 100644
index 0000000..ada39eb
--- /dev/null
+++ b/notes/release-notes.uk.html.in
@@ -0,0 +1,21 @@
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+</HEAD>
+<BODY>
+<H2>Дякуємо Вам за вибір Simply Linux!</H2>
+
+<P ALIGN=JUSTIFY>
+Операційну систему успішно встановлено та налаштовано, Ви можете
+починати працювати одразу після перезавантаження.
+</p>
+<P ALIGN=JUSTIFY>
+Сподіваємось, що Вам сподобається!
+</p>
+<P ALIGN=JUSTIFY>
+Корисну інформацію російською щодо системи Ви можете знайти
+на сайті проекту <a href='http://www.simplylinux.ru'>www.simplylinux.ru</a>.
+</P>
+</BODY>
+</HTML>
diff --git a/slideshow/slideshow.conf b/slideshow/slideshow.conf
index aa4854b..30fb4c3 100644
--- a/slideshow/slideshow.conf
+++ b/slideshow/slideshow.conf
@@ -1,2 +1,3 @@
 step=30
 once=false
+url=/usr/share/install2/slideshow/slides
diff --git a/system-settings/ldm_pam_environment b/system-settings/ldm_pam_environment
new file mode 100644
index 0000000..2e45680
--- /dev/null
+++ b/system-settings/ldm_pam_environment
@@ -0,0 +1,4 @@
+# Workaround for ALT bug #29167.
+# Based on suggestion by Daniel Gnoutcheff (gnoutchd)
+# https://bugs.launchpad.net/lightdm/+bug/1024482/comments/18.
+GDK_CORE_DEVICE_EVENTS=true
diff --git a/system-settings/polkit-rules/70-SL-NM-allow-modify-system.rules b/system-settings/polkit-rules/70-SL-NM-allow-modify-system.rules
new file mode 100644
index 0000000..014dea1
--- /dev/null
+++ b/system-settings/polkit-rules/70-SL-NM-allow-modify-system.rules
@@ -0,0 +1,6 @@
+polkit.addRule(function(action, subject) {
+	if (action.id == "org.freedesktop.NetworkManager.settings.modify.system" &&
+		subject.isInGroup("wheel")) {
+		return polkit.Result.YES;
+	};
+});
diff --git a/xfce-settings/backgrounds/slinux_march_2013_1600x1200.png b/xfce-settings/backgrounds/slinux_march_2013_1600x1200.png
new file mode 100644
index 0000000..b15a6a1
Binary files /dev/null and b/xfce-settings/backgrounds/slinux_march_2013_1600x1200.png differ
diff --git a/xfce-settings/backgrounds/slinux_march_2013_1680x1050.png b/xfce-settings/backgrounds/slinux_march_2013_1680x1050.png
new file mode 100644
index 0000000..f4d99f9
Binary files /dev/null and b/xfce-settings/backgrounds/slinux_march_2013_1680x1050.png differ
diff --git a/xfce-settings/backgrounds/slinux_march_2013_1920x1080.jpg b/xfce-settings/backgrounds/slinux_march_2013_1920x1080.jpg
new file mode 100644
index 0000000..44f3eb5
Binary files /dev/null and b/xfce-settings/backgrounds/slinux_march_2013_1920x1080.jpg differ
diff --git a/xfce-settings/etcskel/.config/Thunar/volmanrc b/xfce-settings/etcskel/.config/Thunar/volmanrc
deleted file mode 100644
index 3790a4a..0000000
--- a/xfce-settings/etcskel/.config/Thunar/volmanrc
+++ /dev/null
@@ -1,30 +0,0 @@
-[Configuration]
-AutomountDrives=TRUE
-AutomountMedia=TRUE
-Autobrowse=TRUE
-Autorun=TRUE
-Autoopen=TRUE
-Autoburn=TRUE
-AutoburnDataCommand=brasero
-AutoburnAudioCommand=brasero
-AutoplayAudioCd=TRUE
-AutoplayAudioCdCommand=gnome-mplayer %d
-AutoplayVideoCd=TRUE
-AutoplayVideoCdCommand=gnome-mplayer %d
-Autoipod=FALSE
-AutoipodCommand=
-Autophoto=TRUE
-AutophotoCommand=gthumb --import-photos
-Autopalm=FALSE
-AutopalmCommand=gpilotd-control-applet
-Autopocketpc=FALSE
-AutopocketpcCommand=multisync
-Autoprinter=FALSE
-AutoprinterCommand=gnome-printer-add hal://%h
-Autokeyboard=FALSE
-AutokeyboardCommand=
-Automouse=FALSE
-AutomouseCommand=
-Autotablet=FALSE
-AutotabletCommand=
-
diff --git a/xfce-settings/etcskel/.config/autostart/xfce4-settings-helper-autostart.desktop b/xfce-settings/etcskel/.config/autostart/xfce4-settings-helper-autostart.desktop
deleted file mode 100644
index 5673067..0000000
--- a/xfce-settings/etcskel/.config/autostart/xfce4-settings-helper-autostart.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-
diff --git a/xfce-settings/etcskel/.config/autostart/xfce4-tips-autostart.desktop b/xfce-settings/etcskel/.config/autostart/xfce4-tips-autostart.desktop
deleted file mode 100644
index 5673067..0000000
--- a/xfce-settings/etcskel/.config/autostart/xfce4-tips-autostart.desktop
+++ /dev/null
@@ -1,3 +0,0 @@
-[Desktop Entry]
-Hidden=true
-
diff --git a/xfce-settings/etcskel/.config/autostart/xfconf-migration-4.6.desktop b/xfce-settings/etcskel/.config/autostart/xfconf-migration-4.6.desktop
deleted file mode 100644
index e1e3e17..0000000
--- a/xfce-settings/etcskel/.config/autostart/xfconf-migration-4.6.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
diff --git a/xfce-settings/etcskel/.fonts.conf b/xfce-settings/etcskel/.config/fontconfig/fonts.conf
similarity index 100%
rename from xfce-settings/etcskel/.fonts.conf
rename to xfce-settings/etcskel/.config/fontconfig/fonts.conf
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/actions-12.rc b/xfce-settings/etcskel/.config/xfce4/panel/actions-12.rc
deleted file mode 100644
index cef4af6..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/actions-12.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-type=0
-orientation=0
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/launcher-10.rc b/xfce-settings/etcskel/.config/xfce4/panel/launcher-10.rc
deleted file mode 100644
index 40a54f7..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/launcher-10.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-[Global]
-MoveFirst=false
-ArrowPosition=0
-
-[Entry 0]
-Name=Mozilla Firefox
-Comment=Интернет-проводник
-Icon=web-browser
-Exec=exo-open --launch WebBrowser
-Terminal=false
-StartupNotify=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/launcher-5/13015098300.desktop b/xfce-settings/etcskel/.config/xfce4/panel/launcher-5/13015098300.desktop
deleted file mode 100644
index 5b6964a..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/launcher-5/13015098300.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Web browser
-Name[ru]=Веб-браузер
-Comment=Интернет-проводник
-Icon=web-browser
-Exec=exo-open --launch WebBrowser
-Path=
-Terminal=false
-StartupNotify=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/launcher-5/13403667181.desktop b/xfce-settings/etcskel/.config/xfce4/panel/launcher-5/13403667181.desktop
new file mode 100644
index 0000000..5042474
--- /dev/null
+++ b/xfce-settings/etcskel/.config/xfce4/panel/launcher-5/13403667181.desktop
@@ -0,0 +1,18 @@
+
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch WebBrowser %u
+TryExec=exo-open --launch WebBrowser %u
+Icon=web-browser
+StartupNotify=false
+Terminal=false
+Categories=Network;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+MimeType=x-scheme-handler/http;x-scheme-handler/https;
+Name=Web Browser
+Name[ru]=Веб-браузер
+Comment=Browse the web
+Comment[ru]=Смотреть в интернете
+X-XFCE-Source=file:///usr/share/slinux-style/applications/exo-web-browser.desktop
+Path=
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/orageclock-12433258364.rc b/xfce-settings/etcskel/.config/xfce4/panel/orageclock-12433258364.rc
deleted file mode 100644
index 4df5f20..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/orageclock-12433258364.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-show_frame=false
-fg_set=false
-bg_set=false
-timezone=
-width_set=false
-height_set=false
-show0=true
-data0=%R
-font0=
-show1=false
-show2=false
-tooltip=%A, %d %b, %Y
-hib_timing=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/pager-2.rc b/xfce-settings/etcskel/.config/xfce4/panel/pager-2.rc
deleted file mode 100644
index cb0d5e9..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/pager-2.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-rows=2
-scrolling=true
-show-names=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/panels.xml b/xfce-settings/etcskel/.config/xfce4/panel/panels.xml
deleted file mode 100644
index b1b0f64..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/panels.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config SYSTEM "config.dtd">
-<panels>
-	<panel>
-		<properties>
-			<property name="size" value="32"/>
-			<property name="monitor" value="0"/>
-			<property name="screen-position" value="11"/>
-			<property name="fullwidth" value="1"/>
-			<property name="xoffset" value="0"/>
-			<property name="yoffset" value="767"/>
-			<property name="handlestyle" value="0"/>
-			<property name="autohide" value="0"/>
-			<property name="transparency" value="20"/>
-			<property name="activetrans" value="0"/>
-		</properties>
-		<items>
-			<item name="xfce4-menu" id="5"/>
-			<item name="separator" id="6"/>
-			<item name="showdesktop" id="1"/>
-			<item name="separator" id="12433231430"/>
-			<item name="launcher" id="10"/>
-			<item name="separator" id="12433231771"/>
-			<item name="launcher" id="9"/>
-			<item name="pager" id="2"/>
-			<item name="tasklist" id="3"/>
-			<item name="xkb-plugin" id="12433233132"/>
-			<item name="systray" id="4"/>
-			<item name="separator" id="11"/>
-			<item name="xfce4-mixer-plugin" id="12695164530"/>
-			<item name="orageclock" id="12433258364"/>
-			<item name="separator" id="13"/>
-			<item name="actions" id="12"/>
-		</items>
-	</panel>
-</panels>
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/places-16.rc b/xfce-settings/etcskel/.config/xfce4/panel/places-16.rc
deleted file mode 100644
index c72d6c1..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/places-16.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-show_button_icon=true
-show_button_label=false
-label=Переход
-show_icons=true
-show_volumes=true
-mount_open_volumes=false
-show_bookmarks=true
-show_recent=true
-show_recent_clear=true
-show_recent_number=10
-search_cmd=
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/places-19.rc b/xfce-settings/etcskel/.config/xfce4/panel/places-19.rc
deleted file mode 100644
index caa7168..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/places-19.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-show_button_icon=true
-show_button_label=false
-label=Переход
-show_icons=true
-show_volumes=true
-mount_open_volumes=false
-show_bookmarks=true
-show_recent=true
-show_recent_clear=true
-show_recent_number=10
-search_cmd=
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/separator-11.rc b/xfce-settings/etcskel/.config/xfce4/panel/separator-11.rc
deleted file mode 100644
index c46dd6a..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/separator-11.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=2
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/separator-12433231430.rc b/xfce-settings/etcskel/.config/xfce4/panel/separator-12433231430.rc
deleted file mode 100644
index 967f05f..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/separator-12433231430.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=0
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/separator-12433231771.rc b/xfce-settings/etcskel/.config/xfce4/panel/separator-12433231771.rc
deleted file mode 100644
index 967f05f..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/separator-12433231771.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=0
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/separator-13.rc b/xfce-settings/etcskel/.config/xfce4/panel/separator-13.rc
deleted file mode 100644
index c46dd6a..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/separator-13.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=2
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/separator-6.rc b/xfce-settings/etcskel/.config/xfce4/panel/separator-6.rc
deleted file mode 100644
index c46dd6a..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/separator-6.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-separator-type=2
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/systray-4.rc b/xfce-settings/etcskel/.config/xfce4/panel/systray-4.rc
deleted file mode 100644
index 52e4b76..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/systray-4.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-[Global]
-ShowFrame=false
-Rows=1
-
-[Applications]
-xfce4-power-manager=false
-orage=false
-$(b'!'a'a']'v'd(b networkmanager=false
-apt-indicator-agent=false
-gnome-mplayer=false
-pidgin=false
-vlc=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/tasklist-3.rc b/xfce-settings/etcskel/.config/xfce4/panel/tasklist-3.rc
deleted file mode 100644
index 3a548d2..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/tasklist-3.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-grouping=0
-width=300
-all_workspaces=false
-expand=true
-flat_buttons=true
-show_handles=true
-fixed_width=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/xfce4-menu-5.rc b/xfce-settings/etcskel/.config/xfce4/panel/xfce4-menu-5.rc
deleted file mode 100644
index 90efd53..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/xfce4-menu-5.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-use_default_menu=true
-menu_file=
-icon_file=/usr/share/design/slinux/icons/large/slinux.png
-show_menu_icons=true
-button_title=Меню Xfce
-show_button_title=false
-
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-plugin-15.rc b/xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-plugin-15.rc
deleted file mode 100644
index 8cf86c9..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/xfce4-mixer-plugin-15.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-card=PlaybackPulseAudioMixer
-track=Master
-command=xfce4-mixer
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-12.rc b/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-12.rc
deleted file mode 100644
index e181594..0000000
--- a/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-12.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-display_type=1
-group_policy=2
-default_group=0
-never_modify_config=false
diff --git a/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-8.rc b/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-8.rc
new file mode 100644
index 0000000..64356ff
--- /dev/null
+++ b/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-8.rc
@@ -0,0 +1,11 @@
+display_type=1
+display_textsize=0
+group_policy=2
+default_group=0
+never_modify_config=false
+model=evdev
+layouts=us,ru
+variants=,
+toggle_option=grp:ctrl_shift_toggle
+compose_key_position=compose:menu
+
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
index a437fee..3df01c4 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar-volman.xml
@@ -23,14 +23,14 @@
   </property>
   <property name="autoplay-audio-cds" type="empty">
     <property name="enabled" type="bool" value="true"/>
-    <property name="command" type="string" value="gnome-mplayer %d"/>
+    <property name="command" type="string" value="smplayer %d"/>
   </property>
   <property name="autoplay-video-cds" type="empty">
     <property name="enabled" type="bool" value="true"/>
-    <property name="command" type="string" value="gnome-mplayer %d"/>
+    <property name="command" type="string" value="smplayer %d"/>
   </property>
   <property name="autophoto" type="empty">
-    <property name="enabled" type="bool" value="true"/>
-    <property name="command" type="string" value="gthumb --import-photos"/>
+    <property name="enabled" type="bool" value="false"/>
+    <property name="command" type="string" value=""/>
   </property>
 </channel>
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index 7cef225..a7bd2e7 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -4,7 +4,9 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/wallpaper.png"/>
+        <property name="image-path" type="string" value="/usr/share/design/current/backgrounds/default.png"/>
+        <property name="last-image" type="string" value="/usr/share/design/current/backgrounds/default.png"/>
+        <property name="last-single-image" type="string" value="/usr/share/design/current/backgrounds/default.png"/>
         <property name="color-style" type="int" value="3"/>
         <property name="image-style" type="int" value="0"/>
       </property>
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
index 207b150..c408ab4 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -15,6 +15,8 @@
       <property name="&lt;Control&gt;&lt;Alt&gt;Delete" type="string" value="gnome-system-monitor"/>
       <property name="&lt;Control&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
       <property name="Print" type="string" value="xfce4-screenshooter"/>
+      <property name="Super_L" type="string" value="xfce4-popup-applicationsmenu"/>
+      <property name="Super_R" type="string" value="xfce4-popup-applicationsmenu"/>
     </property>
   </property>
   <property name="xfwm4" type="empty">
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 5c3f611..917d3bc 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -1,98 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <channel name="xfce4-panel" version="1.0">
-  <property name="panels" type="uint" value="1">
-    <property name="panel-0" type="empty">
-      <property name="size" type="uint" value="32"/>
+  <property name="configver" type="int" value="2"/>
+  <property name="panels" type="array">
+    <value type="int" value="1"/>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=12;x=379;y=741"/>
+      <property name="position-locked" type="bool" value="true"/>
       <property name="length" type="uint" value="100"/>
-      <property name="locked" type="bool" value="true"/>
-      <property name="autohide" type="bool" value="false"/>
+      <property name="size" type="uint" value="32"/>
       <property name="plugin-ids" type="array">
         <value type="int" value="1"/>
         <value type="int" value="2"/>
         <value type="int" value="3"/>
         <value type="int" value="4"/>
         <value type="int" value="5"/>
+        <value type="int" value="6"/>
         <value type="int" value="7"/>
+        <value type="int" value="15"/>
+        <value type="int" value="8"/>
         <value type="int" value="9"/>
         <value type="int" value="10"/>
         <value type="int" value="11"/>
         <value type="int" value="12"/>
         <value type="int" value="13"/>
-        <value type="int" value="14"/>
-        <value type="int" value="15"/>
-        <value type="int" value="17"/>
         <value type="int" value="16"/>
-        <value type="int" value="19"/>
-        <value type="int" value="18"/>
+        <value type="int" value="14"/>
       </property>
-      <property name="horizontal" type="bool" value="true"/>
-      <property name="position" type="string" value="p=10;x=0;y=767"/>
-      <property name="leave-opacity" type="uint" value="100"/>
-      <property name="enter-opacity" type="uint" value="100"/>
     </property>
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="applicationsmenu">
-      <property name="show-menu-icons" type="bool" value="true"/>
       <property name="show-button-title" type="bool" value="false"/>
-      <property name="custom-menu-file" type="string" value=""/>
-      <property name="button-icon" type="string" value="/usr/share/design/slinux/icons/large/slinux.png"/>
-      <property name="button-title" type="string" value="Меню Xfce"/>
-      <property name="custom-menu" type="bool" value="false"/>
+      <property name="button-icon" type="string" value="slinux"/>
+      <property name="show-tooltips" type="bool" value="false"/>
+      <property name="show-generic-names" type="bool" value="true"/>
     </property>
     <property name="plugin-2" type="string" value="separator">
       <property name="style" type="uint" value="1"/>
     </property>
     <property name="plugin-3" type="string" value="showdesktop"/>
     <property name="plugin-4" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
+      <property name="style" type="uint" value="1"/>
     </property>
     <property name="plugin-5" type="string" value="launcher">
-      <property name="move-first" type="bool" value="false"/>
-      <property name="arrow-position" type="bool" value="false"/>
       <property name="items" type="array">
-        <value type="string" value="13015098300.desktop"/>
+        <value type="string" value="13403667181.desktop"/>
       </property>
     </property>
-    <property name="plugin-7" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-10" type="string" value="pager">
+    <property name="plugin-6" type="string" value="pager">
       <property name="rows" type="uint" value="2"/>
-      <property name="show-names" type="bool" value="false"/>
-      <property name="workspace-scrolling" type="bool" value="true"/>
     </property>
-    <property name="plugin-11" type="string" value="tasklist">
-      <property name="grouping" type="uint" value="0"/>
-      <property name="include-all-workspaces" type="bool" value="false"/>
+    <property name="plugin-7" type="string" value="tasklist">
       <property name="flat-buttons" type="bool" value="true"/>
-      <property name="show-handle" type="bool" value="true"/>
+      <property name="switch-workspace-on-unminimize" type="bool" value="false"/>
     </property>
-    <property name="plugin-12" type="string" value="xkb-plugin"/>
-    <property name="plugin-13" type="string" value="systray">
-      <property name="show-frame" type="bool" value="false"/>
-      <property name="rows" type="uint" value="1"/>
+    <property name="plugin-8" type="string" value="xkb-plugin"/>
+    <property name="plugin-9" type="string" value="systray">
       <property name="names-visible" type="array">
-        <value type="string" value="xfce4-power-manager"/>
+        <value type="string" value="fusion-icon"/>
+        <value type="string" value="apt-indicator"/>
         <value type="string" value="апплет networkmanager"/>
-        <value type="string" value="apt-indicator-agent"/>
+        <value type="string" value="blueman-applet"/>
+      </property>
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
+    <property name="plugin-10" type="string" value="separator">
+      <property name="style" type="uint" value="1"/>
+    </property>
+    <property name="plugin-11" type="string" value="mixer">
+      <property name="sound-card" type="string" value="PlaybackPulseAudioMixer"/>
+      <property name="track" type="string" value="Master"/>
+      <property name="command" type="string" value="pavucontrol"/>
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+    </property>
+    <property name="plugin-12" type="string" value="separator">
+      <property name="style" type="uint" value="1"/>
+    </property>
+    <property name="plugin-13" type="string" value="clock">
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
+    <property name="plugin-14" type="string" value="actions">
+      <property name="appearance" type="uint" value="0"/>
+      <property name="items" type="array">
+        <value type="string" value="-lock-screen"/>
+        <value type="string" value="-switch-user"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="-suspend"/>
+        <value type="string" value="-hibernate"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="-shutdown"/>
+        <value type="string" value="-restart"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="+logout"/>
+        <value type="string" value="-logout-dialog"/>
       </property>
     </property>
-    <property name="plugin-14" type="string" value="separator">
-      <property name="style" type="uint" value="1"/>
+    <property name="plugin-15" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="true"/>
     </property>
-    <property name="plugin-15" type="string" value="xfce4-mixer-plugin"/>
-    <property name="plugin-17" type="string" value="separator">
-      <property name="style" type="uint" value="1"/>
-    </property>
-    <property name="plugin-18" type="string" value="actions">
-      <property name="first-action" type="uint" value="0"/>
-    </property>
-	<property name="plugin-16" type="string" value="clock">
-      <property name="mode" type="uint" value="2"/>
-	  <property name="show-frame" type="bool" value="false"/>
-    </property>
-    <property name="plugin-19" type="string" value="places"/>
+    <property name="plugin-16" type="string" value="places"/>
   </property>
 </channel>
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
index 4cef51f..d62bf2a 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -2,7 +2,7 @@
 
 <channel name="xfce4-power-manager" version="1.0">
   <property name="xfce4-power-manager" type="empty">
-    <property name="lid-action-on-ac" type="uint" value="3"/>
+    <property name="lid-action-on-ac" type="uint" value="1"/>
     <property name="lid-action-on-battery" type="uint" value="1"/>
     <property name="dpms-enabled" type="bool" value="true"/>
     <property name="critical-power-level" type="uint" value="10"/>
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
index 1f4059e..d62a626 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -26,6 +26,9 @@
     <property name="Engine" type="empty"/>
   </property>
   <property name="compat" type="empty">
-    <property name="LaunchGNOME" type="bool" value="true"/>
+    <property name="LaunchGNOME" type="bool" value="false"/>
+  </property>
+  <property name="shutdown" type="empty">
+    <property name="LockScreen" type="bool" value="true"/>
   </property>
 </channel>
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
index b7bebed..75d4087 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -50,7 +50,7 @@
     <property name="snap_to_border" type="bool" value="true"/>
     <property name="snap_to_windows" type="bool" value="false"/>
     <property name="snap_width" type="int" value="10"/>
-    <property name="theme" type="string" value="Clearlooks"/>
+    <property name="theme" type="string" value="Clearlooks-Phenix"/>
     <property name="title_alignment" type="string" value="center"/>
     <property name="title_font" type="string" value="Sans Bold 9"/>
     <property name="title_horizontal_offset" type="int" value="0"/>
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index e9bd2e8..97bc0b9 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -2,8 +2,8 @@
 
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Clearlooks"/>
-    <property name="IconThemeName" type="string" value="Simple"/>
+    <property name="ThemeName" type="string" value="Clearlooks-Phenix"/>
+    <property name="IconThemeName" type="string" value="SimpleSL"/>
     <property name="DoubleClickTime" type="int" value="250"/>
     <property name="DoubleClickDistance" type="int" value="5"/>
     <property name="DndDragThreshold" type="int" value="8"/>
diff --git a/xfce-settings/etcskel/.local/share/applications/mimeapps.list b/xfce-settings/etcskel/.local/share/applications/mimeapps.list
new file mode 100644
index 0000000..2143082
--- /dev/null
+++ b/xfce-settings/etcskel/.local/share/applications/mimeapps.list
@@ -0,0 +1,93 @@
+[Added Associations]
+video/3gp=smplayer.desktop
+video/3gpp=smplayer.desktop
+video/divx=smplayer.desktop
+video/dv=smplayer.desktop
+video/matroska=smplayer.desktop
+video/mp2t=smplayer.desktop
+video/mp4=smplayer.desktop
+video/mpeg=smplayer.desktop
+video/msvideo=smplayer.desktop
+video/ogg=smplayer.desktop
+video/quicktime=smplayer.desktop
+video/vivo=smplayer.desktop
+video/vnd.mpegurl=smplayer.desktop
+video/vnd.rn-realvideo=smplayer.desktop
+video/webm=smplayer.desktop
+video/x-anim=smplayer.desktop
+video/x-flc=smplayer.desktop
+video/x-flic=smplayer.desktop
+video/x-flv=smplayer.desktop
+video/x-matroska=smplayer.desktop
+video/x-mng=smplayer.desktop
+video/x-mpeg=smplayer.desktop
+video/x-mpeg2=smplayer.desktop
+video/x-mpg=smplayer.desktop
+video/x-ms-asf=smplayer.desktop
+video/x-ms-asf-plugin=smplayer.desktop
+video/x-ms-asx=smplayer.desktop
+video/x-ms-wmp=smplayer.desktop
+video/x-ms-wmv=smplayer.desktop
+video/x-msvideo=smplayer.desktop
+video/x-nsv=smplayer.desktop
+video/x-ogm+ogg=smplayer.desktop
+video/x-quicktime=smplayer.desktop
+video/x-theora+ogg=smplayer.desktop
+video/x-totem-stream=smplayer.desktop
+video/x-webm=smplayer.desktop
+video/mpeg=smplayer.desktop
+image/png=ristretto.desktop
+image/gif=ristretto.desktop
+image/jpeg=ristretto.desktop
+image/bmp=ristretto.desktop
+image/x-pixmap=ristretto.desktop
+image/tiff=ristretto.desktop
+image/svg+xml=ristretto.desktop
+image/x-xpixmap=ristretto.desktop
+
+[Default Applications]
+video/3gp=smplayer.desktop
+video/3gpp=smplayer.desktop
+video/divx=smplayer.desktop
+video/dv=smplayer.desktop
+video/matroska=smplayer.desktop
+video/mp2t=smplayer.desktop
+video/mp4=smplayer.desktop
+video/mpeg=smplayer.desktop
+video/msvideo=smplayer.desktop
+video/ogg=smplayer.desktop
+video/quicktime=smplayer.desktop
+video/vivo=smplayer.desktop
+video/vnd.mpegurl=smplayer.desktop
+video/vnd.rn-realvideo=smplayer.desktop
+video/webm=smplayer.desktop
+video/x-anim=smplayer.desktop
+video/x-flc=smplayer.desktop
+video/x-flic=smplayer.desktop
+video/x-flv=smplayer.desktop
+video/x-matroska=smplayer.desktop
+video/x-mng=smplayer.desktop
+video/x-mpeg=smplayer.desktop
+video/x-mpeg2=smplayer.desktop
+video/x-mpg=smplayer.desktop
+video/x-ms-asf=smplayer.desktop
+video/x-ms-asf-plugin=smplayer.desktop
+video/x-ms-asx=smplayer.desktop
+video/x-ms-wmp=smplayer.desktop
+video/x-ms-wmv=smplayer.desktop
+video/x-msvideo=smplayer.desktop
+video/x-nsv=smplayer.desktop
+video/x-ogm+ogg=smplayer.desktop
+video/x-quicktime=smplayer.desktop
+video/x-theora+ogg=smplayer.desktop
+video/x-totem-stream=smplayer.desktop
+video/x-webm=smplayer.desktop
+video/mpeg=smplayer.desktop
+image/png=ristretto.desktop
+image/gif=ristretto.desktop
+image/jpeg=ristretto.desktop
+image/bmp=ristretto.desktop
+image/x-pixmap=ristretto.desktop
+image/tiff=ristretto.desktop
+image/svg+xml=ristretto.desktop
+image/x-xpixmap=ristretto.desktop
diff --git a/xfce-settings/etcskel/.local/share/gsettings-data-convert b/xfce-settings/etcskel/.local/share/gsettings-data-convert
deleted file mode 100644
index 3e0a80b..0000000
--- a/xfce-settings/etcskel/.local/share/gsettings-data-convert
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[State]
-timestamp=1301509402
-converted=gsettings-desktop-schemas.convert;evince.convert;org.gnome.crypto.cache.convert;brasero.convert;org.gnome.crypto.pgp.convert;
diff --git a/xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Calc.ods b/xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Calc.ods
similarity index 100%
rename from xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Calc.ods
rename to xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Calc.ods
diff --git a/xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Draw.odg b/xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Draw.odg
similarity index 100%
rename from xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Draw.odg
rename to xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Draw.odg
diff --git a/xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Impress.odp b/xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Impress.odp
similarity index 100%
rename from xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Impress.odp
rename to xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Impress.odp
diff --git a/xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Writer.odt b/xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Writer.odt
similarity index 100%
rename from xfce-settings/etcskel/Документы/Шаблоны/OpenOffice.org Writer.odt
rename to xfce-settings/etcskel/XDG-Templates.skel/OpenOffice.org Writer.odt
diff --git a/xfce-settings/scripts/zdg-move-templates.sh b/xfce-settings/scripts/zdg-move-templates.sh
new file mode 100644
index 0000000..99c7845
--- /dev/null
+++ b/xfce-settings/scripts/zdg-move-templates.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Move XDG-Templates.skel/ to XDG_TEMPLATES_DIR.
+
+SKEL_TEMPLATES_DIR="$HOME/XDG-Templates.skel"
+
+if [ -d "$SKEL_TEMPLATES_DIR" -a -f "$HOME/.config/user-dirs.dirs" -a \
+	! -L "$SKEL_TEMPLATES_DIR" ]; then
+
+	. "$HOME/.config/user-dirs.dirs"
+
+	if [ -n "$XDG_TEMPLATES_DIR" -a "$XDG_TEMPLATES_DIR" != "$HOME" -a \
+		 "$XDG_TEMPLATES_DIR" != "$SKEL_TEMPLATES_DIR" ]; then
+		if [ -d "$XDG_TEMPLATES_DIR" ] && rmdir "$XDG_TEMPLATES_DIR" ||
+				mkdir -p "${XDG_TEMPLATES_DIR%/*}"; then
+			mv "$SKEL_TEMPLATES_DIR" "$XDG_TEMPLATES_DIR" ||:
+		fi
+	fi
+fi