6.9.9-alt1

branding.spec

 %define theme server
 %define Theme School Server
-%define codename none
+%define codename Aquila chrysaetos
 %define brand school
-%define Brand ALT Linux
-
+%define status альфа
+%define status_en alpha
+%define distro_name Informika 6.9.9 School Server (alpha)
+%define distro_name_ru Информика 6.9.9 Школьный Сервер (альфа)
 
 Name: branding-%brand-%theme
-Version: 6.0.0 
-Release: alt10
+Version: 6.9.9 
+Release: alt1
 
-BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
+BuildRequires: cpio fonts-ttf-dejavu fonts-ttСерверd
 BuildRequires: design-bootloader-source >= 5.0-alt2
 %ifnarch %arm
 BuildRequires: cpio gfxboot >= 4 
@@ -21,9 +23,12 @@ BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
-%define status %nil
 %define status_en %nil
-%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-desktop altlinux-gnome-desktop
+%define status %nil
+%define ProductName_ru Альт Линукс 7.0 Кентавр
+
+# All existing branding without this branding
+%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 
 
 
 Source: branding.tar
@@ -47,8 +52,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" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
 
-%define grub_normal white/black
-%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. Suitable for both lilo
@@ -155,6 +160,22 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
 %description fvwm-settings
 FVWM2 settings for %Brand %version %Theme
 
+%package mate-settings
+
+BuildArch: noarch
+Summary: MATE settings for %Brand %version %Theme
+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 %Brand %version %Theme
+
 %package slideshow
 
 BuildArch: noarch
@@ -200,7 +221,7 @@ ALT Linux index.html welcome page.
 
 %build
 autoconf
-THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version X86='%x86' ./configure 
+THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%ProductName_ru' CODENAME='%codename' X86='%x86' ./configure 
 make
 
 %install
@@ -232,6 +253,7 @@ echo >>%buildroot%_sysconfdir/altlinux-release
 for n in fedora redhat system; do
 	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
 done
+install -m 0644 components/systemd/os-release %buildroot%_sysconfdir/os-release
 
 #notes
 pushd notes
@@ -248,6 +270,13 @@ popd
 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
+
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
@@ -292,6 +321,9 @@ 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
@@ -318,6 +350,10 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %files fvwm-settings
 %_sysconfdir/skel/.fvwm2rc
 
+%files mate-settings
+%_datadir/glib-2.0/schemas/*.gschema.override
+%_sysconfdir/skel/.config/Trolltech.conf
+
 %files slideshow
 /usr/share/install2/slideshow
 
@@ -333,8 +369,8 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
-* Tue Apr 09 2013 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt10
-- gnome2 settings removed
+* Tue Sep 10 2013 Andrey Cherepanov <cas@altlinux.org> 6.9.9-alt1
+- Update branding for Seven platform
 
 * Thu Apr 04 2013 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt9
 - kde3 settings removed
@@ -368,140 +404,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 * Thu Nov 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
 - school server branding on top of centaurus one
 
-* Fri Sep 30 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt18
-- theme-livecd.qrc for livecd
-
-* Mon Sep 19 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt17
-- New design of indexhtml
-
-* Fri Sep 09 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt16
-- gtk theme fix from mex3@
-
-* Tue Aug 23 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt15
-- tooltip color in browser-qt really fixed
-
-* Mon Aug 22 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt14
-- indexhtml design and links fixed
-- tooltip color in browser-qt fixed
-
-* Wed Aug 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt13
-- yet another slide added
-
-* Fri Jul 01 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt12.1
-- rebuild with design-bootloader-source 6.0
-
-* Wed Jun 15 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt12
-- Style=Cleanlooks in alterator
-
-* Fri Jun 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt11
-- images with p6 logo
-
-* Mon Jun 06 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt10
-- automatic 800x600 for virtualbox
-
-* Thu May 26 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt9
-- setup default gnome panel
-- .gconf deleted from etcskel
-
-* Mon May 23 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt8
-- dependence on altlinux-menus dropped
-
-* Sat May 07 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt7
-- beta status deleted
-- rebuild with design-bootloader-source 5.9-alt4
-
-* Wed Apr 27 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt6
-- settings menu translation fixed
-
-* Tue Apr 26 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt5
-- arm buildabulity
-- gnome menus customization
-
-* Mon Feb 21 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt4
-- indexhtml colors changed (mex3)
-
-* Thu Feb 10 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt3
-- fixed logo in web interface
-- boot colors changed
-
-* Thu Feb 03 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt2
-- install menu position changed
-- web design from mex3@
-
-* Fri Jan 28 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt1
-- production slideshow
-- installer wallpaper changed
-- grub theme
-
-* Wed Dec 15 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt11
-- fvwm settings added
-
-* Thu Nov 18 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt10
-- gfxboot colors changed
-
-* Tue Nov 16 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt9
-- plymouth: scaling for non 4:3 or 16:9 resolutions fixed
-
-* Sat Nov 13 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt8
-- typo in plymouth script fixed
-
-* Fri Nov 12 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt7
-- migration from bootsplash to plymouth
-
-* Fri Oct 22 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt6
-- menu bar size fixed
-
-* Wed Sep 15 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt5
-- setup grub colors added
-
-* Tue Aug 31 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt4
-- status changed to beta
-- background changed
-
-* Mon Aug 02 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt3
-- fonts changed
-
-* Tue May 25 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt2.2
-- rebuld with design-bootloader-source 5.9
-
-* Fri May 21 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt2.1
-- rebuild with gfxboot.git-4.1.47
-
-* Tue Apr 06 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt2
-- product-logo.png changed
-
-* Thu Mar 04 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.9.9-alt1
-- Centaurus branding
-
-* Wed Mar 03 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.1-alt1
-- OO.o desktop files names changed
-
-* Mon Oct 26 2009 Andrey Cherepanov <cas@altlinux.org> 5.0.0-alt22
-- provide design-graphics and gnome-session-splash to avoid wrong 
-  graphics package installation
-
-* Thu Oct 22 2009 Andrey Cherepanov <cas@altlinux.org> 5.0.0-alt21
-- fix Russian name and copyright years
-- fix images
-- remove beta status
-
-* Mon Sep 07 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt20
-- beep on boot disabled
-
-* Thu Aug 13 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt19
-- production images, slides (and colors?)
-
-* Sun Jul 12 2009 Alexey Rusakov <ktirf@altlinux.org> 5.0.0-alt18.1.1
-- fix unexpanded autoconf substitute (closes bug 20757)
-- beautify theme names in -gnome-settings
-
-* Thu Jun 25 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt18.1
-- titles removed from wallpater and installer 
-
-* Wed Jun 24 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt18
-- sources restructure 
->>>>>>> school-server/sisyphus
-
 * Thu Jun 11 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt17
 - merge with desktop
 

components.mk

 # browser-qt
 
 components/browser-qt/design/bg.png: images/installer.png
-	convert $< -resize '800x600!' $@
-	#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
-	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc;
-	subst 's/background-image.*//' components/browser-qt/design/design.qss
-	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc;
+	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
 
@@ -21,7 +20,6 @@ ahttpd:
 	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
 
 
@@ -39,13 +37,12 @@ boot-images:
 #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
 boot: boot-images
-	subst 's/label:ALT/label:School/g' design-bootloader-source/src/dia_install.inc
 	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)
@@ -54,7 +51,8 @@ boot: boot-images
 #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:
@@ -70,5 +68,4 @@ indexhtml: components/indexhtml/index.css
 	for i in alt-docs documentation;do \
 	  ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
 	done
-	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop

components/ahttpd/images/steps/datetime.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/finish.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/greeting.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/install.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/install2-basesystem.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/install2-preinstall.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/lilo.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/net-eth.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/notes-license.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/notes-release-notes.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/pkg-groups.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/preinstall.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/root.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/sysconfig-base.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/sysconfig-kbd.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/sysconfig-language.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/timezone.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/user.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/users.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/vm.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/x11.png

+empty.png
\ No newline at end of file

components/ahttpd/styles/alterator.css.in

 /* basic elements and widgets */
 
 body {
-	background-color: #@LIGHT_COLOR_HEX@;
-	color: #@DARK_LABELS_HEX@;
-	margin: 0px;
+	background-color: white;
+	margin: 5px;
 	padding: 10px;
-	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-family : "Liberation Sans", Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
 	font-size: 9pt;
+	width: 85%;
 }
 
 a {
-	color: #@DARK_LABELS_HEX@;
+	color: #0088bf;
 	font-weight: bold;
 }
 
