Merge branch 'school-server' into school-master

Conflicts: Makefile.in branding.spec components/ahttpd/images/groups/datetime.png components/ahttpd/images/groups/firewall.png components/ahttpd/images/groups/mail.png components/ahttpd/images/groups/network.png components/ahttpd/images/groups/pkg.png components/ahttpd/images/groups/servers.png components/ahttpd/images/groups/system.png components/ahttpd/images/groups/users.png components/ahttpd/images/groups/xorg.png components/ahttpd/images/steps/install2-preinstall.png components/ahttpd/images/steps/timezone.png components/ahttpd/styles/alterator.css.in components/bootloader/config.in components/bootloader/gfxboot.cfg.in components/browser-qt/design/design.qss.in components/indexhtml/index-en.html.in components/indexhtml/index-ru.html.in components/indexhtml/index.css components/systemd/os-release.in configure.ac gnome-settings/index.theme.in gnome-settings/metacity-theme-1.xml.in images/background16x9.png images/background4x3.png images/boot.png images/grub.png images/product-logo.png notes/index-ru.html.in slideshow/README
2013-10-16 18:53:08 +04:00 · 2013-10-16 18:53:08 +04:00 · 000989f5d0
commit 000989f5d0
parent 6cd045009c 96f4010d49
46 changed files with 356 additions and 563 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -4,10 +4,25 @@ NAME=@NAME@
 VERSION=@VERSION@

 all:
-# background
-	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -draw 'gravity SouthEast rotate -90 text -300,5 "$(STATUS)"' wallpaper.png
-	cp -al wallpaper.png graphics/backgrounds/default.png
-	cp -al wallpaper.png graphics/backgrounds/xdm.png
+# generate derivative graphics
+# make default wallpaper
+	cp -al images/background4x3.png images/wallpaper.png
+	cp -al images/wallpaper.png graphics/backgrounds/default.png
+	cp -al images/wallpaper.png graphics/backgrounds/xdm.png
+# make wallpapers for gfxboot and grub2
+	convert images/background4x3.png -resize 800x600 images/small.png
+
+# display status
+	if [ -n "$(STATUS)" ] ; then \
+		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@"' wlogo.png; \
+		convert wlogo.png images/product-logo.png -geometry +30+30 -composite images/boot.jpg; \
+	else \
+		convert images/wallpaper.png images/product-logo.png -geometry +30+30 -composite images/boot.jpg; \
+	fi
+	convert images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png
+	cp -al images/grub.png images/boot.png
+# product logo for ahttpd
+	cp -al images/product-logo.png components/ahttpd/images/product-logo.png

 include components.mk
 install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
--- a/branding.spec
+++ b/branding.spec
@ -1,12 +1,13 @@
-%define theme master
-%define Name School Master
-%define codename Phylloscopus inornatus
-%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-junior school-server school-terminal altlinux-centaurus sisyphus-server-light simply-linux
 %define brand school
+%define Brand School
+%define theme master
+%define Theme master
+%define codename Phylloscopus inornatus
+%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-junior school-lite school-master school-server school-teacher school-terminal simply-linux sisyphus-server-light altlinux-centaurus
 %define status альфа
 %define status_en alpha
-%define distro_name Informika 6.9.9 School Master (alpha)
-%define distro_name_ru Информика 6.9.9 Школьный Мастер (альфа)
+%define distro_name ALT Linux 6.9.9 School Master (alpha)
+%define distro_name_ru Альт Линукс 6.9.9 Школьный Мастер (альфа)

 Name: branding-%brand-%theme
 Version: 6.9.9
@ -15,9 +16,6 @@ BuildArch: noarch

 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
-%ifnarch %arm
-BuildRequires: cpio gfxboot >= 4 
-%endif

 BuildRequires(pre): libqt4-core
 BuildRequires: libalternatives-devel
@ -40,21 +38,19 @@ Distro-specific packages with design and texts for %distro_name.
 %description -l ru_RU.UTF-8
 Пакеты оформления для дистрибутива %distro_name_ru.

-
 %package bootloader
-Group: System/Configuration/Boot and Init
+Group:   System/Configuration/Boot and Init
 Summary: Graphical boot logo for grub2, lilo and syslinux
 Summary(ru_RU.UTF-8): Тема для экрана выбора вариантов загрузки (lilo и syslinux) 
 License: GPLv2+

-PreReq: coreutils
-Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
-
+PreReq:    coreutils
+Provides:  design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
+Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
 Provides:  branding-informika-schoolmaster-bootloader = %version-%release
 Obsoletes: branding-informika-schoolmaster-bootloader < %version-%release

-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 )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )

 %define grub_normal white/light-blue
 %define grub_high black/light-gray
@ -69,15 +65,15 @@ Suitable for both lilo and syslinux.

 %package bootsplash
 BuildArch: noarch
-Summary: Theme for splash animations during bootup
-Summary(ru_RU.UTF-8): Тема для экрана загрузки для дистрибутива %distro_name_ru.
-License: Distributable
-Group:  System/Configuration/Boot and Init
+Summary:  Theme for splash animations during bootup
+Summary(ru_RU.UTF-8): Тема для экрана загрузки для дистрибутива %distro_name_ru
+License:  Distributable
+Group:    System/Configuration/Boot and Init
 Provides: plymouth-theme-%theme
 Requires: plymouth-plugin-script
-PreReq: plymouth
+PreReq:   plymouth

-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootsplash ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootsplash ";done )

 Provides:  branding-informika-schoolmaster-bootsplash = %version-%release
 Obsoletes: branding-informika-schoolmaster-bootsplash < %version-%release
