Rename KStyle to TDEStyle in packaging files on Debian and Ubuntu

30 files changed, 348 insertions, 348 deletions

diff --git a/debian/lenny/tdeartwork/debian/tdeartwork-style-trinity.install b/debian/lenny/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..c62e326fe 100644
--- a/debian/lenny/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/debian/lenny/tdeartwork/debian/tdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/lib/trinity/plugins/styles
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
-debian/tmp/opt/trinity/share/apps/kstyle
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.so
+debian/tmp/opt/trinity/share/apps/tdestyle
diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install
index bb25d0f14..65a650cbc 100644
--- a/debian/lenny/tdebase/debian/kcontrol-trinity.install
+++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install
@@ -114,8 +114,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index d59d33605..a5bb8114a 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -1665,54 +1665,54 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/background.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check_checked.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/checkmark.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/htab.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/menu_back.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/raised_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/scrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/slider.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/sunk_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/tab_up.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
-debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcontrast.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/keramik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v2.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/plastik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtcde.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotifplus.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotif.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/background.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check_checked.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/checkmark.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/htab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/menu_back.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/raised_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/scrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/slider.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/sunk_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/tab_up.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/asteroid.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/b3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/default.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcolor.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcontrast.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/keramik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v2.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/plastik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtcde.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotifplus.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotif.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtplatinum.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtsgi.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtwindows.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/riscos.themerc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
index e1841eb75..a6c084acd 100644
--- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -174,10 +174,10 @@ debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
diff --git a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
index 59f2ee5c9..661568771 100644
--- a/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/lenny/tdesdk/debian/tdesdk-misc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
-debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
 kdepalettes/README /opt/trinity/share/kdepalettes
diff --git a/debian/squeeze/tdeartwork/debian/tdeartwork-style-trinity.install b/debian/squeeze/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..c62e326fe 100644
--- a/debian/squeeze/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/debian/squeeze/tdeartwork/debian/tdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/lib/trinity/plugins/styles
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
-debian/tmp/opt/trinity/share/apps/kstyle
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.so
+debian/tmp/opt/trinity/share/apps/tdestyle
diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.install b/debian/squeeze/tdebase/debian/kcontrol-trinity.install
index bb25d0f14..65a650cbc 100644
--- a/debian/squeeze/tdebase/debian/kcontrol-trinity.install
+++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.install
@@ -114,8 +114,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
diff --git a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index d59d33605..a5bb8114a 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
@@ -1665,54 +1665,54 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/background.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check_checked.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/checkmark.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/htab.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/menu_back.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/raised_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/scrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/slider.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/sunk_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/tab_up.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
-debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcontrast.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/keramik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v2.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/plastik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtcde.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotifplus.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotif.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/background.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check_checked.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/checkmark.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/htab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/menu_back.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/raised_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/scrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/slider.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/sunk_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/tab_up.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/asteroid.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/b3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/default.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcolor.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcontrast.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/keramik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v2.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/plastik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtcde.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotifplus.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotif.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtplatinum.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtsgi.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtwindows.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/riscos.themerc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
index e1841eb75..a6c084acd 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -174,10 +174,10 @@ debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
diff --git a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
index 59f2ee5c9..661568771 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
-debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
 kdepalettes/README /opt/trinity/share/kdepalettes
diff --git a/debian/wheezy/tdeartwork/debian/tdeartwork-style-trinity.install b/debian/wheezy/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..c62e326fe 100644
--- a/debian/wheezy/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/debian/wheezy/tdeartwork/debian/tdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/lib/trinity/plugins/styles
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
-debian/tmp/opt/trinity/share/apps/kstyle
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.so
+debian/tmp/opt/trinity/share/apps/tdestyle
diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.install b/debian/wheezy/tdebase/debian/kcontrol-trinity.install
index bb25d0f14..65a650cbc 100644
--- a/debian/wheezy/tdebase/debian/kcontrol-trinity.install
+++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.install
@@ -114,8 +114,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
diff --git a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
index d59d33605..a5bb8114a 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs-data-trinity.install
@@ -1665,54 +1665,54 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/background.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check_checked.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/checkmark.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/htab.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/menu_back.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/raised_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/scrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/slider.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/sunk_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/tab_up.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
-debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcontrast.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/keramik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v2.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/plastik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtcde.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotifplus.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotif.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/background.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check_checked.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/checkmark.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/htab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/menu_back.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/raised_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/scrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/slider.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/sunk_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/tab_up.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/asteroid.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/b3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/default.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcolor.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcontrast.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/keramik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v2.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/plastik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtcde.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotifplus.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotif.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtplatinum.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtsgi.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtwindows.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/riscos.themerc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
diff --git a/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install
index e1841eb75..a6c084acd 100644
--- a/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/debian/wheezy/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -174,10 +174,10 @@ debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
diff --git a/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install b/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install
index 59f2ee5c9..661568771 100644
--- a/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/wheezy/tdesdk/debian/tdesdk-misc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
-debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
 kdepalettes/README /opt/trinity/share/kdepalettes