@@ -21,9 +21,14 @@ a {
 
 table {
 	font-size: 9pt;
-	border-color: #@MIDDLE_COLOR_HEX@;
+	border-color: #306ac4;
 	border-spacing: 0px;
-/*	border-collapse: collapse;*/
+	border-collapse: collapse;
+}
+
+#main table {
+	margin: 0;
+	margin-bottom: 0;
 }
 
 th {
@@ -45,15 +50,15 @@ hr {
 h1 {
 	text-align: center;
 	margin: 0px;
-	color: #@DARK_LABELS_HEX@;
+	color: black;
 }
 
 h2 {
-        color: #@DARK_LABELS_HEX@;
+	color: black;
 }
 
 h3 {
-        color: #@DARK_LABELS_HEX@;
+	color: black;
 }
 
 
@@ -61,53 +66,61 @@ textarea, select, input.text {
 	
 	/*border: 1px solid #e2e6eb; #MIDDLE_LABELS_HEX@;*/ /*FIX NEEDED!!!!!*/
 
-	font-size: 8pt;
-	margin: 1px 3px 1px 0px;
-	padding: 1px 3px;
-	border-color: #c1c3cb;
-	
-	-moz-border-radius: 0.3em;
-        -webkit-border-radius: 0.3em;
-        -khtml-border-radius: 0.3em;
-        border-radius: 0.3em;
-	background-color: #eaecf2;
+	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;
+	background-color: #e2e6eb;
 }
 
 .disabled{
-color:#@MIDDLE_LABELS_HEX@;
+	color:#666666;
+}
+
+small {
+	margin-left: 5px;
+	margin-bottom: 3px;
 }
 
 .btn, button {
-	background-image: url(/design/images/button-active.png);
-	background-repeat:repeat-x;
-	color: #@DARK_LABELS_HEX@;
-	border: 1px solid #@MIDDLE_COLOR_HEX@;
-	
-	-moz-border-radius: 0.7em;
-	-webkit-border-radius: 0.7em;
-	-khtml-border-radius: 0.7em;
-	border-radius: 0.7em;
+	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;
+}
 
-	-moz-box-shadow: 5px 5px 6px #a6a6a6;
-	-webkit-box-shadow: 5px 5px 6px #a6a6a6;
-	box-shadow: 5px 5px 6px #a6a6a6;
-
+#main .btn:hover, .box .btn:hover {
+        background-color: #5b76af;
 }
 
-.btn:hover, button:hover {
-	background-image: url(/design/images/button-passive.png);
-	background-repeat:repeat-x;
-	color: #@LIGHT_LABELS_HEX@;
-	border: 1px solid #@DARK_LABELS_HEX@;
+div#top .btn {
+	width: 7em;
 }
 
 .box {
@@ -117,13 +130,15 @@ color:#@MIDDLE_LABELS_HEX@;
 
     padding: 10px 20px;
     padding-top: 10px;
-    background-color: #cfd4e3;
-    border: 1px solid #@SHADOW_HEX@;
+    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: 25px;
-    height: 20px;
+    width: 31px;
+    height: 25px;
     vertical-align:middle;
     cursor: pointer;
 }
@@ -145,8 +160,8 @@ color:#@MIDDLE_LABELS_HEX@;
 }
 
 .close-dialog-button {
-	width: 22px;
-	height: 22px;
+	width: 27px;
+	height: 27px;
 	border: 0px;
 	cursor: pointer;
 	background: url(/design/images/close-dialog-button.png) no-repeat;
@@ -167,14 +182,15 @@ color:#@MIDDLE_LABELS_HEX@;
 
 .alterator-attention-message {
     color: darkred;
-    border-color: darkred;
+    border-color: #cf7878;
     border-width: 5px;
-    border-style: double;
-    padding: 4px;
+    border-style: solid;
+    background-color: #e8cfcf;
+    padding: 14px;
     margin: 4px;
+    margin-bottom: 10px;
 
     min-width:10px;
-    float:left;
 
     -moz-border-radius: 7px;
     -webkit-border-radius: 7px;
@@ -182,6 +198,10 @@ color:#@MIDDLE_LABELS_HEX@;
     border-radius: 7px;
 }
 
+.alterator-attention-message a {
+    color: darkred;
+}
+
 .alterator-attention-message img {
     vertical-align:middle;
 }
@@ -196,15 +216,16 @@ canvas.alterator-clock {
 
 .year {
 	font-weight: bold;
-	color:#@DARK_LABELS_HEX@;
-	font-size:10pt;
-	/*background-color: #F4F8F9;*/
+	color: black;
+	font-size: 10pt;
+	vertical-align: middle;
 }
 
 .month {
 	font-weight:bold;
-	color:#@DARK_LABELS_HEX@;
-	font-size:10pt;
+	color: black;
+	font-size: 10pt;
+	vertical-align: middle;
 }
 
 .week {
@@ -214,7 +235,7 @@ canvas.alterator-clock {
 }
 
 .today {
-	border: 1px solid #@DARK_LABELS_HEX@;
+	border: 1px solid #242a60;
 	cursor: pointer;
 
 	background-image: url(/design/images/button-passive.png);
@@ -226,29 +247,30 @@ canvas.alterator-clock {
 .day {
 	border-style:solid;
 	border-width:1px;
-	background-color: #@LIGHT_LABELS_HEX@;
+	background-color: #FFFFFF;
 	cursor: pointer;
 }
 
 .day:hover {
-	background-color: #@MIDDLE_COLOR_HEX@;
+	background-color: #306ac4;
 }
 
 .alterator-dateedit-calendar table {
 	width: 100%;
 	text-align: center;
-	background-image: url(/design/images/table-header.png);
-	background-repeat:repeat-x;
+	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-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-width: 2px;
-border-style: solid;
-border-color: #242a60;*/
+	border-top-right-radius: 0.7em;*/
+	/*border: 2px solid #242a60;*/
+	border: 2px solid #c4c4c4;
 	border-collapse: collapse;
 
 /*
@@ -259,9 +281,9 @@ border-color: #242a60;*/
 	-webkit-border-top-right-radius: 4px;
 */
 
-	-moz-box-shadow: 0 0 8px 0.2em #a6a6a6;
+/*	-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;
+	box-shadow: 0 0 8px 0.2em #a6a6a6;*/
 }
 
 .alterator-dateedit-calendar td {
@@ -279,13 +301,14 @@ border-color: #242a60;*/
 /* main menu */
 
 #main, #box {
+	margin-top: 14px;
 	padding: 10px 20px;
 	padding-top: 10px;
 
-	background-color: #cfd4e3;
-	border: 1px solid #@MIDDLE_COLOR_HEX@;
-	-moz-border-radius: 0.8em;
-	-webkit-border-radius: 0.8em;
+	background-color: #dbeef6;
+	border: 1px solid #36a1cc;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
 }
 
 #main-td {
@@ -294,37 +317,30 @@ border-color: #242a60;*/
 }
 
 #menu-td {
-	padding-right: 10px;
 	padding-top: 10px;
 }
 
 #menu {
-	/*padding: 10px;*/
-	background-color: white;
-	border: 1px solid #c1c3cb;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
-	-khtml-border-radius: 7px;
-	border-radius: 7px;
+	padding: 0;
+	margin-right: 10px;
 }
 
 .menu-item-normal a {
 	font-weight: normal;
 	text-decoration: none;
-	color: #@DARK_LABELS_HEX@;
+	color: black;
 }
 
 .menu-item-selected a {
 	font-weight: bold;
 	text-decoration: none;
-	color: #@DARK_LABELS_HEX@;
+	color: #0088bf;
 	padding-top: 10px;
 	margin-top: 10px;
-	width: 200px;
 }
 
 .menu-item-normal {
-	padding-left: 20px;
+	padding-left: 10px;
 	width: 100%;
 	padding-right: 4px;
 	margin-top: 3px;
@@ -332,58 +348,48 @@ border-color: #242a60;*/
 }
 
 .menu-item-selected {
-	background-image: url(/design/images/menu-selected.png);
-	background-repeat:repeat-y;
-	padding-left: 20px;
-	width: 80%;
+	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  {
-	color: #@DARK_LABELS_HEX@;
-	/*background-image: url(/design/images/menu-header.png);*/
-	background-repeat:repeat-x;
+	width: 224px;
+	color: #0088bf;
+	height: 16px;
+	background: url(/design/images/section.png) no-repeat 0px 23px;
 	font-size: 10pt;
 	
 	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-bottom: 10px;
 	padding-right: 4px;
 	padding-left: 10px;
-	margin: 10px;
-
+	margin-top: 10px;
+	margin-bottom: 8px;
+	margin-right: 10px;
 	font-weight: bold;
-	border-bottom: 3px solid #6aacf1;
 }
 
 /* tables */
 
 table.alterator-listbox {
 	font-family:arial;
-	margin:10px 0pt 15px;
+	/*margin:10px 0pt 15px;*/
 	font-size: 8pt;
 	width: 100%;
 	text-align: left;
-/*	border: solid 1px;*/
-
-	-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-style:solid;
-	border-color:#242a60;
-	border-width: 1px;
-	border-spacing:0px;
-
-	background-image: url(/design/images/table-header.png);
-        background-repeat:repeat-x;
-
+	border: 1px solid #808080;
+	border-spacing: 0;
 }
 
 table.alterator-listbox thead tr th, table.alterator-listbox tfoot tr th {
@@ -395,7 +401,14 @@ table.alterator-listbox thead tr th, table.alterator-listbox tfoot tr th {
 	font-size: 8pt;
 	margin: 0px;
 	padding: 4px;
-	color: #@DARK_LABELS_HEX@;
+	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 {
@@ -404,24 +417,21 @@ table.alterator-listbox thead tr .header {
 	background-position: center right;
 	cursor: pointer;
 	padding-right: 24px;
-border-right: #@MIDDLE_COLOR_HEX@ solid 1px;
-
 }
 
 table.alterator-listbox tbody td {
-	color: #@DARK_COLOR_HEX@;
+	color: #001056;
 	padding: 4px;
-	background-color: #@LIGHT_LABELS_HEX@;
+	background-color: #FFFFFF;
 	vertical-align: top;
 	/*border-left: solid 1px;
 	border-right: solid 1px;
 	border:none;*/
-border-right: #@MIDDLE_COLOR_HEX@ solid 1px;
-	
+	border-right: 1px solid #808080;
 }
 
 table.alterator-listbox tbody tr.odd td {
-	background-color:#eaecf2;
+	background-color:#f0f0f0;
 	/*border:none;*/
 }
 
@@ -457,7 +467,7 @@ table.alterator-listbox thead tr .headerSortDown {
 }
 
 table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead tr .headerSortUp {
-	background-color: #@LIGHT_LABELS_HEX@;
+	background-color: #d6d6d6;
 }
 
 /* states */
@@ -465,7 +475,7 @@ table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead
 .ui-state-disabled {
 	cursor: default !important;
 	color: #c3c7cb;
-	background-color: #e2e6eb;
+	/*background-color: #e2e6eb;*/
 }
 
 .btn.ui-state-disabled {
@@ -492,16 +502,14 @@ table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead
 .ui-state-disabled {
 	cursor: default !important;
 	color: #c3c7cb;
-	background-color: #@LIGHT_COLOR_HEX@;
-}
-
-.btn.ui-state-disabled {
-	color: #@MIDDLE_LABELS_HEX@;
-	background-color: #@MIDDLE_COLOR_HEX@;
+/*	background-color: #F5F5F5;*/
 }
 
-.btn.ui-state-disabled:hover {
-	background-color: #@MIDDLE_COLOR_HEX@;
+#main .btn.ui-state-disabled, #main .btn.ui-state-disabled:hover {
+	cursor: default !important;
+	color: #c3c7cb;
+	background-color: #E2E6EB;
+	border: 1px solid #c0c0c0;
 }
 
 /* progressbar */
@@ -517,23 +525,54 @@ table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead
 /* accordion */
 
 div.alterator-accordion h3 {
-	background-color:  #eaecf2;
+	background-color:  #DBEEF6;
 	font-size: 9pt;
 
 	padding-top: 3px;
 	padding-bottom: 3px;
 	padding-left: 24px;
 
-	margin: 2px;
+	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 {
-	background-image: url(/design/images/asc.gif);
+	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 */
@@ -555,51 +594,51 @@ div.alterator-accordion h3.ui-state-active {
 /* corner radius */
 
 .ui-corner-tl {
-	-moz-border-radius-topleft: 4px;
-	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 0px;
+	-webkit-border-top-left-radius: 0px;
 }
 
 .ui-corner-tr {
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 0px;
+	-webkit-border-top-right-radius: 0px;
 }
 
 .ui-corner-bl {
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-bottom-left-radius: 4px;
+	-moz-border-radius-bottomleft: 0px;
+	-webkit-border-bottom-left-radius: 0px;
 }
 
 .ui-corner-br {
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomright: 0px;
+	-webkit-border-bottom-right-radius: 0px;
 }
 
 .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;
+	-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: 4px;
-	-webkit-border-bottom-left-radius: 4px;
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
+	-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: 4px;
-	-webkit-border-top-right-radius: 4px;
-	-moz-border-radius-bottomright: 4px;
-	-webkit-border-bottom-right-radius: 4px;
+	-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: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-moz-border-radius-bottomleft: 4px;
-	-webkit-border-bottom-left-radius: 4px;
+	-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 {
@@ -623,16 +662,19 @@ div.alterator-accordion h3.ui-state-active {
 /* dialog */
 
 .ui-widget-content {
-	background-color: #@LIGHT_LABELS_HEX@;
-	border: 1px solid #@MIDDLE_COLOR_HEX@;
+	background-color: #FFFFFF;
 }
 
 .ui-widget-header {
 	color: #EAEDEF;
-	background-color: #@MIDDLE_COLOR_HEX@;
+	background-color: #306ac4;
 	font-weight: bold;
 }
 
+.ui-dialog {
+	border: 2px solid #c4c4c4;
+}
+
 .ui-dialog .ui-dialog-title {
     float: left;
     margin: .1em 0 .2em;
@@ -670,14 +712,17 @@ div.alterator-accordion h3.ui-state-active {
 .ui-dialog .ui-dialog-buttonpane button {
 	float: right;
 	margin: .5em .4em .5em 0;
-	cursor: pointer;
 	width:auto;
 	overflow:visible;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-color: #455a85;
+	border: 1px solid #1b2575;
 }
 
 .ui-icon-closethick {
-    width: 22px;
-    height: 22px;
+    width: 27px;
+    height: 27px;
     text-indent: -99999px;
     overflow: hidden;
     background: url(/design/images/close-dialog-button.png) no-repeat;
@@ -695,7 +740,7 @@ div.alterator-accordion h3.ui-state-active {
 /* help button */
 
 .ui-help-button {
-	background-color: #@LIGHT_LABELS_HEX@;
+	background-color: #FFFFFF;
 	margin-bottom: 10px;
 	padding-top: 7px;
 
@@ -715,17 +760,15 @@ div.alterator-accordion h3.ui-state-active {
 
 #top {
 	text-align:left;
-	/*background: url(/design/images/header-gradient.png) repeat-x;*/
-
 	padding: 0em;
 	margin-bottom: 0px;
-	border-bottom: 1px solid #c1c3cb;
+	border-bottom: 1px solid #ebebeb;
 }
 
 #product-logo {
 	background: url(/design/images/product-logo.png) no-repeat;
-	width: 194px;
-	height: 56px;
+	width: 348px;
+	height: 52px;
 	border: 0px;
 	padding: 0px;
 	margin: 0px;
@@ -736,14 +779,16 @@ div.alterator-accordion h3.ui-state-active {
 	padding-right: 1em;
 	text-align: left;
 
-	color: #@DARK_LABELS_HEX@;
+	color: black;
+	font-family: "DejaVu Sans",Verdana,Tahoma,Helvetica;
 	font-weight: bold;
 	text-decoration: none;
 	font-size:large;
+	text-transform: uppercase;
 }
 
 .top-button {
-        padding-right: 10px;
+        padding-left: 10px;
 }
 
 
@@ -760,7 +805,7 @@ div.alterator-accordion h3.ui-state-active {
 #help-popup {
 	padding-left: 10px;
 	padding-right: -30px;
-	background-color: #@LIGHT_LABELS_HEX@;
+	background-color: #FFFFFF;
 
         border: 1px solid #c1c3cb;
         -moz-border-radius: 0.5em;
@@ -772,10 +817,10 @@ div.alterator-accordion h3.ui-state-active {
 .hresizeable {
 	width: 100%;
 	height: 7px;
-	background:#@DARK_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+	background:#001056 url(/design/images/hgrabber.gif) no-repeat scroll 45%;
 	cursor: s-resize;
 }
 
 .hresizeable:hover {
-	background-color: #@MIDDLE_COLOR_HEX@;
+	background-color: #306ac4;
 }

components/bootloader/gfxboot.cfg.in

@@ -40,40 +40,34 @@ mainmenu.bar.minwidth=294
 mainmenu.bar.transparency=0
 ; main menu colors
 mainmenu.bar.color=0x001056
-mainmenu.normal.fg=0x001056
+mainmenu.normal.fg=0xb6c1cd
 mainmenu.selected.fg=0xffffff
 ; boot option colors
 bootopt.label.fg=0xffffff
 bootopt.text.fg=0xffffff
 ; progress bar color
-progress.bar.color=0x@DARK_COLOR_HEX@
+progress.bar.color=0x@MIDDLE_COLOR_HEX@
 ; menu colors
-menu.normal.bg=0x798491
-menu.normal.fg=@DARK_LABELS_HEX@
-menu.selected.bg=0x@LIGHT_COLOR_HEX@
-menu.selected.fg=@DARK_LABELS_HEX@
+menu.normal.bg=0xe9e8e7
+menu.normal.fg=0x000000
+menu.selected.bg=0xc9c8c8
+menu.selected.fg=0x000000
 ; window colors
 window.bg=0xd8deed
 window.fg=0x000000
 window.title.bg=0x@TITLE_COLOR@
-window.title.fg=0x@MIDDLE_LABELS_HEX@
+window.title.fg=0x@DARK_LABELS_HEX@
 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
-<<<<<<< HEAD
-panel.title.fg=0x5c6570
-panel.normal.fg=0x5c6570
-panel.f-key.fg=0x@MIDDLE_LABELS_HEX@
-=======
 panel.title.fg=0xffffff
-panel.normal.fg=0xffffff
-panel.f-key.fg=0xffffff
->>>>>>> school-server/sisyphus
+panel.normal.fg=0xf1f1ff
+panel.f-key.fg=0xf8e97c
 ; default keymap (e.g. de_DE, czech)
 keymap=
 

components/browser-qt/design/design-live.qss.in

+/* 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;
+}

components/browser-qt/design/design.qss.in

 /* Customize any plain widget that is a child of a QMainWindow. */
+
+/* Main area */
 .AWizardFace {
     border-style: none;
     background-image: url(:/design/bg.png);
-    background-position: bottom right;
+    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[echoMode="2"] {
+QLineEdit {
     lineedit-password-character: 9679;
 }
 
+AWizardFace QLineEdit {
+    border: 2px inset gray;
+}
+
+/* White color for labels: 100% for title text and 80% for other labels */
+AWizardFace QLabel {
+	color: rgba(255, 255, 255, 80%);
+}
+
+QCheckBox, QRadioButton {
+	color: black;
+}
+
+AWizardFace QCheckBox:checked, AWizardFace QCheckBox:unchecked, AWizardFace QCheckBox:indeterminate {
+	color: rgba(255, 255, 255, 80%);
+}
+
+AWizardFace QRadioButton:checked, AWizardFace QRadioButton:unchecked, AWizardFace QRadioButton:indeterminate {
+	color: rgba(255, 255, 255, 80%);
+}
+
+/* Sections */
+AWizardFace AGroupBox {
+	border: 1px solid rgba(255, 255, 255, 0%);
+}
+
+AWizardFace AGroupBox::title {
+        color: #F8E97C;
+	font: bold;
+}
+
+QCheckBox:hover, QRadioButton:hover {
+	background: none;
+}
+
+/* Fix side effect on transparent background */
+QCheckBox:indicator:hover, QRadioButton:indicator:hover {
+	margin-left: 1px;
+}
+
+/* Step title */
+QLabel#wizardface_title_text {
+	color: white;
+}
+
+/* Popup dialogs and message boxes with warnings and errors */
+MessageBox {
+	background-color: rgba(235, 235, 235, 100%);
+	border: 5px solid #d7d7d7;
+}
+
+AGridBox {
+	background-color: transparent;
+	border: 0px;
+}
+
+/* Installation steps list
+AWizardFaceStepList {
+	background-color: rgba(235, 235, 235, 10%);
+}
+*/

components/grub2/theme.txt

@@ -21,10 +21,10 @@
 # THE SOFTWARE.
 
 #general settings
-message-font: "Misc Fixed Bold 13"
+message-font: "DejaVu Sans Regular 12"
 title-text: ""
 message-color: "#000000"
-message-bg-color: "#ffffff"
+message-bg-color: "#0c2c6c"
 desktop-image: "boot.png"
 terminal-font: "Misc Fixed Regular 13"
 
@@ -34,20 +34,20 @@ terminal-font: "Misc Fixed Regular 13"
 	left = 0
 	width = 100%
 	height = 20
-	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
+	text = "To boot the selected operating system using default settings, press Enter. For additional settings, press E"
 	align = "center"
-	font = "DejaVu Sans Regular 10"
-	color = "#000000"
+	font = "DejaVu Sans Regular 12"
+	color = "#F8E97C"
 }
 
 #menu
 + boot_menu {
-	left = 21%
-	width = 58%
+	left = 16%
+	width = 68%
 	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
@@ -59,7 +59,7 @@ terminal-font: "Misc Fixed Regular 13"
 	scrollbar_width = 20
 	scrollbar_thumb = "scrollbar_slider_*.png"
 	scrollbar_frame = "scrollbar_border_*.png"
-	item_color = "#001056"
+	item_color = "#b5bdd0"
 	selected_item_color = "#ffffff"
 }
 

components/indexhtml/index-en.html.in

@@ -5,6 +5,7 @@
 <title>@NAME@ @VERSION@ @STATUS@</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">@NAME@ @VERSION@ @STATUS@</div>
+<table border="0" width="100%" id="header">
+<tr>
+<td><img src="images/product-logo.png" alt="@NAME@ @VERSION@ @STATUS@" 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 in Internet">
+
+</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="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="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club667081" 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>
 

components/indexhtml/index-ru.html.in

@@ -2,9 +2,10 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>Информика 6.0 Школьный Сервер</title>
+<title>Альт Линукс 7.0 Кентавр</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>
 
@@ -16,19 +17,32 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">Информика 6.0 Школьный Сервер</div>
+
+<table border="0" width="100%" id="header">
+<tr>
+<td><img src="images/product-logo.png" alt="Альт Линукс 7.0 Кентавр" 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="Поиск в Интернете">
+
+</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="documentation/index.html">Руководство пользователя</a></li>
 <li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
@@ -39,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>
@@ -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">Списки рассылки</a></li>
 <li><a href="http://forum.altlinux.org">Форум пользователей</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="Поиск по ресурсам 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="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club667081" 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>
 

components/indexhtml/index.css

@@ -8,14 +8,14 @@ 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;
+    width: 740px;
     margin: 40px auto;
 }
 div#languages {
@@ -44,12 +44,39 @@ div#top-site {
     padding: 4px;
 }
 div#main {
-    padding: 12px;
+    padding: 10px 0px 20px 0px;
+}
+table#header {
+    padding-left: 12px;
+    padding-right: 12px;
+}
+
+td#search {
+	width: 99%;
+	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 +87,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;
 }
-.column {
-    text-align: center;
+td#central-pane {
+    background-color: #ffe57e;
 }
-td#search {
-    text-align: center;
-    padding: 12px;
+td#right-pane {
+    background-color: #f2f2f2;
 }
-input#search_string {
-    position: relative;
-    vertical-align: top;
-    margin-top: 12px;
-    font-size: 130%;
-    background: white;
-    border: solid 1px #657fbe;
-    border-radius: 2px; 
-    -webkit-border-radius: 2px; 
-    -moz-border-radius: 2px; 
-    -khtml-border-radius: 2px;
+.column {
+    text-align: center;
+    border-top: 2px solid #0088bf;
+    background: url('images/section.png') no-repeat 112px 0px;
+    padding: 9px 0 5px 0;
 }
-input#search_button {
-    margin-top: 12px;
-    vertical-align: top;
-    font-size: 130%;
+
+td#social-pane {
+    padding: 14px 12px 2px 12px;
 }
-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;

components/systemd/os-release.in

+NAME="ALT Linux"
+VERSION="@VERSION@ @STATUS_EN@ (@CODENAME@)"
+ID=altlinux
+VERSION_ID=@VERSION@
+PRETTY_NAME="@BRAND_FNAME@ @VERSION@ @STATUS_EN@ @NAME@ (@CODENAME@)"
+ANSI_COLOR="1;33"
+CPE_NAME="cpe:/o:alt linux:@THEME@:@VERSION@"
+HOME_URL="http://altlinux.ru/"
+BUG_REPORT_URL="https://bugs.altlinux.org/"

configure.ac

@@ -18,12 +18,14 @@ DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 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_RU)
 AC_SUBST(DOCDIR)
 AC_SUBST(PROGRESS_COLOR)
 AC_SUBST(LIGHT_COLOR_HEX)
@@ -45,17 +47,16 @@ AC_CONFIG_FILES([
 		 components/bootsplash/theme.plymouth
 		 components/browser-qt/design/design.ini
 		 components/browser-qt/design/design.qss
+		 components/browser-qt/design/design-live.qss
 		 components/bootloader/gfxboot.cfg
 		 components/indexhtml/index-ru.html
 		 components/indexhtml/index-en.html
+		 components/systemd/os-release
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
 		 notes/release-notes.all.html
 		 notes/license.ru.html
 		 notes/license.all.html
-		 notes/index-ru.html
-		 notes/index-uk.html
-		 notes/index-en.html
 		 components/indexhtml/indexhtml.desktop
 		 gnome-settings/gtkrc
 		 gnome-settings/index.theme

gnome-settings/index.theme.in

@@ -5,11 +5,10 @@ Comment=Theme for @BRAND_FNAME@ @NAME@
 
 [X-GNOME-Metatheme]
 Encoding=UTF-8
-GtkTheme=Glossy
-MetacityTheme=Clearlooks
+GtkTheme=TraditionalOk
+MetacityTheme=TraditionalOk
 IconTheme=gnome
 GtkColorScheme=base_color:#ffffff,fg_color:#000000,tooltip_fg_color:#000000,selected_fg_color:#5598d7,selected_fg_color:#ffffff,text_color:#000000,bg_color:#ede9e3,tooltip_bg_color:#FFFFBF
 CursorTheme=default
 CursorSize=18
 NotificationTheme=slider
-

gnome-settings/metacity-theme-1.xml.in

@@ -2,398 +2,948 @@
 <!-- 	$Id$	 -->
 <metacity_theme>
 <info>
-  <name>@BRAND_FNAME@ @NAME@</name>
-  <author>Dave Camp &lt;dave@ximian.com&gt;</author>
-  <copyright>&#194; 2002 Ximian, Inc. </copyright>
-  <date>Sep, 2002</date>
-  <description>The Mist theme</description>
+	<name>TraditionalOk</name>
+	<author>Daniel Borgmann &lt;daniel.borgmann@gmail.com&gt;, Andrea Cimitan &lt;andrea.cimitan@gmail.com&gt;</author>
+	<copyright>&#194; 2005-2007 Daniel Borgmann, Andrea Cimitan</copyright>
+	<date>Apr, 2007</date>
+	<description>The TraditionalOk "Gummy" Marco Theme</description>
 </info>
- 
-<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="1"/>
-  <distance name="right_width" value="1"/>
-  <distance name="bottom_height" value="5"/>
-  <distance name="left_titlebar_edge" value="1"/>
-  <distance name="right_titlebar_edge" value="1"/>
-  <aspect_ratio name="button" value="1"/>
-  <distance name="title_vertical_pad" value="2"/>
-  <border name="title_border" left="2" right="2" top="1" bottom="1"/>
-  <border name="button_border" left="1" right="1" top="1" bottom="1"/>
+
+<!-- ::: GEOMETRY ::: -->
+<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="4"/>
+	<aspect_ratio name="button" value="1.0"/>
+	<distance name="title_vertical_pad" value="0"/>
+	<border name="title_border" left="2" right="2" top="4" bottom="3"/>
+	<border name="button_border" left="1" right="1" top="2" bottom="2"/>
 </frame_geometry>
 
-	<!-- strip borders off the normal geometry -->
+<frame_geometry name="shaded" parent="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true"/>
+
 <frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+	<!-- strip frame spacing off the normal geometry when maximised -->
 	<distance name="left_width" value="0"/>
 	<distance name="right_width" value="0"/>
-	<distance name="bottom_height" value="0"/>
-	<distance name="left_titlebar_edge" value="2"/>
-	<distance name="right_titlebar_edge" value="2"/>
+	<distance name="bottom_height" value="1"/>
+	<distance name="left_titlebar_edge" value="1"/>
+	<distance name="right_titlebar_edge" value="1"/>
 </frame_geometry>
 
-<frame_geometry name="normal_small_borders" parent="normal">
-  <distance name="left_width" value="0"/>
-  <distance name="right_width" value="0"/>
-  <distance name="bottom_height" value="0"/>
-  <distance name="left_titlebar_edge" value="0"/>
-  <distance name="right_titlebar_edge" value="0"/>
+<frame_geometry name="utility" title_scale="small" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_titlebar_edge" value="4"/>
+	<distance name="right_titlebar_edge" value="4"/>
+	<distance name="title_vertical_pad" value="0"/>
+	<border name="title_border" left="2" right="2" top="4" bottom="3"/>
+	<border name="button_border" left="0" right="0" top="2" bottom="2"/>
+	<aspect_ratio name="button" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false">
-  <distance name="left_width" value="4"/>
-  <distance name="right_width" value="4"/>
-  <distance name="bottom_height" value="4"/>
-  <distance name="left_titlebar_edge" value="0"/>
-  <distance name="right_titlebar_edge" value="0"/>
-  <distance name="button_width" value="0"/>
-  <distance name="button_height" value="0"/>
-  <distance name="title_vertical_pad" value="4"/>
-  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
-  <border name="button_border" left="1" right="1" top="1" bottom="1"/>
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_titlebar_edge" value="0"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="button_width" value="0"/>
+	<distance name="button_height" value="0"/>
+	<distance name="title_vertical_pad" value="4"/>
+	<border name="title_border" left="0" right="0" top="0" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
+<!-- button minimum size -->
+<constant name="Bmin" value="7"/>
 <!-- button inside padding -->
-<constant name="ButtonIPad" value="4"/>
+<constant name="Bpad" value="6"/>
+
+<!-- ::: CORNERS ::: -->
+<draw_ops name="corners_outline_selected_top">
+	<!-- top left -->
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="3"/>
+	<line color="shade/gtk:bg[SELECTED]/0.73" x1="1" y1="4" x2="1" y2="4"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="2" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="3" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.73" x1="4" y1="1" x2="4" y2="1"/>
+
+	<!-- top right -->
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="3"/>
+	<line color="shade/gtk:bg[SELECTED]/0.73" x1="width-2" y1="4" x2="width-2" y2="4"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-3" y1="2" x2="width-3" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-4" y1="1" x2="width-4" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.73" x1="width-5" y1="1" x2="width-5" y2="1"/>
+</draw_ops>
+
+<draw_ops name="corners_outline_top">
+	<!-- top left -->
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="3"/>
+	<line color="shade/gtk:bg[NORMAL]/0.68" x1="1" y1="4" x2="1" y2="4"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="2" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="3" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.68" x1="4" y1="1" x2="4" y2="1"/>
 
-<draw_ops name="focus_outline">
-  <rectangle color="black"
-             x="left_width-1" y="top_height-1"
-             width="width-left_width-right_width+1"
-             height="height-top_height-bottom_height+1"/>
+	<!-- top right -->
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="3"/>
+	<line color="shade/gtk:bg[NORMAL]/0.68" x1="width-2" y1="4" x2="width-2" y2="4"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-3" y1="2" x2="width-3" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="1" x2="width-4" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.68" x1="width-5" y1="1" x2="width-5" y2="1"/>
 </draw_ops>
 
-<!-- ** interlace ** -->
-<draw_ops name="title_tile">
-  <tint color="black" x="0" y="0" width="width - 2" height="0" alpha="0.1"/>
-  <tint color="white" x="0" y="1" width="width - 2" height="1" alpha="0.05"/>
+<draw_ops name="corners_outline_selected_bottom">
+	<!-- bottom left -->
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="height-4" x2="1" y2="height-5"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-3" x2="2" y2="height-3"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-2" x2="4" y2="height-2"/>
+
+	<!-- bottom right -->
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="height-4" x2="width-2" y2="height-5"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
 </draw_ops>
 
+<draw_ops name="corners_outline_bottom">
+	<!-- bottom left -->
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="height-4" x2="1" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-3" x2="2" y2="height-3"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-2" x2="4" y2="height-2"/>
 
-<draw_ops name="bevel_unfocused">
-  <rectangle color="black" filled="false"
-             x="0" y="0"
-             width="width - 1"
-             height="height - 1"/> 
+	<!-- bottom right -->
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="height-4" x2="width-2" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
 </draw_ops>
 
+<draw_ops name="corners_highlight">
+	<!-- ** corner highlight for left top ** -->
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="2" y1="3" x2="2" y2="4"/>
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="3" y1="2" x2="4" y2="2"/>
+
+	<!-- ** corner highlight for right top ** -->
+	<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
+	<line color="shade/gtk:bg[SELECTED]/1.16" x1="width-5" y1="2" x2="width-4" y2="2"/>
+
+	<!-- ** corner highlight for left bottom ** -->
+	<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
+
+	<!-- ** corner highlight for right bottom ** -->
+	<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
+</draw_ops>
+
+<draw_ops name="corners_highlight_unfocused">
+	<!-- ** corner highlight for left top ** -->
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="3" x2="2" y2="4"/>
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="2" x2="4" y2="2"/>
+
+	<!-- ** corner highlight for right top ** -->
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
+	<line color="shade/gtk:bg[NORMAL]/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
+
+	<!-- ** corner highlight for left bottom ** -->
+	<!--<line color="shade/gtk:bg[NORMAL]/1.3" x1="2" y1="height-4" x2="2" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
+
+	<!-- ** corner highlight for right bottom ** -->
+	<!--<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
+</draw_ops>
+
+<draw_ops name="corners_highlight_shaded">
+	<!-- ** corner highlight for left top ** -->
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="2" y1="3" x2="2" y2="4"/>
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="3" y1="2" x2="4" y2="2"/>
+
+	<!-- ** corner highlight for right top ** -->
+	<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="3" x2="width-3" y2="4"/>
+	<line color="shade/gtk:bg[SELECTED]/1.16" x1="width-5" y1="2" x2="width-4" y2="2"/>
+
+	<!-- ** corner highlight for left bottom ** -->
+	<line color="shade/gtk:bg[SELECTED]/1.08" x1="2" y1="height-4" x2="2" y2="height-5"/>
+	<line color="shade/gtk:bg[SELECTED]/0.98" x1="3" y1="height-3" x2="4" y2="height-3"/>
+
+	<!-- ** corner highlight for right bottom ** -->
+	<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
+	<line color="shade/gtk:bg[SELECTED]/0.98" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
+</draw_ops>
+
+<draw_ops name="corners_highlight_shaded_unfocused">
+	<!-- ** corner highlight for left top ** -->
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="3" x2="2" y2="4"/>
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="2" x2="4" y2="2"/>
+
+	<!-- ** corner highlight for right top ** -->
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="3" x2="width-3" y2="4"/>
+	<line color="shade/gtk:bg[NORMAL]/1.04" x1="width-5" y1="2" x2="width-4" y2="2"/>
+
+	<!-- ** corner highlight for left bottom ** -->
+	<line color="shade/gtk:bg[NORMAL]/1.02" x1="2" y1="height-4" x2="2" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="3" y1="height-3" x2="4" y2="height-3"/>
+
+	<!-- ** corner highlight for right bottom ** -->
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
+</draw_ops>
+
+<draw_ops name="window_bg">
+	<rectangle color="gtk:bg[NORMAL]" filled="true" x="0" y="0" width="width" height="height"/>
+</draw_ops>
+
+<!-- ::: BEVEL FOCUSED ::: -->
 <draw_ops name="bevel">
-  <rectangle color="black" filled="false"
-             x="0" y="0"
-             width="width - 1"
-             height="top_height - 1"/> 
-  <rectangle color="black" filled="false"
-       x="0" y="0"
-       width="width - 1"
-       height="height - 1"/>
-  <rectangle color="gtk:bg[NORMAL]" filled="true"
-             x="1" y="1"
-             width="width - 3"
-             height="height - 2"/>
-  <rectangle color="gtk:bg[SELECTED]" filled="true"
-             x="1" y="1"
-             width="width - 2"
-             height="top_height - 2"/> 
-
-  <!--<tile name="title_tile" tile_width="width" tile_height="2" x="1" y="1" width="width - 2" height="title_height + 5"/>-->
-
-  <tint color="white" x="1" y="1" width="1" height="top_height - 1" alpha="0.2"/>
-  <tint color="white" x="1" y="1" width="width - 2" height="1" alpha="0.2"/>
-  <tint color="black" x="1" y="top_height - 2" width="width - 1" height="1" alpha="0.2"/>
-  <tint color="black" x="width - 2" y="1" width="1" height="top_height - 1" alpha="0.2"/>
+	<include name="window_bg"/>
+	<!-- ** titlebar outline ** -->
+	<rectangle color="shade/gtk:bg[SELECTED]/0.55" filled="false" x="0" y="0" width="width - 1" height="((title_height + 6) `max` (top_height - 2))"/>
+
+	<!-- ** 3d beveled frame ** -->
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="3" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="3" y1="1" x2="width - 4" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="3" x2="1" y2="height - 2"/>
+
+	<line color="shade/gtk:bg[SELECTED]/0.94" x1="2" y1="((title_height + 5) `max` (top_height - 3))" x2="width - 3" y2="((title_height + 5) `max` (top_height - 3))"/>
+	<line color="shade/gtk:bg[SELECTED]/0.95" x1="width - 2" y1="2" x2="width - 2" y2="((title_height + 6) `max` (top_height - 2))"/>
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="1" y1="1" x2="width - 2" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/1.1" x1="1" y1="2" x2="1" y2="((title_height + 5) `max` (top_height - 3))"/>
+
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="2" y="top_height/2" width="width-4" height="top_height/2-1">
+		<color value="shade/gtk:bg[SELECTED]/1.0"/>
+		<color value="shade/gtk:bg[SELECTED]/0.94"/>
+	</gradient>
+	<gradient type="vertical" x="2" y="2" width="width-4" height="top_height/2-2">
+		<color value="shade/gtk:bg[SELECTED]/1.08"/>
+		<color value="shade/gtk:bg[SELECTED]/1.02"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[SELECTED]/0.7" x1="1" y1="((title_height + 6) `max` (top_height - 2))" x2="width - 2" y2="((title_height + 6) `max` (top_height - 2))"/>
+
+	<!-- ** border outline ** -->
+	<line color="shade/gtk:bg[NORMAL]/0.45" x1="0" y1="((title_height + 6) `max` (top_height - 2))" x2="0" y2="height"/>
+	<line color="shade/gtk:bg[NORMAL]/0.45" x1="width - 1" y1="((title_height + 6) `max` (top_height - 2))" x2="width - 1" y2="height"/>
+	<line color="shade/gtk:bg[NORMAL]/0.45" x1="1" y1="height - 1" x2="width - 2" y2="height - 1"/>
+</draw_ops>
+
+<draw_ops name="bevel_maximized">
+	<!-- ** 3d beveled frame ** -->
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="0" x2="width" y2="0"/>
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="0" y1="1" x2="width" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.94" x1="0" y1="((title_height + 5) `max` (top_height - 3))" x2="width" y2="((title_height + 5) `max` (top_height - 3))"/>
+
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="0" y="top_height/2" width="width" height="top_height/2-1">
+		<color value="shade/gtk:bg[SELECTED]/1.0"/>
+		<color value="shade/gtk:bg[SELECTED]/0.94"/>
+	</gradient>
+	<gradient type="vertical" x="0" y="1" width="width" height="top_height/2-1">
+		<color value="shade/gtk:bg[SELECTED]/1.08"/>
+		<color value="shade/gtk:bg[SELECTED]/1.02"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[SELECTED]/0.7" x1="0" y1="((title_height + 6) `max` (top_height - 2))" x2="width" y2="((title_height + 6) `max` (top_height - 2))"/>
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
 </draw_ops>
 
 <draw_ops name="round_bevel">
-  <include name="bevel"/>
-  <include name="focus_outline"/>
+	<include name="bevel"/>
+	<include name="corners_outline_selected_top"/>
+	<!--<include name="corners_outline_bottom"/>-->
+	<include name="corners_highlight"/>
+</draw_ops>
 
+<draw_ops name="bevel_shaded">
+	<include name="bevel"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="0" y1="height-1" x2="width" y2="height-1"/>
 </draw_ops>
 
-<!-- ::: TITLES ::: -->
+<draw_ops name="round_bevel_shaded">
+	<include name="bevel"/>
+	<include name="corners_outline_selected_top"/>
+	<include name="corners_outline_selected_bottom"/>
+	<include name="corners_highlight_shaded"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
+</draw_ops>
 
-<draw_ops name="title_bg">
-  <!-- tile name="title_tile" tile_width="4" tile_height="10" x="0" y="2" width="(width-title_width)/2-4" height="11"/>
-  <tile name="title_tile" tile_width="4" tile_height="10" x="(width-title_width)/2+title_width+4" y="2" width="(width-title_width)/2-4" height="11"/ -->
+<!-- ::: BEVEL UNFOCUSED ::: -->
+<draw_ops name="bevel_unfocused">
+	<include name="window_bg"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="2" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="1" y1="1" x2="width - 2" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/1.03" x1="1" y1="2" x2="1" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.89" x1="2" y1="((title_height + 5) `max` (top_height - 3))" x2="width - 3" y2="((title_height + 5) `max` (top_height - 3))"/>
+
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="2" y="top_height/2" width="width-4" height="top_height/2-1">
+		<color value="shade/gtk:bg[NORMAL]/0.93"/>
+		<color value="shade/gtk:bg[NORMAL]/0.89"/>
+	</gradient>
+	<gradient type="vertical" x="2" y="2" width="width-4" height="top_height/2-2">
+		<color value="shade/gtk:bg[NORMAL]/0.99"/>
+		<color value="shade/gtk:bg[NORMAL]/0.95"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[NORMAL]/0.65" x1="1" y1="((title_height + 6) `max` (top_height - 2))" x2="width - 2" y2="((title_height + 6) `max` (top_height - 2))"/>
+	<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
+</draw_ops>
+
+<draw_ops name="bevel_maximized_unfocused">
+	<!-- ** 3d beveled frame ** -->
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="0" y1="0" x2="width" y2="0"/>
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="0" y1="1" x2="width" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.89" x1="0" y1="((title_height + 5) `max` (top_height - 3))" x2="width" y2="((title_height + 5) `max` (top_height - 3))"/>
+
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="0" y="top_height/2" width="width" height="top_height/2-1">
+		<color value="shade/gtk:bg[NORMAL]/0.93"/>
+		<color value="shade/gtk:bg[NORMAL]/0.89"/>
+	</gradient>
+	<gradient type="vertical" x="0" y="2" width="width" height="top_height/2-2">
+		<color value="shade/gtk:bg[NORMAL]/0.99"/>
+		<color value="shade/gtk:bg[NORMAL]/0.95"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[NORMAL]/0.65" x1="0" y1="((title_height + 6) `max` (top_height - 2))" x2="width" y2="((title_height + 6) `max` (top_height - 2))"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="0" y1="height-1" x2="width" y2="height-1"/>
+</draw_ops>
+
+<draw_ops name="round_bevel_unfocused">
+	<include name="bevel_unfocused"/>
+	<include name="corners_outline_top"/>
+	<!--<include name="corners_outline_bottom"/>-->
+	<include name="corners_highlight_unfocused"/>
+</draw_ops>
+
+<draw_ops name="round_bevel_unfocused_shaded">
+	<include name="bevel_unfocused"/>
+	<include name="corners_outline_top"/>
+	<include name="corners_outline_bottom"/>
+	<include name="corners_highlight_shaded_unfocused"/>
+</draw_ops>
+
+<!-- ::: BORDER ::: -->
+<draw_ops name="border">
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="1" x2="width - 2" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="1" x2="1" y2="height - 2"/>
+
+	<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
 </draw_ops>
 
-<!-- hush! nothing to see here! move on! :^) -->
+<!-- ::: TITLES ::: -->
 <draw_ops name="title_text">
-  <title color="gtk:text[SELECTED]"
-         x="0"
-         y="(((height - title_height) / 2) `max` 0)"/>
+	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0) + 1"/>
+	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)+1" y="(((height - title_height) / 2) `max` 0)"/>
+	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)-1" y="(((height - title_height) / 2) `max` 0)"/>
+	<title color="shade/gtk:bg[SELECTED]/0.7" x="((3 `max` (width-title_width)) / 2)" y="(((height - title_height) / 2) `max` 0)-1"/>
+	<title color="#FFFFFF" x="(3 `max` (width-title_width)) / 2" y="(((height - title_height) / 2) `max` 0)"/>
 </draw_ops>
 
 <draw_ops name="title_text_unfocused">
-  <title color="gtk:fg[ACTIVE]"
-         x="0"
-         y="(((height - title_height) / 2) `max` 0)"/>
+	<!--<title color="shade/gtk:bg[NORMAL]/1.07" x="5 `max` (width-title_width)/2+1" y="1 `max` ((height-title_height)/2)+1"/>-->
+	<title color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" x="4 `max` (width-title_width)/2" y="0 `max` ((height-title_height)/2)"/>
 </draw_ops>
 
-
 <draw_ops name="title">
-  <include name="title_bg"/>
-  <include name="title_text"/>
+	<include name="title_text"/>
 </draw_ops>
 
 <draw_ops name="title_unfocused">
-  <include name="title_text_unfocused"/>
+	<include name="title_text_unfocused"/>
 </draw_ops>
 
 <!-- ::: BUTTONS ::: -->
-
-
-<draw_ops name="menu_button_icon"> 
-<gtk_arrow state="selected" shadow="none" arrow="down"
-         x="4"
-         y="5"
-         width="width - 8" height="height - 8"/>
-</draw_ops>
-<draw_ops name="menu_button_icon_unfocused"> 
-<gtk_arrow state="insensitive" shadow="none" arrow="down"
-         x="4"
-         y="5"
-         width="width - 8" height="height - 8"/>
+<draw_ops name="button_bg">
+	<!-- inset -->
+	<gradient type="vertical" x="0" y="3" width="width" height="height-6">
+		<color value="shade/gtk:bg[SELECTED]/0.96"/>
+		<color value="shade/gtk:bg[SELECTED]/1.05"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[SELECTED]/1.00" x1="2" y1="0" x2="width-3" y2="0"/>
+	<line color="shade/gtk:bg[SELECTED]/0.99" x1="1" y1="1" x2="width-2" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.99" x1="0" y1="2" x2="width-1" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.98" x1="3" y1="0" x2="width-4" y2="0"/>
+
+	<line color="shade/gtk:bg[SELECTED]/0.91" x1="2" y1="1" x2="width-3" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.90" x1="1" y1="2" x2="width-2" y2="2"/>
+
+	<line color="shade/gtk:bg[SELECTED]/1.03" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
+	<line color="shade/gtk:bg[SELECTED]/1.00" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
+	<line color="shade/gtk:bg[SELECTED]/1.01" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
+	<line color="shade/gtk:bg[SELECTED]/1.06" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
+	<line color="shade/gtk:bg[SELECTED]/1.02" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
+	<line color="shade/gtk:bg[SELECTED]/1.03" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
+
+	<!-- border outline -->
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
+
+	<!-- border smooth effect -->
+	<line color="shade/gtk:bg[SELECTED]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
+	<line color="shade/gtk:bg[SELECTED]/0.90" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
+	<!-- inside highlight -->
+	<line color="shade/gtk:bg[SELECTED]/1.18" x1="4" y1="2" x2="width-5" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
+	<!-- inside shadow -->
+	<line color="shade/gtk:bg[SELECTED]/1.0" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
+
+	<!-- fill gradient -->
+	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
+		<color value="shade/gtk:bg[SELECTED]/1.1"/>
+		<color value="shade/gtk:bg[SELECTED]/1.02"/>
+	</gradient>
+	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
+		<color value="shade/gtk:bg[SELECTED]/1.0"/>
+		<color value="shade/gtk:bg[SELECTED]/0.92"/>
+	</gradient>
+
+	<!-- bottom border smooth effect -->
+	<line color="shade/gtk:bg[SELECTED]/0.84" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+	<line color="shade/gtk:bg[SELECTED]/0.92" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused">
+	<!-- inset -->
+	<gradient type="vertical" x="0" y="3" width="width" height="height-6">
+		<color value="shade/gtk:bg[NORMAL]/0.92"/>
+		<color value="shade/gtk:bg[NORMAL]/0.96"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[NORMAL]/0.93" x1="2" y1="0" x2="width-3" y2="0"/>
+	<line color="shade/gtk:bg[NORMAL]/0.92" x1="1" y1="1" x2="width-2" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.92" x1="0" y1="2" x2="width-1" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.91" x1="3" y1="0" x2="width-4" y2="0"/>
+
+	<line color="shade/gtk:bg[NORMAL]/0.87" x1="2" y1="1" x2="width-3" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.86" x1="1" y1="2" x2="width-2" y2="2"/>
+
+	<line color="shade/gtk:bg[NORMAL]/0.945" x1="2" y1="height-1" x2="width-3" y2="height-1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.93" x1="1" y1="height-2" x2="width-2" y2="height-2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.935" x1="0" y1="height-3" x2="width-1" y2="height-3"/>
+	<line color="shade/gtk:bg[NORMAL]/0.96" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
+	<line color="shade/gtk:bg[NORMAL]/0.94" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.95" x1="1" y1="height-3" x2="width-2" y2="height-3"/>
+
+	<!-- border outline -->
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="1" x2="width-4" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="1" y1="3" x2="1" y2="height-4"/>
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="2" x2="width-3" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
+
+	<!-- border smooth effect -->
+	<line color="shade/gtk:bg[NORMAL]/1.02" x1="3" y1="2" x2="width-4" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.00" x1="2" y1="3" x2="2" y2="height-4"/>
+	<line color="shade/gtk:bg[NORMAL]/0.95" x1="width-3" y1="3" x2="width-3" y2="height-4"/>
+
+	<!-- inside highlight -->
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="4" y1="2" x2="width-5" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.1" x1="2" y1="4" x2="2" y2="height-5"/>
+	<!-- inside shadow -->
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="width-3" y1="4" x2="width-3" y2="height-5"/>
+
+	<!-- fill gradient -->
+	<gradient type="vertical" x="3" y="3" width="width-6" height="(height)/2-1">
+		<color value="shade/gtk:bg[NORMAL]/1.15"/>
+		<color value="shade/gtk:bg[NORMAL]/1.07"/>
+	</gradient>
+	<gradient type="vertical" x="3" y="(height)/2" width="width-6" height="(height)/2-2">
+		<color value="shade/gtk:bg[NORMAL]/1.05"/>
+		<color value="shade/gtk:bg[NORMAL]/0.97"/>
+	</gradient>
+
+	<!-- bottom border smooth effect -->
+	<line color="shade/gtk:bg[NORMAL]/0.89" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+	<line color="shade/gtk:bg[NORMAL]/0.97" x1="4" y1="height-3" x2="width-5" y2="height-3"/>
 </draw_ops>
 
 <draw_ops name="button_bg_prelight">
-  <tint color="white" x="0" y="0" width="width" height="height" alpha="0.3"/>
+	<include name="button_bg"/>
+	<tint color="shade/gtk:bg[SELECTED]/1.5" alpha="0.2" x="3" y="3" width="width-5" height="height-5"/>
+	<line color="shade/gtk:bg[SELECTED]/0.6" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
+</draw_ops>
+
+<draw_ops name="button_bg_pressed">
+	<!-- outside highlight -->
+	<gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
+		<color value="shade/gtk:bg[SELECTED]/1.2"/>
+		<color value="shade/gtk:bg[SELECTED]/1.0"/>
+	</gradient>
+	<gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
+		<color value="shade/gtk:bg[SELECTED]/1.2"/>
+		<color value="shade/gtk:bg[SELECTED]/1.0"/>
+	</gradient>
+	<line color="shade/gtk:bg[SELECTED]/1.0" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
+	<line color="shade/gtk:bg[SELECTED]/1.0" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
+	<!-- border outline -->
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
+
+	<!-- inside shadow -->
+	<line color="shade/gtk:bg[SELECTED]/0.9" x1="3" y1="2" x2="width-4" y2="2"/>
+	<line color="shade/gtk:bg[SELECTED]/0.85" x1="2" y1="3" x2="2" y2="height-4"/>
+
+	<!-- fill gradient -->
+	<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
+		<color value="shade/gtk:bg[SELECTED]/0.95"/>
+		<color value="shade/gtk:bg[SELECTED]/0.9"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[SELECTED]/0.9" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_prelight">
+	<include name="button_bg_unfocused"/>
+	<tint color="shade/gtk:bg[NORMAL]/1.5" alpha="0.3" x="3" y="3" width="width-5" height="height-5"/>
+	<line color="shade/gtk:bg[NORMAL]/0.6" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_pressed">
+	<!-- outside highlight -->
+	<gradient type="vertical" x="width-2" y="2" width="1" height="height-4">
+		<color value="shade/gtk:bg[NORMAL]/1.25"/>
+		<color value="shade/gtk:bg[NORMAL]/1.05"/>
+	</gradient>
+	<gradient type="vertical" x="width-1" y="3" width="1" height="height-6">
+		<color value="shade/gtk:bg[NORMAL]/1.25"/>
+		<color value="shade/gtk:bg[NORMAL]/1.05"/>
+	</gradient>
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="2" y1="height-2" x2="width-3" y2="height-2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.05" x1="3" y1="height-1" x2="width-4" y2="height-1"/>
+
+	<!-- border outline -->
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="1" x2="width-4" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="3" y1="height-2" x2="width-4" y2="height-2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="1" y1="3" x2="1" y2="height-4"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="width-2" y1="3" x2="width-2" y2="height-4"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="2" x2="width-3" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.55" x1="2" y1="height-3" x2="width-3" y2="height-3"/>
+
+	<!-- inside shadow -->
+	<line color="shade/gtk:bg[NORMAL]/0.8" x1="3" y1="2" x2="width-4" y2="2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.75" x1="2" y1="3" x2="2" y2="height-4"/>
+
+	<!-- fill gradient -->
+	<gradient type="vertical" x="3" y="3" width="width-5" height="height-6">
+		<color value="shade/gtk:bg[NORMAL]/0.9"/>
+		<color value="shade/gtk:bg[NORMAL]/0.85"/>
+	</gradient>
+
+	<line color="shade/gtk:bg[NORMAL]/0.85" x1="3" y1="height-3" x2="width-4" y2="height-3"/>
+</draw_ops>
+
+<!-- ::: ICONS ::: -->
+<!--
+	using a minimum icon size until there is a proper way to specify relative sizes
+	unfortunately it's logically impossible to always center the icons on non-square
+	buttons (utility windows) without distortion.
+
+	icon_size = (Bmin`max`height-Bpad*2)
+	hpadding = (width - icon_size) / 2 = ((width-(Bmin`max`height-Bpad*2))/2)
+	vpadding = (height - icon_size) / 2 = ((height-(Bmin`max`height-Bpad*2))/2)
+-->
+
+<!-- menu icon -->
+<draw_ops name="menu_button_icon">
+	<!--<icon  x="0" y="0" width="width" height="height"/>-->
+	<icon  x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+
+<draw_ops name="menu_button_icon_unfocused">
+	<!--<icon  x="0" y="0" width="width" height="height" alpha="0.5"/>-->
+	<icon  x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
 </draw_ops>
 
 <draw_ops name="menu_button_normal">
-  <include name="menu_button_icon"/>
-</draw_ops>
-<draw_ops name="menu_button_prelight">
-  <include name="button_bg_prelight"/>
-  <include name="menu_button_icon"/>
+	<include name="menu_button_icon"/>
 </draw_ops>
 <draw_ops name="menu_button_pressed">
-  <include name="menu_button_icon"/>
+	<include name="menu_button_icon"/>
 </draw_ops>
 <draw_ops name="menu_button_unfocused">
-  <include name="menu_button_icon_unfocused"/>
+	<include name="menu_button_icon_unfocused"/>
 </draw_ops>
 
+<!-- close icon -->
 <draw_ops name="close_button_icon">
-  <line color="gtk:fg[SELECTED]" width="2"
-        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad-1" y2="height - ButtonIPad-1"/>
-  <line color="gtk:fg[SELECTED]" width="1"
-        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad" y2="height - ButtonIPad"/>
-  <line color="gtk:fg[SELECTED]" width="2"
-        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad-1" y2="ButtonIPad"/>
-  <line color="gtk:fg[SELECTED]" width="1"
-        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad" y2="ButtonIPad - 1"/>
+	<!-- outside border -->
+
+	<!-- main cross  -->
+	<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
+	<line color="shade/gtk:bg[SELECTED]/0.7" width="4"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
+	<!-- top-left -->
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+		width="2" height="1"/>
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)/1"
+		width="1" height="2"/>
+	<!-- top-right -->
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+		width="2" height="1"/>
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+		width="1" height="2"/>
+	<!-- bottom-left -->
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+		width="2" height="1"/>
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+		width="1" height="2"/>
+	<!-- bottom-right -->
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="width - ((width-(Bmin`max`height-Bpad*2))/2) -2" y="height - ((height-(Bmin`max`height-Bpad*2))/2)"
+		width="2" height="1"/>
+	<tint color="shade/gtk:bg[SELECTED]/0.7" alpha="1.0"
+		x="width - ((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2)-2"
+		width="1" height="2"/>
+
+	<!-- icon -->
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+		x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
 </draw_ops>
 
 <draw_ops name="close_button_icon_unfocused">
-  <line color="gtk:fg[INSENSITIVE]" width="2"
-        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad-1" y2="height - ButtonIPad-1"/>
-  <line color="gtk:fg[INSENSITIVE]" width="1"
-        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad" y2="height - ButtonIPad"/>
-  <line color="gtk:fg[INSENSITIVE]" width="2"
-        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad-1" y2="ButtonIPad"/>
-  <line color="gtk:fg[INSENSITIVE]" width="1"
-        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad" y2="ButtonIPad - 1"/>
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
 </draw_ops>
 
 <draw_ops name="close_button_normal">
-   <include name="close_button_icon"/>
+	<include name="button_bg"/>
+	<include name="close_button_icon"/>
 </draw_ops>
 <draw_ops name="close_button_prelight">
-  <include name="button_bg_prelight"/>
-   <include name="close_button_icon"/>
+	<include name="button_bg_prelight"/>
+	<include name="close_button_icon"/>
 </draw_ops>
 <draw_ops name="close_button_pressed">
-  <include name="close_button_icon_unfocused"/>
+	<include name="button_bg_pressed"/>
+	<include name="close_button_icon"/>
 </draw_ops>
 <draw_ops name="close_button_unfocused">
-  <include name="close_button_icon_unfocused"/>
+	<include name="button_bg_unfocused"/>
+	<include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="close_button_icon_unfocused"/>
 </draw_ops>
 
+<!-- maximize icon -->
 <draw_ops name="maximize_button_icon">
-  <rectangle color="gtk:fg[SELECTED]" filled="false"
-             x="ButtonIPad" y="ButtonIPad" width="width-ButtonIPad*2-1" height="height-ButtonIPad*2-1"/>
-  <line color="gtk:fg[SELECTED]" width="1"
-        x1="ButtonIPad + 1" y1="ButtonIPad + 1" x2="width-ButtonIPad" y2="ButtonIPad + 1"/>
+	<!-- outside border -->
+	<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="((height-(Bmin`max`height-Bpad*2))/2)-1"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2+1"/>
+	<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)+1" y="((height-(Bmin`max`height-Bpad*2))/2)+2"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-4"/>
+
+	<!-- icon -->
+	<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
 </draw_ops>
 
 <draw_ops name="maximize_button_icon_unfocused">
-  <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
-             x="ButtonIPad" y="ButtonIPad" width="width-ButtonIPad*2-1" height="height-ButtonIPad*2-1"/>
-  <line color="gtk:fg[INSENSITIVE]" width="1"
-        x1="ButtonIPad + 1" y1="ButtonIPad + 1" x2="width-ButtonIPad" y2="ButtonIPad + 1"/>
+	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2) + 1" y1="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) + 1"/>
 </draw_ops>
 
 <draw_ops name="maximize_button_normal">
-  <include name="maximize_button_icon"/>
+	<include name="button_bg"/>
+	<include name="maximize_button_icon"/>
 </draw_ops>
 <draw_ops name="maximize_button_prelight">
-  <include name="button_bg_prelight"/>
-  <include name="maximize_button_icon"/>
+	<include name="button_bg_prelight"/>
+	<include name="maximize_button_icon"/>
 </draw_ops>
 <draw_ops name="maximize_button_pressed">
-  <include name="maximize_button_icon_unfocused"/>
+	<include name="button_bg_pressed"/>
+	<include name="maximize_button_icon"/>
 </draw_ops>
 <draw_ops name="maximize_button_unfocused">
-  <include name="maximize_button_icon_unfocused"/>
+	<include name="button_bg_unfocused"/>
+	<include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="maximize_button_icon_unfocused"/>
 </draw_ops>
 
+<!-- restore icon -->
 <draw_ops name="restore_button_icon">
-
-  <rectangle color="gtk:fg[SELECTED]" filled="false"
-             x="ButtonIPad + 2" y="ButtonIPad + 2" width="width-ButtonIPad*2-5"
-height="height-ButtonIPad*2-5"/>
-  <line color="gtk:fg[SELECTED]" width="1"
-        x1="ButtonIPad + 3" y1="ButtonIPad + 3" x2="width-ButtonIPad - 3" y2="ButtonIPad + 3"/>
-
+	<!-- outside border -->
+	<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="((height-(Bmin`max`height-Bpad*2))/2)"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-1" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-1"/>
+	<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)+2" y="((height-(Bmin`max`height-Bpad*2))/2)+3"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-5" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-6"/>
+
+	<!-- icon -->
+	<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
 </draw_ops>
 
 <draw_ops name="restore_button_icon_unfocused">
-  <rectangle color="gtk:fg[INSENSITIVE]" filled="false"
-             x="ButtonIPad + 2" y="ButtonIPad + 2" width="width-ButtonIPad*2-5"
-height="height-ButtonIPad*2-5"/>
-  <line color="gtk:fg[INSENSITIVE]" width="1"
-        x1="ButtonIPad + 3" y1="ButtonIPad + 3" x2="width-ButtonIPad - 3" y2="ButtonIPad + 3"/>
-
+	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2) + 1" y="((height-(Bmin`max`height-Bpad*2))/2) + 1"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2-3" height="height-((height-(Bmin`max`height-Bpad*2))/2)*2-3"/>
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+		x1="((width-(Bmin`max`height-Bpad*2))/2) + 2" y1="((height-(Bmin`max`height-Bpad*2))/2) + 2"
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 2" y2="((height-(Bmin`max`height-Bpad*2))/2) + 2"/>
 </draw_ops>
 
 <draw_ops name="restore_button_normal">
-  <include name="restore_button_icon"/>
+	<include name="button_bg"/>
+	<include name="restore_button_icon"/>
 </draw_ops>
 <draw_ops name="restore_button_prelight">
-  <include name="restore_button_icon"/>
-  <include name="button_bg_prelight"/>
+	<include name="button_bg_prelight"/>
+	<include name="restore_button_icon"/>
 </draw_ops>
 <draw_ops name="restore_button_pressed">
-  <include name="restore_button_icon_unfocused"/>
+	<include name="button_bg_pressed"/>
+	<include name="restore_button_icon"/>
 </draw_ops>
 <draw_ops name="restore_button_unfocused">
-  <include name="restore_button_icon_unfocused"/>
+	<include name="button_bg_unfocused"/>
+	<include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="restore_button_icon_unfocused"/>
 </draw_ops>
 
+<!-- minimize icon -->
 <draw_ops name="minimize_button_icon">
-  <rectangle color="gtk:fg[SELECTED]" filled="true"
-             x="ButtonIPad" y="height - ButtonIPad - 2" width="width-ButtonIPad*2" height="2"/>
+	<!-- outside border -->
+	<rectangle color="shade/gtk:bg[SELECTED]/0.7" filled="false"
+		x="((width-(Bmin`max`height-Bpad*2))/2)-1" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 3"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2+1" height="3"/>
+	<!-- icon -->
+	<rectangle color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" filled="true"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
 </draw_ops>
 
 <draw_ops name="minimize_button_icon_unfocused">
-  <rectangle color="gtk:fg[INSENSITIVE]" filled="true"
-             x="ButtonIPad" y="height - ButtonIPad - 2" width="width-ButtonIPad*2" height="2"/>
+	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" filled="true"
+		x="((width-(Bmin`max`height-Bpad*2))/2)" y="height - ((height-(Bmin`max`height-Bpad*2))/2) - 2"
+		width="width-((width-(Bmin`max`height-Bpad*2))/2)*2" height="2"/>
 </draw_ops>
 
 <draw_ops name="minimize_button_normal">
-  <include name="minimize_button_icon"/>
+	<include name="button_bg"/>
+	<include name="minimize_button_icon"/>
 </draw_ops>
 <draw_ops name="minimize_button_prelight">
-  <include name="button_bg_prelight"/>
-  <include name="minimize_button_icon"/>
+	<include name="button_bg_prelight"/>
+	<include name="minimize_button_icon"/>
 </draw_ops>
 <draw_ops name="minimize_button_pressed">
-  <include name="minimize_button_icon_unfocused"/>
+	<include name="button_bg_pressed"/>
+	<include name="minimize_button_icon"/>
 </draw_ops>
 <draw_ops name="minimize_button_unfocused">
-  <include name="minimize_button_icon_unfocused"/>
+	<include name="button_bg_unfocused"/>
+	<include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="minimize_button_icon_unfocused"/>
 </draw_ops>
 
 <draw_ops name="blank">
 <!-- nothing -->
 </draw_ops>
 
+<!-- ::: FRAME STYLES ::: -->
 <frame_style name="normal" geometry="normal">
-  <piece position="entire_background" draw_ops="bevel_unfocused"/>
-  <piece position="title" draw_ops="title_unfocused"/>
-  <button function="close" state="normal" draw_ops="close_button_unfocused"/>
-  <button function="close" state="pressed" draw_ops="close_button_pressed"/>
-  <button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/>
-  <button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/>
-  <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
-  <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
-  <button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
-  <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+	<piece position="entire_background" draw_ops="round_bevel_unfocused"/>
+	<piece position="title" draw_ops="title_unfocused"/>
+	<button function="close" state="normal" draw_ops="close_button_unfocused"/>
+	<button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
+	<button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
+	<button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_button_unfocused_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_button_unfocused_prelight"/>
+	<button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
+	<button function="menu" state="normal" draw_ops="menu_button_normal"/>
+	<button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+</frame_style>
+
+<frame_style name="normal_shaded" geometry="shaded" parent="normal">
+	<piece position="entire_background" draw_ops="round_bevel_unfocused_shaded"/>
 </frame_style>
 
 <frame_style name="focused" geometry="normal" parent="normal">
-  <piece position="entire_background" draw_ops="round_bevel"/>
-  <piece position="title" draw_ops="title"/>
-  <button function="close" state="normal" draw_ops="close_button_normal"/>
-  <button function="close" state="prelight" draw_ops="close_button_prelight"/>
-  <button function="maximize" state="normal" draw_ops="maximize_button_normal"/>
-  <button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/>
-  <button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
-  <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
-  <button function="menu" state="normal" draw_ops="menu_button_normal"/>
-  <button function="menu" state="prelight" draw_ops="menu_button_prelight"/>
+	<piece position="entire_background" draw_ops="round_bevel"/>
+	<piece position="title" draw_ops="title"/>
+	<button function="close" state="normal" draw_ops="close_button_normal"/>
+	<button function="close" state="pressed" draw_ops="close_button_pressed"/>
+	<button function="close" state="prelight" draw_ops="close_button_prelight"/>
+	<button function="maximize" state="normal" draw_ops="maximize_button_normal"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/>
+	<button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
+</frame_style>
+
+<frame_style name="focused_shaded" geometry="shaded" parent="focused">
+	<piece position="entire_background" draw_ops="round_bevel_shaded"/>
 </frame_style>
 
-<frame_style name="normal_maximized" geometry="normal_maximized">
-  <piece position="entire_background" draw_ops="bevel_unfocused"/>
-  <piece position="title" draw_ops="title_unfocused"/>
-  <button function="close" state="normal" draw_ops="close_button_unfocused"/>
-  <button function="close" state="pressed" draw_ops="close_button_pressed"/>
-  <button function="maximize" state="normal" draw_ops="restore_button_unfocused"/>
-  <button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
-  <button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
-  <button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
-  <button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
-  <button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
-  <button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal">
+	<piece position="entire_background" draw_ops="bevel_maximized_unfocused"/>
+	<button function="maximize" state="normal" draw_ops="restore_button_unfocused"/>
+	<button function="maximize" state="pressed" draw_ops="restore_button_unfocused_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="restore_button_unfocused_prelight"/>
 </frame_style>
 
-<frame_style name="focused_maximized" geometry="normal_maximized" parent="normal_maximized">
-  <piece position="entire_background" draw_ops="bevel"/>
-  <piece position="title" draw_ops="title"/>
-  <button function="close" state="normal" draw_ops="close_button_normal"/>
-  <button function="close" state="prelight" draw_ops="close_button_prelight"/>
-  <button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
-  <button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
-  <button function="maximize" state="normal" draw_ops="restore_button_normal"/>
-  <button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
-  <button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
-  <button function="menu" state="normal" draw_ops="menu_button_normal"/>
-  <button function="menu" state="prelight" draw_ops="menu_button_prelight"/>
+<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused">
+	<piece position="entire_background" draw_ops="bevel_maximized"/>
+	<button function="maximize" state="normal" draw_ops="restore_button_normal"/>
+	<button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
 </frame_style>
 
 <frame_style name="border" geometry="border" parent="normal">
-  <piece position="entire_background" draw_ops="bevel_unfocused"/>
-  <piece position="title" draw_ops="blank"/>
+	<piece position="entire_background" draw_ops="border"/>
+	<piece position="title" draw_ops="blank"/>
+</frame_style>
+
+<frame_style name="utility_normal" geometry="utility" parent="normal">
+	<piece position="entire_background" draw_ops="bevel_unfocused"/>
+</frame_style>
+<frame_style name="utility_focused" geometry="utility" parent="focused">
+	<piece position="entire_background" draw_ops="bevel"/>
+</frame_style>
+<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded">
+	<piece position="entire_background" draw_ops="bevel_shaded"/>
 </frame_style>
 
 <frame_style_set name="normal">
-   <frame focus="yes" state="normal" resize="both" style="focused"/>
-   <frame focus="no" state="normal" resize="both" style="normal"/>
-   <frame focus="yes" state="maximized" style="focused_maximized"/>
-   <frame focus="no" state="maximized" style="normal_maximized"/>
-   <frame focus="yes" state="shaded" style="focused"/>
-   <frame focus="no" state="shaded" style="normal"/>
-   <frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
-   <frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
+	<frame focus="yes" state="normal" resize="both" style="focused"/>
+	<frame focus="no" state="normal" resize="both" style="normal"/>
+	<frame focus="yes" state="maximized" style="focused_maximized"/>
+	<frame focus="no" state="maximized" style="normal_maximized"/>
+	<frame focus="yes" state="shaded" style="focused_shaded"/>
+	<frame focus="no" state="shaded" style="normal_shaded"/>
+	<frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
+	<frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
 </frame_style_set>
 
 <frame_style_set name="utility" parent="normal">
-<frame focus="yes" state="normal" resize="both" style="focused"/>
-<frame focus="no" state="normal" resize="both" style="normal"/>
-<!-- this is a bunch of crack since utility windows shouldn't be maximized -->
-<frame focus="yes" state="maximized" style="focused"/>
-<frame focus="no" state="maximized" style="normal"/>
-<frame focus="yes" state="shaded" style="focused"/>
-<frame focus="no" state="shaded" style="normal"/>
-<frame focus="yes" state="maximized_and_shaded" style="focused"/>
-<frame focus="no" state="maximized_and_shaded" style="normal"/>
+	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
+	<frame focus="no" state="normal" resize="both" style="utility_normal"/>
+	<!-- this is a bunch of crack since utility windows shouldn't be maximized -->
+	<frame focus="yes" state="maximized" style="focused"/>
+	<frame focus="no" state="maximized" style="normal"/>
+	<frame focus="yes" state="shaded" style="utility_focused_shaded"/>
+	<frame focus="no" state="shaded" style="utility_normal"/>
+	<frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/>
+	<frame focus="no" state="maximized_and_shaded" style="normal"/>
 </frame_style_set>
 
 <frame_style_set name="border">
-<frame focus="yes" state="normal" resize="both" style="border"/>
-<frame focus="no" state="normal" resize="both" style="border"/>
-<frame focus="yes" state="maximized" style="border"/>
-<frame focus="no" state="maximized" style="border"/>
-<frame focus="yes" state="shaded" style="border"/>
-<frame focus="no" state="shaded" style="border"/>
-<frame focus="yes" state="maximized_and_shaded" style="border"/>
-<frame focus="no" state="maximized_and_shaded" style="border"/>
+	<frame focus="yes" state="normal" resize="both" style="border"/>
+	<frame focus="no" state="normal" resize="both" style="border"/>
+	<frame focus="yes" state="maximized" style="border"/>
+	<frame focus="no" state="maximized" style="border"/>
+	<frame focus="yes" state="shaded" style="border"/>
+	<frame focus="no" state="shaded" style="border"/>
+	<frame focus="yes" state="maximized_and_shaded" style="border"/>
+	<frame focus="no" state="maximized_and_shaded" style="border"/>
 </frame_style_set>
 
 <window type="normal" style_set="normal"/>
 <window type="dialog" style_set="normal"/>
 <window type="modal_dialog" style_set="normal"/>
 <window type="menu" style_set="normal"/>
-<window type="utility" style_set="normal"/>
+<window type="utility" style_set="utility"/>
 <window type="border" style_set="border"/>
 
 <menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/>

images/README

+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)

mate-settings/50_mate-background.gschema.override

+[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"
+

mate-settings/60_mate-theme.gschema.override

+[org.mate.interface]
+gtk-theme="Clearlooks-Phenix"
+icon-theme="mate"
+
+[org.mate.Marco.general]
+theme="Clearlooks-Phenix"
+

mate-settings/Trolltech.conf

+[Qt]
+style=GTK+

notes/index-en.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME@ @VERSION@ @NAME@</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="index.css">
-</head>
-
-<body onload="MakeLink()">
-<script type="text/javascript" src="makelink.js"></script>
-
-<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-ru.html">Русский</a> |
- <a href="index-uk.html">Українська</a>
-</div>
-
-<div class="box ui-corner-all">
-  <p align="justify">Welcome to <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. The distribution is set up and ready to use, you may proceed. We hope that results of our work will be of use to you.</p>
-
-  <h2>Documentation</h2>
-  <ul>
-   <li><a href="../@DOCDIR@/index.html">Local documentation on this distribution</a></li>
-   <li><a href="http://altlinux.org/">Online documentation on http://altlinux.org</a></li>
-  </ul>
-
-  <h2>In the Internet</h2>
-  <ul>
-   <li><a href="http://www.altlinux.ru/">Official ALT Linux website</a></li>
-   <li><a href="http://www.altlinux.ru/FAQ">Frequently Asked QUestion</a></li>
-   <li><a href="http://search.altlinux.ru/">Search on ALT Linux websites</a></li>
-   <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Mailing lists</a></li>
-   <li><a href="http://forum.altlinux.org/">ALT Linux Forum</a></li>
-   <li><a href="http://support.altlinux.ru/">Technical support</a></li>
-  </ul>
-  
-  <h2>Support</h2>
-
-  <h3>Official ALT Linux support</h3>
-  <ul>
-  <li><a href="http://altlinux.ru/support">http://altlinux.ru/support</a></li>
-  </ul>
-  <div class="warning">
-  Only for registered users with coupons!
-  </div>
-  <h3>Unofficial support</h3>
-  <ul>
-  <li><a href="http://lists.altlinux.org/">Mailing lists</a></li>
-  <li><a href="http://forum.altlinux.org/">Forum</a></li>
-  <li><a href="http://bugzilla.altlinux.org/">Bug tracking system</a></li>
-  <li><a href="http://search.altlinux.org/">Search on ALT Linux websites</a></li>
-  </ul>
-  <div class="warning">
-  No warranity on solving problems!
-  </div>
-
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2012. All rights reserved.<br />
-  Address: 5th Donskoy proezd, 15/6, Moscow<br />
-  Phone/Fax: +7 (495) 662-3883
-</p>
-
-</body>
-</html>

notes/index-ru.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME@ @VERSION@ @NAME@ @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@ @VERSION@ @NAME@ @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@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2012. Все права защищены.<br />
-   Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
-   Телефон/факс: +7 (495) 662-3883
-</p>
-
-</body>
-</html>

notes/index-uk.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME@ @VERSION@ @NAME@ @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-ru.html">Русский</a>
-</div>
-
-<div class="box ui-corner-all">
-  <p>Ласкаво просимо до <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @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.ru/FAQ">Відповіді на часті запитання</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>
-   <li><a href="http://www.magic.kiev.ua/">Підтримка та рішення в Україні</a></li>
-  </ul>
-
-  <h2>ALT Linux Team</h2>
-  <p>Цей дистрибутив не міг би з'явитися без активної участі ALT Linux Team &mdash; спільноти розробників вільного програмного забезпечення.</p>
-  <ul>
-   <li><a href="http://www.altlinux.org/">Wiki спільноти</a> (<a
-	 href="http://uk.altlinux.org/">українською</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@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2010. Усі права застережено.<br />
-   Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 6<br />
-   Телефон/факс: +7 (495) 662-3883
-</p>
-
-</body>
-</html>

notes/license.ru.html.in

@@ -6,13 +6,13 @@
 <body>
 
 <h1>Лицензионный договор</h1>
-<h2>на программное обеспечение Информика 6.0 Школьный Сервер и включенные в него программы для ЭВМ</h2>
+<h2>на программное обеспечение @PRODUCT_NAME_RU@ и включенные в него программы для ЭВМ</h2>
 
 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>
 
 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
-<strong>Информика 6.0 Школьный Сервер</strong> 
+<strong>@PRODUCT_NAME_RU@</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
 
 <p>1.2 Предмет договора</p>
@@ -47,6 +47,8 @@
 <li>    Драйверы модемов pct789 (PCTel), cm8738, i8xx, sis и via686a</li>
 <li>    Драйверы контроллеров Promise IDE/RAID</li>
 <li>    Модули поддержки модемов Lucent/Agere</li>
+<li>    Adobe Flash Player Plugin</li>
+<li>    Java 2 (SUN) Runtime Environment, Standard Edition</li>
 </ul>
 
 <p>Обладатели исключительных прав на перечисленные ПРОГРАММЫ так или иначе ограничивают вашу свободу в использовании этих ПРОГРАММ. Ознакомьтесь с текстами сопровождающих указанные ПРОГРАММЫ лицензионных договоров для того, чтобы определить, правомерно ли то или иное использование той или иной ПРОГРАММЫ, выходящее за пределы «свободного воспроизведения». Лицензионные договоры этих ПРОГРАММ поставляются в составе пакетов ДИСТРИБУТИВА.

notes/release-notes.all.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 </head>
 <body>
-    <H2>Thank you for choosing ALT Linux 6.0 School Server!</H2>
+    <center><p>
+        Thank you for choosing @BRAND_FNAME@ @VERSION@!
+    </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>

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>

slideshow/README

-installer slides
+Place for slideshow pictures (PNG image, 650 x 300)