@ -97,6 +93,7 @@ License: GPL
 Group: System/Configuration/Other
 Provides: design-alterator-browser-%theme  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
 Provides: alterator-icons design-alterator design-alterator-%theme
+Obsoletes:  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt 

 # lexicographically first of the village
 Conflicts: branding-sisyphus-server-light-alterator
@ -104,7 +101,7 @@ Conflicts: branding-sisyphus-server-light-alterator
 Provides:  branding-informika-schoolmaster-alterator = %version-%release
 Obsoletes: branding-informika-schoolmaster-alterator < %version-%release

-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-alterator ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%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

@ -126,7 +123,7 @@ Obsoletes:  branding-alt-%theme-graphics design-graphics-%theme
 Provides: design-graphics = 12.0.0

 PreReq(post,preun): alternatives >= 0.2
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-graphics ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-graphics ";done )

 Provides:  branding-informika-schoolmaster-graphics = %version-%release
 Obsoletes: branding-informika-schoolmaster-graphics < %version-%release
@ -138,21 +135,19 @@ This package contains some graphics for %distro_name design.
 В данном пакете находится необходимые графические элементы для дистрибутива 
 %distro_name_ru.

-
 %define provide_list altlinux fedora redhat system altlinux
 %define obsolete_list altlinux-release fedora-release redhat-release
 %define conflicts_list altlinux-release-sisyphus altlinux-release-4.0 altlinux-release-5.0 altlinux-release-5.1 altlinux-release-junior altlinux-release-master altlinux-release-server altlinux-release-terminal altlinux-release-small_business
 %package release
-BuildArch: noarch

-Summary: %distro_name release file
+Summary:  %distro_name release file
 Summary(ru_RU.UTF-8): Описание дистрибутива %distro_name_ru
-License: GPL
-Group: System/Configuration/Other
+License:  GPL
+Group:    System/Configuration/Other
 Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme  branding-alt-%theme-release
 Obsoletes: %obsolete_list  branding-alt-%theme-release
 Conflicts: %conflicts_list
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-release ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-release ";done )

 Provides:  branding-informika-schoolmaster-release = %version-%release
 Obsoletes: branding-informika-schoolmaster-release < %version-%release
@ -165,15 +160,14 @@ Obsoletes: branding-informika-schoolmaster-release < %version-%release

 %package notes
 BuildArch: noarch
-Provides: alt-license-theme = %version alt-notes-%theme
-Obsoletes: alt-license-%theme alt-notes-%theme 
-Summary: Distribution license and release notes
+Provides:  alt-license-theme = %version alt-notes-%theme
+Obsoletes: alt-license-%theme alt-notes-%theme
+Summary:   Distribution license and release notes
 Summary(ru_RU.UTF-8): Лицензия и дополнительные сведения для дистрибутива %distro_name_ru
-License: Distributable
-Group: Documentation
-Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-school-server alt-notes-server-lite alt-notes-skif alt-notes-terminal alt-notes-desktop
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-notes ";done )
-
+License:   Distributable
+Group:     Documentation
+Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-office-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-notes ";done )
 Provides:  branding-informika-schoolmaster-notes = %version-%release
 Obsoletes: branding-informika-schoolmaster-notes < %version-%release

@ -188,10 +182,9 @@ Distribution license and release notes
 BuildArch: noarch
 Summary: KDE4 settings for %distro_name
 License: Distributable
-Group: Graphical desktop/KDE
+Group:   Graphical desktop/KDE
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde4-settings ";done )
 PreReq: %name-graphics
-
 Provides:  branding-informika-schoolmaster-kde4-settings = %version-%release
 Obsoletes: branding-informika-schoolmaster-kde4-settings < %version-%release

@ -199,7 +192,6 @@ Obsoletes: branding-informika-schoolmaster-kde4-settings < %version-%release
 KDE4 settings for %distro_name

 %package xfce-settings
-
 Summary: default settings for Xfce 4.6 for %distro_name
 License: Distributable
 Group: Graphical desktop/XFce
@ -208,24 +200,50 @@ 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: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-xfce-settings ";done )
 Conflicts: xfce-settings-simply-linux
-
 Provides:  branding-informika-schoolmaster-xfce-settings = %version-%release
 Obsoletes: branding-informika-schoolmaster-xfce-settings < %version-%release

 %description xfce-settings
-This package contains default settings for Xfce 4.6 for %distro_name.
+XFCE settings for %distro_name
+
+%package fvwm-settings
+BuildArch: noarch
+Summary: FVWM2 settings for %distro_name
+License: Distributable
+Group:   Graphical desktop/FVWM based
+Requires: altlinux-freedesktop-menu-gnomish-menu
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-fvwm-settings ";done )
+
+%description fvwm-settings
+FVWM2 settings for %distro_name
+
+%package mate-settings
+BuildArch: noarch
+Summary: MATE settings for %distro_name
+License: Distributable
+Group:   Graphical desktop/GNOME
+Requires: gksu
+Requires: dconf
+Requires: gtk3-theme-clearlooks-phenix
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
+PreReq(post): lightdm-gtk-greeter
+PreReq(post): libgio
+
+%description mate-settings
+MATE settings for %distro_name

 %package slideshow
 Summary: Slideshow for %distro_name installer
 Summary(ru_RU.UTF-8): Изображения для организации "слайдшоу" в установщике дистрибутива %distro_name_ru
 License: Distributable
 Group: System/Configuration/Other 
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-slideshow ";done )
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-slideshow ";done )

 Provides:  branding-informika-schoolmaster-slideshow = %version-%release
 Obsoletes: branding-informika-schoolmaster-slideshow < %version-%release
