set Esc as the key to swich to verbose mode

improve switch-theme so that it can be used in post of mandrake_theme packages
remove images and config files

41 files changed, 105 insertions, 120 deletions

diff --git a/Makefile b/Makefile
index 4990729..e923509 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,6 @@ RELEASE := $(shell sed -n 's/%define release //p' < $(NAME).spec)
 RELTAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 
 SUBDIRS=scripts fb fbmngplay fbtruetype splash po
-DATADIRS=themes/data/
-CONFIGDIRS=themes/config/
-THEMES=Mandrake
 
 prefix=/
 sharedir=/usr/share
@@ -17,12 +14,7 @@ all:
 	@for i in $(SUBDIRS);do	make -C $$i all;done
 
 install:
-	@mkdir -p $(prefix)$(sharedir)/bootsplash/themes/
-	@mkdir -p $(prefix)$(configdir)/bootsplash/themes/
 	@for i in $(SUBDIRS);do	make -C $$i install;done
-	@for i in $(DATADIRS);do for t in $(THEMES); do cp -a $$i/$$t $(prefix)$(sharedir)/bootsplash/themes/;done; done
-	@for i in $(CONFIGDIRS);do for t in $(THEMES); do install -d $(prefix)/$(configdir)/bootsplash/themes/$$t/config; cp -a $(CONFIGDIRS)/$$t/cfg/* $(prefix)$(configdir)/bootsplash/themes/$$t/config/;done ;done
-	@for d in 800x600 1024x768; do for v in 1 2 3; do ln -s vt0-$$d.cfg $(prefix)$(configdir)/bootsplash/themes/Mandrake/config/vt$$v-$$d.cfg; done; done
 
 dis: clean 
 	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
diff --git a/bootsplash.spec b/bootsplash.spec
index fbdb455..695c9be 100644
--- a/bootsplash.spec
+++ b/bootsplash.spec
@@ -50,20 +50,6 @@ done
 %find_lang bootsplash
 
 %post
-cd %{_bootdir} 
-    if [[ -x /usr/share/loader/make-initrd ]]; then 
-        /usr/share/loader/make-initrd -n &> /dev/null 
-        if [[ -x /usr/sbin/detectloader ]]; then 
-            LOADER=$(/usr/sbin/detectloader -q) 
-	    if [[ $LOADER = "LILO" ]] && [[ -x /sbin/lilo ]];then 
-                /sbin/lilo >/dev/null 2>/dev/null 
-	    fi   
-	    if [[ $LOADER = "YABOOT" ]] && [[ -x /sbin/ybin ]];then 
-	        /sbin/ybin >/dev/null 2>/dev/null 
-	    fi 
-        fi 
-    fi 
-
 # Add right translation file
 for i in `echo $LANGUAGE:$LC_ALL:$LC_COLLATE:$LANG:C | tr ':' ' '`
 do      
@@ -75,22 +61,6 @@ do
         fi
 done
     
-%postun
-cd %{_bootdir} 
-    if [[ -x /usr/share/loader/make-initrd ]]; then 
-        /usr/share/loader/make-initrd -n &> /dev/null 
-        if [[ -x /usr/sbin/detectloader ]]; then 
-            LOADER=$(/usr/sbin/detectloader -q) 
-	    if [[ $LOADER = "LILO" ]] && [[ -x /sbin/lilo ]];then 
-                /sbin/lilo >/dev/null 2>/dev/null 
-	    fi   
-	    if [[ $LOADER = "YABOOT" ]] && [[ -x /sbin/ybin ]];then 
-	        /sbin/ybin >/dev/null 2>/dev/null 
-	    fi 
-        fi 
-    fi 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 %files -f %name.lang
@@ -98,8 +68,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc README ChangeLog fbmngplay/ChangeLog.fbmngplay fbmngplay/README.fbmngplay fbtruetype/ChangeLog.fbtruetype fbtruetype/README.fbtruetype
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %_datadir/%{name}/scripts
-%_datadir/%{name}/themes/Mandrake
-%config(noreplace) %_sysconfdir/%{name}/themes/Mandrake/*
+#%_datadir/%{name}/themes/Mandrake
+#%config(noreplace) %_sysconfdir/%{name}/themes/Mandrake/*
 /bin/*
 /sbin/*
 %{_bindir}/*
@@ -107,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sat Aug 16 2003 Pablo Saratxaga <pablo@mandrakesoft.com> 2.0.2-1mdk
 - added support for other fonts, depending on the language
+- now themes are in packages provinding mandrake_theme
 
 * Fri Aug 01 2003 Warly <warly@mandrakesoft.com> 2.0.1-2mdk
 - require to initscripts was not correct
diff --git a/po/ar.po b/po/ar.po
index dfba79b..77a7a91 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "جاري بدء تشغيل النظام..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "اضغط F2 للوضعية المفصلة"
+msgid "Press Esc for verbose mode."
+msgstr "اضغط Esc للوضعية المفصلة"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/az.po b/po/az.po
index 06cc173..8555485 100644
--- a/po/az.po
+++ b/po/az.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Sistem açılır..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "İnteraktiv mod üçün F2 düyməsinə basın."
+msgid "Press Esc for verbose mode."
+msgstr "İnteraktiv mod üçün Esc düyməsinə basın."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/bg.po b/po/bg.po
index e518c60..272b84d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Зареждане на системата..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Натиснете F2 за \"многословен\" режим"
+msgid "Press Esc for verbose mode."
+msgstr "Натиснете Esc за \"многословен\" режим"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/bootsplash.pot b/po/bootsplash.pot
index dbd9031..b64f87d 100644
--- a/po/bootsplash.pot
+++ b/po/bootsplash.pot
@@ -19,7 +19,7 @@ msgid "Booting the system..."
 msgstr ""
 
 #: tmp/splash.sh:172 
-msgid "Press F2 for verbose mode."
+msgid "Press Esc for verbose mode."
 msgstr ""
 
 #: tmp/splash.sh:162 
diff --git a/po/bs.po b/po/bs.po
index 5d3eae6..c53c391 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Pokrecem sistem..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Pritisnite F2 za vise infomracija."
+msgid "Press Esc for verbose mode."
+msgstr "Pritisnite Esc za vise infomracija."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/cs.po b/po/cs.po
index 2f362c8..50eb7e2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Startuji systém..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Stiskněte F2 pro režim s výpisy."
+msgid "Press Esc for verbose mode."
+msgstr "Stiskněte Esc pro režim s výpisy."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/da.po b/po/da.po
index 40193b8..13c4774 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Starter systemet op..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Tryk F2 for informativ tilstand."
+msgid "Press Esc for verbose mode."
+msgstr "Tryk Esc for informativ tilstand."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/de.po b/po/de.po
index e7e4f67..28dd622 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18,7 +18,7 @@ msgid "Booting the system..."
 msgstr "Das System wird gestartet..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
+msgid "Press Esc for verbose mode."
 msgstr "F2 drücken für den Detailmodus"
 
 #: tmp/splash.sh:162
diff --git a/po/et.po b/po/et.po
index 87ee187..cfa9185 100644
--- a/po/et.po
+++ b/po/et.po
@@ -19,7 +19,7 @@ msgid "Booting the system..."
 msgstr "Süsteemi käivitamine..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
+msgid "Press Esc for verbose mode."
 msgstr "F2 rakendab selgitava resiimi"
 
 #: tmp/splash.sh:162
diff --git a/po/eu.po b/po/eu.po
index c11c4f3..f6b4929 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Sistema abiarazten..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Sakatu F2 modu berritsurako"
+msgid "Press Esc for verbose mode."
+msgstr "Sakatu Esc modu berritsurako"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/fa.hack b/po/fa.hack
index 61bb6e8..0abdb2e 100644
--- a/po/fa.hack
+++ b/po/fa.hack
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "          ...ﻢﺘﺴﻴﺳ ﺯﺎﻏﺁ ﻝﺎﺣ ﺭﺩ"
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "     .ﺪﻴﻫﺩ ﺭﺎﺸﻓ ﺍﺭ F2 ﻰﺤﻳﺮﺸﺗ ﺖﻟﺎﺣ ﻯﺍﺮﺑ"
+msgid "Press Esc for verbose mode."
+msgstr "     .ﺪﻴﻫﺩ ﺭﺎﺸﻓ ﺍﺭ Esc ﻰﺤﻳﺮﺸﺗ ﺖﻟﺎﺣ ﻯﺍﺮﺑ"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/fa.po b/po/fa.po
index af6a832..33cb8b6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "در حال آغاز سیستم..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "برای حالت تشریحی F2 را فشار دهید."
+msgid "Press Esc for verbose mode."
+msgstr "برای حالت تشریحی Esc را فشار دهید."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/fi.po b/po/fi.po
index 3b7f186..00750e1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -20,8 +20,8 @@ msgid "Booting the system..."
 msgstr "Käynnistetään järjestelmää..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "F2 vaihtaa ykityiskohtaiseen tilaan"
+msgid "Press Esc for verbose mode."
+msgstr "Esc vaihtaa ykityiskohtaiseen tilaan"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/fr.po b/po/fr.po
index 9bae0c4..2c4f024 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,8 +17,8 @@ msgid "Booting the system..."
 msgstr "Démarrage du système..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Appuyez sur F2 pour le mode détaillé."
+msgid "Press Esc for verbose mode."
+msgstr "Appuyez sur Esc pour le mode détaillé."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/he.po b/po/he.po
index 2f7de6f..9120e4d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "מאתחל את המערכת...."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "נא ללחוץ F2 עבור מצב מפורט"
+msgid "Press Esc for verbose mode."
+msgstr "נא ללחוץ Esc עבור מצב מפורט"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/hi.po b/po/hi.po
index d331eb0..4371488 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "प्रणाली शुरू (बूट) हो रही है..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "वर्णनात्मक विधा के लिए F2 कुज़ीं को दबायें"
+msgid "Press Esc for verbose mode."
+msgstr "वर्णनात्मक विधा के लिए Esc कुज़ीं को दबायें"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/hu.po b/po/hu.po
index 8746965..109c7ba 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Rendszerindítás..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Részletes információkért nyomja le az F2 billentyűt."
+msgid "Press Esc for verbose mode."
+msgstr "Részletes információkért nyomja le az Esc billentyűt."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/lv.po b/po/lv.po
index 1c7bfc9..6fecdab 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Startēju sistēmu..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Nospiediet F2 izvērstam režīmam."
+msgid "Press Esc for verbose mode."
+msgstr "Nospiediet Esc izvērstam režīmam."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/ms.po b/po/ms.po
index eba9f32..086348c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Memboot sistem..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Tekan F2 untuk mod verbose."
+msgid "Press Esc for verbose mode."
+msgstr "Tekan Esc untuk mod verbose."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/nl.po b/po/nl.po
index fce219f..41fc9f2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Systeem opstarten..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Druk op F2 voor 'veel informatie' modus"
+msgid "Press Esc for verbose mode."
+msgstr "Druk op Esc voor 'veel informatie' modus"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/pl.po b/po/pl.po
index 09cbe73..ad1786f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Uruchamianie systemu..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Naciśnij F2 aby przejśc do trybu informacyjnego."
+msgid "Press Esc for verbose mode."
+msgstr "Naciśnij Esc aby przejśc do trybu informacyjnego."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/pt.po b/po/pt.po
index 26d6d28..3cf7f3c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "A iniciar o sistema..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Carregue em F2 para o modo detalhado."
+msgid "Press Esc for verbose mode."
+msgstr "Carregue em Esc para o modo detalhado."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6735f41..1a8829a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Iniciando o sistema..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Acione F2 para ver mensagens"
+msgid "Press Esc for verbose mode."
+msgstr "Acione Esc para ver mensagens"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/ro.po b/po/ro.po
index 962276c..c045490 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Pornesc sistemul..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Apăsați F2 pentru mod detaliat."
+msgid "Press Esc for verbose mode."
+msgstr "Apăsați Esc pentru mod detaliat."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/ru.po b/po/ru.po
index 8b0ac3e..a410e0c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,8 +20,8 @@ msgid "Booting the system..."
 msgstr "Загружаем систему..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Нажмите F2 для подробного режима."
+msgid "Press Esc for verbose mode."
+msgstr "Нажмите Esc для подробного режима."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/sk.po b/po/sk.po
index 59688ef..fe957f1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -16,8 +16,8 @@ msgid "Booting the system..."
 msgstr "Systém sa spúšťa..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Stlačte F2 ak chcete vidieť výpisy."
+msgid "Press Esc for verbose mode."
+msgstr "Stlačte Esc ak chcete vidieť výpisy."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/sq.po b/po/sq.po
index 8afcead..8b58edd 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Rinisja e sistemit..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Shtypeni F2 për mode detaje."
+msgid "Press Esc for verbose mode."
+msgstr "Shtypeni Esc për mode detaje."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/sv.po b/po/sv.po
index 2d3daa3..59d5e65 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Startar systemet..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Tryck på F2 för utförligt läge."
+msgid "Press Esc for verbose mode."
+msgstr "Tryck på Esc för utförligt läge."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/tr.po b/po/tr.po
index 18fd4d6..ec88e86 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Sistem başlatılıyor..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Ayrıntılı kip için F2 tuşuna basın."
+msgid "Press Esc for verbose mode."
+msgstr "Ayrıntılı kip için Esc tuşuna basın."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/uk.po b/po/uk.po
index db71cc7..242b1af 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -20,8 +20,8 @@ msgid "Booting the system..."
 msgstr "Завантажується система..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Натисніть F2 для детального режиму."
+msgid "Press Esc for verbose mode."
+msgstr "Натисніть Esc для детального режиму."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/uz.po b/po/uz.po
index c81b001..9ed57fb 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Sistema yuklanmoqda..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Batafsil usuli uchun F2 tugmasini bosing."
+msgid "Press Esc for verbose mode."
+msgstr "Batafsil usuli uchun Esc tugmasini bosing."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/uz@Cyrl.po b/po/uz@Cyrl.po
index 8831f1f..277c1ae 100644
--- a/po/uz@Cyrl.po
+++ b/po/uz@Cyrl.po
@@ -19,8 +19,8 @@ msgid "Booting the system..."
 msgstr "Система юкланмоқда..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Батафсил усули учун F2 тугмасини босинг."
+msgid "Press Esc for verbose mode."
+msgstr "Батафсил усули учун Esc тугмасини босинг."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/vi.po b/po/vi.po
index 4e379e5..ff7e4e9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Đang kh?i d?ng h? th?ng..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Nh?n F2 cho phuong th?c verbose."
+msgid "Press Esc for verbose mode."
+msgstr "Nh?n Esc cho phuong th?c verbose."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/wa.po b/po/wa.po
index 56310fa..83c3d84 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "Enondant l' éndjole..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "Tchôkîz so F2 pol môde badjawe."
+msgid "Press Esc for verbose mode."
+msgstr "Tchôkîz so Esc pol môde badjawe."
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 77c8aae..fd85a07 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,8 +18,8 @@ msgid "Booting the system..."
 msgstr "正在启动系统..."
 
 #: tmp/splash.sh:172
-msgid "Press F2 for verbose mode."
-msgstr "按 F2 键以显示详细信息"
+msgid "Press Esc for verbose mode."
+msgstr "按 Esc 键以显示详细信息"
 
 #: tmp/splash.sh:162
 msgid "Shutting down the system..."
diff --git a/scripts/Makefile b/scripts/Makefile
index 9c86f0f..c82b9db 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,5 +1,5 @@
 PL=detect-resolution
-SH=make-boot-splash rewritejpeg switch-themes
+SH=make-boot-splash rewritejpeg switch-themes remove-theme
 SBIN=splash.sh
 SYS=bootsplash.sysconfig
 
diff --git a/scripts/bootsplash.sysconfig b/scripts/bootsplash.sysconfig
index 0217535..4a61577 100644
--- a/scripts/bootsplash.sysconfig
+++ b/scripts/bootsplash.sysconfig
@@ -8,11 +8,11 @@
 # 
 # SPLASH=INT When Integer could be 800x600 1024x768 1280x1024 1600x1200
 #
-SPLASH=auto
+SPLASH=no
 
 # Choose the themes. The should be based in 
 # /usr/share/bootsplash/themes/
-THEME=Mandrake
+THEME=
 
 # Say yes here if you want to leave the logo on the console.
 # Three options :
diff --git a/scripts/splash.sh b/scripts/splash.sh
index 5bb4bb4..d200b12 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -184,7 +184,7 @@ if [ "$progress" == 1 -o "$1" == "start" ]; then
     _boot=$TEXT
     if [ "$text_x" != "" -a "$text_y" != "" \
         -a "$text_color" != "" -a "$text_size" != "" -a "$_silent" == "yes" ]; then
-        gprintf "Press F2 for verbose mode."
+        gprintf "Press Esc for verbose mode."
         fbtruetype.static -x $text_x -y $text_y -t $text_color -s $text_size \
   			$custom_font "$_boot $TEXT"
     fi
diff --git a/scripts/switch-themes b/scripts/switch-themes
index 3492e09..273044c 100755
--- a/scripts/switch-themes
+++ b/scripts/switch-themes
@@ -40,23 +40,22 @@ function lilo_switch_themes () {
     if [[ ! -f $message_from_theme ]];then
 	return;
     fi
-    if [[ ! -e $bootdir/lilo ]];then
+    if [[ ! -e $bootdir/message ]];then
 	return;
     fi
     
     #Make sure to point on lilo-graphic
-    if [[ -L $bootdir/lilo ]];then
-	point_to=$(read_link $bootdir/lilo)
+    if [[ -L $bootdir/message ]];then
+	point_to=$(read_link $bootdir/message)
 	if [[ $point_to != lilo-graphic ]];then
-	    rm -f $bootdir/lilo
-	    ln -s lilo-graphic $bootdir/lilo
+	    rm -f $bootdir/message
+	    ln -s lilo-graphic $bootdir/message
 	fi
     fi
 
     if ! cmp -s $message_from_theme $message_from_current;then
 	cp -f $message_from_theme $message_from_current
     fi
-
 }
 
 function check_it () {
@@ -89,6 +88,11 @@ function switch_theme () {
 	tmpfile=$(mktemp /tmp/.bootsplash.XXXXXXX)
 	cp -f $sysconfig $tmpfile && rm -f $sysconfig
 	while read line;do
+	    if [[ $line == SPLASH=* ]];then 
+		echo "SPLASH=auto" >> $sysconfig
+		ok=yes
+		continue;
+	    fi
 	    if [[ $line == THEME=* ]];then 
 		echo "THEME=$toswitch" >> $sysconfig
 		ok=yes
@@ -100,13 +104,30 @@ function switch_theme () {
 	    echo "THEME=$toswitch" >> $sysconfig
 	fi
 	rm -f $tmpfile
-	if [[ -d /etc/bootsplash/$toswitch ]]; then 
-	    rm -f /etc/bootsplash/current
-	    ln -s /etc/bootsplash/$toswitch current
+	if [[ -d /etc/bootsplash/themes/$toswitch ]]; then 
+	    rm -f /etc/bootsplash/themes/current
+	    ln -s /etc/bootsplash/themes/$toswitch current
         fi
     fi
 }
 
+function update_boot () {
+    pushd /boot &> /dev/null
+    if [[ -x /usr/share/loader/make-initrd ]]; then 
+        /usr/share/loader/make-initrd -n &> /dev/null 
+        if [[ -x /usr/sbin/detectloader ]]; then 
+            LOADER=$(/usr/sbin/detectloader -q) 
+	    if [[ $LOADER = "LILO" ]] && [[ -x /sbin/lilo ]];then 
+                /sbin/lilo >/dev/null 2>/dev/null 
+	    fi   
+	    if [[ $LOADER = "YABOOT" ]] && [[ -x /sbin/ybin ]];then 
+	        /sbin/ybin >/dev/null 2>/dev/null 
+	    fi 
+        fi 
+    fi 
+    popd &> /dev/null
+}
+
 function usage () {
     basename=`basename $0`
     cat <<EOF
@@ -154,3 +175,4 @@ fi
 
 check_it $theme
 switch_theme $theme
+update_boot