diff --git a/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install b/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..c62e326fe 100644
--- a/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/ubuntu/maverick/tdeartwork/debian/tdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/lib/trinity/plugins/styles
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
-debian/tmp/opt/trinity/share/apps/kstyle
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.so
+debian/tmp/opt/trinity/share/apps/tdestyle
diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
index bb25d0f14..65a650cbc 100644
--- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install
@@ -114,8 +114,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index d59d33605..a5bb8114a 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -1665,54 +1665,54 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/background.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check_checked.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/checkmark.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/htab.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/menu_back.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/raised_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/scrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/slider.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/sunk_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/tab_up.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
-debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcontrast.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/keramik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v2.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/plastik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtcde.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotifplus.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotif.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/background.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check_checked.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/checkmark.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/htab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/menu_back.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/raised_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/scrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/slider.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/sunk_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/tab_up.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/asteroid.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/b3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/default.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcolor.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcontrast.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/keramik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v2.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/plastik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtcde.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotifplus.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotif.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtplatinum.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtsgi.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtwindows.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/riscos.themerc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
index e1841eb75..a6c084acd 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -174,10 +174,10 @@ debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
diff --git a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
index 59f2ee5c9..661568771 100644
--- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
-debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
 kdepalettes/README /opt/trinity/share/kdepalettes
diff --git a/ubuntu/precise/tdeartwork/debian/tdeartwork-style-trinity.install b/ubuntu/precise/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..c62e326fe 100644
--- a/ubuntu/precise/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/ubuntu/precise/tdeartwork/debian/tdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/lib/trinity/plugins/styles
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
-debian/tmp/opt/trinity/share/apps/kstyle
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.so
+debian/tmp/opt/trinity/share/apps/tdestyle
diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
index bb25d0f14..65a650cbc 100644
--- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install
@@ -114,8 +114,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
index d59d33605..a5bb8114a 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs-data-trinity.install
@@ -1665,54 +1665,54 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/background.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check_checked.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/checkmark.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/htab.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/menu_back.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/raised_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/scrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/slider.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/sunk_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/tab_up.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
-debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcontrast.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/keramik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v2.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/plastik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtcde.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotifplus.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotif.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/background.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check_checked.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/checkmark.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/htab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/menu_back.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/raised_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/scrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/slider.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/sunk_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/tab_up.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/asteroid.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/b3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/default.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcolor.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcontrast.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/keramik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v2.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/plastik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtcde.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotifplus.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotif.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtplatinum.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtsgi.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtwindows.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/riscos.themerc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
diff --git a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
index e1841eb75..a6c084acd 100644
--- a/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/precise/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -174,10 +174,10 @@ debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
diff --git a/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install
index 59f2ee5c9..661568771 100644
--- a/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/precise/tdesdk/debian/tdesdk-misc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
-debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
 kdepalettes/README /opt/trinity/share/kdepalettes