+BuildArch: noarch

 %description slideshow
 Slideshow for %distro_name installer.
@ -235,16 +253,25 @@ Slideshow for %distro_name installer.
 дистрибутива %distro_name_ru.

 %package indexhtml
-Summary: %distro_name welcome page
+BuildArch: noarch
+Summary:  HTML welcome page for %distro_name
 Summary(ru_RU.UTF-8): Стартовая страница для дистрибутива %distro_name_ru
-License: distributable
-Group: System/Base
+License:  distributable
+Group:    System/Base
 Provides: indexhtml indexhtml-%theme = %version indexhtml-Desktop = 1:5.0
 Obsoletes: indexhtml-desktop indexhtml-Desktop
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-indexhtml ";done )

 Provides:  branding-informika-schoolmaster-indexhtml = %version-%release
 Obsoletes: branding-informika-schoolmaster-indexhtml < %version-%release
+Conflicts: indexhtml-sisyphus
+Conflicts: indexhtml-school_junior
+Conflicts: indexhtml-school_lite
+Conflicts: indexhtml-school_master
+Conflicts: indexhtml-school_terminal
+Conflicts: indexhtml-small_business
+Conflicts: indexhtml-school-server
+Conflicts: branding-altlinux-backup-server-indexhtml

 Requires: xdg-utils 
 Requires: docs-simply-linux
@ -252,7 +279,7 @@ Requires: docs-linux_intro
 Requires(post): indexhtml-common

 %description indexhtml
-%distro_name index.html welcome page.
+%distro_name welcome page.

 %description indexhtml -l ru_RU.UTF-8
 В данном пакете содержится стартовая страница для дистрибутива
@ -292,7 +319,7 @@ Some system settings for Simply Linux.

 %build
 autoconf
-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
+THEME=%theme NAME='%Brand %Theme' 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
@ -322,7 +349,7 @@ __EOF__
 #release
 mkdir -p %buildroot%_sysconfdir/buildreqs/packages/ignore.d/
 install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
-echo "%Name %version %status_en (%codename)" >%buildroot%_sysconfdir/altlinux-release
+echo "%distro_name" >%buildroot%_sysconfdir/altlinux-release
 for n in fedora redhat system; do
 	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
 done
@ -343,6 +370,17 @@ popd

 ln -s license.ru.html %buildroot%_datadir/alt-notes/license.uk.html

