diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index 3530b2743..a15f77cd6 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -1,5 +1,5 @@
  /*
- *  This file is part of the KDE Help Center
+ *  This file is part of the Trinity Help Center
  *
  *  Copyright (c) 2002 Frerich Raabe <raabe@kde.org>
  *
@@ -60,12 +60,13 @@ static KCmdLineOptions options[] =
 
 extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 {
-  KAboutData aboutData( "khelpcenter", I18N_NOOP("KDE Help Center"),
+  KAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"),
                         HELPCENTER_VERSION,
-                        I18N_NOOP("The KDE Help Center"),
+                        I18N_NOOP("The Trinity Help Center"),
                         KAboutData::License_GPL,
                         I18N_NOOP("(c) 1999-2003, The KHelpCenter developers") );
 
+  aboutData.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
   aboutData.addAuthor( "Frerich Raabe", 0, "raabe@kde.org" );
   aboutData.addAuthor( "Matthias Elter", I18N_NOOP("Original Author"),
diff --git a/khelpcenter/khelpcenter.desktop b/khelpcenter/khelpcenter.desktop
index cf3f6a70a..5dad26cfe 100644
--- a/khelpcenter/khelpcenter.desktop
+++ b/khelpcenter/khelpcenter.desktop
@@ -1,32 +1,32 @@
 [Desktop Entry]
 Name=KHelpCenter
 Name[af]=Khulpsentrum
-Name[be]=Цэнтр дапамогі KDE
+Name[be]=Цэнтр дапамогі Trinity
 Name[bg]=Помощен център
 Name[cs]=Centrum nápovědy
 Name[csb]=Centróm Pòmòcë
 Name[cy]=KCanolfanCymorth
 Name[da]=KHjælpecenter
-Name[de]=KDE-Hilfezentrum
+Name[de]=Trinity-Hilfezentrum
 Name[en_GB]=KHelpCentre
 Name[eo]=KHelpCentro
 Name[es]=KHelpcenter
-Name[et]=KDE abikeskus
-Name[fr]=Centre d'aide de KDE
-Name[gl]=Centro de Axuda de KDE
+Name[et]=Trinity abikeskus
+Name[fr]=Centre d'aide de Trinity
+Name[gl]=Centro de Axuda de Trinity
 Name[hi]=के-हेल्प-सेंटर
-Name[is]=Hjálparkerfi KDE
+Name[is]=Hjálparkerfi Trinity
 Name[ja]=K ヘルプセンター
 Name[lo]=ສູນຊ່ວຍເຫລືອ - K
 Name[lv]=KPalīdzībasCentrs
 Name[mn]=КДЭ-Тусламжийн төв
-Name[nds]=KDE-Hülpzentrum
+Name[nds]=Trinity-Hülpzentrum
 Name[ne]=केडीई मद्दत केन्द्र
 Name[nso]=KBogare bja Thuso
 Name[pa]=ਕੇਸਹਾਇਤਾਕੇਂਦਰ
 Name[pl]=Centrum Pomocy
 Name[pt_BR]=Centro de Ajuda
-Name[ro]=Centrul de ajutor KDE
+Name[ro]=Centrul de ajutor Trinity
 Name[ru]=Центр справки
 Name[rw]=K-UmwanyaGufasha
 Name[sv]=Hjälpcentralen
@@ -34,95 +34,95 @@ Name[ta]=Kஉதவிமையம்
 Name[te]=కెసహాయ కేంద్రం
 Name[tg]=Маркази роҳнамо
 Name[th]=ศูนย์ช่วยเหลือ K
-Name[tr]=KDE Yardım Merkezi
+Name[tr]=Trinity Yardım Merkezi
 Name[uz]=Yordam markazi
 Name[uz@cyrillic]=Ёрдам маркази
 Name[ven]=Senthara ya thuso ya K
-Name[vi]=Trung tâm Trợ giúp KDE
+Name[vi]=Trung tâm Trợ giúp Trinity
 Name[wa]=KCinteDAidance
 Name[zh_CN]=KHelpcenter
-Comment=The KDE Help Center
+Comment=The Trinity Help Center
 Comment[af]=Die Kde Hulp Sentrum
-Comment[ar]=مركز KDE للمساعدة
-Comment[az]=KDE Yardım Mərkəzi
-Comment[be]=Цэнтр дапамогі KDE
+Comment[ar]=مركز Trinity للمساعدة
+Comment[az]=Trinity Yardım Mərkəzi
+Comment[be]=Цэнтр дапамогі Trinity
 Comment[bg]=Център за помощна информация
 Comment[bn]=কে.ডি.ই. সাহায্য কেন্দ্র
-Comment[br]=Kreizenn sikour KDE
-Comment[bs]=KDE centar za pomoć
-Comment[ca]=El centre d'ajuda KDE
-Comment[cs]=Centrum nápovědy prostředí KDE
-Comment[csb]=Centróm Pòmòcë KDE
-Comment[cy]=Canolfan Cymorth KDE
-Comment[da]=KDE's hjælpecenter
-Comment[de]=Das KDE-Hilfezentrum
-Comment[el]=Το κέντρο βοήθειας του KDE
-Comment[en_GB]=The KDE Help Centre
-Comment[eo]=La KDE-helpocentro
-Comment[es]=El centro de ayuda de KDE
-Comment[et]=KDE abikeskus
-Comment[eu]=KDE laguntza gunea
-Comment[fa]=مرکز کمک KDE
-Comment[fi]=KDE:n Ohje
-Comment[fr]=Le centre de documentation de KDE
-Comment[fy]=It KDE-dokumintaasjesintrum
-Comment[ga]=Lárionad Cabhrach KDE
-Comment[gl]=O Centro de Axuda de KDE
-Comment[he]=מרכז העזרה של KDE
+Comment[br]=Kreizenn sikour Trinity
+Comment[bs]=Trinity centar za pomoć
+Comment[ca]=El centre d'ajuda Trinity
+Comment[cs]=Centrum nápovědy prostředí Trinity
+Comment[csb]=Centróm Pòmòcë Trinity
+Comment[cy]=Canolfan Cymorth Trinity
+Comment[da]=Trinity's hjælpecenter
+Comment[de]=Das Trinity-Hilfezentrum
+Comment[el]=Το κέντρο βοήθειας του Trinity
+Comment[en_GB]=The Trinity Help Centre
+Comment[eo]=La Trinity-helpocentro
+Comment[es]=El centro de ayuda de Trinity
+Comment[et]=Trinity abikeskus
+Comment[eu]=Trinity laguntza gunea
+Comment[fa]=مرکز کمک Trinity
+Comment[fi]=Trinity:n Ohje
+Comment[fr]=Le centre de documentation de Trinity
+Comment[fy]=It Trinity-dokumintaasjesintrum
+Comment[ga]=Lárionad Cabhrach Trinity
+Comment[gl]=O Centro de Axuda de Trinity
+Comment[he]=מרכז העזרה של Trinity
 Comment[hi]=केडीई मदद केंद्र
-Comment[hr]=KDE pomoć
-Comment[hu]=KDE Segítség
-Comment[id]=Pusat Bantuan KDE
-Comment[is]=Hjálparkerfi KDE
-Comment[it]=La guida di KDE
-Comment[ja]=KDE ヘルプセンター
-Comment[ka]=KDE-ს დახმარების ცენტრი
-Comment[kk]=KDE анықтама орталығы
-Comment[km]=មជ្ឈមណ្ឌលជំនួយ​របស់ KDE
-Comment[ko]=KDE 도움말 센터
-Comment[lo]=ສູນຊ່ວຍເຫລືອຂອງ KDE
-Comment[lt]=KDE pagalbos centras
-Comment[lv]=KDE Palīdzības Centrs
-Comment[mk]=KDE Центарот за Помош
+Comment[hr]=Trinity pomoć
+Comment[hu]=Trinity Segítség
+Comment[id]=Pusat Bantuan Trinity
+Comment[is]=Hjálparkerfi Trinity
+Comment[it]=La guida di Trinity
+Comment[ja]=Trinity ヘルプセンター
+Comment[ka]=Trinity-ს დახმარების ცენტრი
+Comment[kk]=Trinity анықтама орталығы
+Comment[km]=មជ្ឈមណ្ឌលជំនួយ​របស់ Trinity
+Comment[ko]=Trinity 도움말 센터
+Comment[lo]=ສູນຊ່ວຍເຫລືອຂອງ Trinity
+Comment[lt]=Trinity pagalbos centras
+Comment[lv]=Trinity Palīdzības Centrs
+Comment[mk]=Trinity Центарот за Помош
 Comment[mn]=КДЭ-Тусламжийн төв
-Comment[ms]=Pusat Bantuan KDE
-Comment[mt]=Ċentru tal-Għajnuna KDE
-Comment[nb]=KDE Hjelpesenter
-Comment[nds]=Dat KDE-Hülpzentrum
+Comment[ms]=Pusat Bantuan Trinity
+Comment[mt]=Ċentru tal-Għajnuna Trinity
+Comment[nb]=Trinity Hjelpesenter
+Comment[nds]=Dat Trinity-Hülpzentrum
 Comment[ne]=केडीई मद्दत केन्द्र
-Comment[nl]=Het KDE-documentatiecentrum
-Comment[nn]=KDE Hjelpesenter
-Comment[nso]=Bogare bja Thuso ya KDE
-Comment[oc]=Lo centre d'ajuda KDE
+Comment[nl]=Het Trinity-documentatiecentrum
+Comment[nn]=Trinity Hjelpesenter
+Comment[nso]=Bogare bja Thuso ya Trinity
+Comment[oc]=Lo centre d'ajuda Trinity
 Comment[pa]=ਕੇਡੀਈ ਸਹਾਇਤਾ ਕੇਂਦਰ
-Comment[pl]=Centrum Pomocy KDE
-Comment[pt]=O Centro de Ajuda do KDE
-Comment[pt_BR]=Centro de Ajuda do KDE
-Comment[ro]=Centrul de ajutor al KDE
-Comment[ru]=Центр справки KDE
-Comment[rw]=KDE Ifashayobora Hagati
-Comment[se]=KDE veahkkeguovddáš
-Comment[sk]=KDE Centrum pomoci
-Comment[sl]=Središče pomoči za KDE
-Comment[sr]=KDE центар за помоћ
-Comment[sr@Latn]=KDE centar za pomoć
-Comment[sv]=KDE:s hjälpcentral
-Comment[ta]=KDE உதவி மையம்
+Comment[pl]=Centrum Pomocy Trinity
+Comment[pt]=O Centro de Ajuda do Trinity
+Comment[pt_BR]=Centro de Ajuda do Trinity
+Comment[ro]=Centrul de ajutor al Trinity
+Comment[ru]=Центр справки Trinity
+Comment[rw]=Trinity Ifashayobora Hagati
+Comment[se]=Trinity veahkkeguovddáš
+Comment[sk]=Trinity Centrum pomoci
+Comment[sl]=Središče pomoči za Trinity
+Comment[sr]=Trinity центар за помоћ
+Comment[sr@Latn]=Trinity centar za pomoć
+Comment[sv]=Trinity:s hjälpcentral
+Comment[ta]=Trinity உதவி மையம்
 Comment[te]=కెడిఈ సహాయ కేంద్రం
-Comment[tg]=Маркази роҳнамои KDE
-Comment[th]=ศูนย์ช่วยเหลือของ KDE
-Comment[tr]=KDE Yardım Merkezi
-Comment[tt]=KDE Yärdäm Üzäge
-Comment[uk]=Центр довідок KDE
-Comment[uz]=KDE yordam markazi
-Comment[uz@cyrillic]=KDE ёрдам маркази
-Comment[ven]=Senthara ya thuso ya KDE
-Comment[vi]=Trung tâm Trợ giúp KDE
-Comment[wa]=Li Cinte d' aidance KDE
-Comment[xh]=Umbindi woncedo lwe KDE
-Comment[zh_CN]=KDE 帮助中心
-Comment[zh_TW]=KDE 求助中心
-Comment[zu]=Indawo Yosizi ye-KDE
+Comment[tg]=Маркази роҳнамои Trinity
+Comment[th]=ศูนย์ช่วยเหลือของ Trinity
+Comment[tr]=Trinity Yardım Merkezi
+Comment[tt]=Trinity Yärdäm Üzäge
+Comment[uk]=Центр довідок Trinity
+Comment[uz]=Trinity yordam markazi
+Comment[uz@cyrillic]=Trinity ёрдам маркази
+Comment[ven]=Senthara ya thuso ya Trinity
+Comment[vi]=Trung tâm Trợ giúp Trinity
+Comment[wa]=Li Cinte d' aidance Trinity
+Comment[xh]=Umbindi woncedo lwe Trinity
+Comment[zh_CN]=Trinity 帮助中心
+Comment[zh_TW]=Trinity 求助中心
+Comment[zu]=Indawo Yosizi ye-Trinity
 Icon=khelpcenter
 DocPath=khelpcenter/index.html
 Type=Service
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 0e54d9236..633bf0085 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -1,5 +1,5 @@
  /*
- *  This file is part of the KDE Help Center
+ *  This file is part of the Trinity Help Center
  *
  *  Copyright (C) 1999 Matthias Elter (me@kde.org)
  *                2001 Stephan Kulow (coolo@kde.org)
diff --git a/ksplashml/pics/themes/default/splash_active_bar.png b/ksplashml/pics/themes/default/splash_active_bar.png
index be3fa94e2..ed4c25f1e 100644
Binary files a/ksplashml/pics/themes/default/splash_active_bar.png and b/ksplashml/pics/themes/default/splash_active_bar.png differ
diff --git a/ksplashml/pics/themes/default/splash_inactive_bar.png b/ksplashml/pics/themes/default/splash_inactive_bar.png
index 0cfa31e4a..c521c8c68 100644
Binary files a/ksplashml/pics/themes/default/splash_inactive_bar.png and b/ksplashml/pics/themes/default/splash_inactive_bar.png differ
diff --git a/startkde b/startkde
index a05084c92..31744e07f 100644
--- a/startkde
+++ b/startkde
@@ -381,7 +381,7 @@ if test -r "$kde_fontpaths" ; then
     IFS=$savifs
 fi
 
-if [ -n "$KDEDIR" ]; then
+if [ ! -n "$KDEDIR" ]; then
   export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'`
 fi