diff --git a/ubuntu/raring/tdeartwork/debian/tdeartwork-style-trinity.install b/ubuntu/raring/tdeartwork/debian/tdeartwork-style-trinity.install
index 8fab1bcbf..c62e326fe 100644
--- a/ubuntu/raring/tdeartwork/debian/tdeartwork-style-trinity.install
+++ b/ubuntu/raring/tdeartwork/debian/tdeartwork-style-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/lib/trinity/plugins/styles
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_phase_config.so
-debian/tmp/opt/trinity/share/apps/kstyle
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_phase_config.so
+debian/tmp/opt/trinity/share/apps/tdestyle
diff --git a/ubuntu/raring/tdebase/debian/kcontrol-trinity.install b/ubuntu/raring/tdebase/debian/kcontrol-trinity.install
index bb25d0f14..65a650cbc 100644
--- a/ubuntu/raring/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/raring/tdebase/debian/kcontrol-trinity.install
@@ -114,8 +114,8 @@ debian/tmp/opt/trinity/lib/trinity/tdefile_font.la
 debian/tmp/opt/trinity/lib/trinity/tdefile_font.so
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.la
 debian/tmp/opt/trinity/lib/trinity/tdeio_fonts.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_keramik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_keramik_config.so
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.la
 debian/tmp/opt/trinity/lib/trinity/libtdefontviewpart.so
 debian/tmp/opt/trinity/lib/trinity/libtdeshorturifilter.la
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
index d59d33605..a5bb8114a 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/raring/tdelibs/debian/tdelibs-data-trinity.install
@@ -1665,54 +1665,54 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION
 debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowright.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowup.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/background.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check_checked.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/checkmark.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/check.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/combo.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/hscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/htab.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/menu_back.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/radio.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/raised_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/scrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/slider.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/sunk_border.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/tab_up.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollback.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollbar.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vscrollborder.png
-debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/vtab.png
-debian/tmp/opt/trinity/share/apps/kstyle/themes/asteroid.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/b3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/default.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcolor.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/highcontrast.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/keramik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v2.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/light-v3.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/plastik.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtcde.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotifplus.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtmotif.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtplatinum.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtsgi.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/qtwindows.themerc
-debian/tmp/opt/trinity/share/apps/kstyle/themes/riscos.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowdown.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowleft.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowright.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/arrowup.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/background.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check_checked.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/checkmark.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/check.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/combo.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/hscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/htab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/menu_back.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/radio.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/raised_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/scrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/slider.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/sunk_border.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/tab_up.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollback.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar_down.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollbar.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vscrollborder.png
+debian/tmp/opt/trinity/share/apps/tdestyle/pixmaps/riscos/vtab.png
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/asteroid.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/b3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/default.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcolor.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/highcontrast.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/keramik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v2.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/light-v3.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/plastik.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtcde.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotifplus.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtmotif.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtplatinum.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtsgi.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/qtwindows.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/riscos.themerc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_docwordcompletion/docwordcompletionui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_insertfile/tdetexteditor_insertfileui.rc
 debian/tmp/opt/trinity/share/apps/tdetexteditor_isearch/tdetexteditor_isearchui.rc
diff --git a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.install
index e1841eb75..a6c084acd 100644
--- a/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.install
+++ b/ubuntu/raring/tdelibs/debian/tdelibs4c2a-trinity.install
@@ -174,10 +174,10 @@ debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_hspell.so
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.la
 debian/tmp/opt/trinity/lib/trinity/tdespell_ispell.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_highcontrast_config.so
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.la
-debian/tmp/opt/trinity/lib/trinity/kstyle_plastik_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_highcontrast_config.so
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.la
+debian/tmp/opt/trinity/lib/trinity/tdestyle_plastik_config.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.la
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_docwordcompletion.so
 debian/tmp/opt/trinity/lib/trinity/tdetexteditor_insertfile.la
diff --git a/ubuntu/raring/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/raring/tdesdk/debian/tdesdk-misc-trinity.install
index 59f2ee5c9..661568771 100644
--- a/ubuntu/raring/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/ubuntu/raring/tdesdk/debian/tdesdk-misc-trinity.install
@@ -4,7 +4,7 @@ debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so
 debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.la
 debian/tmp/opt/trinity/share/apps/tdeabc/formats/kdeaccountsplugin.desktop
-debian/tmp/opt/trinity/share/apps/kstyle/themes/scheck.themerc
+debian/tmp/opt/trinity/share/apps/tdestyle/themes/scheck.themerc
 kdepalettes/kde_xpaintrc /opt/trinity/share/kdepalettes
 kdepalettes/KDE_Gimp /opt/trinity/share/kdepalettes
 kdepalettes/README /opt/trinity/share/kdepalettes