+#fwvm-settings
+mkdir -p %buildroot/etc/skel
+install -m 644 fvwm-settings/.fvwm2rc %buildroot/etc/skel/
+
+#mate-settings
+pushd mate-settings
+install -m 644 -D 50_mate-background.gschema.override '%buildroot%_datadir/glib-2.0/schemas/50_mate-background.gschema.override'
+install -m 644 -D 60_mate-theme.gschema.override '%buildroot%_datadir/glib-2.0/schemas/60_mate-theme.gschema.override'
+install -m 644 -D Trolltech.conf '%buildroot%_sysconfdir/skel/.config/Trolltech.conf'
+popd
+
 mkdir -p %buildroot/etc/skel/XDG-Templates.skel/

 cp -r xfce-settings/etcskel/* %buildroot/etc/skel/
@ -351,6 +389,8 @@ 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/
+
 mkdir -p %buildroot/usr/share/backgrounds/xfce/
 cp -P xfce-settings/backgrounds/*.{jpg,png} %buildroot/usr/share/backgrounds/xfce/

@ -430,6 +470,10 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
      subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
             /etc/sysconfig/grub2 ||:

+%post mate-settings
+subst 's/#theme-name=/theme-name=Clearlooks-Phenix/' /etc/lightdm/lightdm-gtk-greeter.conf ||:
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+
 %files alterator
 %config %_altdir/*.rcc
 /usr/share/alterator-browser-qt/design/*.rcc
@ -456,9 +500,16 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_sysconfdir/kde4/xdg/menus/applications-merged/*.menu
 %_sysconfdir/skel/.kde4

+%files fvwm-settings
+%_sysconfdir/skel/.fvwm2rc
+
+%files mate-settings
+%_datadir/glib-2.0/schemas/*.gschema.override
+
 %files xfce-settings
 %_sysconfdir/X11/profile.d/zdg-move-templates.sh
 /etc/skel/XDG-Templates.skel/
+/etc/skel/.wm-select
 /etc/skel/.config
 /etc/skel/.local
 /etc/skel/.gconf
@ -472,15 +523,9 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %define indexhtmldir %_defaultdocdir/indexhtml

 %files indexhtml
-#%%ghost %%_indexhtmldir/index.html
-#%%_indexhtmldir/*
-#%%_desktopdir/*
-
-%ghost %indexhtmldir/index.html
-%indexhtmldir/index-*.html
-%indexhtmldir/index.css
-%indexhtmldir/images
-%_desktopdir/indexhtml.desktop
+%ghost %_indexhtmldir/index.html
+%_indexhtmldir/*
+%_desktopdir/*

 %files menu
 /usr/share/slinux-style
@ -492,7 +537,7 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %config %_localstatedir/ldm/.pam_environment

 %changelog
-* Mon Sep 09 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.9-alt1
+* Wed Oct 16 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.9-alt1
 - Update branding for Seven platform

 * Mon Apr 08 2013 Sergey V Turchin <zerg at altlinux dot org> 6.0.0-alt46
--- a/components/ahttpd/images/clock-face.png
+++ b/components/ahttpd/images/clock-face.png
--- a/components/ahttpd/images/product-logo.png
+++ b/components/ahttpd/images/product-logo.png
--- a/components/ahttpd/images/steps/empty.png
+++ b/components/ahttpd/images/steps/empty.png
--- a/components/ahttpd/styles/alterator.css.in
+++ b/components/ahttpd/styles/alterator.css.in
@ -756,222 +756,6 @@ div.alterator-accordion {
 	padding-right: 30px;
 }

-.btn.ui-state-disabled {
-	color: #@MIDDLE_LABELS_HEX@;
-	background-color: #@MIDDLE_COLOR_HEX@;
-}
-
-.btn.ui-state-disabled:hover {
-	background-color: #@MIDDLE_COLOR_HEX@;
-}
-
-/* progressbar */
-
-.ui-progressbar {
-    height:20px;
-    text-align: left;
-}
-.ui-progressbar .ui-progressbar-value {
-    height:100%;
-}
-
-/* accordion */
-
-div.alterator-accordion h3 {
-	background-color:  #eaecf2;
-	font-size: 9pt;
-
-	padding-top: 3px;
-	padding-bottom: 3px;
-	padding-left: 24px;
-
-	margin: 2px;
-
-	background-image: url(/design/images/right.gif);
-	background-repeat: no-repeat;
-	background-position: center left;
-	cursor: pointer;
-}
-
-div.alterator-accordion h3.ui-state-active {
-	background-image: url(/design/images/asc.gif);
-}
-
-/* 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: 4px;
-	-webkit-border-top-left-radius: 4px;
-}
-
-.ui-corner-tr {
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-right-radius: 4px;
-}
-
-.ui-corner-bl {
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-}
-
-.ui-corner-br {
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
-}
-
-.ui-corner-top {
-	-moz-border-radius-topleft: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-right-radius: 4px;
-}
-
-.ui-corner-bottom {
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
-}
-
-.ui-corner-right {
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-right-radius: 4px;
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
-}
-
-.ui-corner-left {
-	-moz-border-radius-topleft: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-}
-
-.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: #@LIGHT_LABELS_HEX@;
-	border: 1px solid #@MIDDLE_COLOR_HEX@;
-}
-
-.ui-widget-header {
-	color: #EAEDEF;
-	background-color: #@MIDDLE_COLOR_HEX@;
-	font-weight: bold;
-}
-
-.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;
-	cursor: pointer;
-	width:auto;
-	overflow:visible;
-}
-
-.ui-icon-closethick {
-    width: 22px;
-    height: 22px;
-    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: #@LIGHT_LABELS_HEX@;
-	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 {
--- a/components/bootloader/config.in
+++ b/components/bootloader/config.in
@ -1,2 +1,2 @@
-product=@NAME@ @VERSION@@STATUS@
+product=@DISTRO_NAME@
 based_on=ALT Linux Sisyphus
--- a/components/bootloader/gfxboot.cfg.in
+++ b/components/bootloader/gfxboot.cfg.in
@ -23,7 +23,7 @@ talk=0
 ; sound volume (0..100)
 volume=70
 ; menu background transparency (0..255)
-menu.transparency=60
+menu.transparency=0x20
 ; default font
 font.normal=drs16.fnt
 ; main menu font
@ -35,23 +35,23 @@ background=back.jpg
 ; max. visible main menu items
 mainmenu.entries=8
 ; minimal main menu selection bar width
-mainmenu.bar.minwidth=280
+mainmenu.bar.minwidth=294
 ; main menu selection bar transparency (0..255)
 mainmenu.bar.transparency=0
 ; main menu colors
-mainmenu.bar.color=0x77b5f2
-mainmenu.normal.fg=0x787878
-mainmenu.selected.fg=0xe4ecf2
+mainmenu.bar.color=0x001056
+mainmenu.normal.fg=0x2b328d
+mainmenu.selected.fg=0xffffff
 ; boot option colors
-bootopt.label.fg=0x000000
-bootopt.text.fg=0x000000
+bootopt.label.fg=0x2b328d
+bootopt.text.fg=0x2b328d
 ; progress bar color
-progress.bar.color=0xd4ecfa
+progress.bar.color=0x001056
 ; menu colors
-menu.normal.bg=0x798491
-menu.normal.fg=0xffffff
-menu.selected.bg=0x787878
-menu.selected.fg=0xffffff
+menu.normal.bg=0xe9e8e7
+menu.normal.fg=0x000000
+menu.selected.bg=0xc9c8c8
+menu.selected.fg=0x000000
 ; window colors
 window.bg=0xffffff
 window.fg=0x000000
@ -59,15 +59,15 @@ window.title.bg=0x787878
 window.title.fg=0x000000
 window.title.error.bg=0xc00000
 ; help system colors
-help.link.fg=0x@DARK_COLOR_HEX@
+help.link.fg=0x185da0
 help.link.selected.fg=0xffffff
-help.link.selected.bg=0x@DARK_COLOR_HEX@
+help.link.selected.bg=0x185da
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0x000000
-panel.normal.fg=0x000000
-panel.f-key.fg=0x000080
+panel.title.fg=0x001056
+panel.normal.fg=0x2b328d
+panel.f-key.fg=0x2b328d
 ; default keymap (e.g. de_DE, czech)
 keymap=

@ -75,7 +75,7 @@ keymap=
 ; screen size
 screen.size=800,600
 ; upper left corner
-mainmenu.pos=260,200
+mainmenu.pos=253,210
 ; boot option input field position
 bootopt.pos=200,480

@ -83,7 +83,7 @@ bootopt.pos=200,480
 ; screen size
 screen.size=640,480
 ; upper left corner
-mainmenu.pos=130,100
+mainmenu.pos=130,122
 ; boot option input field position
 bootopt.pos=263,380

--- a/components/browser-qt/design/design-live.qss.in
+++ b/components/browser-qt/design/design-live.qss.in
@ -0,0 +1,30 @@
+/* Customize any plain widget that is a child of a QMainWindow. */
+
+/* Main area */
+.AWizardFace {
+    border-style: none;
+    background-position: top left;
+    background-repeat: no-repeat
+}
+
+.ACenterFace {
+    border-style: none;
+}
+
+.ACenterFace #modules_view {
+    background-color: white;
+}
+
+/* Nice WindowsXP-style password character for password line edits. */
+QLineEdit {
+    lineedit-password-character: 9679;
+}
+
+QCheckBox:hover, QRadioButton:hover {
+	background: none;
+}
+
+/* Fix side effect on transparent background */
+QCheckBox:indicator:hover, QRadioButton:indicator:hover {
+	margin-left: 1px;
+}
--- a/components/browser-qt/design/design.ini.in
+++ b/components/browser-qt/design/design.ini.in
@ -2,4 +2,3 @@ Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #f
 Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@PROGRESS_COLOR@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
 Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4,  #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7,  #eeece9, #000000, #aed4a1, #141312

