new xfce settings

branding-simply-linux/Makefile.in

@@ -5,7 +5,7 @@ VERSION=@VERSION@
 
 all:
 # background
-	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/droid/DroidSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
 	cp -al wallpaper.png graphics/backgrounds/default.png
 	cp -al wallpaper.png graphics/backgrounds/xdm.png
 

branding-simply-linux/components/grub2/theme.txt

@@ -21,12 +21,12 @@
 # THE SOFTWARE.
 
 #general settings
-message-font: "DejaVu Sans Bold 14"
+message-font: "Droid Sans Bold 14"
 title-text: ""
 message-color: "#000"
 message-bg-color: "#fff"
 desktop-image: "boot.png"
-terminal-font: "DejaVu Sans Regular 12"
+terminal-font: "Droid Sans Regular 12"
 
 #help bar at the bottom
 + label {
@@ -36,7 +36,7 @@ terminal-font: "DejaVu Sans Regular 12"
 	height = 20
 	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
 	align = "center"
-	font = "DejaVu Sans Regular 10"
+	font = "Droid Sans Regular 10"
 	color = "#000"
 }
 
@@ -46,8 +46,8 @@ terminal-font: "DejaVu Sans Regular 12"
 	width = 58%
 	top = 30%
 	height = 40%
-	item_font = "DejaVu Sans Regular 12"
-	selected_item_font = "DejaVu Sans Bold 14"
+	item_font = "Droid Sans Regular 12"
+	selected_item_font = "Droid Sans Bold 14"
 	icon_height = 24
 	icon_width = 24
 	item_height = 26

branding-simply-linux/xfce-settings/etcskel/.config/audacious/config~