-Style=Cleanlooks
--- a/components/browser-qt/design/design.qss.in
+++ b/components/browser-qt/design/design.qss.in
@ -8,7 +8,9 @@
 }

 .AWizardFace #wizardface_title_text {
-    color: rgb(30,144,255);
+    color: rgb(255,255,255);
+	font: bold;
+	font-size: 24px;
 }

 .ACenterFace {
--- a/components/indexhtml/images/altlinux-logo.png
+++ b/components/indexhtml/images/altlinux-logo.png
--- a/components/indexhtml/images/bullet.png
+++ b/components/indexhtml/images/bullet.png
--- a/components/indexhtml/images/community.png
+++ b/components/indexhtml/images/community.png
--- a/components/indexhtml/images/documentation.png
+++ b/components/indexhtml/images/documentation.png
--- a/components/indexhtml/images/facebook.png
+++ b/components/indexhtml/images/facebook.png
--- a/components/indexhtml/images/product-logo.png
+++ b/components/indexhtml/images/product-logo.png
--- a/components/indexhtml/images/product.png
+++ b/components/indexhtml/images/product.png
--- a/components/indexhtml/images/search.png
+++ b/components/indexhtml/images/search.png
--- a/components/indexhtml/images/section.png
+++ b/components/indexhtml/images/section.png
--- a/components/indexhtml/images/twitter.png
+++ b/components/indexhtml/images/twitter.png
--- a/components/indexhtml/images/vkontakte.png
+++ b/components/indexhtml/images/vkontakte.png
--- a/components/indexhtml/index-en.html.in
+++ b/components/indexhtml/index-en.html.in
@ -5,6 +5,7 @@
 <title>@PRODUCT_NAME@</title>

 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>

@ -16,30 +17,43 @@
 </div>

 <!-- Disto name -->
-<div id="title">@PRODUCT_NAME@</div>
+<table border="0" width="100%" id="header">
+<tr>
+<td id="product-logo"><img src="images/product-logo.png" alt="@PRODUCT_NAME@" id="product-logo"></td>
+<td id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+
+<input id="search_string" type="text" name="q" placeholder="Search ALT Linux">
+
+</form>
+</td>
+</tr></table>
+

 <div id="main">
 <!-- Links columns -->
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0">
 <tr>
 <th width="33%"><img src="images/documentation.png" alt="Documentation"></th>
-<th width="33%"><img src="images/altlinux-logo.png" alt="Company" class="icon_big"></th>
-<th width="34%"><img src="images/community.png" alt="Community" class="icon"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Company"></th>
+<th width="34%"><img src="images/community.png" alt="Community"></th>
 </tr>

 <tr>
-<td width="33%" class="column"> <!-- First column: documentation -->
+<td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
 <ul>
-<li><a href="file:///usr/share/doc/documentation/index.html">User Manual</a></li>
+<li><a href="documentation/index.html">User Manual</a></li>
 <li><a href="http://docs.altlinux.org">Online Documentation</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>
 <li><a href="http://altlinux.org/FAQ">FAQ</a></li>
-<li><a href="http://altlinux.org/Features">Features</a></li>
+<li><a href="http://altlinux.org/Features">ALT Linux Features</a></li>
 </ul>
 </td>

-<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
 <ul>
 <li><a href="http://www.altlinux.com">ALT Linux Website</a></li>
 <li><a href="http://shop.altlinux.ru">Internet Shop</a></li>
@ -50,7 +64,7 @@
 </ul>
 </td>

-<td width="34%" class="column"> <!-- Third column: community -->
+<td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
 <ul>
 <li><a href="http://lists.altlinux.org">Mailing Lists</a></li>
 <li><a href="http://forum.altlinux.org">User Forum</a></li>
@ -63,23 +77,14 @@

 </tr>

-<tr><td colspan="3" id="search">
-<!-- Search pane -->
-<form action="http://www.google.com/search" method="get">
-<img src="images/magnifier.png" alt="Search on online resources">
-<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
-<input id="search_string" type="text" name="q" size="35">
-<input id="search_button" type="submit" name="sa" value="Search in Internet">
-</form>
-</td></tr>
-
 <!-- Social networks -->
-<tr><td colspan="3" id="social">We will be glade to meet you on the following social networks:</td></tr>
-<tr>
-<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
-<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a></th>
-</tr>
+<tr><td colspan="3" id="social-pane">
+<div id="social">We will be glade to meet you on the following social networks:</div>
+<div id="social-icons">
+<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
+<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
+<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a>
+</div></td></tr>

 </table>

--- a/components/indexhtml/index-ru.html.in
+++ b/components/indexhtml/index-ru.html.in
@ -5,6 +5,7 @@
 <title>@PRODUCT_NAME_RU@</title>

 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>

@ -16,21 +17,35 @@
 </div>

 <!-- Disto name -->
-<div id="title">@PRODUCT_NAME_RU@</div>
+
+<table border="0" width="100%" id="header">
+<tr>
+<td id="product-logo"><img src="images/product-logo.png" alt="@PRODUCT_NAME_RU@" id="product-logo"></td>
+<td id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+
+<input id="search_string" type="text" name="q" placeholder="Поиск по ALT Linux">
+
+</form>
+</td>
+</tr></table>

 <div id="main">
 <!-- Links columns -->
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0">
 <tr>
 <th width="33%"><img src="images/documentation.png" alt="Документация"></th>
-<th width="33%"><img src="images/altlinux-logo.png" alt="Компания" class="icon_big"></th>
-<th width="34%"><img src="images/community.png" alt="Сообщество" class="icon"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Компания"></th>
+<th width="34%"><img src="images/community.png" alt="Сообщество"></th>
 </tr>

 <tr>
-<td width="33%" class="column"> <!-- First column: documentation -->
+<td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
 <ul>
-<li><a href="file:///usr/share/doc/documentation/index.html">Руководство пользователя</a></li>
+<li><a href="documentation/index.html">Руководство пользователя</a></li>
+<li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Книги</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>
 <li><a href="http://altlinux.org/FAQ">FAQ</a></li>
@ -38,7 +53,7 @@
 </ul>
 </td>

-<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
 <ul>
 <li><a href="http://www.altlinux.ru">Сайт компании</a></li>
 <li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li>
@ -49,7 +64,7 @@
 </ul>
 </td>

-<td width="34%" class="column"> <!-- Third column: community -->
+<td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
 <ul>
 <li><a href="http://lists.altlinux.org">Списки рассылки</a></li>
 <li><a href="http://forum.altlinux.org">Форум пользователей</a></li>
@ -62,23 +77,14 @@

 </tr>

-<tr><td colspan="3" id="search">
-<!-- Search pane -->
-<form action="http://www.google.com/search" method="get">
-<img src="images/magnifier.png" alt="Поиск по ресурсам ALT Linux">
-<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
-<input id="search_string" type="text" name="q" size="35">
-<input id="search_button" type="submit" name="sa" value="Поиск в Интернете">
-</form>
-</td></tr>
-
 <!-- Social networks -->
-<tr><td colspan="3" id="social">Мы рады встретиться с вами в социальных сетях:</td></tr>
-<tr>
-<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
-<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a></th>
-</tr>
+<tr><td colspan="3" id="social-pane">
+<div id="social">Мы рады встретиться с вами в социальных сетях:</div>
+<div id="social-icons">
+<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
+<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
+<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a>
+</div></td></tr>

 </table>

--- a/components/indexhtml/index.css
+++ b/components/indexhtml/index.css
@ -8,11 +8,11 @@ body {
 }
 div#content {
    background: white;
-    border: solid 6px #d0d0d0;
-    border-radius: 8px; 
-    -webkit-border-radius: 8px; 
-    -moz-border-radius: 7px; 
-    -khtml-border-radius: 12px;
+    border: solid 10px #e6e6e6;
+    border-radius: 16px; 
+    -webkit-border-radius: 16px; 
+    -moz-border-radius: 16px; 
+    -khtml-border-radius: 16px;
    padding: 0;
    position: relative;
    width: 780px;
@ -30,10 +30,10 @@ div#title {
    text-align: center;
    margin-top: 0;
    margin-bottom: 12px;
-    background: #d3eaf9;
+    background: #657fbe;
    padding: 6px 0 6px 0;
-    border-top: solid 1px #81c3eb;
-    border-bottom: solid 1px #81c3eb;
+    border-top: solid 1px #657fbe;
+    border-bottom: solid 1px #657fbe;
    background-image: url('images/lines.png');
 }
 div#top-site {
@ -44,12 +44,43 @@ div#top-site {
    padding: 4px;
 }
 div#main {
-    padding: 12px;
+    padding: 10px 0px 20px 0px;
 }
+table#header {
+    padding-left: 12px;
+    padding-right: 12px;
+}
+
+td#product-logo {
+	text-align: center;
+}
+
+td#search {
+	width: 60%;
+	text-align: right;
+}
+input#search_string {
+    position: relative;
+    vertical-align: middle;
+    background: white;
+    padding: 4px;
+    padding-right: 24px;
+    border: solid 1px #aeaeae;
+    width: 350px;
+    background: url('images/search.png') no-repeat 357px 2px;
+	background-color: white;
+}
+input#search_button {
+    margin-top: 12px;
+    vertical-align: top;
+    font-size: 130%;
+}
+
 th {
    vertical-align: bottom;
    text-align: center;
    padding-top: 5px;
+    padding-bottom: 5px;
 }
 img.icon {
    width: 48px;
@ -60,64 +91,61 @@ img.icon_big {
    height: 60px;
 }
 img.banner {
-    width: 130px;
-    height: 30px;
-    margin: 6px;
+    width:  32px;
+    height: 32px;
+    margin: 5px;
 }
 li {
    line-height: 1.35em;
 }
-td#central_pane {
-    border-left:  dotted 1px #ccc;
-    border-right: dotted 1px #ccc;
-    text-align: center;
+td#left-pane {
+    background-color: #dbeef6;
+}
+td#central-pane {
+    background-color: #ffe57e;
+}
+td#right-pane {
+    background-color: #f2f2f2;
 }
 .column {
    text-align: center;
+    border-top: 2px solid #0088bf;
+    background: url('images/section.png') no-repeat 112px 0px;
+    padding: 9px 0 5px 0;
 }