+[audacious]
+allow_multiple_instances=FALSE
+use_realtime=FALSE
+always_show_cb=TRUE
+convert_underscore=TRUE
+convert_twenty=TRUE
+convert_slash=TRUE
+show_numbers_in_pl=TRUE
+show_separator_in_pl=TRUE
+snap_windows=TRUE
+save_window_positions=TRUE
+dim_titlebar=TRUE
+get_info_on_load=FALSE
+get_info_on_demand=TRUE
+eq_scaled_linked=TRUE
+no_playlist_advance=FALSE
+refresh_file_list=TRUE
+sort_jump_to_file=FALSE
+use_pl_metadata=TRUE
+warn_about_win_visibility=TRUE
+use_backslash_as_dir_delimiter=FALSE
+player_shaded=FALSE
+player_visible=TRUE
+shuffle=FALSE
+repeat=FALSE
+scaled=FALSE
+autoscroll_songname=TRUE
+stop_after_current_song=FALSE
+playlist_shaded=FALSE
+playlist_visible=TRUE
+use_fontsets=FALSE
+mainwin_use_bitmapfont=TRUE
+equalizer_visible=FALSE
+equalizer_active=FALSE
+equalizer_shaded=FALSE
+equalizer_autoload=FALSE
+easy_move=FALSE
+use_eplugins=FALSE
+always_on_top=FALSE
+sticky=FALSE
+random_skin_on_play=FALSE
+pause_between_songs=FALSE
+show_wm_decorations=FALSE
+eq_extra_filtering=TRUE
+analyzer_peaks=TRUE
+allow_broken_skins=FALSE
+close_dialog_open=TRUE
+close_dialog_add=TRUE
+resume_playback_on_startup=FALSE
+playlist_detect=TRUE
+show_filepopup_for_tuple=TRUE
+recurse_for_cover=FALSE
+use_file_cover=FALSE
+use_extension_probing=TRUE
+filepopup_showprogressbar=TRUE
+close_jtf_dialog=TRUE
+twoway_scroll=TRUE
+software_volume_control=FALSE
+warn_about_broken_gtk_engines=TRUE
+disable_inline_gtk=FALSE
+remember_jtf_entry=TRUE
+enable_replay_gain=TRUE
+enable_clipping_prevention=TRUE
+replay_gain_track=TRUE
+replay_gain_album=FALSE
+enable_adaptive_scaler=FALSE
+enable_src=FALSE
+bypass_dsp=FALSE
+no_dithering=FALSE
+player_x=0
+player_y=0
+timer_mode=0
+vis_type=0
+analyzer_mode=0
+analyzer_type=0
+scope_mode=0
+vu_mode=0
+voiceprint_mode=0
+vis_refresh_rate=0
+analyzer_falloff=0
+peaks_falloff=0
+playlist_x=0
+playlist_y=0
+playlist_width=0
+playlist_height=0
+playlist_position=0
+equalizer_x=0
+equalizer_y=0
+snap_distance=10
+pause_between_songs_time=2
+titlestring_preset=0
+resume_state=0
+resume_playback_on_startup_time=0
+output_buffer_size=500
+recurse_for_cover_depth=0
+filepopup_pixelsize=150
+filepopup_delay=20
+colorize_r=255
+colorize_g=255
+colorize_b=255
+output_bit_depth=16
+src_rate=450
+src_type=0
+player_width=450
+player_height=150
+sw_volume_left=100
+sw_volume_right=100
+playlist_font=(null)
+mainwin_font=(null)
+eqpreset_default_file=(null)
+eqpreset_extension=(null)
+generic_title_format=${?artist:${artist} - }${?album:${album} - }${title}
+chardet_detector=Russian
+cover_name_exclude=back
+equalizer_preamp=0
+replay_gain_preamp=0
+default_gain=-9
+equalizer_band0=0
+equalizer_band1=0
+equalizer_band2=0
+equalizer_band3=0
+equalizer_band4=0
+equalizer_band5=0
+equalizer_band6=0
+equalizer_band7=0
+equalizer_band8=0
+equalizer_band9=0
+output_plugin=/usr/lib/audacious/Output/alsa-gapless.so (#0)
+url_history_length=0
+clear_playlist=FALSE
+resume_playlist=0
+resume_entry=0
+filesel_path=/home/test/Музыка
+[AdPlug]
+16bit=TRUE
+Stereo=FALSE
+Frequency=44100
+Endless=FALSE
+[CDDA]
+use_dae=TRUE
+limitspeed=1
+use_cdtext=TRUE
+use_cddb=TRUE
+cddbserver=freedb.org
+cddbport=8880
+cddbhttp=FALSE
+disc_speed=2
+[AudioCompress]
+anticlip=FALSE
+target=0
+gainmax=0
+gainsmooth=0
+buckets=0
+[streambrowser]
+debug=FALSE
+bookmarks_count=0
+[skins]
+skin=/usr/share/audacious/Skins/Default
+playlist_font=Sans Bold 8
+mainwin_font=Sans Bold 9
+always_show_cb=TRUE
+always_on_top=FALSE
+sticky=FALSE
+scaled=FALSE
+autoscroll_songname=TRUE
+equalizer_visible=FALSE
+playlist_visible=TRUE
+player_visible=TRUE
+player_shaded=FALSE
+equalizer_shaded=FALSE
+playlist_shaded=FALSE
+dim_titlebar=TRUE
+show_wm_decorations=FALSE
+easy_move=TRUE
+allow_broken_skins=FALSE
+disable_inline_gtk=FALSE
+snap_windows=TRUE
+save_window_positions=TRUE
+analyzer_peaks=TRUE
+twoway_scroll=TRUE
+warn_about_win_visibility=TRUE
+warn_about_broken_gtk_engines=TRUE
+mainwin_use_bitmapfont=TRUE
+eq_scaled_linked=TRUE
+show_separator_in_pl=TRUE
+random_skin_on_play=FALSE
+player_x=30
+player_y=17
+timer_mode=0
+vis_type=0
+analyzer_mode=0
+analyzer_type=1
+scope_mode=0
+vu_mode=1
+voiceprint_mode=0
+analyzer_falloff=3
+peaks_falloff=1
+playlist_x=305
+playlist_y=17
+playlist_width=275
+playlist_height=232
+playlist_position=0
+equalizer_x=20
+equalizer_y=136
+colorize_r=255
+colorize_g=255
+colorize_b=255
+snap_distance=10
+equalizer_visible_prev=FALSE
+playlist_visible_prev=FALSE
+player_visible_prev=FALSE
+[gtkui]
+save_window_position=TRUE
+player_visible=TRUE
+player_x=95
+player_y=96
+player_width=549
+player_height=150
+vis_position=0
+[alsa-gapless]
+pcm=default
+mixer=default
+mixer-element=PCM

branding-simply-linux/xfce-settings/etcskel/.config/autostart/Настройки Compiz.desktop

+[Desktop Entry]
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Настройки Compiz
+Comment=
+Exec=fusion-icon
+StartupNotify=false
+Terminal=false
+Hidden=false

branding-simply-linux/xfce-settings/etcskel/.config/compiz/fusion-icon

+[compiz options]
+indirect rendering = false
+loose binding = false
+
+[window manager]
+active wm = xfwm4
\ No newline at end of file

branding-simply-linux/xfce-settings/etcskel/.config/user-dirs.dirs

-XDG_DESKTOP="$HOME/"
-XDG_Download="$HOME/Загрузки"
-XDG_TEMPLATES="$HOME/Документы/Шаблоны"
-XDG_DOCUMENTS="$HOME/Документы"
-XDG_MUSIC="$HOME/Документы/Музыка"
-XDG_PICTURES="$HOME/Документы/Картинки"
-XDG_PHOTOS="$HOME/Документы/Картинки"
-XDG_VIDEO="$HOME/Документы/Видео"
-XDG_MOVIES="$HOME/Документы/Видео"
-
-

branding-simply-linux/xfce-settings/etcskel/.config/user-dirs.locale

+ru_RU
\ No newline at end of file

branding-simply-linux/xfce-settings/etcskel/.config/xfce4/panel/places-19.rc

+show_button_icon=true
+show_button_label=false
+label=Переход
+show_icons=true
+show_volumes=true
+mount_open_volumes=false
+show_bookmarks=true
+show_recent=true
+show_recent_clear=true
+show_recent_number=10
+search_cmd=
+

branding-simply-linux/xfce-settings/etcskel/.config/xfce4/panel/xkb-plugin-12.rc

@@ -2,9 +2,9 @@ display_type=0
 group_policy=2
 default_group=0
 never_modify_config=false
-model=evdev
+model=pc104
 layouts=us,ru
 variants=,
-toggle_option=grp:caps_toggle
-compose_key_position=compose:menu
+toggle_option=grp:ctrl_shift_toggle
+compose_key_position=
 

branding-simply-linux/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="keyboard-layout" version="1.0">
+  <property name="Default" type="empty">
+    <property name="XkbDisable" type="bool" value="true"/>
+    <property name="XkbLayout" type="string" value="ru,us"/>
+    <property name="XkbVariant" type="string" value=","/>
+    <property name="XkbModel" type="string" value="pc101"/>
+  </property>
+</channel>

branding-simply-linux/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="keyboards" version="1.0">
+  <property name="Default" type="empty">
+    <property name="Numlock" type="bool" value="false"/>
+  </property>
+</channel>

branding-simply-linux/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -24,6 +24,8 @@
         <value type="int" value="14"/>
         <value type="int" value="15"/>
         <value type="int" value="17"/>
+        <value type="int" value="16"/>
+        <value type="int" value="19"/>
         <value type="int" value="18"/>
       </property>
       <property name="horizontal" type="bool" value="true"/>
@@ -104,12 +106,13 @@
       <property name="style" type="uint" value="1"/>
     </property>
     <property name="plugin-15" type="string" value="xfce4-mixer-plugin"/>
-    <property name="plugin-16" type="string" value="orageclock"/>
     <property name="plugin-17" type="string" value="separator">
       <property name="style" type="uint" value="1"/>
     </property>
     <property name="plugin-18" type="string" value="actions">
       <property name="first-action" type="uint" value="0"/>
     </property>
+    <property name="plugin-16" type="string" value="clock"/>
+    <property name="plugin-19" type="string" value="places"/>
   </property>
 </channel>

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/gimp.desktop

+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=GIMP
+Name[ru]=Редактор изображений GIMP
+GenericName=Image Editor
+GenericName[ar]=محرر صور
+GenericName[ast]=Editor d'imaxe
+GenericName[be]=Рэдактар відарысаў
+GenericName[bg]=Редактор на изображения
+GenericName[ca]=Editor d'imatges
+GenericName[ca@valencia]=Editor d'imatges
+GenericName[cs]=Editor obrázků
+GenericName[da]=Billedredigering
+GenericName[de]=Bildeditor
+GenericName[dz]=གཟུགས་བརྙན་ ཞུན་དག་པ།
+GenericName[el]=Επεξεργαστής εικόνων
+GenericName[en_CA]=Image Editor
+GenericName[en_GB]=Image Editor
+GenericName[eo]=Bilada Redaktilo
+GenericName[es]=Editor de imagen
+GenericName[et]=Pildiredaktor
+GenericName[eu]=Irudi-editorea
+GenericName[fa]=ویرایشگر تصویر
+GenericName[fi]=Kuvankäsittely
+GenericName[fr]=Éditeur d'image
+GenericName[gl]=Editor de imaxes
+GenericName[gu]=ચિત્ર સંપાદક
+GenericName[hu]=Képszerkesztő
+GenericName[is]=Myndvinnsluforrit
+GenericName[it]=Editor immagine
+GenericName[ja]=画像エディタ
+GenericName[ka]=გამოსახულებების რედაქტორი
+GenericName[km]=កម្មវិធី​និពន្ធ​រូបភាព
+GenericName[kn]=ಚಿತ್ರ ಸಂಪಾದಕ
+GenericName[ko]=이미지 편집기
+GenericName[lt]=Paveikslėlių rengyklė
+GenericName[lv]=Attēla redaktors
+GenericName[mk]=Уредник за слики
+GenericName[mr]=प्रतिमा संपादक
+GenericName[my]=ရုပ်ပုံ တည်းဖြတ်ကိရိယာ
+GenericName[nb]=Bildebehandler
+GenericName[nds]=Billbewarker
+GenericName[ne]=छवि सम्पादक
+GenericName[nl]=Afbeeldingsbewerker
+GenericName[nn]=Biletbehandlar
+GenericName[or]=ପ୍ରତିଛବି ସମ୍ପାଦକ
+GenericName[pa]=ਚਿੱਤਰ ਐਡੀਟਰ
+GenericName[pl]=Edytor obrazu
+GenericName[pt]=Editor de Imagens
+GenericName[pt_BR]=Editor de Imagens
+GenericName[ro]=Editor de imagine
+GenericName[ru]=Редактор изображений
+GenericName[sk]=Editor obrázkov
+GenericName[sl]=Urejevalnik slik
+GenericName[sr]=Обрада слика
+GenericName[sr@latin]=Obrada slika
+GenericName[sv]=Bildredigerare
+GenericName[ta]=பிம்ப திருத்தி
+GenericName[th]=ตัวแก้ไขภาพ
+GenericName[tr]=Resim Düzenleyici
+GenericName[tt]=Sürät Tözätkeç
+GenericName[uk]=Редактор зображень
+GenericName[vi]=Bộ biên soạn ảnh
+GenericName[xh]=UmHleli woMfanekiso
+GenericName[zh_CN]=图像编辑器
+GenericName[zh_HK]=圖片編輯器
+GenericName[zh_TW]=圖片編輯器
+Comment=Create images and edit photographs
+Comment[ar]=أنشئ صورا وحرّر لقطات
+Comment[ast]=Cree imáxenes y edite semeyes
+Comment[be]=Стварэньне відарысаў і рэдагаваньне фатаграфій
+Comment[bg]=Създаване на изображения и редакция на снимки
+Comment[ca]=Creeu imatges i editeu fotografies
+Comment[ca@valencia]=Creeu imatges i editeu fotografies
+Comment[cs]=Vytvářet obrázky a upravovat fotografie
+Comment[da]=Opret billeder og redigér fotografier
+Comment[de]=Bilder erstellen und Fotografien bearbeiten
+Comment[dz]=གཟུགས་བརྙན་ཚུ་ གསར་བསྐྲུན་འབད་ནི་དང་ དཔར་ཚུ་ཞུན་དག་འབད།
+Comment[el]=Δημιουργία εικόνων και επεξεργασία φωτογραφιών
+Comment[en_CA]=Create images and edit photographs
+Comment[en_GB]=Create images and edit photographs
+Comment[eo]=Kreu bildojn aŭ redaktu fotojn
+Comment[es]=Cree imágenes y edite fotografías
+Comment[et]=Loo pilte ja redigeeri fotosid
+Comment[eu]=Sortu irudiak eta editatu argazkiak
+Comment[fi]=Luo kuvia ja muokkaa valokuvia
+Comment[fr]=Créer des images et modifier des photographies
+Comment[gl]=Crear imaxes e editar fotografías
+Comment[gu]=ચિત્રો બનાવો અને ફોટાઓમાં ફેરફાર કરો
+Comment[hu]=Képek létrehozása és fotók szerkesztése
+Comment[it]=Crea immagini o modifica fotografie
+Comment[ja]=画像の作成と写真の編集を行います
+Comment[km]=បង្កើត​រូបភាព និង កែសម្រួល​រូបថត
+Comment[kn]=ಚಿತ್ರಗಳನ್ನು ರಚಿಸಿ ಹಾಗು ಫೋಟೋಗ್ರಾಫ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಿ
+Comment[ko]=이미지를 만들거나 사진을 편집합니다.
+Comment[lt]=Kurti paveikslėlius ir redaguoti fotografijas
+Comment[lv]=Veido attēlus vai rediģē fotogrāfijas
+Comment[mk]=Направи слики и уреди фотографии
+Comment[mr]=प्रतिमा बनवा व फोटोग्राफ संपादीत करा
+Comment[my]=ရုပ်ပုံများကို ဖန်တီးပြီး ဓါတ်ပုံများကို တည်းဖြတ်ပါ
+Comment[nb]=Lag bilder og rediger fotografier
+Comment[ne]=छवि सिर्जना गर्नुहोस् र फोटोग्राफ सम्पादन गर्नुहोस्
+Comment[nl]=Afbeeldingen of foto's aanmaken en bewerken
+Comment[nn]=Lag teikningar eller rediger foto
+Comment[or]=ପ୍ରତିଛବି ନିର୍ମାଣ କରନ୍ତୁ ଏବଂ ଫୋଟଗ୍ରାଫଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
+Comment[pa]=ਚਿੱਤਰ ਬਣਾਓ ਅਤੇ ਤਸਵੀਰਾਂ ਸੋਧੋ
+Comment[pl]=Program do tworzenia oraz obróbki obrazów i fotografii
+Comment[pt]=Criar imagens e editar fotografias
+Comment[pt_BR]=Crie e edite imagens ou fotografias
+Comment[ro]=Creează imagini și editează fotografii
+Comment[ru]=Создание изображений и редактирование фотографий
+Comment[sl]=Ustvari slike in uredi fotografije
+Comment[sr]=Направите слике и уредите фотографије
+Comment[sr@latin]=Napravite slike i uredite fotografije
+Comment[sv]=Skapa bilder och redigera fotografier
+Comment[ta]=பிம்பங்களை உருவாக்கவும் மற்றும் படங்களை திருத்தவும்
+Comment[tr]=Resim ya da fotoğrafları oluşturun ve düzenleyin
+Comment[uk]=Створення зображень та редагування фотографій
+Comment[vi]=Tạo và biên soạn ảnh hay ảnh chụp
+Comment[zh_CN]=创建图像或编辑照片
+Comment[zh_HK]=建立圖像與編輯照片
+Comment[zh_TW]=建立圖像與編輯照片
+Exec=gimp %U
+TryExec=gimp
+Icon=gimp
+Terminal=false
+Categories=Graphics;2DGraphics;RasterGraphics;GTK;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=GIMP
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version=2.6.11
+X-GNOME-Bugzilla-OtherBinaries=gimp
+StartupNotify=true
+MimeType=application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/tiff;image/jpeg;image/x-psp;image/png;image/x-icon;image/x-xpixmap;image/svg+xml;image/x-wmf;

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/gnome-mplayer.desktop

+[Desktop Entry]
+Version=1.0
+Name=GNOME MPlayer
+Name[el]=GNOME MPlayer
+Name[fr]=GNOME MPlayer
+Name[ja]=GNOME MPlayer
+Name[sr]=Гномов Мплејер
+Name[sr@latin]=Gnomov Mplejer
+Name[tr]=GNOME MPlayer
+Name[ru]=GNOME MPlayer
+GenericName=Media Player
+GenericName[el]=Αναπαραγωγέας Πολυμέσων
+GenericName[es]=Reproductor multimedia
+GenericName[fi]=Multimediasoitin
+GenericName[fr]=Lecteur multimédia
+GenericName[ja]=メディアプレイヤー
+GenericName[pl]=Odtwarzacz multimediów
+GenericName[tr]=Çokluortam Oynatıcı
+GenericName[ru]=Мультимедийный проигрыватель
+GenericName[zh_CN]=媒体播放器
+GenericName[zh_TW]=媒體播放器
+Comment=Play your media
+Comment[el]=Παίξτε οποιοδήποτε αρχείο ήχου ή βίντεο
+Comment[es]=Reproduce tus archivos multimedia
+Comment[fi]=Toista multimediatiedostoja
+Comment[fr]=Lire vos média
+Comment[ja]=動画や楽曲のメディアファイルを再生します
+Comment[pl]=Odtwarzaj swoje multimedia
+Comment[sr]=Пуштање мултимедијалних датотека
+Comment[sr@latin]=Puštanje multimedijalnih datoteka
+Comment[tr]=Ses ve görüntü oynatıcı
+Comment[ru]=Воспроизведение мультимедиа
+Comment[zh_CN]=播放常见格式媒体文件
+Exec=gnome-mplayer %U
+Icon=gnome-mplayer
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=AudioVideo;Audio;Video;Player;
+MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audio/mp3;audio/mp4;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;application/x-vorbis+ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;audio/x-pn-realaudio;application/vnd.rn-realmedia;application/vnd.rn-realaudio;video/vnd.rn-realvideo;audio/x-realaudio;audio/x-pn-realaudio-plugin;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;audio/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;audio/x-ms-wax;audio/x-ms-wma;application/x-drm-v2;audio/wav;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;audio/mpeg2;audio/x-mpeg2;video/mp4;video/3gpp;audio/x-mpeg3;audio/x-mpegurl;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;audio/basic;audio/x-basic;audio/midi;audio/x-scpls;video/x-matroska;video/matroska;video/x-mng;audio/webm;video/webm;audio/x-webm;video/x-webm;video/mp2t;video/vnd.mpegurl;

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/gnome-screensaver-preferences.desktop

@@ -156,8 +156,7 @@ Icon=preferences-desktop-screensaver
 Exec=gnome-screensaver-preferences
 Terminal=false
 Type=Application
-Categories=GTK;GNOME;Settings;DesktopSettings;
-OnlyShowIn=GNOME;XFCE
+Categories=GTK;Settings;DesktopSettings;
 StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-screensaver

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/java-1.6.0-sun-control-panel.desktop

+[Desktop Entry]
+Name=Java Plugin Control Panel (java-1.6.0-sun)
+Comment=Java Control Panel
+Exec=jcontrol
+Icon=java-1.6.0-sun
+Terminal=false
+Type=Application
+Hidden=true
+Categories=Settings;Java;X-ALTLinux-Java;X-ALTLinux-Java-1.6.0-sun;

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/printeradmin.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Terminal=false
+Icon=libreoffice-printeradmin.png
+Type=Application
+Categories=Application;HardwareSettings;
+Exec=/usr/lib/libreoffice/program/spadmin
+Name=LibreOffice Printer Administration
+Name[en]=LibreOffice Printer Administration
+Name[de]=LibreOffice Drucker Verwaltung
+Name[af]=LibreOffice-drukkeradministrasie
+Name[ar]=LibreOffice Drucker Verwaltung
+Name[be_BY]=Кіраванне прынтэрам LibreOffice
+Name[bg]=Администрация на принтера за LibreOffice
+Name[bs]=LibreOffice administracija štampača
+Name[ca]=Administració d'impressió de l'LibreOffice
+Name[cs]=Administrace tiskáren LibreOffice
+Name[cy]=Gweinyddu Argraffu LibreOffice
+Name[da]=LibreOffice-printeradministration
+Name[el]=Διαχείριση εκτυπωτή LibreOffice
+Name[en_GB]=LibreOffice Printer Administration
+Name[en_ZA]=LibreOffice Printer Administration
+Name[es]=Administración de la impresora de LibreOffice 
+Name[et]=LibreOffice-i printerite haldamine
+Name[fi]=LibreOffice - Tulostimen hallinta
+Name[fr]=Gestion des imprimantes de LibreOffice
+Name[gu_IN]=LibreOffice પ્રિન્ટરનો વહીહટકર્તા
+Name[he]=LibreOffice Drucker Verwaltung
+Name[hi_IN]=LibreOffice Drucker Verwaltung
+Name[hr]=LibreOffice aAdministracija pisača
+Name[hu]=LibreOffice Nyomtatókezelés
+Name[it]=LibreOffice Gestione stampanti
+Name[ja]=LibreOffice プリンタの管理
+Name[km]=ការ​គ្រប់គ្រង​ម៉ាស៊ីន​បោះពុម្ព​ LibreOffice
+Name[ko]=LibreOffice 프린터 관리
+Name[lt]=„LibreOffice“ spausdintuvo tvarkymas
+Name[nb]=LibreOffice-skriveradministrasjon
+Name[nl]=LibreOffice-printerbeheer
+Name[nn]=LibreOffice Printer Administration
+Name[nr]=LibreOffice Ukuphathwa Kwesigadangisi
+Name[ns]=LibreOffice Taolo ya Segatiši
+Name[pa_IN]=LibreOffice ਛਪਾਈ ਪ੍ਰਬੰਧਨ
+Name[pl]=LibreOffice - Zarządzanie drukarką
+Name[pt]=LibreOffice Drucker Verwaltung
+Name[pt_BR]=Administrador de impressoras LibreOffice
+Name[ru]=LibreOffice Управление принтером
+Name[rw]=Ubugenzuzi bwa Mucapyi LibreOffice
+Name[sh_YU]=LibreOffice podešavanje štampača
+Name[sk]=Správa tlačiarní LibreOffice
+Name[sl]=Nastavitve tiskalnika LibreOffice
+Name[sr_CS]=LibreOffice подешавање штампача
+Name[sv]=LibreOffice-skrivaradministration
+Name[sw_TZ]=LibreOffice Utawala wa Printa
+Name[th]=LibreOffice ดูแลเครื่องพิมพ์
+Name[tn]=LibreOffice Printer Administration
+Name[tr]=LibreOffice Yazıcı Yönetimi
+Name[ts]=Vukongomisi bya Printa LibreOffice
+Name[uk]=Налаштування друкарки LibreOffice
+Name[vi]=Quản lý Máy in %TÊNSẢNPHẨM
+Name[xh]=Ulawulo Lwesishicileli lwe-LibreOffice
+Name[zh_CN]=LibreOffice 打印机管理
+Name[zh_TW]=LibreOffice 印表機管理
+Name[zu]=LibreOffice Ukuphathwa komshicileli

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/ristretto.desktop

+[Desktop Entry]
+Version=1.0
+Name=Ristretto Photo Viewer
+Name[ar]=عراض الصور Ristretto
+Name[ca]=Visualitzador de fotografies Ristretto
+Name[cs]=Prohlížeč fotografií Ristretto
+Name[da]=Ristretto billedfremviser
+Name[de]=Bildbetrachter Ristretto
+Name[el]=Προβολέας εικόνων ristretto
+Name[en_GB]=Ristretto Photo Viewer
+Name[es]=Visor de imágenes Ristretto
+Name[eu]=Ristretto argazki ikustatzailea
+Name[fi]=Ristretto-valokuvakatselin
+Name[fr]=Visionneuse d’Images Ristretto
+Name[gl]=Visor de fotos Ristretto
+Name[hr]=Ristretto preglednik fotografija
+Name[hu]=Ristretto fénykép-megjelenítő
+Name[id]=Penilik Gambar Ristretto
+Name[it]=Visualizzatore di foto Ristretto
+Name[ja]=Ristretto フォトビューア
+Name[lv]=Ristretto attēlu skatītājs
+Name[nb]=Ristretto bildefremviser
+Name[pl]=Przeglądarka obrazów Ristretto
+Name[pt]=Visualizador de fotos Ristretto
+Name[ro]=Vizualizare imagini Ristretto
+Name[ru]=Просмотр изображений
+Name[sk]=Ristretto - prehliadač fotiek
+Name[sv]=Fotovisaren Ristretto
+Name[tr]=Ristretto Fotoğraf Gösterici
+Name[ug]=Ristretto سۈرەت كۆرگۈ
+Name[uk]=Переглядач фотографій Ristretto
+Name[zh_CN]=Ristretto 图像查看器
+Comment=Look at your photo's easily
+Comment[ar]=نظرة على الصورك الخاصة بسهول
+Comment[ast]=Ver semeyes cenciellamente
+Comment[ca]=Mira fàcilment les teves fotos
+Comment[cs]=Prohlížejte si své fotografie jednoduše
+Comment[da]=Se nemt dine billeder
+Comment[de]=Bilder anschauen leicht gemacht
+Comment[el]=Δείτε τις εικόνες σας εύκολα
+Comment[en_GB]=Look at your photo's easily
+Comment[es]=Mire su foto fácilmente
+Comment[eu]=Ikusi zure argazkiak erraz
+Comment[fi]=Katsele valokuviasi helposti
+Comment[fr]=Regardez votre photo facilement
+Comment[gl]=Mire as súas fotos sen complicarse
+Comment[hr]=Pogledajte svoje fotografije lako
+Comment[hu]=Fényképek egyszerű megjelenítése
+Comment[id]=Lihat foto anda dengan mudah
+Comment[it]=Guardare le proprie foto con semplicità
+Comment[ja]=簡単に写真を見ます。
+Comment[lv]=Apskaties savas fotogrāfijas viegli
+Comment[nb]=Se på bildene dine
+Comment[nl]=Kijk gemakkelijk naar je foto's 
+Comment[pl]=Umożliwia wygodne przeglądanie zdjęć i obrazów
+Comment[pt]=Veja as suas fotos facilmente
+Comment[ro]=De văzut rapid poze
+Comment[ru]=Просмотр фотографий - это просто
+Comment[sk]=Prezerajte Vaše fotografie jednoducho
+Comment[sv]=Se enkelt på dina foton
+Comment[tr]=Fotoğraflarına kolayca bak
+Comment[uk]=Переглядайте Ваші фотографії легко
+Comment[zh_CN]=轻松查看您的照片
+GenericName=Image Viewer
+GenericName[ar]=عارض الصور
+GenericName[ast]=Visor d'imáxenes
+GenericName[bg]=Програма за преглед на изображения
+GenericName[ca]=Visor d'imatges
+GenericName[cs]=Prohlížeč obrázků
+GenericName[da]=Billedfremviser
+GenericName[de]=Bildbetrachter
+GenericName[el]=Εφαρμογή προβολής εικόνων
+GenericName[en_GB]=Image Viewer
+GenericName[es]=Visor de imágenes
+GenericName[eu]=Irudi ikustatzailea
+GenericName[fi]=Kuvakatselin
+GenericName[fr]=Visualiseur d’images
+GenericName[gl]=Visor de imaxes
+GenericName[hr]=Preglednik slika
+GenericName[hu]=Képmegjelenítő
+GenericName[id]=Penilik Gambar
+GenericName[it]=Visualizzatore di immagini
+GenericName[ja]=画像ビューア
+GenericName[lv]=Attēlu Skatītājs
+GenericName[nb]=Bildefremviser
+GenericName[nl]=Afbeeldingsweergave
+GenericName[pl]=Przeglądarka obrazów
+GenericName[pt]=Visualizador de imagens
+GenericName[pt_BR]=Visualizador de Imagens
+GenericName[ro]=Vizualizare imagini
+GenericName[ru]=Просмотр изображений
+GenericName[sk]=Prehliadač obrázkov
+GenericName[sv]=Bildvisare
+GenericName[tr]=Resim Gösterici
+GenericName[ug]=سۈرەت كۆرگۈ
+GenericName[uk]=Переглядач зображень
+GenericName[ur]=تصاویر منظر کار
+GenericName[ur_PK]=تصاویر منظر کار
+GenericName[vi]=Trình xem ảnh
+GenericName[zh_CN]=图像查看器
+Exec=ristretto %F
+Icon=ristretto
+Terminal=false
+Hidden=true
+Type=Application
+X-MultipleArgs=false
+Categories=GTK;Graphics;Viewer;
+StartupNotify=true
+MimeType=image/png;image/gif;image/jpeg;image/bmp;image/x-ico;image/x-pixmap;image/tiff;

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/system-config-printer.desktop

+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Printing
+Name[ar]=الطباعة
+Name[as]=মুদ্ৰণ কৰা কাৰ্য্য
+Name[bg]=Печатане
+Name[bn]=প্রিন্ট করা হচ্ছে
+Name[bn_IN]=প্রিন্ট ব্যবস্থা
+Name[br]=Moullañ
+Name[bs]=Ispisivanje
+Name[ca]=Impressió
+Name[cs]=Tisk
+Name[cy]=Yn argraffu
+Name[da]=Udskrift
+Name[de]=Drucken
+Name[el]=Εκτύπωση
+Name[en_GB]=Printing
+Name[es]=Impresión
+Name[et]=Trükkimine
+Name[fa]=در حال چاپ
+Name[fi]=Tulostus
+Name[fr]=Impression
+Name[gu]=છાપન
+Name[he]=הדפסה
+Name[hi]=छपाई कर रहा है
+Name[hr]=Ispisivanje
+Name[hu]=Nyomtatás
+Name[id]=Mencetak
+Name[is]=Prenta
+Name[it]=Stampa
+Name[ja]=印刷
+Name[kn]=ಮುದ್ರಣ
+Name[ko]=인쇄
+Name[lv]=Drukāšana
+Name[mai]=छापि रहल अछि
+Name[mk]=Печатам
+Name[ml]=പ്രിന്‍റ് ചെയ്യുന്നു
+Name[mr]=मुद्रण
+Name[ms]=Mencetak
+Name[nb]=Skrivere
+Name[nl]=Afdrukken
+Name[nn]=Skriv ut
+Name[or]=ମୁଦ୍ରଣ କରୁଅଛି
+Name[pa]=ਛਾਪਣਾ
+Name[pl]=Drukowanie
+Name[pt]=Impressão
+Name[pt_BR]=Impressão
+Name[ro]=Tipărire
+Name[ru]=Печать
+Name[si]=මුද්‍රණය කරමින්
+Name[sk]=Tlač
+Name[sl]=Tiskanje
+Name[sr]=Штампање
+Name[sr@latin]=Štampanje
+Name[sv]=Utskrifter
+Name[ta]=அச்சிடுதல்
+Name[te]=ముద్రించు
+Name[th]=เครื่องพิมพ์
+Name[tr]=Yazdırma
+Name[uk]=Друк
+Name[vi]=In ấn
+Name[zh_CN]=打印
+Name[zh_TW]=列印
+Comment=Configure printers
+Comment[ar]=اضبط الطابعات
+Comment[as]=মুদ্ৰকৰ বিন্যাস কৰক
+Comment[bg]=Настройка на принтерите
+Comment[bn_IN]=প্রিন্টার কনফিগার করুন
+Comment[br]=Kefluniañ ar voullerezed
+Comment[bs]=Konfiguriranje pisača
+Comment[ca]=Configuració d'impressores
+Comment[cs]=Nastavit tiskárny
+Comment[da]=Indstil printere
+Comment[de]=Drucker konfigurieren
+Comment[el]=Ρύθμιση εκτυπωτών
+Comment[en_GB]=Configure printers
+Comment[es]=Configurar impresoras
+Comment[et]=Printerite seadistamine
+Comment[fi]=Muokkaa tulostimien asetuksia
+Comment[fr]=Configurer les imprimantes
+Comment[gu]=પ્રિન્ટરો રૂપરેખાંકિત કરો
+Comment[he]=הגדרת מדפסות
+Comment[hi]=मुद्रक विन्यस्त करें
+Comment[hr]=Konfiguriranje pisača
+Comment[hu]=Nyomtatók beállítása
+Comment[is]=Stilla prentara
+Comment[it]=Configura le stampanti
+Comment[ja]=プリンターの設定
+Comment[kn]=ಮುದ್ರಕವನ್ನು ಸ್ವರೂಪಿಸು
+Comment[ko]=프린터 설정
+Comment[lv]=Printeru iestatīšana
+Comment[ml]=പ്രിന്‍ററുകള്‍ സജ്ജമാക്കുക
+Comment[mr]=मुद्रक व्यूहरचित करा
+Comment[ms]=Tetapkan pencetak
+Comment[nb]=Konfigurer skrivere
+Comment[nl]=Printers configureren
+Comment[nn]=Set opp skrivarar
+Comment[or]=ମୁଦ୍ରଣୀ ମାନଙ୍କୁ ବିନ୍ଯାସ କରନ୍ତୁ
+Comment[pa]=ਪ੍ਰਿੰਟਰ ਸੰਰਚਨਾ
+Comment[pl]=Konfiguracja drukarek
+Comment[pt]=Configurar impressoras
+Comment[pt_BR]=Configure impressoras
+Comment[ro]=Configurează imprimantele
+Comment[ru]=Настроить принтеры
+Comment[si]=මුද්‍රකයන් මානකරන්න
+Comment[sk]=Konfigurovať tlačiarne
+Comment[sr]=Подешавање штампача
+Comment[sr@latin]=Podešavanje štampača
+Comment[sv]=Konfigurera skrivare
+Comment[ta]=அச்சடிப்பிகளை கட்டமைக்கவும்
+Comment[te]=ముద్రకాలను ఆకృతీకరించు
+Comment[th]=ตั้งค่าเครื่องพิมพ์
+Comment[uk]=Налаштовування принтерів
+Comment[vi]=Cấu hình máy in
+Comment[zh_CN]=配置打印机
+Comment[zh_TW]=設定印表機
+Exec=system-config-printer
+Terminal=false
+Type=Application
+Icon=printer
+StartupNotify=true
+X-Alterator-Category=X-Alterator-System
+X-Desktop-File-Install-Version=0.19
+Categories=GTK;HardwareSettings;Settings;System;

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/xfce4-mixer.desktop

+[Desktop Entry]
+Version=1.0
+Name=Mixer
+Name[ar]=مازج
+Name[ast]=Entemecedor
+Name[ca]=Mesclador
+Name[cs]=Směšovač
+Name[da]=Mikser
+Name[de]=Lautstärkeregelung
+Name[es]=Mezclador
+Name[eu]=Nahastailea
+Name[fi]=Äänenvoimakkuus
+Name[fr]=Mixer
+Name[gl]=Mesturador
+Name[hu]=Keverő
+Name[id]=Mixer
+Name[it]=Mixer
+Name[ja]=ミキサー
+Name[lv]=Mikseris
+Name[nb]=Mikser
+Name[nl]=Volumeregelaar
+Name[pl]=Mikser dźwięku
+Name[pt]=Misturador
+Name[pt_BR]=Mixador
+Name[ro]=Mixer
+Name[ru]=Регулятор громкости 
+Name[si]=මිශ්‍රකය
+Name[sk]=Zmiešavač
+Name[sv]=Mixer
+Name[tr]=Ses Düzenleyicisi
+Name[uk]=Регулювання гучності
+Name[ur]=مکسر
+Name[ur_PK]=مکسر
+Name[zh_CN]=混音器
+Comment=Audio mixer for the Xfce Desktop Environment
+Comment[ast]=Entemecedor d'audio pal entornu d'escritoriu Xfce
+Comment[ca]=Mesclador d'àudio per l'entorn d'escriptori Xfce
+Comment[cs]=Směšovač zvuku pro pracovní prostředí Xfce
+Comment[da]=Lydmikser til Xfce-skrivebordsmiljøet
+Comment[de]=Lautstärkeregelung
+Comment[es]=Mezclador de audio para el entorno de escritorio Xfce
+Comment[eu]=Xfce idazmahai ingurunearen audio nahasgailua
+Comment[fi]=Äänenvoimakkuuden säätöohjelma Xfce-työpöytäympäristöön
+Comment[fr]=Mixer audio pour l'environnement Xfce
+Comment[gl]=Mesturador de audio do ambiente de escritorio Xfce
+Comment[hu]=Hangkeverő az Xfce asztali környezethez
+Comment[id]=Mixer audio untuk Lingkungan Destop Xfce
+Comment[it]=Mixer audio per l'ambiente grafico Xfce
+Comment[ja]=Xfce デスクトップ環境向けオーディオミキサー
+Comment[lv]=Audio mikseris Xfce darbavirsmas videi
+Comment[nb]=Lydmikser for Xfce Skrivebordsmiljøet
+Comment[nl]=Volumeregelaar voor de Xfce bureaublad omgeving
+Comment[pl]=Mikser dźwięku dla środowiska Xfce
+Comment[pt]=Misturador áudio para o ambiente de trabalho Xfce
+Comment[pt_BR]=Mixador de áudio para o ambiente de área de trabalho do Xfce
+Comment[ro]=Mixer audio pentru mediul desktop Xfce
+Comment[ru]=Регулятор громкости для рабочего окружения Xfce 
+Comment[si]=Xfce වැඩතල පරිපරය සඳහා ශබ්ද මිශ්‍රකයක්
+Comment[sk]=Zmiešavač zvuku pre pracovné prostredie Xfce
+Comment[sv]=Ljudmixer för skrivbordsmiljön Xfce
+Comment[tr]=Xfce Masaüstü Yöneticisi için ses düzenleyicisi
+Comment[uk]=Регулятор гучності для середовища стільниці Xfce
+Comment[ur]=صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول
+Comment[ur_PK]=صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول
+Comment[zh_CN]=Xfce 桌面环境混音器
+Icon=multimedia-volume-control
+Exec=xfce4-mixer
+Type=Application
+StartupNotify=true
+Terminal=false
+Categories=X-XFCE;Audio;AudioVideo;

branding-simply-linux/xfce-settings/etcskel/.local/share/applications/xsane.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Name=XSane Image scanning program
+Name[ru]=Программа для сканирования изображений
+Name[ca]=Programa d'escaneig d'imatges XSane
+Name[es]=Programa de escaneo de imágenes XSane
+Name[fr]=Programme d'acquisition d'images XSane
+Comment=A program to work with scanner. Can be used as a scanning, copier, OCR, fax tools.
+Comment[ru]=Программа для работы со сканером. Может быть использована в качестве копировального аппарата, факса, и др.
+Comment[ca]=Un programa per a treballar amb escànners. Es pot utilitzar com una eina d'escanejat, copiat, OCR i fax.
+Comment[es]=Un programa para trabajar con escáners. Se puede utilizar como una herramienta para escanear, copiar, OCR y fax.
+Comment[fr]=Un programme d'acquisition d'images pour votre scanner. Peut également photocopier, faxer ou faire de la reconnaissance de caractères.
+Exec=xsane
+Icon=xsane
+Terminal=false
+Type=Application
+Categories=GTK;Application;Graphics;RasterGraphics;Scanning;
+StartupNotify=true

branding.spec

@@ -10,7 +10,7 @@ Version: 6.0.0
 Release: alt1
 BuildArch: noarch
 
-BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
+BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
 
 BuildRequires(pre): libqt4-core 
@@ -262,51 +262,52 @@ pushd notes
 popd
 
 #xfce-settings
-pushd xfce-settings
-mkdir -p %buildroot/etc/skel/.config/Terminal
-mkdir -p %buildroot/etc/skel/.config/Thunar
-mkdir -p %buildroot/etc/skel/.config/autostart
-mkdir -p %buildroot/etc/skel/.config/sonata
+#pushd xfce-settings
+#mkdir -p %buildroot/etc/skel/.config/Terminal
+#mkdir -p %buildroot/etc/skel/.config/Thunar
+#mkdir -p %buildroot/etc/skel/.config/autostart
+#mkdir -p %buildroot/etc/skel/.config/sonata
 
-mkdir -p %buildroot/etc/skel/.gconf/apps/gnome-screensaver
-mkdir -p %buildroot/etc/skel/.gconf/desktop/gnome/session
+#mkdir -p %buildroot/etc/skel/.gconf/apps/gnome-screensaver
+#mkdir -p %buildroot/etc/skel/.gconf/desktop/gnome/session
 
-mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
-mkdir -p %buildroot/etc/skel/.config/xfce4/notication-daemon-xfce
-mkdir -p %buildroot/etc/skel/.config/xfce4/panel
+#mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
+#mkdir -p %buildroot/etc/skel/.config/xfce4/notication-daemon-xfce
+#mkdir -p %buildroot/etc/skel/.config/xfce4/panel
 
-mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-5
-mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-6
-mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-8
-mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-9
+#mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-5
+#mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-6
+#mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-8
+#mkdir -p %buildroot/etc/skel/.config/xfce4/panel/launcher-9
 
-mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf
-mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
+#mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf
+#mkdir -p %buildroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
 
 mkdir -p %buildroot/etc/skel/.local/share/applications
-mkdir -p %buildroot/etc/skel/Шаблоны
-mkdir -p %buildroot/etc/skel/Музыка
+#mkdir -p %buildroot/etc/skel/Шаблоны
+#mkdir -p %buildroot/etc/skel/Музыка
 mkdir -p %buildroot/etc/skel/Музыка/mpd
 mkdir -p %buildroot/etc/skel/Музыка/mpd/playlists
 
-cp etcskel/Шаблоны/* %buildroot/etc/skel/Шаблоны
+#cp xfce-settings/etcskel/Шаблоны %buildroot/etc/skel/
 
-cp -ra etcskel/.config/* %buildroot/etc/skel/.config
-cp -ra etcskel/.gconf/* %buildroot/etc/skel/.gconf
+cp -r xfce-settings/etcskel/* %buildroot/etc/skel/
+cp -r xfce-settings/etcskel/.config %buildroot/etc/skel/
+cp -r xfce-settings/etcskel/.gconf %buildroot/etc/skel/
 
-install -m 644 etcskel/.local/share/applications/*  %buildroot/etc/skel/.local/share/applications
-install -m 644 etcskel/.wm-select %buildroot/etc/skel/
-install -m 644 etcskel/.fonts.conf %buildroot/etc/skel/
-install -m 644 etcskel/.mpdconf %buildroot/etc/skel/
+install -m 644 xfce-settings/etcskel/.local/share/applications/*  %buildroot/etc/skel/.local/share/applications
+install -m 644 xfce-settings/etcskel/.wm-select %buildroot/etc/skel/
+install -m 644 xfce-settings/etcskel/.fonts.conf %buildroot/etc/skel/
+install -m 644 xfce-settings/etcskel/.mpdconf %buildroot/etc/skel/
 
 mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200
 mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050
-cp -P backgrounds/*.jpg %buildroot/usr/share/xfce4/backdrops/
-install -m 644 backgrounds/vladstudio.com/LICENSE.txt %buildroot/usr/share/xfce4/backdrops/vladstudio.com/
-install -m 644 backgrounds/vladstudio.com/1600x1200/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200/
-install -m 644 backgrounds/vladstudio.com/1680x1050/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050/
-install -m 644 backgrounds/new*.png %buildroot/usr/share/xfce4/backdrops/
-popd
+cp -P xfce-settings/backgrounds/*.jpg %buildroot/usr/share/xfce4/backdrops/
+install -m 644 xfce-settings/backgrounds/vladstudio.com/LICENSE.txt %buildroot/usr/share/xfce4/backdrops/vladstudio.com/
+install -m 644 xfce-settings/backgrounds/vladstudio.com/1600x1200/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200/
+install -m 644 xfce-settings/backgrounds/vladstudio.com/1680x1050/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050/
+install -m 644 xfce-settings/backgrounds/new*.png %buildroot/usr/share/xfce4/backdrops/
+#popd
 
 
 #slideshow
@@ -323,7 +324,8 @@ install components/indexhtml/img/* %buildroot%_defaultdocdir/indexhtml/img/
 
 #bootloader
 %pre bootloader
-[ -s /boot/splash/%theme ] && rm -rf  /boot/splash/%theme ||:
+[ -s /usr/share/gfxboot/%theme ] && rm -fr  /usr/share/gfxboot/%theme ||:
+[ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
 
 %post bootloader
 %__ln_s -nf %theme/message /boot/splash/message
@@ -333,11 +335,11 @@ cd boot/splash/%theme/
 echo $lang > lang
 [ "$lang" = "C" ] || echo lang | cpio -o --append -F message
 . shell-config
-shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme
+shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt
+#shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme
 shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
 shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
 
-
 %preun bootloader
 [ $1 = 0 ] || exit 0
 [ "`readlink /boot/splash/message`" != "%theme/message" ] ||
@@ -355,7 +357,7 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
 %post bootsplash
 subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 [ -f /etc/sysconfig/grub2 ] && \
-      subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/theme/grub.jpg|" \
+      subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
              /etc/sysconfig/grub2 ||:
 
 %files alterator