-td#search {
-    text-align: center;
-    padding: 12px;
+
+td#social-pane {
+    padding: 14px 12px 2px 12px;
 }
-input#search_string {
-    position: relative;
-    vertical-align: top;
-    margin-top: 12px;
-    font-size: 130%;
-    background: white;
-    border: solid 1px #81c3eb;
-    border-radius: 2px; 
-    -webkit-border-radius: 2px; 
-    -moz-border-radius: 2px; 
-    -khtml-border-radius: 2px;
-}
-input#search_button {
-    margin-top: 12px;
-    vertical-align: top;
-    font-size: 130%;
-}
-td#social {
-    text-align: center;
+
+div#social {
+    text-align: left;
    border-bottom: dotted 1px #ccc;
    font-size: xx-small;
+    padding-bottom: 10px;
    color: #999;
 }
+div#social-icons {
+    text-align: left;
+    padding-top: 10px;
+}
+
 td#left_footer, td#right_footer {
    font-size: xx-small;
    color: #999;
    vertical-align: bottom;
-    padding-top: 15px;
+    padding: 2px 12px 0px 12px;
 }
 td#right_footer {
    text-align: right;
 }
 ul li {
    text-align: left;
-    list-style: square url('bullet.png');
+    list-style: square url('images/bullet.png');
 }
 a:link, a:visited {
    text-decoration: none;
-    color: #2e7194;
+    color: black;
 }
 a:hover {
    text-decoration: none;
--- a/components/indexhtml/index.css.in
+++ b/components/indexhtml/index.css.in
@ -1,88 +0,0 @@
-/* Stylesheet for index file */
-
-body {
-	background-color: #@MIDDLE_COLOR_HEX@;
-	color: #@MIDDLE_LABELS_HEX@;
-	margin: 0px;
-	padding: 10px;
-	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 9pt;
-}
-
-p {
-    text-align: justify;
-}
-
-a:link, a:visited { 
-    text-decoration: none; 
-    color: #39c;
-}
-
-a:hover { 
-    text-decoration: underline; 
-    color: #f60;
-}
-
-ul li {
-    padding-left: 3px;
-    text-align: left;
-    list-style: square url('img/bullet.png');
-}
-
-li.spacebefore {
-    margin-top: 1em;
-}
-
-div.box {
-    position: relative;
-    width: 780px;
-    margin-top: 10px;
-
-    padding: 10px 20px;
-    padding-top: 10px;
-
-    background-color: #@LIGHT_COLOR_HEX@;
-    border: 1px solid #@DARK_COLOR_HEX@;;
-
-    -moz-border-radius: 0.5em;
-    -webkit-border-radius: 0.5em;
-    -khtml-border-radius: 0.5em;
-    border-radius: 0.5em;
-}
-
-div.warning {
-    border: 1px solid #@DARK_ERRORS_HEX@;;
-    background-color: #@LIGHT_ERRORS_HEX@;;
-    padding: 5px;
-}
-
-#lang {
-    text-align: center;
-}
-
-
-.footer {
-	font-size: 9px;
-	color: #@DARK_COLOR_HEX@;
-}
-
-/* top line */
-
-#top {
-	text-align:left;
-	background: #@DARK_COLOR_HEX@;
-
-	padding: 0.25em;
-	margin-bottom: 10px;
-	-moz-border-radius: 0.5em;
-	-webkit-border-radius: 0.5em;
-	-khtml-border-radius: 0.5em;
-	border-radius: 0.5em;
-}
-
-#product-logo {
-	background: url(img/product-logo.png) no-repeat;
-	width: 600px;
-	height: 52px;
-	border: 0px;
-}
--- a/components/systemd/os-release.in
+++ b/components/systemd/os-release.in
@ -3,7 +3,7 @@ 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@"
+ANSI_COLOR="1;33"
+CPE_NAME="cpe:/o:alt linux:school server:@VERSION@"
 HOME_URL="http://altlinux.ru/"
 BUG_REPORT_URL="https://bugs.altlinux.org/"
--- a/configure.ac
+++ b/configure.ac
@ -15,10 +15,8 @@ DOCDIR=documentation
 AC_SUBST(THEME)
 AC_SUBST(CODENAME)
 AC_SUBST(NAME)
-AC_SUBST(NAME_RU)
 AC_SUBST(BRAND)
 AC_SUBST(BRAND_FNAME)
-AC_SUBST(BRAND_FNAME_RU)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)
 AC_SUBST(VERSION)
@ -40,20 +38,20 @@ AC_SUBST(INACTIVE_COLOR)
 AC_SUBST(X86)

 AC_CONFIG_FILES([
-		 Makefile
-		 components/bootloader/config
-		 components/bootsplash/theme.plymouth
-		 components/browser-qt/design/design.ini
-		 components/browser-qt/design/design.qss
-		 components/bootloader/gfxboot.cfg
-		 notes/release-notes.ru.html
-		 notes/release-notes.all.html
-		 notes/license.ru.html
-		 notes/license.all.html
-		 components/indexhtml/indexhtml.desktop
-		 components/indexhtml/index-ru.html
-		 components/indexhtml/index-en.html
-		 components/systemd/os-release
+	 Makefile
+	 components/bootloader/config
+	 components/bootsplash/theme.plymouth
+	 components/browser-qt/design/design.ini
+	 components/browser-qt/design/design.qss
+	 components/bootloader/gfxboot.cfg
+	 notes/release-notes.ru.html
+	 notes/release-notes.all.html
+	 notes/license.ru.html
+	 notes/license.all.html
+	 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
--- a/graphics/backgrounds/ALTLinux
+++ b/graphics/backgrounds/ALTLinux
--- a/images/README
+++ b/images/README
@ -0,0 +1,9 @@
+background16x9.png: PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced		wallpaper for 16x9 monitors (without logotypes)
+background4x3.png:  PNG image, 1600 x 1200, 8-bit/color RGB, non-interlaced		wallpaper for 4x3 monitors (without logotypes)
+boot.jpg:           JPEG image data, JFIF standard 1.01							screen for Plymouth (with logotypes)
+boot.png:           PNG image, 800 x 600, 8-bit/color RGB, non-interlaced		DVD disk menu screen (with logotypes)
+console.jpg:        JPEG image data, JFIF standard 1.01							?
+grub.png:           PNG image, 800 x 600, 8-bit/color RGB, non-interlaced		GRUB loader screen for installed system (with logotypes)
+installer.png:      PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced		installer backgrount (only right bottom corner is used) (without logotypes)
+product-logo.png:   PNG image, 348 x 45, 8-bit/color RGBA, non-interlaced		product logotype
+wallpaper.png:      PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced		default wallpaper (without logotypes)
--- a/images/background16x9.png
+++ b/images/background16x9.png
--- a/images/background4x3.png
+++ b/images/background4x3.png
--- a/images/boot.jpg
+++ b/images/boot.jpg
--- a/images/boot.png
+++ b/images/boot.png
--- a/images/console.jpg
+++ b/images/console.jpg
--- a/images/grub.png
+++ b/images/grub.png
--- a/images/installer.png
+++ b/images/installer.png
--- a/images/product-logo.png
+++ b/images/product-logo.png
--- a/images/wallpaper.png
+++ b/images/wallpaper.png
--- a/mate-settings/50_mate-background.gschema.override
+++ b/mate-settings/50_mate-background.gschema.override
@ -0,0 +1,7 @@
+[org.mate.background]
+color-shading-type="solid"
+primary-color="#0c0c2c2c6c6c"
+picture-options="zoom"
+picture-filename="/usr/share/design/current/backgrounds/default.png"
+secondary-color="#0c0c2c2c6c6c"
+
--- a/mate-settings/60_mate-theme.gschema.override
+++ b/mate-settings/60_mate-theme.gschema.override
@ -0,0 +1,7 @@
+[org.mate.interface]
+gtk-theme="Clearlooks-Phenix"
+icon-theme="mate"
+
+[org.mate.Marco.general]
+theme="Clearlooks-Phenix"
+
--- a/mate-settings/Trolltech.conf
+++ b/mate-settings/Trolltech.conf
@ -0,0 +1,2 @@
+[Qt]
+style=GTK+
--- a/notes/index-ru.html.in
+++ b/notes/index-ru.html.in
@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="index.css">
-</head>
-
-<body>
-
-<div id="top" class="ui-corner-all">
-	<table>
-	    <tbody>
-		<tr>
-		    <td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
-		    <td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
-		</tr>
-	    </tbody>
-	</table>
-</div>
-
-<div class="box ui-corner-all" id="lang">
- <a href="index-en.html">English</a> |
- <a href="index-uk.html">Українська</a>
-</div>
-
-<div class="box ui-corner-all">
-  <p>Добро пожаловать в <nobr>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
-
-  <h2>Документация</h2>
-  <ul>
-    <li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
-  </ul>
-
-  <h2>Информация в Интернете</h2>
-  <ul>
- <li><a href="http://www.altlinux.ru/">Сайт компании ALT Linux</a></li>
- <li><a href="http://www.altlinux.org/FAQ">Ответы на часто задаваемые вопросы</a></li>
- <li><a href="http://www.altlinux.org/">Онлайновая документация</a></li>
- <li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li>
- <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
- <li><a href="http://forum.altlinux.org/">Форум пользователей ALT Linux</a></li>
- <li><a href="http://support.altlinux.ru/">Техническая поддержка через веб-сайт</a></li>
-  </ul>
-
-  <h2>ALT Linux Team</h2>
-  <p>Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p>
-  <ul>
-    <li><a href="http://www.altlinux.org/">Wiki сообщества</a></li>
-    <li><a href="http://backports.altlinux.org/">Backports</a></li>
-    <li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
-  </ul>
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</nobr> &copy; ALT Linux, 2011. Все права защищены.<br />
-   Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 11<br />
-   Телефон/факс: +7 (495) 662-3883
-</p>
-
-</body>
-</html>
--- a/notes/release-notes.all.html.in
+++ b/notes/release-notes.all.html.in
@ -1,4 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
    <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
@ -12,6 +11,12 @@
    <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,
--- a/slideshow/README
+++ b/slideshow/README
@ -1 +1 @@
-Put some PNG image, 650 x 300 for slideshow
+Place for slideshow pictures (PNG image, 650 x 300)
--- a/xfce-settings/etcskel/.wm-select
+++ b/xfce-settings/etcskel/.wm-select
@ -0,0 +1 @@
+EXEC=/usr/bin/startxfce4