Rename KStyle to TDEStyle to avoid conflicts with KDE4.

361 files changed, 116 insertions, 116 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a443a261..8f8be8971 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1005,7 +1005,7 @@ add_subdirectory( tdeconf_update )
 add_subdirectory( kdewidgets )
 add_subdirectory( kimgio )
 add_subdirectory( tdeioslave )
-add_subdirectory( kstyles )
+add_subdirectory( tdestyles )
 add_subdirectory( libtdemid )
 add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 47246adb8..74f71978a 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -319,7 +319,7 @@ The old name will still work unless KDE_NO_COMPAT is defined.
 
 <H4>KThemeBase, KThemeStyle</H4>
 KThemeBase and KThemeStyle have been ported over to the new QStyle/TDEStyle API
-present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in kstyles/kthemestyle
+present in Qt3/KDE3. KThemeBase is no longer in tdeui, but in tdestyles/kthemestyle
 as its use is basically limited to KThemeStyle.
 
 <H4>TDEAction, TDEToolBar, TDEToolBarButton and icons</H4>
diff --git a/README b/README
index c16ab7334..6ef755ce6 100644
--- a/README
+++ b/README
@@ -98,7 +98,7 @@ Here is an alphabetical list:
 * tdeparts
     KDE component model.
 
-* kstyles
+* tdestyles
     The theme engine lies within. It handles nearly anything relating to
     customizing the appearance of widgets.
 
diff --git a/kstyles/highcontrast/config/Makefile.am b/kstyles/highcontrast/config/Makefile.am
deleted file mode 100644
index 7aa7535a2..000000000
--- a/kstyles/highcontrast/config/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = highcontrastconfig.h
-kde_module_LTLIBRARIES = kstyle_highcontrast_config.la
-kstyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE)
-kstyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
-kstyle_highcontrast_config_la_METASOURCES = AUTO
-
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_highcontrast_config.pot
diff --git a/kstyles/plastik/config/Makefile.am b/kstyles/plastik/config/Makefile.am
deleted file mode 100644
index 887c7ea89..000000000
--- a/kstyles/plastik/config/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(all_includes)
-
-noinst_HEADERS = plastikconf.h
-kde_module_LTLIBRARIES = kstyle_plastik_config.la
-kstyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kstyle_plastik_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
-kstyle_plastik_config_la_SOURCES = plastikconf.cpp
-kstyle_plastik_config_la_METASOURCES = AUTO
-
-
-messages:
-	$(XGETTEXT) *.cpp *.h -o $(podir)/kstyle_plastik_config.pot
diff --git a/kstyles/themes/Makefile.am b/kstyles/themes/Makefile.am
deleted file mode 100644
index da72902c7..000000000
--- a/kstyles/themes/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-kstylethemesdata_DATA = qtplatinum.themerc qtcde.themerc qtmotif.themerc qtwindows.themerc \
-	qtsgi.themerc qtmotifplus.themerc\
-	highcolor.themerc \
-	default.themerc b3.themerc light-v2.themerc \
-	light-v3.themerc keramik.themerc
-kstylethemesdatadir = $(kde_datadir)/kstyle/themes
-
-EXTRA_DIST = $(kstylethemesdata_DATA)
-
-kde_conf_DATA = kthemestylerc
-
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 22c43bdc1..f2f776a2f 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -893,7 +893,7 @@ public:
   /**
    * @deprecated
    */
-  KDE_DEPRECATED TDEStyle* kstyle() const { return 0; }
+  KDE_DEPRECATED TDEStyle* tdestyle() const { return 0; }
 
   /**
    * Builds a caption that contains the application name along with the
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 46b36f1d8..e59837feb 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -45,7 +45,7 @@
 #define TDESU_EXPORT KDE_EXPORT
 #define KVCARD_EXPORT KDE_EXPORT
 #define TDERESOURCES_EXPORT KDE_EXPORT
-#define KSTYLE_EXPORT KDE_EXPORT
+#define TDESTYLE_EXPORT KDE_EXPORT
 #define TDEHTML_EXPORT KDE_EXPORT
 #define KMDI_EXPORT KDE_EXPORT
 #define KUTILS_EXPORT KDE_EXPORT
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index 996c7f343..36355a9bc 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -154,7 +154,7 @@ class TransparencyHandler : public TQObject
 		bool    dropShadow;
 		float   opacity;
 		TQPixmap pix;
-		TDEStyle* kstyle;
+		TDEStyle* tdestyle;
 		TransparencyEngine te;
 };
 } // namespace
@@ -1600,7 +1600,7 @@ TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control,
 	return ret;
 }
 
-static const char * const kstyle_close_xpm[] = {
+static const char * const tdestyle_close_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1617,7 +1617,7 @@ static const char * const kstyle_close_xpm[] = {
 "............",
 "............"};
 
-static const char * const kstyle_maximize_xpm[]={
+static const char * const tdestyle_maximize_xpm[]={
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1635,7 +1635,7 @@ static const char * const kstyle_maximize_xpm[]={
 "............"};
 
 
-static const char * const kstyle_minimize_xpm[] = {
+static const char * const tdestyle_minimize_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1652,7 +1652,7 @@ static const char * const kstyle_minimize_xpm[] = {
 "............",
 "............"};
 
-static const char * const kstyle_normalizeup_xpm[] = {
+static const char * const tdestyle_normalizeup_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1670,7 +1670,7 @@ static const char * const kstyle_normalizeup_xpm[] = {
 "............"};
 
 
-static const char * const kstyle_shade_xpm[] = {
+static const char * const tdestyle_shade_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1687,7 +1687,7 @@ static const char * const kstyle_shade_xpm[] = {
 "............",
 "............"};
 
-static const char * const kstyle_unshade_xpm[] = {
+static const char * const tdestyle_unshade_xpm[] = {
 "12 12 2 1",
 "# c #000000",
 ". c None",
@@ -1850,17 +1850,17 @@ TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap,
 {
 	switch (stylepixmap) {
 		case SP_TitleBarShadeButton:
-			return TQPixmap(const_cast<const char**>(kstyle_shade_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_shade_xpm));
 		case SP_TitleBarUnshadeButton:
-			return TQPixmap(const_cast<const char**>(kstyle_unshade_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_unshade_xpm));
 		case SP_TitleBarNormalButton:
-			return TQPixmap(const_cast<const char**>(kstyle_normalizeup_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_normalizeup_xpm));
 		case SP_TitleBarMinButton:
-			return TQPixmap(const_cast<const char**>(kstyle_minimize_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_minimize_xpm));
 		case SP_TitleBarMaxButton:
-			return TQPixmap(const_cast<const char**>(kstyle_maximize_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_maximize_xpm));
 		case SP_TitleBarCloseButton:
-			return TQPixmap(const_cast<const char**>(kstyle_close_xpm));
+			return TQPixmap(const_cast<const char**>(tdestyle_close_xpm));
 		case SP_DockWindowCloseButton:
 			return TQPixmap(const_cast<const char**>(dock_window_close_xpm ));
 		case SP_MessageBoxInformation:
@@ -1998,7 +1998,7 @@ TransparencyHandler::TransparencyHandler( TDEStyle* style,
 	: TQObject()
 {
 	te = tEngine;
-	kstyle = style;
+	tdestyle = style;
 	opacity = menuOpacity;
 	dropShadow = useDropShadow;
 	pix.setOptimization(TQPixmap::BestOptim);
@@ -2341,7 +2341,7 @@ void TransparencyHandler::blendToPixmap(const TQColorGroup &cg, const TQWidget*
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
 	if (::tqqt_cast<TQPopupMenu*>(p))
-		kstyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) );
+		tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) );
 	else
 		blendPix.fill(cg.button());	// Just tint as the default behavior
 
@@ -2363,7 +2363,7 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
 	if (::tqqt_cast<TQPopupMenu*>(p))
-	   kstyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
+	   tdestyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
 			   ::tqqt_cast<TQPopupMenu*>(p) );
 	else
 		renderPix.fill(p->colorGroup().button());	// Just tint as the default behavior
@@ -2407,7 +2407,7 @@ void TDEStyle::virtual_hook( int, void* )
 // HACK for gtk-qt-engine
 
 extern "C" KDE_EXPORT
-void kde_kstyle_set_scrollbar_type_windows( void* style )
+void kde_tdestyle_set_scrollbar_type_windows( void* style )
 {
     ((TDEStyle*)style)->setScrollBarType( TDEStyle::WindowsStyleScrollBar );
 }
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h
index 9c3867bb3..edcb9eb91 100644
--- a/tdefx/tdestyle.h
+++ b/tdefx/tdestyle.h
@@ -24,8 +24,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KSTYLE_H
-#define __KSTYLE_H
+#ifndef __TDESTYLE_H
+#define __TDESTYLE_H
 
 // W A R N I N G
 // -------------
diff --git a/kstyles/CMakeLists.txt b/tdestyles/CMakeLists.txt
index a0a138422..a0a138422 100644
--- a/kstyles/CMakeLists.txt
+++ b/tdestyles/CMakeLists.txt
diff --git a/kstyles/Makefile.am b/tdestyles/Makefile.am
index 48316f8cd..1f0a19b49 100644
--- a/kstyles/Makefile.am
+++ b/tdestyles/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = asteroid plastik highcolor highcontrast themes light kthemestyle riscos utils keramik
 
-#kstyles should not be included in the apidocs
+#tdestyles should not be included in the apidocs
 #include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kstyles/asteroid/CMakeLists.txt b/tdestyles/asteroid/CMakeLists.txt
index d198efdef..906c844ab 100644
--- a/kstyles/asteroid/CMakeLists.txt
+++ b/tdestyles/asteroid/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES asteroid.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+install( FILES asteroid.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 
 ##### asteroid ###################################
diff --git a/kstyles/asteroid/Makefile.am b/tdestyles/asteroid/Makefile.am
index 3d2bcab8c..4a23a37a4 100644
--- a/kstyles/asteroid/Makefile.am
+++ b/tdestyles/asteroid/Makefile.am
@@ -14,5 +14,5 @@ asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 asteroid_la_LIBADD = -ltdefx -ltdeutils
 asteroid_la_SOURCES = asteroid.cpp
 
-themercdir = $(kde_datadir)/kstyle/themes
+themercdir = $(kde_datadir)/tdestyle/themes
 themerc_DATA = asteroid.themerc
diff --git a/kstyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp
index 7119af5a8..7119af5a8 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/tdestyles/asteroid/asteroid.cpp
diff --git a/kstyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h
index d6be130aa..d6be130aa 100644
--- a/kstyles/asteroid/asteroid.h
+++ b/tdestyles/asteroid/asteroid.h
diff --git a/kstyles/asteroid/asteroid.themerc b/tdestyles/asteroid/asteroid.themerc
index 2679b6818..2679b6818 100644
--- a/kstyles/asteroid/asteroid.themerc
+++ b/tdestyles/asteroid/asteroid.themerc
diff --git a/kstyles/highcolor/CMakeLists.txt b/tdestyles/highcolor/CMakeLists.txt
index 8b601d6ac..8b601d6ac 100644
--- a/kstyles/highcolor/CMakeLists.txt
+++ b/tdestyles/highcolor/CMakeLists.txt
diff --git a/kstyles/highcolor/Makefile.am b/tdestyles/highcolor/Makefile.am
index 5b2880215..5b2880215 100644
--- a/kstyles/highcolor/Makefile.am
+++ b/tdestyles/highcolor/Makefile.am
diff --git a/kstyles/highcolor/bitmaps.h b/tdestyles/highcolor/bitmaps.h
index f63301818..f63301818 100644
--- a/kstyles/highcolor/bitmaps.h
+++ b/tdestyles/highcolor/bitmaps.h
diff --git a/kstyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp
index 4fccff059..4fccff059 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/tdestyles/highcolor/highcolor.cpp
diff --git a/kstyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h
index 7fa618a92..7fa618a92 100644
--- a/kstyles/highcolor/highcolor.h
+++ b/tdestyles/highcolor/highcolor.h
diff --git a/kstyles/highcontrast/CMakeLists.txt b/tdestyles/highcontrast/CMakeLists.txt
index ec948a719..b68dc34e1 100644
--- a/kstyles/highcontrast/CMakeLists.txt
+++ b/tdestyles/highcontrast/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES highcontrast.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+install( FILES highcontrast.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 
 ##### highcontrast ##############################
diff --git a/kstyles/highcontrast/Makefile.am b/tdestyles/highcontrast/Makefile.am
index dade3965a..8c7d11320 100644
--- a/kstyles/highcontrast/Makefile.am
+++ b/tdestyles/highcontrast/Makefile.am
@@ -25,7 +25,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = $(all_includes)
 
-stylercdir = $(kde_datadir)/kstyle/themes
+stylercdir = $(kde_datadir)/tdestyle/themes
 stylerc_DATA = highcontrast.themerc
 
 EXTRA_DIST = $(stylerc_DATA)
diff --git a/kstyles/highcontrast/TODO b/tdestyles/highcontrast/TODO
index a7795bab8..a7795bab8 100644
--- a/kstyles/highcontrast/TODO
+++ b/tdestyles/highcontrast/TODO
diff --git a/kstyles/highcontrast/config/CMakeLists.txt b/tdestyles/highcontrast/config/CMakeLists.txt
index 07b378372..1305f8163 100644
--- a/kstyles/highcontrast/config/CMakeLists.txt
+++ b/tdestyles/highcontrast/config/CMakeLists.txt
@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### kstyle_highcontrast_config ################
+##### tdestyle_highcontrast_config ################
 
-set( target kstyle_highcontrast_config )
+set( target tdestyle_highcontrast_config )
 
 set( ${target}_SRCS
   highcontrastconfig.cpp
diff --git a/tdestyles/highcontrast/config/Makefile.am b/tdestyles/highcontrast/config/Makefile.am
new file mode 100644
index 000000000..31592f288
--- /dev/null
+++ b/tdestyles/highcontrast/config/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = highcontrastconfig.h
+kde_module_LTLIBRARIES = tdestyle_highcontrast_config.la
+tdestyle_highcontrast_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdestyle_highcontrast_config_la_LIBADD  = $(LIB_QT) $(LIB_TDECORE)
+tdestyle_highcontrast_config_la_SOURCES = highcontrastconfig.cpp
+tdestyle_highcontrast_config_la_METASOURCES = AUTO
+
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_highcontrast_config.pot
diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/tdestyles/highcontrast/config/highcontrastconfig.cpp
index f271113ca..8d8df0e79 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/tdestyles/highcontrast/config/highcontrastconfig.cpp
@@ -34,7 +34,7 @@ DEALINGS IN THE SOFTWARE.
 #include "highcontrastconfig.h"
 
 extern "C" KDE_EXPORT TQWidget* 
-allocate_kstyle_config(TQWidget* parent)
+allocate_tdestyle_config(TQWidget* parent)
 {
     return new HighContrastStyleConfig(parent);
 }
@@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
 {
     // Should have no margins here, the dialog provides them
     TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
-    TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
+    TDEGlobal::locale()->insertCatalogue("tdestyle_highcontrast_config");
 
     wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this);
 
@@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
 
 HighContrastStyleConfig::~HighContrastStyleConfig()
 {
-    TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+    TDEGlobal::locale()->removeCatalogue("tdestyle_keramik_config");
 }
 
 
diff --git a/kstyles/highcontrast/config/highcontrastconfig.h b/tdestyles/highcontrast/config/highcontrastconfig.h
index d52a22b47..d52a22b47 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.h
+++ b/tdestyles/highcontrast/config/highcontrastconfig.h
diff --git a/kstyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp
index af021a91a..af021a91a 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/tdestyles/highcontrast/highcontrast.cpp
diff --git a/kstyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h
index 552526254..552526254 100644
--- a/kstyles/highcontrast/highcontrast.h
+++ b/tdestyles/highcontrast/highcontrast.h
diff --git a/kstyles/highcontrast/highcontrast.themerc b/tdestyles/highcontrast/highcontrast.themerc
index f7f30809c..c3b8445d4 100644
--- a/kstyles/highcontrast/highcontrast.themerc
+++ b/tdestyles/highcontrast/highcontrast.themerc
@@ -59,7 +59,7 @@ Name[uk]=Висока контрастність
 Name[vi]=Độ tương phản cao
 Name[zh_CN]=高对比度
 Name[zh_HK]=高反差
-ConfigPage=kstyle_highcontrast_config
+ConfigPage=tdestyle_highcontrast_config
 Comment=A style that works well with high contrast color schemes
 Comment[af]=´n Styl wat goed werk met hoë kontras kleur skemas
 Comment[be]=Стыль, які створаны для працы з высокакантрастнымі колернымі схемамі
diff --git a/kstyles/keramik/CMakeLists.txt b/tdestyles/keramik/CMakeLists.txt
index 8ee7c9730..8ee7c9730 100644
--- a/kstyles/keramik/CMakeLists.txt
+++ b/tdestyles/keramik/CMakeLists.txt
diff --git a/kstyles/keramik/Makefile.am b/tdestyles/keramik/Makefile.am
index 4f3dbebae..4f3dbebae 100644
--- a/kstyles/keramik/Makefile.am
+++ b/tdestyles/keramik/Makefile.am
diff --git a/kstyles/keramik/bitmaps.h b/tdestyles/keramik/bitmaps.h
index 54c30dd8d..54c30dd8d 100644
--- a/kstyles/keramik/bitmaps.h
+++ b/tdestyles/keramik/bitmaps.h
diff --git a/kstyles/keramik/colorutil.cpp b/tdestyles/keramik/colorutil.cpp
index 81d5eeb7a..81d5eeb7a 100644
--- a/kstyles/keramik/colorutil.cpp
+++ b/tdestyles/keramik/colorutil.cpp
diff --git a/kstyles/keramik/colorutil.h b/tdestyles/keramik/colorutil.h
index 7bffe75f1..7bffe75f1 100644
--- a/kstyles/keramik/colorutil.h
+++ b/tdestyles/keramik/colorutil.h
diff --git a/kstyles/keramik/genembed.cpp b/tdestyles/keramik/genembed.cpp
index 18608205d..18608205d 100644
--- a/kstyles/keramik/genembed.cpp
+++ b/tdestyles/keramik/genembed.cpp
diff --git a/kstyles/keramik/gradients.cpp b/tdestyles/keramik/gradients.cpp
index ab804d117..ab804d117 100644
--- a/kstyles/keramik/gradients.cpp
+++ b/tdestyles/keramik/gradients.cpp
diff --git a/kstyles/keramik/gradients.h b/tdestyles/keramik/gradients.h
index 8a9a17425..8a9a17425 100644
--- a/kstyles/keramik/gradients.h
+++ b/tdestyles/keramik/gradients.h
diff --git a/kstyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index fa1848203..fa1848203 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
diff --git a/kstyles/keramik/keramik.h b/tdestyles/keramik/keramik.h
index 7bf8cd3d4..7bf8cd3d4 100644
--- a/kstyles/keramik/keramik.h
+++ b/tdestyles/keramik/keramik.h
diff --git a/kstyles/keramik/keramikimage.h b/tdestyles/keramik/keramikimage.h
index 05bc75900..05bc75900 100644
--- a/kstyles/keramik/keramikimage.h
+++ b/tdestyles/keramik/keramikimage.h
diff --git a/kstyles/keramik/pics/checkbox-off.png b/tdestyles/keramik/pics/checkbox-off.png
index 0cade1079..0cade1079 100644
--- a/kstyles/keramik/pics/checkbox-off.png
+++ b/tdestyles/keramik/pics/checkbox-off.png
diff --git a/kstyles/keramik/pics/checkbox-on.png b/tdestyles/keramik/pics/checkbox-on.png
index 69c1a7d83..69c1a7d83 100644
--- a/kstyles/keramik/pics/checkbox-on.png
+++ b/tdestyles/keramik/pics/checkbox-on.png
diff --git a/kstyles/keramik/pics/checkbox-tri.png b/tdestyles/keramik/pics/checkbox-tri.png
index c73ca8124..c73ca8124 100644
--- a/kstyles/keramik/pics/checkbox-tri.png
+++ b/tdestyles/keramik/pics/checkbox-tri.png
diff --git a/kstyles/keramik/pics/combobox-list-bc.png b/tdestyles/keramik/pics/combobox-list-bc.png
index 609a72627..609a72627 100644
--- a/kstyles/keramik/pics/combobox-list-bc.png
+++ b/tdestyles/keramik/pics/combobox-list-bc.png
diff --git a/kstyles/keramik/pics/combobox-list-bl.png b/tdestyles/keramik/pics/combobox-list-bl.png
index 512bbeafe..512bbeafe 100644
--- a/kstyles/keramik/pics/combobox-list-bl.png
+++ b/tdestyles/keramik/pics/combobox-list-bl.png
diff --git a/kstyles/keramik/pics/combobox-list-br.png b/tdestyles/keramik/pics/combobox-list-br.png
index 93151ffa6..93151ffa6 100644
--- a/kstyles/keramik/pics/combobox-list-br.png
+++ b/tdestyles/keramik/pics/combobox-list-br.png
diff --git a/kstyles/keramik/pics/combobox-list-cl.png b/tdestyles/keramik/pics/combobox-list-cl.png
index e0b29c26d..e0b29c26d 100644
--- a/kstyles/keramik/pics/combobox-list-cl.png
+++ b/tdestyles/keramik/pics/combobox-list-cl.png
diff --git a/kstyles/keramik/pics/combobox-list-cr.png b/tdestyles/keramik/pics/combobox-list-cr.png
index 33b9b7224..33b9b7224 100644
--- a/kstyles/keramik/pics/combobox-list-cr.png
+++ b/tdestyles/keramik/pics/combobox-list-cr.png
diff --git a/kstyles/keramik/pics/combobox-list-tc.png b/tdestyles/keramik/pics/combobox-list-tc.png
index a3f5d7225..a3f5d7225 100644
--- a/kstyles/keramik/pics/combobox-list-tc.png
+++ b/tdestyles/keramik/pics/combobox-list-tc.png
diff --git a/kstyles/keramik/pics/combobox-list-tl.png b/tdestyles/keramik/pics/combobox-list-tl.png
index 89d4b48d2..89d4b48d2 100644
--- a/kstyles/keramik/pics/combobox-list-tl.png
+++ b/tdestyles/keramik/pics/combobox-list-tl.png
diff --git a/kstyles/keramik/pics/combobox-list-tr.png b/tdestyles/keramik/pics/combobox-list-tr.png
index 54e5d6032..54e5d6032 100644
--- a/kstyles/keramik/pics/combobox-list-tr.png
+++ b/tdestyles/keramik/pics/combobox-list-tr.png
diff --git a/kstyles/keramik/pics/frame-shadow-cl.png b/tdestyles/keramik/pics/frame-shadow-cl.png
index d9b5edb1f..d9b5edb1f 100644
--- a/kstyles/keramik/pics/frame-shadow-cl.png
+++ b/tdestyles/keramik/pics/frame-shadow-cl.png
diff --git a/kstyles/keramik/pics/frame-shadow-tc.png b/tdestyles/keramik/pics/frame-shadow-tc.png
index 408e07314..408e07314 100644
--- a/kstyles/keramik/pics/frame-shadow-tc.png
+++ b/tdestyles/keramik/pics/frame-shadow-tc.png
diff --git a/kstyles/keramik/pics/frame-shadow-tl.png b/tdestyles/keramik/pics/frame-shadow-tl.png
index 8e6e3a147..8e6e3a147 100644
--- a/kstyles/keramik/pics/frame-shadow-tl.png
+++ b/tdestyles/keramik/pics/frame-shadow-tl.png
diff --git a/kstyles/keramik/pics/listview-bc.png b/tdestyles/keramik/pics/listview-bc.png
index fc615ea8a..fc615ea8a 100644
--- a/kstyles/keramik/pics/listview-bc.png
+++ b/tdestyles/keramik/pics/listview-bc.png
diff --git a/kstyles/keramik/pics/listview-bl.png b/tdestyles/keramik/pics/listview-bl.png
index efd68101a..efd68101a 100644
--- a/kstyles/keramik/pics/listview-bl.png
+++ b/tdestyles/keramik/pics/listview-bl.png
diff --git a/kstyles/keramik/pics/listview-br.png b/tdestyles/keramik/pics/listview-br.png
index 7e35a14c8..7e35a14c8 100644
--- a/kstyles/keramik/pics/listview-br.png
+++ b/tdestyles/keramik/pics/listview-br.png
diff --git a/kstyles/keramik/pics/listview-cc.png b/tdestyles/keramik/pics/listview-cc.png
index 9fa204bf4..9fa204bf4 100644
--- a/kstyles/keramik/pics/listview-cc.png
+++ b/tdestyles/keramik/pics/listview-cc.png
diff --git a/kstyles/keramik/pics/listview-cl.png b/tdestyles/keramik/pics/listview-cl.png
index 41850b2e6..41850b2e6 100644
--- a/kstyles/keramik/pics/listview-cl.png
+++ b/tdestyles/keramik/pics/listview-cl.png
diff --git a/kstyles/keramik/pics/listview-cr.png b/tdestyles/keramik/pics/listview-cr.png
index 69b1cf8c6..69b1cf8c6 100644
--- a/kstyles/keramik/pics/listview-cr.png
+++ b/tdestyles/keramik/pics/listview-cr.png
diff --git a/kstyles/keramik/pics/listview-pressed-bc.png b/tdestyles/keramik/pics/listview-pressed-bc.png
index 283fe7329..283fe7329 100644
--- a/kstyles/keramik/pics/listview-pressed-bc.png
+++ b/tdestyles/keramik/pics/listview-pressed-bc.png
diff --git a/kstyles/keramik/pics/listview-pressed-bl.png b/tdestyles/keramik/pics/listview-pressed-bl.png
index a457f83a6..a457f83a6 100644
--- a/kstyles/keramik/pics/listview-pressed-bl.png
+++ b/tdestyles/keramik/pics/listview-pressed-bl.png
diff --git a/kstyles/keramik/pics/listview-pressed-br.png b/tdestyles/keramik/pics/listview-pressed-br.png
index a49203f89..a49203f89 100644
--- a/kstyles/keramik/pics/listview-pressed-br.png
+++ b/tdestyles/keramik/pics/listview-pressed-br.png
diff --git a/kstyles/keramik/pics/listview-pressed-cc.png b/tdestyles/keramik/pics/listview-pressed-cc.png
index 63265116e..63265116e 100644
--- a/kstyles/keramik/pics/listview-pressed-cc.png
+++ b/tdestyles/keramik/pics/listview-pressed-cc.png
diff --git a/kstyles/keramik/pics/listview-pressed-cl.png b/tdestyles/keramik/pics/listview-pressed-cl.png
index 7dcc0540c..7dcc0540c 100644
--- a/kstyles/keramik/pics/listview-pressed-cl.png
+++ b/tdestyles/keramik/pics/listview-pressed-cl.png
diff --git a/kstyles/keramik/pics/listview-pressed-cr.png b/tdestyles/keramik/pics/listview-pressed-cr.png
index 3a0b74f9a..3a0b74f9a 100644
--- a/kstyles/keramik/pics/listview-pressed-cr.png
+++ b/tdestyles/keramik/pics/listview-pressed-cr.png
diff --git a/kstyles/keramik/pics/listview-pressed-tc.png b/tdestyles/keramik/pics/listview-pressed-tc.png
index 1fa2e6905..1fa2e6905 100644
--- a/kstyles/keramik/pics/listview-pressed-tc.png
+++ b/tdestyles/keramik/pics/listview-pressed-tc.png
diff --git a/kstyles/keramik/pics/listview-pressed-tl.png b/tdestyles/keramik/pics/listview-pressed-tl.png
index e58e62306..e58e62306 100644
--- a/kstyles/keramik/pics/listview-pressed-tl.png
+++ b/tdestyles/keramik/pics/listview-pressed-tl.png
diff --git a/kstyles/keramik/pics/listview-pressed-tr.png b/tdestyles/keramik/pics/listview-pressed-tr.png
index bc33f3823..bc33f3823 100644
--- a/kstyles/keramik/pics/listview-pressed-tr.png
+++ b/tdestyles/keramik/pics/listview-pressed-tr.png
diff --git a/kstyles/keramik/pics/listview-tc.png b/tdestyles/keramik/pics/listview-tc.png
index 09434cebb..09434cebb 100644
--- a/kstyles/keramik/pics/listview-tc.png
+++ b/tdestyles/keramik/pics/listview-tc.png
diff --git a/kstyles/keramik/pics/listview-tl.png b/tdestyles/keramik/pics/listview-tl.png
index d2ca26d7a..d2ca26d7a 100644
--- a/kstyles/keramik/pics/listview-tl.png
+++ b/tdestyles/keramik/pics/listview-tl.png
diff --git a/kstyles/keramik/pics/listview-tr.png b/tdestyles/keramik/pics/listview-tr.png
index 42c49a597..42c49a597 100644
--- a/kstyles/keramik/pics/listview-tr.png
+++ b/tdestyles/keramik/pics/listview-tr.png
diff --git a/kstyles/keramik/pics/menuitem-cc.png b/tdestyles/keramik/pics/menuitem-cc.png
index 29362ccc8..29362ccc8 100644
--- a/kstyles/keramik/pics/menuitem-cc.png
+++ b/tdestyles/keramik/pics/menuitem-cc.png
diff --git a/kstyles/keramik/pics/menuitem-cl.png b/tdestyles/keramik/pics/menuitem-cl.png
index c742516f4..c742516f4 100644
--- a/kstyles/keramik/pics/menuitem-cl.png
+++ b/tdestyles/keramik/pics/menuitem-cl.png
diff --git a/kstyles/keramik/pics/menuitem-cr.png b/tdestyles/keramik/pics/menuitem-cr.png
index c742516f4..c742516f4 100644
--- a/kstyles/keramik/pics/menuitem-cr.png
+++ b/tdestyles/keramik/pics/menuitem-cr.png
diff --git a/kstyles/keramik/pics/progressbar-cc.png b/tdestyles/keramik/pics/progressbar-cc.png
index e7881df47..e7881df47 100644
--- a/kstyles/keramik/pics/progressbar-cc.png
+++ b/tdestyles/keramik/pics/progressbar-cc.png
diff --git a/kstyles/keramik/pics/progressbar-cl.png b/tdestyles/keramik/pics/progressbar-cl.png
index 66824c873..66824c873 100644
--- a/kstyles/keramik/pics/progressbar-cl.png
+++ b/tdestyles/keramik/pics/progressbar-cl.png
diff --git a/kstyles/keramik/pics/progressbar-cr.png b/tdestyles/keramik/pics/progressbar-cr.png
index c6d61e75d..c6d61e75d 100644
--- a/kstyles/keramik/pics/progressbar-cr.png
+++ b/tdestyles/keramik/pics/progressbar-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-bc.png b/tdestyles/keramik/pics/pushbutton-bc.png
index 62f169aa2..62f169aa2 100644
--- a/kstyles/keramik/pics/pushbutton-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-bl.png b/tdestyles/keramik/pics/pushbutton-bl.png
index ea17ef991..ea17ef991 100644
--- a/kstyles/keramik/pics/pushbutton-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-br.png b/tdestyles/keramik/pics/pushbutton-br.png
index 91703e742..91703e742 100644
--- a/kstyles/keramik/pics/pushbutton-br.png
+++ b/tdestyles/keramik/pics/pushbutton-br.png
diff --git a/kstyles/keramik/pics/pushbutton-cc.png b/tdestyles/keramik/pics/pushbutton-cc.png
index ac5a2fdc0..ac5a2fdc0 100644
--- a/kstyles/keramik/pics/pushbutton-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-cl.png b/tdestyles/keramik/pics/pushbutton-cl.png
index 0a9c56630..0a9c56630 100644
--- a/kstyles/keramik/pics/pushbutton-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-cr.png b/tdestyles/keramik/pics/pushbutton-cr.png
index 68449467f..68449467f 100644
--- a/kstyles/keramik/pics/pushbutton-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-default-bc.png b/tdestyles/keramik/pics/pushbutton-default-bc.png
index 308020237..308020237 100644
--- a/kstyles/keramik/pics/pushbutton-default-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-bl.png b/tdestyles/keramik/pics/pushbutton-default-bl.png
index 97c69cd1c..97c69cd1c 100644
--- a/kstyles/keramik/pics/pushbutton-default-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-br.png b/tdestyles/keramik/pics/pushbutton-default-br.png
index e084dca00..e084dca00 100644
--- a/kstyles/keramik/pics/pushbutton-default-br.png
+++ b/tdestyles/keramik/pics/pushbutton-default-br.png
diff --git a/kstyles/keramik/pics/pushbutton-default-cc.png b/tdestyles/keramik/pics/pushbutton-default-cc.png
index 51e655302..51e655302 100644
--- a/kstyles/keramik/pics/pushbutton-default-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-cl.png b/tdestyles/keramik/pics/pushbutton-default-cl.png
index 5c4c001b1..5c4c001b1 100644
--- a/kstyles/keramik/pics/pushbutton-default-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-cr.png b/tdestyles/keramik/pics/pushbutton-default-cr.png
index 0b1ea243b..0b1ea243b 100644
--- a/kstyles/keramik/pics/pushbutton-default-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-default-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-bc.png b/tdestyles/keramik/pics/pushbutton-default-hov-bc.png
index 1c3f23766..1c3f23766 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-bl.png b/tdestyles/keramik/pics/pushbutton-default-hov-bl.png
index 5072df3a7..5072df3a7 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-br.png b/tdestyles/keramik/pics/pushbutton-default-hov-br.png
index 827df317d..827df317d 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-br.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-br.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-cc.png b/tdestyles/keramik/pics/pushbutton-default-hov-cc.png
index ec57f7ed7..ec57f7ed7 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-cl.png b/tdestyles/keramik/pics/pushbutton-default-hov-cl.png
index 09fdf4dfa..09fdf4dfa 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-cr.png b/tdestyles/keramik/pics/pushbutton-default-hov-cr.png
index 131c96f55..131c96f55 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-tc.png b/tdestyles/keramik/pics/pushbutton-default-hov-tc.png
index 45f4e86c3..45f4e86c3 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-tl.png b/tdestyles/keramik/pics/pushbutton-default-hov-tl.png
index 13e2cdfa2..13e2cdfa2 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-hov-tr.png b/tdestyles/keramik/pics/pushbutton-default-hov-tr.png
index 0eb2d5f2d..0eb2d5f2d 100644
--- a/kstyles/keramik/pics/pushbutton-default-hov-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-default-hov-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-bc.png b/tdestyles/keramik/pics/pushbutton-default-pressed-bc.png
index 7d1f31b4b..7d1f31b4b 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-bl.png b/tdestyles/keramik/pics/pushbutton-default-pressed-bl.png
index 05d432d3a..05d432d3a 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-br.png b/tdestyles/keramik/pics/pushbutton-default-pressed-br.png
index 5ac4eb761..5ac4eb761 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-br.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-br.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-cc.png b/tdestyles/keramik/pics/pushbutton-default-pressed-cc.png
index a29eb9b26..a29eb9b26 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-cl.png b/tdestyles/keramik/pics/pushbutton-default-pressed-cl.png
index 1732ab586..1732ab586 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-cr.png b/tdestyles/keramik/pics/pushbutton-default-pressed-cr.png
index 3e52fd79f..3e52fd79f 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-tc.png b/tdestyles/keramik/pics/pushbutton-default-pressed-tc.png
index a2774ed4d..a2774ed4d 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-tl.png b/tdestyles/keramik/pics/pushbutton-default-pressed-tl.png
index 209673d91..209673d91 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-pressed-tr.png b/tdestyles/keramik/pics/pushbutton-default-pressed-tr.png
index 4b4d8bed1..4b4d8bed1 100644
--- a/kstyles/keramik/pics/pushbutton-default-pressed-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-default-pressed-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-default-tc.png b/tdestyles/keramik/pics/pushbutton-default-tc.png
index e71531f73..e71531f73 100644
--- a/kstyles/keramik/pics/pushbutton-default-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-default-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-default-tl.png b/tdestyles/keramik/pics/pushbutton-default-tl.png
index 02c8adb38..02c8adb38 100644
--- a/kstyles/keramik/pics/pushbutton-default-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-default-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-default-tr.png b/tdestyles/keramik/pics/pushbutton-default-tr.png
index 741dd67cb..741dd67cb 100644
--- a/kstyles/keramik/pics/pushbutton-default-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-default-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-bc.png b/tdestyles/keramik/pics/pushbutton-hov-bc.png
index 1b7731085..1b7731085 100644
--- a/kstyles/keramik/pics/pushbutton-hov-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-bl.png b/tdestyles/keramik/pics/pushbutton-hov-bl.png
index 29f066774..29f066774 100644
--- a/kstyles/keramik/pics/pushbutton-hov-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-br.png b/tdestyles/keramik/pics/pushbutton-hov-br.png
index c7b045337..c7b045337 100644
--- a/kstyles/keramik/pics/pushbutton-hov-br.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-br.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-cc.png b/tdestyles/keramik/pics/pushbutton-hov-cc.png
index f57781d87..f57781d87 100644
--- a/kstyles/keramik/pics/pushbutton-hov-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-cl.png b/tdestyles/keramik/pics/pushbutton-hov-cl.png
index 1540ef437..1540ef437 100644
--- a/kstyles/keramik/pics/pushbutton-hov-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-cr.png b/tdestyles/keramik/pics/pushbutton-hov-cr.png
index e105ae6f8..e105ae6f8 100644
--- a/kstyles/keramik/pics/pushbutton-hov-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-tc.png b/tdestyles/keramik/pics/pushbutton-hov-tc.png
index fa2a00270..fa2a00270 100644
--- a/kstyles/keramik/pics/pushbutton-hov-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-tl.png b/tdestyles/keramik/pics/pushbutton-hov-tl.png
index 9eddbf5f9..9eddbf5f9 100644
--- a/kstyles/keramik/pics/pushbutton-hov-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-hov-tr.png b/tdestyles/keramik/pics/pushbutton-hov-tr.png
index c4ea2e1ae..c4ea2e1ae 100644
--- a/kstyles/keramik/pics/pushbutton-hov-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-hov-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-bc.png b/tdestyles/keramik/pics/pushbutton-pressed-bc.png
index 1e9097faa..1e9097faa 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-bl.png b/tdestyles/keramik/pics/pushbutton-pressed-bl.png
index ae8ad9ba3..ae8ad9ba3 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-br.png b/tdestyles/keramik/pics/pushbutton-pressed-br.png
index 8d1a62e7e..8d1a62e7e 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-br.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-br.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-cc.png b/tdestyles/keramik/pics/pushbutton-pressed-cc.png
index 09cb446ba..09cb446ba 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-cl.png b/tdestyles/keramik/pics/pushbutton-pressed-cl.png
index 1291cf33f..1291cf33f 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-cr.png b/tdestyles/keramik/pics/pushbutton-pressed-cr.png
index 6e35bd28b..6e35bd28b 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-tc.png b/tdestyles/keramik/pics/pushbutton-pressed-tc.png
index ab1ccf476..ab1ccf476 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-tl.png b/tdestyles/keramik/pics/pushbutton-pressed-tl.png
index 41df0033f..41df0033f 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-pressed-tr.png b/tdestyles/keramik/pics/pushbutton-pressed-tr.png
index fc83cfdef..fc83cfdef 100644
--- a/kstyles/keramik/pics/pushbutton-pressed-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-pressed-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-small-bc.png b/tdestyles/keramik/pics/pushbutton-small-bc.png
index b55ed441c..b55ed441c 100644
--- a/kstyles/keramik/pics/pushbutton-small-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-small-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-small-bl.png b/tdestyles/keramik/pics/pushbutton-small-bl.png
index fc14a94c1..fc14a94c1 100644
--- a/kstyles/keramik/pics/pushbutton-small-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-small-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-small-br.png b/tdestyles/keramik/pics/pushbutton-small-br.png
index f24b47af1..f24b47af1 100644
--- a/kstyles/keramik/pics/pushbutton-small-br.png
+++ b/tdestyles/keramik/pics/pushbutton-small-br.png
diff --git a/kstyles/keramik/pics/pushbutton-small-cc.png b/tdestyles/keramik/pics/pushbutton-small-cc.png
index 8f8d49964..8f8d49964 100644
--- a/kstyles/keramik/pics/pushbutton-small-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-small-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-small-cl.png b/tdestyles/keramik/pics/pushbutton-small-cl.png
index 9ce9e492f..9ce9e492f 100644
--- a/kstyles/keramik/pics/pushbutton-small-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-small-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-small-cr.png b/tdestyles/keramik/pics/pushbutton-small-cr.png
index db05257b2..db05257b2 100644
--- a/kstyles/keramik/pics/pushbutton-small-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-small-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-bc.png b/tdestyles/keramik/pics/pushbutton-small-pressed-bc.png
index 560f17c5d..560f17c5d 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-bc.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-bc.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-bl.png b/tdestyles/keramik/pics/pushbutton-small-pressed-bl.png
index 36e39f88d..36e39f88d 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-bl.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-bl.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-br.png b/tdestyles/keramik/pics/pushbutton-small-pressed-br.png
index d269e61bf..d269e61bf 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-br.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-br.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-cc.png b/tdestyles/keramik/pics/pushbutton-small-pressed-cc.png
index abab3832c..abab3832c 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-cc.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-cc.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-cl.png b/tdestyles/keramik/pics/pushbutton-small-pressed-cl.png
index 8049bee04..8049bee04 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-cl.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-cl.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-cr.png b/tdestyles/keramik/pics/pushbutton-small-pressed-cr.png
index ef13139c2..ef13139c2 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-cr.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-cr.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-tc.png b/tdestyles/keramik/pics/pushbutton-small-pressed-tc.png
index d10fc26a8..d10fc26a8 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-tl.png b/tdestyles/keramik/pics/pushbutton-small-pressed-tl.png
index 7f189e50d..7f189e50d 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-small-pressed-tr.png b/tdestyles/keramik/pics/pushbutton-small-pressed-tr.png
index 5262f63a2..5262f63a2 100644
--- a/kstyles/keramik/pics/pushbutton-small-pressed-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-small-pressed-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-small-tc.png b/tdestyles/keramik/pics/pushbutton-small-tc.png
index 216126077..216126077 100644
--- a/kstyles/keramik/pics/pushbutton-small-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-small-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-small-tl.png b/tdestyles/keramik/pics/pushbutton-small-tl.png
index 75d8052b1..75d8052b1 100644
--- a/kstyles/keramik/pics/pushbutton-small-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-small-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-small-tr.png b/tdestyles/keramik/pics/pushbutton-small-tr.png
index 18ac1208d..18ac1208d 100644
--- a/kstyles/keramik/pics/pushbutton-small-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-small-tr.png
diff --git a/kstyles/keramik/pics/pushbutton-tc.png b/tdestyles/keramik/pics/pushbutton-tc.png
index 0d0e396d2..0d0e396d2 100644
--- a/kstyles/keramik/pics/pushbutton-tc.png
+++ b/tdestyles/keramik/pics/pushbutton-tc.png
diff --git a/kstyles/keramik/pics/pushbutton-tl.png b/tdestyles/keramik/pics/pushbutton-tl.png
index 6904db252..6904db252 100644
--- a/kstyles/keramik/pics/pushbutton-tl.png
+++ b/tdestyles/keramik/pics/pushbutton-tl.png
diff --git a/kstyles/keramik/pics/pushbutton-tr.png b/tdestyles/keramik/pics/pushbutton-tr.png
index b3e34dec2..b3e34dec2 100644
--- a/kstyles/keramik/pics/pushbutton-tr.png
+++ b/tdestyles/keramik/pics/pushbutton-tr.png
diff --git a/kstyles/keramik/pics/radiobutton-off.png b/tdestyles/keramik/pics/radiobutton-off.png
index 6eefc781c..6eefc781c 100644
--- a/kstyles/keramik/pics/radiobutton-off.png
+++ b/tdestyles/keramik/pics/radiobutton-off.png
diff --git a/kstyles/keramik/pics/radiobutton-on.png b/tdestyles/keramik/pics/radiobutton-on.png
index ab4dc6798..ab4dc6798 100644
--- a/kstyles/keramik/pics/radiobutton-on.png
+++ b/tdestyles/keramik/pics/radiobutton-on.png
diff --git a/kstyles/keramik/pics/ripple.png b/tdestyles/keramik/pics/ripple.png
index 6b7d04ef3..6b7d04ef3 100644
--- a/kstyles/keramik/pics/ripple.png
+++ b/tdestyles/keramik/pics/ripple.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-arrow1.png b/tdestyles/keramik/pics/scrollbar-hbar-arrow1.png
index af21cb269..af21cb269 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-arrow1.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-arrow1.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-arrow2.png b/tdestyles/keramik/pics/scrollbar-hbar-arrow2.png
index 231520d12..231520d12 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-arrow2.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-arrow2.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-groove1.png b/tdestyles/keramik/pics/scrollbar-hbar-groove1.png
index 0219f2e28..0219f2e28 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-groove1.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-groove1.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-groove2.png b/tdestyles/keramik/pics/scrollbar-hbar-groove2.png
index 990b5b06d..990b5b06d 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-groove2.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-groove2.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-slider1.png b/tdestyles/keramik/pics/scrollbar-hbar-slider1.png
index 6f0896ed9..6f0896ed9 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-slider1.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-slider1.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-slider2.png b/tdestyles/keramik/pics/scrollbar-hbar-slider2.png
index c13ecc00c..c13ecc00c 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-slider2.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-slider2.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-slider3.png b/tdestyles/keramik/pics/scrollbar-hbar-slider3.png
index 105718ba7..105718ba7 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-slider3.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-slider3.png
diff --git a/kstyles/keramik/pics/scrollbar-hbar-slider4.png b/tdestyles/keramik/pics/scrollbar-hbar-slider4.png
index 9d56a784c..9d56a784c 100644
--- a/kstyles/keramik/pics/scrollbar-hbar-slider4.png
+++ b/tdestyles/keramik/pics/scrollbar-hbar-slider4.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-arrow1.png b/tdestyles/keramik/pics/scrollbar-vbar-arrow1.png
index cb2f70aeb..cb2f70aeb 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-arrow1.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-arrow1.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-arrow2.png b/tdestyles/keramik/pics/scrollbar-vbar-arrow2.png
index 4d36f077e..4d36f077e 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-arrow2.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-arrow2.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-groove1.png b/tdestyles/keramik/pics/scrollbar-vbar-groove1.png
index 62ed6491d..62ed6491d 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-groove1.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-groove1.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-groove2.png b/tdestyles/keramik/pics/scrollbar-vbar-groove2.png
index 219781e23..219781e23 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-groove2.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-groove2.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-slider1.png b/tdestyles/keramik/pics/scrollbar-vbar-slider1.png
index 29b85856c..29b85856c 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-slider1.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-slider1.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-slider2.png b/tdestyles/keramik/pics/scrollbar-vbar-slider2.png
index ebacc8e67..ebacc8e67 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-slider2.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-slider2.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-slider3.png b/tdestyles/keramik/pics/scrollbar-vbar-slider3.png
index 197be82c5..197be82c5 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-slider3.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-slider3.png
diff --git a/kstyles/keramik/pics/scrollbar-vbar-slider4.png b/tdestyles/keramik/pics/scrollbar-vbar-slider4.png
index fdb931f4f..fdb931f4f 100644
--- a/kstyles/keramik/pics/scrollbar-vbar-slider4.png
+++ b/tdestyles/keramik/pics/scrollbar-vbar-slider4.png
diff --git a/kstyles/keramik/pics/slider-hgroove-bc.png b/tdestyles/keramik/pics/slider-hgroove-bc.png
index d509e8357..d509e8357 100644
--- a/kstyles/keramik/pics/slider-hgroove-bc.png
+++ b/tdestyles/keramik/pics/slider-hgroove-bc.png
diff --git a/kstyles/keramik/pics/slider-hgroove-bl.png b/tdestyles/keramik/pics/slider-hgroove-bl.png
index 12cb99a5b..12cb99a5b 100644
--- a/kstyles/keramik/pics/slider-hgroove-bl.png
+++ b/tdestyles/keramik/pics/slider-hgroove-bl.png
diff --git a/kstyles/keramik/pics/slider-hgroove-br.png b/tdestyles/keramik/pics/slider-hgroove-br.png
index c540bd09b..c540bd09b 100644
--- a/kstyles/keramik/pics/slider-hgroove-br.png
+++ b/tdestyles/keramik/pics/slider-hgroove-br.png
diff --git a/kstyles/keramik/pics/slider-hgroove-cc.png b/tdestyles/keramik/pics/slider-hgroove-cc.png
index cad18f802..cad18f802 100644
--- a/kstyles/keramik/pics/slider-hgroove-cc.png
+++ b/tdestyles/keramik/pics/slider-hgroove-cc.png
diff --git a/kstyles/keramik/pics/slider-hgroove-cl.png b/tdestyles/keramik/pics/slider-hgroove-cl.png
index a261a086f..a261a086f 100644
--- a/kstyles/keramik/pics/slider-hgroove-cl.png
+++ b/tdestyles/keramik/pics/slider-hgroove-cl.png
diff --git a/kstyles/keramik/pics/slider-hgroove-cr.png b/tdestyles/keramik/pics/slider-hgroove-cr.png
index 601ff7d20..601ff7d20 100644
--- a/kstyles/keramik/pics/slider-hgroove-cr.png
+++ b/tdestyles/keramik/pics/slider-hgroove-cr.png
diff --git a/kstyles/keramik/pics/slider-hgroove-tc.png b/tdestyles/keramik/pics/slider-hgroove-tc.png
index f8ee8d90b..f8ee8d90b 100644
--- a/kstyles/keramik/pics/slider-hgroove-tc.png
+++ b/tdestyles/keramik/pics/slider-hgroove-tc.png
diff --git a/kstyles/keramik/pics/slider-hgroove-tl.png b/tdestyles/keramik/pics/slider-hgroove-tl.png
index 525242cf5..525242cf5 100644
--- a/kstyles/keramik/pics/slider-hgroove-tl.png
+++ b/tdestyles/keramik/pics/slider-hgroove-tl.png
diff --git a/kstyles/keramik/pics/slider-hgroove-tr.png b/tdestyles/keramik/pics/slider-hgroove-tr.png
index 7fcd449ad..7fcd449ad 100644
--- a/kstyles/keramik/pics/slider-hgroove-tr.png
+++ b/tdestyles/keramik/pics/slider-hgroove-tr.png
diff --git a/kstyles/keramik/pics/slider-vgroove-bc.png b/tdestyles/keramik/pics/slider-vgroove-bc.png
index d81815cbf..d81815cbf 100644
--- a/kstyles/keramik/pics/slider-vgroove-bc.png
+++ b/tdestyles/keramik/pics/slider-vgroove-bc.png
diff --git a/kstyles/keramik/pics/slider-vgroove-bl.png b/tdestyles/keramik/pics/slider-vgroove-bl.png
index 5f7063525..5f7063525 100644
--- a/kstyles/keramik/pics/slider-vgroove-bl.png
+++ b/tdestyles/keramik/pics/slider-vgroove-bl.png
diff --git a/kstyles/keramik/pics/slider-vgroove-br.png b/tdestyles/keramik/pics/slider-vgroove-br.png
index 80fbb0c38..80fbb0c38 100644
--- a/kstyles/keramik/pics/slider-vgroove-br.png
+++ b/tdestyles/keramik/pics/slider-vgroove-br.png
diff --git a/kstyles/keramik/pics/slider-vgroove-cc.png b/tdestyles/keramik/pics/slider-vgroove-cc.png
index 56c3e1665..56c3e1665 100644
--- a/kstyles/keramik/pics/slider-vgroove-cc.png
+++ b/tdestyles/keramik/pics/slider-vgroove-cc.png
diff --git a/kstyles/keramik/pics/slider-vgroove-cl.png b/tdestyles/keramik/pics/slider-vgroove-cl.png
index cca74d7e3..cca74d7e3 100644
--- a/kstyles/keramik/pics/slider-vgroove-cl.png
+++ b/tdestyles/keramik/pics/slider-vgroove-cl.png
diff --git a/kstyles/keramik/pics/slider-vgroove-cr.png b/tdestyles/keramik/pics/slider-vgroove-cr.png
index 5e0bba54f..5e0bba54f 100644
--- a/kstyles/keramik/pics/slider-vgroove-cr.png
+++ b/tdestyles/keramik/pics/slider-vgroove-cr.png
diff --git a/kstyles/keramik/pics/slider-vgroove-tc.png b/tdestyles/keramik/pics/slider-vgroove-tc.png
index d381a1672..d381a1672 100644
--- a/kstyles/keramik/pics/slider-vgroove-tc.png
+++ b/tdestyles/keramik/pics/slider-vgroove-tc.png
diff --git a/kstyles/keramik/pics/slider-vgroove-tl.png b/tdestyles/keramik/pics/slider-vgroove-tl.png
index e2bb6ca4e..e2bb6ca4e 100644
--- a/kstyles/keramik/pics/slider-vgroove-tl.png
+++ b/tdestyles/keramik/pics/slider-vgroove-tl.png
diff --git a/kstyles/keramik/pics/slider-vgroove-tr.png b/tdestyles/keramik/pics/slider-vgroove-tr.png
index 03fe46405..03fe46405 100644
--- a/kstyles/keramik/pics/slider-vgroove-tr.png
+++ b/tdestyles/keramik/pics/slider-vgroove-tr.png
diff --git a/kstyles/keramik/pics/slider.png b/tdestyles/keramik/pics/slider.png
index 6949eec33..6949eec33 100644
--- a/kstyles/keramik/pics/slider.png
+++ b/tdestyles/keramik/pics/slider.png
diff --git a/kstyles/keramik/pics/spinbox-1.png b/tdestyles/keramik/pics/spinbox-1.png
index 728959423..728959423 100644
--- a/kstyles/keramik/pics/spinbox-1.png
+++ b/tdestyles/keramik/pics/spinbox-1.png
diff --git a/kstyles/keramik/pics/spinbox-2.png b/tdestyles/keramik/pics/spinbox-2.png
index 8dcebdc47..8dcebdc47 100644
--- a/kstyles/keramik/pics/spinbox-2.png
+++ b/tdestyles/keramik/pics/spinbox-2.png
diff --git a/kstyles/keramik/pics/spinbox-3.png b/tdestyles/keramik/pics/spinbox-3.png
index 43cdaf21d..43cdaf21d 100644
--- a/kstyles/keramik/pics/spinbox-3.png
+++ b/tdestyles/keramik/pics/spinbox-3.png
diff --git a/kstyles/keramik/pics/spinbox-arrow-down.png b/tdestyles/keramik/pics/spinbox-arrow-down.png
index 58d326e01..58d326e01 100644
--- a/kstyles/keramik/pics/spinbox-arrow-down.png
+++ b/tdestyles/keramik/pics/spinbox-arrow-down.png
diff --git a/kstyles/keramik/pics/spinbox-arrow-up.png b/tdestyles/keramik/pics/spinbox-arrow-up.png
index 1e1f7a72b..1e1f7a72b 100644
--- a/kstyles/keramik/pics/spinbox-arrow-up.png
+++ b/tdestyles/keramik/pics/spinbox-arrow-up.png
diff --git a/kstyles/keramik/pics/spinbox-pressed-arrow-down.png b/tdestyles/keramik/pics/spinbox-pressed-arrow-down.png
index 71ce2ff98..71ce2ff98 100644
--- a/kstyles/keramik/pics/spinbox-pressed-arrow-down.png
+++ b/tdestyles/keramik/pics/spinbox-pressed-arrow-down.png
diff --git a/kstyles/keramik/pics/spinbox-pressed-arrow-up.png b/tdestyles/keramik/pics/spinbox-pressed-arrow-up.png
index 7fd277c26..7fd277c26 100644
--- a/kstyles/keramik/pics/spinbox-pressed-arrow-up.png
+++ b/tdestyles/keramik/pics/spinbox-pressed-arrow-up.png
diff --git a/kstyles/keramik/pics/spinbox-pressed-down.png b/tdestyles/keramik/pics/spinbox-pressed-down.png
index 47ac06d41..47ac06d41 100644
--- a/kstyles/keramik/pics/spinbox-pressed-down.png
+++ b/tdestyles/keramik/pics/spinbox-pressed-down.png
diff --git a/kstyles/keramik/pics/spinbox-pressed-up.png b/tdestyles/keramik/pics/spinbox-pressed-up.png
index ed499f6ef..ed499f6ef 100644
--- a/kstyles/keramik/pics/spinbox-pressed-up.png
+++ b/tdestyles/keramik/pics/spinbox-pressed-up.png
diff --git a/kstyles/keramik/pics/tab-bottom-active-bc.png b/tdestyles/keramik/pics/tab-bottom-active-bc.png
index 2cc3e597a..2cc3e597a 100644
--- a/kstyles/keramik/pics/tab-bottom-active-bc.png
+++ b/tdestyles/keramik/pics/tab-bottom-active-bc.png
diff --git a/kstyles/keramik/pics/tab-bottom-active-bl.png b/tdestyles/keramik/pics/tab-bottom-active-bl.png
index 2f28a1cfa..2f28a1cfa 100644
--- a/kstyles/keramik/pics/tab-bottom-active-bl.png
+++ b/tdestyles/keramik/pics/tab-bottom-active-bl.png
diff --git a/kstyles/keramik/pics/tab-bottom-active-br.png b/tdestyles/keramik/pics/tab-bottom-active-br.png
index 8d086710a..8d086710a 100644
--- a/kstyles/keramik/pics/tab-bottom-active-br.png
+++ b/tdestyles/keramik/pics/tab-bottom-active-br.png
diff --git a/kstyles/keramik/pics/tab-bottom-active-cc.png b/tdestyles/keramik/pics/tab-bottom-active-cc.png
index 29fa285ef..29fa285ef 100644
--- a/kstyles/keramik/pics/tab-bottom-active-cc.png
+++ b/tdestyles/keramik/pics/tab-bottom-active-cc.png
diff --git a/kstyles/keramik/pics/tab-bottom-active-cl.png b/tdestyles/keramik/pics/tab-bottom-active-cl.png
index 54c629b55..54c629b55 100644
--- a/kstyles/keramik/pics/tab-bottom-active-cl.png
+++ b/tdestyles/keramik/pics/tab-bottom-active-cl.png
diff --git a/kstyles/keramik/pics/tab-bottom-active-cr.png b/tdestyles/keramik/pics/tab-bottom-active-cr.png
index f36039005..f36039005 100644
--- a/kstyles/keramik/pics/tab-bottom-active-cr.png
+++ b/tdestyles/keramik/pics/tab-bottom-active-cr.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-bc.png b/tdestyles/keramik/pics/tab-bottom-inactive-bc.png
index 538b0e20e..538b0e20e 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-bc.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-bc.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-bl.png b/tdestyles/keramik/pics/tab-bottom-inactive-bl.png
index 14e04519d..14e04519d 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-bl.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-bl.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-br.png b/tdestyles/keramik/pics/tab-bottom-inactive-br.png
index 79298a562..79298a562 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-br.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-br.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-cc.png b/tdestyles/keramik/pics/tab-bottom-inactive-cc.png
index e7fbaf864..e7fbaf864 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-cc.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-cc.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-cl.png b/tdestyles/keramik/pics/tab-bottom-inactive-cl.png
index 9d3aaed8f..9d3aaed8f 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-cl.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-cl.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-cr.png b/tdestyles/keramik/pics/tab-bottom-inactive-cr.png
index e873688c8..e873688c8 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-cr.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-cr.png
diff --git a/kstyles/keramik/pics/tab-bottom-inactive-separator.png b/tdestyles/keramik/pics/tab-bottom-inactive-separator.png
index 525341543..525341543 100644
--- a/kstyles/keramik/pics/tab-bottom-inactive-separator.png
+++ b/tdestyles/keramik/pics/tab-bottom-inactive-separator.png
diff --git a/kstyles/keramik/pics/tab-top-active-cc.png b/tdestyles/keramik/pics/tab-top-active-cc.png
index 494659c77..494659c77 100644
--- a/kstyles/keramik/pics/tab-top-active-cc.png
+++ b/tdestyles/keramik/pics/tab-top-active-cc.png
diff --git a/kstyles/keramik/pics/tab-top-active-cl.png b/tdestyles/keramik/pics/tab-top-active-cl.png
index b369f9570..b369f9570 100644
--- a/kstyles/keramik/pics/tab-top-active-cl.png
+++ b/tdestyles/keramik/pics/tab-top-active-cl.png
diff --git a/kstyles/keramik/pics/tab-top-active-cr.png b/tdestyles/keramik/pics/tab-top-active-cr.png
index 6cbf4238e..6cbf4238e 100644
--- a/kstyles/keramik/pics/tab-top-active-cr.png
+++ b/tdestyles/keramik/pics/tab-top-active-cr.png
diff --git a/kstyles/keramik/pics/tab-top-active-tc.png b/tdestyles/keramik/pics/tab-top-active-tc.png
index 44cf7d16d..44cf7d16d 100644
--- a/kstyles/keramik/pics/tab-top-active-tc.png
+++ b/tdestyles/keramik/pics/tab-top-active-tc.png
diff --git a/kstyles/keramik/pics/tab-top-active-tl.png b/tdestyles/keramik/pics/tab-top-active-tl.png
index 437f95bc2..437f95bc2 100644
--- a/kstyles/keramik/pics/tab-top-active-tl.png
+++ b/tdestyles/keramik/pics/tab-top-active-tl.png
diff --git a/kstyles/keramik/pics/tab-top-active-tr.png b/tdestyles/keramik/pics/tab-top-active-tr.png
index 74cbc48e3..74cbc48e3 100644
--- a/kstyles/keramik/pics/tab-top-active-tr.png
+++ b/tdestyles/keramik/pics/tab-top-active-tr.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-cc.png b/tdestyles/keramik/pics/tab-top-inactive-cc.png
index 1c2f0d47f..1c2f0d47f 100644
--- a/kstyles/keramik/pics/tab-top-inactive-cc.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-cc.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-cl.png b/tdestyles/keramik/pics/tab-top-inactive-cl.png
index 3f4a23136..3f4a23136 100644
--- a/kstyles/keramik/pics/tab-top-inactive-cl.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-cl.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-cr.png b/tdestyles/keramik/pics/tab-top-inactive-cr.png
index 477af0bc7..477af0bc7 100644
--- a/kstyles/keramik/pics/tab-top-inactive-cr.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-cr.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-separator.png b/tdestyles/keramik/pics/tab-top-inactive-separator.png
index fc03d5dbb..fc03d5dbb 100644
--- a/kstyles/keramik/pics/tab-top-inactive-separator.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-separator.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-tc.png b/tdestyles/keramik/pics/tab-top-inactive-tc.png
index 41eda7245..41eda7245 100644
--- a/kstyles/keramik/pics/tab-top-inactive-tc.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-tc.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-tl.png b/tdestyles/keramik/pics/tab-top-inactive-tl.png
index 114d9e99a..114d9e99a 100644
--- a/kstyles/keramik/pics/tab-top-inactive-tl.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-tl.png
diff --git a/kstyles/keramik/pics/tab-top-inactive-tr.png b/tdestyles/keramik/pics/tab-top-inactive-tr.png
index 04a9019f8..04a9019f8 100644
--- a/kstyles/keramik/pics/tab-top-inactive-tr.png
+++ b/tdestyles/keramik/pics/tab-top-inactive-tr.png
diff --git a/kstyles/keramik/pics/title-close-tiny.png b/tdestyles/keramik/pics/title-close-tiny.png
index 1e497547b..1e497547b 100644
--- a/kstyles/keramik/pics/title-close-tiny.png
+++ b/tdestyles/keramik/pics/title-close-tiny.png
diff --git a/kstyles/keramik/pics/title-close.png b/tdestyles/keramik/pics/title-close.png
index b9a7a8f45..b9a7a8f45 100644
--- a/kstyles/keramik/pics/title-close.png
+++ b/tdestyles/keramik/pics/title-close.png
diff --git a/kstyles/keramik/pics/title-iconify.png b/tdestyles/keramik/pics/title-iconify.png
index 6c87e05f3..6c87e05f3 100644
--- a/kstyles/keramik/pics/title-iconify.png
+++ b/tdestyles/keramik/pics/title-iconify.png
diff --git a/kstyles/keramik/pics/title-maximize.png b/tdestyles/keramik/pics/title-maximize.png
index 6a47ce12d..6a47ce12d 100644
--- a/kstyles/keramik/pics/title-maximize.png
+++ b/tdestyles/keramik/pics/title-maximize.png
diff --git a/kstyles/keramik/pics/title-restore.png b/tdestyles/keramik/pics/title-restore.png
index 12d48df42..12d48df42 100644
--- a/kstyles/keramik/pics/title-restore.png
+++ b/tdestyles/keramik/pics/title-restore.png
diff --git a/kstyles/keramik/pics/titlebutton-pressed.png b/tdestyles/keramik/pics/titlebutton-pressed.png
index 23587dd2f..23587dd2f 100644
--- a/kstyles/keramik/pics/titlebutton-pressed.png
+++ b/tdestyles/keramik/pics/titlebutton-pressed.png
diff --git a/kstyles/keramik/pics/titlebutton.png b/tdestyles/keramik/pics/titlebutton.png
index bb99c9b30..bb99c9b30 100644
--- a/kstyles/keramik/pics/titlebutton.png
+++ b/tdestyles/keramik/pics/titlebutton.png
diff --git a/kstyles/keramik/pics/toolbar-clk-bc.png b/tdestyles/keramik/pics/toolbar-clk-bc.png
index 4d8acdcde..4d8acdcde 100644
--- a/kstyles/keramik/pics/toolbar-clk-bc.png
+++ b/tdestyles/keramik/pics/toolbar-clk-bc.png
diff --git a/kstyles/keramik/pics/toolbar-clk-bl.png b/tdestyles/keramik/pics/toolbar-clk-bl.png
index 891f380ed..891f380ed 100644
--- a/kstyles/keramik/pics/toolbar-clk-bl.png
+++ b/tdestyles/keramik/pics/toolbar-clk-bl.png
diff --git a/kstyles/keramik/pics/toolbar-clk-br.png b/tdestyles/keramik/pics/toolbar-clk-br.png
index d2493b18e..d2493b18e 100644
--- a/kstyles/keramik/pics/toolbar-clk-br.png
+++ b/tdestyles/keramik/pics/toolbar-clk-br.png
diff --git a/kstyles/keramik/pics/toolbar-clk-cc.png b/tdestyles/keramik/pics/toolbar-clk-cc.png
index 0ae970f6b..0ae970f6b 100644
--- a/kstyles/keramik/pics/toolbar-clk-cc.png
+++ b/tdestyles/keramik/pics/toolbar-clk-cc.png
diff --git a/kstyles/keramik/pics/toolbar-clk-cl.png b/tdestyles/keramik/pics/toolbar-clk-cl.png
index 12467b4e7..12467b4e7 100644
--- a/kstyles/keramik/pics/toolbar-clk-cl.png
+++ b/tdestyles/keramik/pics/toolbar-clk-cl.png
diff --git a/kstyles/keramik/pics/toolbar-clk-cr.png b/tdestyles/keramik/pics/toolbar-clk-cr.png
index 75bea2f4c..75bea2f4c 100644
--- a/kstyles/keramik/pics/toolbar-clk-cr.png
+++ b/tdestyles/keramik/pics/toolbar-clk-cr.png
diff --git a/kstyles/keramik/pics/toolbar-clk-tc.png b/tdestyles/keramik/pics/toolbar-clk-tc.png
index fcd0e8cd2..fcd0e8cd2 100644
--- a/kstyles/keramik/pics/toolbar-clk-tc.png
+++ b/tdestyles/keramik/pics/toolbar-clk-tc.png
diff --git a/kstyles/keramik/pics/toolbar-clk-tl.png b/tdestyles/keramik/pics/toolbar-clk-tl.png
index 13625cf8e..13625cf8e 100644
--- a/kstyles/keramik/pics/toolbar-clk-tl.png
+++ b/tdestyles/keramik/pics/toolbar-clk-tl.png
diff --git a/kstyles/keramik/pics/toolbar-clk-tr.png b/tdestyles/keramik/pics/toolbar-clk-tr.png
index 1b8c8f33d..1b8c8f33d 100644
--- a/kstyles/keramik/pics/toolbar-clk-tr.png
+++ b/tdestyles/keramik/pics/toolbar-clk-tr.png
diff --git a/kstyles/keramik/pics/vslider.png b/tdestyles/keramik/pics/vslider.png
index e43857388..e43857388 100644
--- a/kstyles/keramik/pics/vslider.png
+++ b/tdestyles/keramik/pics/vslider.png
diff --git a/kstyles/keramik/pixmaploader.cpp b/tdestyles/keramik/pixmaploader.cpp
index 00b4626fd..00b4626fd 100644
--- a/kstyles/keramik/pixmaploader.cpp
+++ b/tdestyles/keramik/pixmaploader.cpp
diff --git a/kstyles/keramik/pixmaploader.h b/tdestyles/keramik/pixmaploader.h
index ab0bb4223..ab0bb4223 100644
--- a/kstyles/keramik/pixmaploader.h
+++ b/tdestyles/keramik/pixmaploader.h
diff --git a/kstyles/klegacy/Makefile.am b/tdestyles/klegacy/Makefile.am
index 9bdee9267..9bdee9267 100644
--- a/kstyles/klegacy/Makefile.am
+++ b/tdestyles/klegacy/Makefile.am
diff --git a/kstyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp
index a169de874..a169de874 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/tdestyles/klegacy/klegacystyle.cpp
diff --git a/kstyles/klegacy/klegacystyle.h b/tdestyles/klegacy/klegacystyle.h
index f82fd5d0a..f82fd5d0a 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/tdestyles/klegacy/klegacystyle.h
diff --git a/kstyles/klegacy/plugin.cpp b/tdestyles/klegacy/plugin.cpp
index 558b54e73..558b54e73 100644
--- a/kstyles/klegacy/plugin.cpp
+++ b/tdestyles/klegacy/plugin.cpp
diff --git a/kstyles/kthemestyle/CMakeLists.txt b/tdestyles/kthemestyle/CMakeLists.txt
index ee6995f2d..63d4cdf6f 100644
--- a/kstyles/kthemestyle/CMakeLists.txt
+++ b/tdestyles/kthemestyle/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 set( target kthemestyle )
 
 set( ${target}_SRCS
-  kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
+  kthemebase.cpp kthemestyle.cpp tdestyledirs.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/kstyles/kthemestyle/Makefile.am b/tdestyles/kthemestyle/Makefile.am
index 407ac1b2a..bc1b13e61 100644
--- a/kstyles/kthemestyle/Makefile.am
+++ b/tdestyles/kthemestyle/Makefile.am
@@ -21,9 +21,9 @@
 AM_CPPFLAGS = -DQT_PLUGIN 
 
 INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
-noinst_HEADERS = kthemestyle.h kthemebase.h kstyledirs.h
+noinst_HEADERS = kthemestyle.h kthemebase.h tdestyledirs.h
 kde_style_LTLIBRARIES = kthemestyle.la
 kthemestyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 kthemestyle_la_LIBADD = ../../tdefx/libtdefx.la  ../../tdecore/libtdecore.la -ldl $(LIB_QT)
-kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp kstyledirs.cpp
+kthemestyle_la_SOURCES = kthemebase.cpp kthemestyle.cpp tdestyledirs.cpp
 kthemestyle_la_METASOURCES = AUTO
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp
index adbf49084..8e1f5605f 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/tdestyles/kthemestyle/kthemebase.cpp
@@ -529,7 +529,7 @@ KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile )
 {
     d = new KThemeBasePrivate;
     if ( configFileName.isEmpty() )
-        configFileName = "kstylerc";
+        configFileName = "tdestylerc";
 
 
     configDirName = dir;
diff --git a/kstyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h
index 1e16bcee7..01ecab138 100644
--- a/kstyles/kthemestyle/kthemebase.h
+++ b/tdestyles/kthemestyle/kthemebase.h
@@ -37,7 +37,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team
 #include <tdestyle.h>
 #include <tqsettings.h>
 #include <tqpalette.h> // for QColorGroup
-#include "kstyledirs.h"
+#include "tdestyledirs.h"
 #include <tqmap.h>
 
 class TQImage;
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp
index a164821b1..27f9ca325 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/tdestyles/kthemestyle/kthemestyle.cpp
@@ -66,7 +66,7 @@ Port version 0.9.7
 #include <tqobjectlist.h>
 #include <tqradiobutton.h>
 #include <tqstatusbar.h>
-#include "kstyledirs.h"
+#include "tdestyledirs.h"
 
 #include <tqimage.h>
 
diff --git a/kstyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h
index ca112ed14..ca112ed14 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/tdestyles/kthemestyle/kthemestyle.h
diff --git a/kstyles/kthemestyle/kstyledirs.cpp b/tdestyles/kthemestyle/tdestyledirs.cpp
index 8755fb294..9f795e1e2 100644
--- a/kstyles/kthemestyle/kstyledirs.cpp
+++ b/tdestyles/kthemestyle/tdestyledirs.cpp
@@ -23,14 +23,14 @@
 
 #include <tqfile.h>
 #include <kstandarddirs.h>
-#include "kstyledirs.h"
+#include "tdestyledirs.h"
 
 TDEStyleDirs* TDEStyleDirs::instance = 0;
 
 TDEStyleDirs::TDEStyleDirs()
 {
-    addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" );
-    addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "kstyle/themes/" );
+    addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "tdestyle/pixmaps/" );
+    addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "tdestyle/themes/" );
 }
 
 TDEStyleDirs::~TDEStyleDirs()
diff --git a/kstyles/kthemestyle/kstyledirs.h b/tdestyles/kthemestyle/tdestyledirs.h
index 410fad2ef..2a42fd2ba 100644
--- a/kstyles/kthemestyle/kstyledirs.h
+++ b/tdestyles/kthemestyle/tdestyledirs.h
@@ -19,8 +19,8 @@
  Boston, MA 02110-1301, USA.
 */
 
-#ifndef KSTYLE_DIRS_H
-#define KSTYLE_DIRS_H
+#ifndef TDESTYLE_DIRS_H
+#define TDESTYLE_DIRS_H
 
 
 #include <tqsettings.h>
@@ -36,8 +36,8 @@
 * This class provides a this wrapper for styles around TDEStandardDirs,
 * permitting integration with TQSettings and easy loading of pixmaps
 *
-* It add share/apps/kstyle/themes as "themerc",
-*    share/apps/kstyle/pixmaps "themepixmap"
+* It add share/apps/tdestyle/themes as "themerc",
+*    share/apps/tdestyle/pixmaps "themepixmap"
 */
 class TDEStyleDirs: public TDEStandardDirs
 {
@@ -63,7 +63,7 @@ public:
     TDEStyleDirs dirs;
     dirs.addToSearch("config",settings);
 
-    The one can do settings.readEntry("kstyle/KDE/WidgetStyle") to access a settings in kstylerc.
+    The one can do settings.readEntry("tdestyle/TDE/WidgetStyle") to access a settings in tdestylerc.
     */
     void addToSearch( const char* type, TQSettings& q) const; //Better name?
 
diff --git a/kstyles/light/CMakeLists.txt b/tdestyles/light/CMakeLists.txt
index af512b94f..af512b94f 100644
--- a/kstyles/light/CMakeLists.txt
+++ b/tdestyles/light/CMakeLists.txt
diff --git a/kstyles/light/Makefile.am b/tdestyles/light/Makefile.am
index 8233d22df..8233d22df 100644
--- a/kstyles/light/Makefile.am
+++ b/tdestyles/light/Makefile.am
diff --git a/kstyles/light/light.cpp b/tdestyles/light/light.cpp
index 17ecde9fc..17ecde9fc 100644
--- a/kstyles/light/light.cpp
+++ b/tdestyles/light/light.cpp
diff --git a/kstyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp
index 0d343f778..0d343f778 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/tdestyles/light/lightstyle-v2.cpp
diff --git a/kstyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h
index 90b3e89c9..90b3e89c9 100644
--- a/kstyles/light/lightstyle-v2.h
+++ b/tdestyles/light/lightstyle-v2.h
diff --git a/kstyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp
index 735bd3169..735bd3169 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/tdestyles/light/lightstyle-v3.cpp
diff --git a/kstyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h
index 0330c8f87..0330c8f87 100644
--- a/kstyles/light/lightstyle-v3.h
+++ b/tdestyles/light/lightstyle-v3.h
diff --git a/kstyles/plastik/CMakeLists.txt b/tdestyles/plastik/CMakeLists.txt
index 9459f3615..ab93e42c4 100644
--- a/kstyles/plastik/CMakeLists.txt
+++ b/tdestyles/plastik/CMakeLists.txt
@@ -30,7 +30,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES plastik.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+install( FILES plastik.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 
 ##### plastik ###################################
diff --git a/kstyles/plastik/Makefile.am b/tdestyles/plastik/Makefile.am
index 70d6377e2..2d228dd07 100644
--- a/kstyles/plastik/Makefile.am
+++ b/tdestyles/plastik/Makefile.am
@@ -6,7 +6,7 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = $(all_includes)
 
-stylercdir = $(kde_datadir)/kstyle/themes
+stylercdir = $(kde_datadir)/tdestyle/themes
 stylerc_DATA = plastik.themerc
 
 EXTRA_DIST = $(stylerc_DATA)
diff --git a/kstyles/plastik/config/CMakeLists.txt b/tdestyles/plastik/config/CMakeLists.txt
index b8534cea7..531a65375 100644
--- a/kstyles/plastik/config/CMakeLists.txt
+++ b/tdestyles/plastik/config/CMakeLists.txt
@@ -22,9 +22,9 @@ link_directories(
 )
 
 
-##### kstyle_plastik_config ######################
+##### tdestyle_plastik_config ######################
 
-set( target kstyle_plastik_config )
+set( target tdestyle_plastik_config )
 
 set( ${target}_SRCS
   plastikconf.cpp
diff --git a/tdestyles/plastik/config/Makefile.am b/tdestyles/plastik/config/Makefile.am
new file mode 100644
index 000000000..428baf69f
--- /dev/null
+++ b/tdestyles/plastik/config/Makefile.am
@@ -0,0 +1,12 @@
+INCLUDES = $(all_includes)
+
+noinst_HEADERS = plastikconf.h
+kde_module_LTLIBRARIES = tdestyle_plastik_config.la
+tdestyle_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdestyle_plastik_config_la_LIBADD  = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
+tdestyle_plastik_config_la_SOURCES = plastikconf.cpp
+tdestyle_plastik_config_la_METASOURCES = AUTO
+
+
+messages:
+	$(XGETTEXT) *.cpp *.h -o $(podir)/tdestyle_plastik_config.pot
diff --git a/kstyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp
index 491f06ffa..4900f708e 100644
--- a/kstyles/plastik/config/plastikconf.cpp
+++ b/tdestyles/plastik/config/plastikconf.cpp
@@ -39,9 +39,9 @@ DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-	KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
+	KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent)
 	{
-		TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+		TDEGlobal::locale()->insertCatalogue("tdestyle_plastik_config");
 		return new PlastikStyleConfig(parent);
 	}
 }
@@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
 {
 	//Should have no margins here, the dialog provides them
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
-	TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+	TDEGlobal::locale()->insertCatalogue("tdestyle_plastik_config");
 
 // 	scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this);
 	animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);
diff --git a/kstyles/plastik/config/plastikconf.h b/tdestyles/plastik/config/plastikconf.h
index 512ad6f2e..512ad6f2e 100644
--- a/kstyles/plastik/config/plastikconf.h
+++ b/tdestyles/plastik/config/plastikconf.h
diff --git a/kstyles/plastik/misc.cpp b/tdestyles/plastik/misc.cpp
index d1a52d61e..d1a52d61e 100644
--- a/kstyles/plastik/misc.cpp
+++ b/tdestyles/plastik/misc.cpp
diff --git a/kstyles/plastik/misc.h b/tdestyles/plastik/misc.h
index c09ee87c8..c09ee87c8 100644
--- a/kstyles/plastik/misc.h
+++ b/tdestyles/plastik/misc.h
diff --git a/kstyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp
index e7b6acd7f..e7b6acd7f 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/tdestyles/plastik/plastik.cpp
diff --git a/kstyles/plastik/plastik.h b/tdestyles/plastik/plastik.h
index 68f707d79..68f707d79 100644
--- a/kstyles/plastik/plastik.h
+++ b/tdestyles/plastik/plastik.h
diff --git a/kstyles/plastik/plastik.themerc b/tdestyles/plastik/plastik.themerc
index c3f8ad861..3ed2783e6 100644
--- a/kstyles/plastik/plastik.themerc
+++ b/tdestyles/plastik/plastik.themerc
@@ -26,7 +26,7 @@ Name[th]=พลาสติคK
 Name[uk]=Пластик
 Name[uz@cyrillic]=Пластик
 Name[zh_CN]=塑料
-ConfigPage=kstyle_plastik_config
+ConfigPage=tdestyle_plastik_config
 Comment=A simple and clean style
 Comment[af]=´n eenvoudige en skoon styl
 Comment[be]=Просты і прыгожы стыль
diff --git a/kstyles/riscos/CMakeLists.txt b/tdestyles/riscos/CMakeLists.txt
index 9ca5b25cf..a6808ba47 100644
--- a/kstyles/riscos/CMakeLists.txt
+++ b/tdestyles/riscos/CMakeLists.txt
@@ -23,8 +23,8 @@ install( FILES
     sunk_border.png tab_up.png vscrollback.png
     vscrollbar.png vscrollbar_down.png vscrollborder.png
     vtab.png
-  DESTINATION ${DATA_INSTALL_DIR}/kstyle/pixmaps/riscos )
+  DESTINATION ${DATA_INSTALL_DIR}/tdestyle/pixmaps/riscos )
 
 install( FILES
     riscos.themerc
-  DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+  DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
diff --git a/kstyles/riscos/Makefile.am b/tdestyles/riscos/Makefile.am
index c861fcbf9..27ebd4e61 100644
--- a/kstyles/riscos/Makefile.am
+++ b/tdestyles/riscos/Makefile.am
@@ -32,9 +32,9 @@ pixmap_DATA = \
   vscrollborder.png \
   vtab.png
 
-pixmapdir = $(kde_datadir)/kstyle/pixmaps/riscos
+pixmapdir = $(kde_datadir)/tdestyle/pixmaps/riscos
 
 themerc_DATA = riscos.themerc
-themercdir = $(kde_datadir)/kstyle/themes
+themercdir = $(kde_datadir)/tdestyle/themes
 
 EXTRA_DIST = $(pixmap_DATA) $(themerc_DATA)
diff --git a/kstyles/riscos/README b/tdestyles/riscos/README
index 2e4e6fba6..2e4e6fba6 100644
--- a/kstyles/riscos/README
+++ b/tdestyles/riscos/README
diff --git a/kstyles/riscos/arrowdown.png b/tdestyles/riscos/arrowdown.png
index 3965607bd..3965607bd 100644
--- a/kstyles/riscos/arrowdown.png
+++ b/tdestyles/riscos/arrowdown.png
diff --git a/kstyles/riscos/arrowdown_down.png b/tdestyles/riscos/arrowdown_down.png
index 060ce51ae..060ce51ae 100644
--- a/kstyles/riscos/arrowdown_down.png
+++ b/tdestyles/riscos/arrowdown_down.png
diff --git a/kstyles/riscos/arrowleft.png b/tdestyles/riscos/arrowleft.png
index 0e774c29c..0e774c29c 100644
--- a/kstyles/riscos/arrowleft.png
+++ b/tdestyles/riscos/arrowleft.png
diff --git a/kstyles/riscos/arrowleft_down.png b/tdestyles/riscos/arrowleft_down.png
index da2332ef5..da2332ef5 100644
--- a/kstyles/riscos/arrowleft_down.png
+++ b/tdestyles/riscos/arrowleft_down.png
diff --git a/kstyles/riscos/arrowright.png b/tdestyles/riscos/arrowright.png
index 89a619932..89a619932 100644
--- a/kstyles/riscos/arrowright.png
+++ b/tdestyles/riscos/arrowright.png
diff --git a/kstyles/riscos/arrowright_down.png b/tdestyles/riscos/arrowright_down.png
index dd6282ee6..dd6282ee6 100644
--- a/kstyles/riscos/arrowright_down.png
+++ b/tdestyles/riscos/arrowright_down.png
diff --git a/kstyles/riscos/arrowup.png b/tdestyles/riscos/arrowup.png
index fce21a75d..fce21a75d 100644
--- a/kstyles/riscos/arrowup.png
+++ b/tdestyles/riscos/arrowup.png
diff --git a/kstyles/riscos/arrowup_down.png b/tdestyles/riscos/arrowup_down.png
index c453a3af2..c453a3af2 100644
--- a/kstyles/riscos/arrowup_down.png
+++ b/tdestyles/riscos/arrowup_down.png
diff --git a/kstyles/riscos/background.png b/tdestyles/riscos/background.png
index 9e41b4e54..9e41b4e54 100644
--- a/kstyles/riscos/background.png
+++ b/tdestyles/riscos/background.png
diff --git a/kstyles/riscos/check.png b/tdestyles/riscos/check.png
index 6b259b27c..6b259b27c 100644
--- a/kstyles/riscos/check.png
+++ b/tdestyles/riscos/check.png
diff --git a/kstyles/riscos/check_checked.png b/tdestyles/riscos/check_checked.png
index 2513565dc..2513565dc 100644
--- a/kstyles/riscos/check_checked.png
+++ b/tdestyles/riscos/check_checked.png
diff --git a/kstyles/riscos/checkmark.png b/tdestyles/riscos/checkmark.png
index 331a6c827..331a6c827 100644
--- a/kstyles/riscos/checkmark.png
+++ b/tdestyles/riscos/checkmark.png
diff --git a/kstyles/riscos/combo.png b/tdestyles/riscos/combo.png
index ead94e7a4..ead94e7a4 100644
--- a/kstyles/riscos/combo.png
+++ b/tdestyles/riscos/combo.png
diff --git a/kstyles/riscos/combo_down.png b/tdestyles/riscos/combo_down.png
index e3e2dfab7..e3e2dfab7 100644
--- a/kstyles/riscos/combo_down.png
+++ b/tdestyles/riscos/combo_down.png
diff --git a/kstyles/riscos/hscrollback.png b/tdestyles/riscos/hscrollback.png
index b6ebe838a..b6ebe838a 100644
--- a/kstyles/riscos/hscrollback.png
+++ b/tdestyles/riscos/hscrollback.png
diff --git a/kstyles/riscos/hscrollbar.png b/tdestyles/riscos/hscrollbar.png
index 9f29c3e0b..9f29c3e0b 100644
--- a/kstyles/riscos/hscrollbar.png
+++ b/tdestyles/riscos/hscrollbar.png
diff --git a/kstyles/riscos/hscrollbar_down.png b/tdestyles/riscos/hscrollbar_down.png
index ef0153cad..ef0153cad 100644
--- a/kstyles/riscos/hscrollbar_down.png
+++ b/tdestyles/riscos/hscrollbar_down.png
diff --git a/kstyles/riscos/hscrollborder.png b/tdestyles/riscos/hscrollborder.png
index 113d92200..113d92200 100644
--- a/kstyles/riscos/hscrollborder.png
+++ b/tdestyles/riscos/hscrollborder.png
diff --git a/kstyles/riscos/htab.png b/tdestyles/riscos/htab.png
index 0527b4d7e..0527b4d7e 100644
--- a/kstyles/riscos/htab.png
+++ b/tdestyles/riscos/htab.png
diff --git a/kstyles/riscos/menu_back.png b/tdestyles/riscos/menu_back.png
index bbb1a0c74..bbb1a0c74 100644
--- a/kstyles/riscos/menu_back.png
+++ b/tdestyles/riscos/menu_back.png
diff --git a/kstyles/riscos/radio.png b/tdestyles/riscos/radio.png
index 4e24602d0..4e24602d0 100644
--- a/kstyles/riscos/radio.png
+++ b/tdestyles/riscos/radio.png
diff --git a/kstyles/riscos/radio_down.png b/tdestyles/riscos/radio_down.png
index d416452f8..d416452f8 100644
--- a/kstyles/riscos/radio_down.png
+++ b/tdestyles/riscos/radio_down.png
diff --git a/kstyles/riscos/raised_border.png b/tdestyles/riscos/raised_border.png
index f37c18eff..f37c18eff 100644
--- a/kstyles/riscos/raised_border.png
+++ b/tdestyles/riscos/raised_border.png
diff --git a/kstyles/riscos/riscos.themerc b/tdestyles/riscos/riscos.themerc
index f88b8625b..f88b8625b 100644
--- a/kstyles/riscos/riscos.themerc
+++ b/tdestyles/riscos/riscos.themerc
diff --git a/kstyles/riscos/scrollborder.png b/tdestyles/riscos/scrollborder.png
index 21ca9e0e5..21ca9e0e5 100644
--- a/kstyles/riscos/scrollborder.png
+++ b/tdestyles/riscos/scrollborder.png
diff --git a/kstyles/riscos/slider.png b/tdestyles/riscos/slider.png
index 6eaf2641f..6eaf2641f 100644
--- a/kstyles/riscos/slider.png
+++ b/tdestyles/riscos/slider.png
diff --git a/kstyles/riscos/sunk_border.png b/tdestyles/riscos/sunk_border.png
index 1710a9696..1710a9696 100644
--- a/kstyles/riscos/sunk_border.png
+++ b/tdestyles/riscos/sunk_border.png
diff --git a/kstyles/riscos/tab_up.png b/tdestyles/riscos/tab_up.png
index 415896544..415896544 100644
--- a/kstyles/riscos/tab_up.png
+++ b/tdestyles/riscos/tab_up.png
diff --git a/kstyles/riscos/vscrollback.png b/tdestyles/riscos/vscrollback.png
index effe211c3..effe211c3 100644
--- a/kstyles/riscos/vscrollback.png
+++ b/tdestyles/riscos/vscrollback.png
diff --git a/kstyles/riscos/vscrollbar.png b/tdestyles/riscos/vscrollbar.png
index 8f869ef3a..8f869ef3a 100644
--- a/kstyles/riscos/vscrollbar.png
+++ b/tdestyles/riscos/vscrollbar.png
diff --git a/kstyles/riscos/vscrollbar_down.png b/tdestyles/riscos/vscrollbar_down.png
index 31174b393..31174b393 100644
--- a/kstyles/riscos/vscrollbar_down.png
+++ b/tdestyles/riscos/vscrollbar_down.png
diff --git a/kstyles/riscos/vscrollborder.png b/tdestyles/riscos/vscrollborder.png
index c40c16a26..c40c16a26 100644
--- a/kstyles/riscos/vscrollborder.png
+++ b/tdestyles/riscos/vscrollborder.png
diff --git a/kstyles/riscos/vtab.png b/tdestyles/riscos/vtab.png
index 0320818e3..0320818e3 100644
--- a/kstyles/riscos/vtab.png
+++ b/tdestyles/riscos/vtab.png
diff --git a/kstyles/themes/CMakeLists.txt b/tdestyles/themes/CMakeLists.txt
index bb9f8ee63..c28f89a44 100644
--- a/kstyles/themes/CMakeLists.txt
+++ b/tdestyles/themes/CMakeLists.txt
@@ -16,7 +16,7 @@ install( FILES
     qtwindows.themerc qtsgi.themerc qtmotifplus.themerc
     highcolor.themerc default.themerc b3.themerc
     light-v2.themerc light-v3.themerc keramik.themerc
-  DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
+  DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes )
 
 install( FILES
     kthemestylerc
diff --git a/tdestyles/themes/Makefile.am b/tdestyles/themes/Makefile.am
new file mode 100644
index 000000000..3ebb62c45
--- /dev/null
+++ b/tdestyles/themes/Makefile.am
@@ -0,0 +1,12 @@
+
+tdestylethemesdata_DATA = qtplatinum.themerc qtcde.themerc qtmotif.themerc qtwindows.themerc \
+	qtsgi.themerc qtmotifplus.themerc\
+	highcolor.themerc \
+	default.themerc b3.themerc light-v2.themerc \
+	light-v3.themerc keramik.themerc
+tdestylethemesdatadir = $(kde_datadir)/tdestyle/themes
+
+EXTRA_DIST = $(tdestylethemesdata_DATA)
+
+kde_conf_DATA = kthemestylerc
+
diff --git a/kstyles/themes/b3.themerc b/tdestyles/themes/b3.themerc
index 76cc88733..76cc88733 100644
--- a/kstyles/themes/b3.themerc
+++ b/tdestyles/themes/b3.themerc
diff --git a/kstyles/themes/beos.themerc b/tdestyles/themes/beos.themerc
index bb3e1a198..bb3e1a198 100644
--- a/kstyles/themes/beos.themerc
+++ b/tdestyles/themes/beos.themerc
diff --git a/kstyles/themes/default.themerc b/tdestyles/themes/default.themerc
index 929fd6831..929fd6831 100644
--- a/kstyles/themes/default.themerc
+++ b/tdestyles/themes/default.themerc
diff --git a/kstyles/themes/highcolor.themerc b/tdestyles/themes/highcolor.themerc
index 36db5a1a8..36db5a1a8 100644
--- a/kstyles/themes/highcolor.themerc
+++ b/tdestyles/themes/highcolor.themerc
diff --git a/kstyles/themes/keramik.themerc b/tdestyles/themes/keramik.themerc
index e9599323c..c59d2ee37 100644
--- a/kstyles/themes/keramik.themerc
+++ b/tdestyles/themes/keramik.themerc
@@ -30,7 +30,7 @@ Name[tg]=Сафолӣ
 Name[th]=Kเครามิก
 Name[uz]=Keramika
 Name[uz@cyrillic]=Керамика
-ConfigPage=kstyle_keramik_config
+ConfigPage=tdestyle_keramik_config
 Comment=A style using alphablending
 Comment[af]='n standaard styl wat alfa vermenging gebruik
 Comment[bg]=Стил, използващ алфа сливане
diff --git a/kstyles/themes/kstep.themerc b/tdestyles/themes/kstep.themerc
index c96c6381f..c96c6381f 100644
--- a/kstyles/themes/kstep.themerc
+++ b/tdestyles/themes/kstep.themerc
diff --git a/kstyles/themes/kthemestylerc b/tdestyles/themes/kthemestylerc
index 96fd4114f..96fd4114f 100644
--- a/kstyles/themes/kthemestylerc
+++ b/tdestyles/themes/kthemestylerc
diff --git a/kstyles/themes/light-v2.themerc b/tdestyles/themes/light-v2.themerc
index d99048c6b..d99048c6b 100644
--- a/kstyles/themes/light-v2.themerc
+++ b/tdestyles/themes/light-v2.themerc
diff --git a/kstyles/themes/light-v3.themerc b/tdestyles/themes/light-v3.themerc
index cc0b5b25c..cc0b5b25c 100644
--- a/kstyles/themes/light-v3.themerc
+++ b/tdestyles/themes/light-v3.themerc
diff --git a/kstyles/themes/mega.themerc b/tdestyles/themes/mega.themerc
index a0cf79e19..a0cf79e19 100644
--- a/kstyles/themes/mega.themerc
+++ b/tdestyles/themes/mega.themerc
diff --git a/kstyles/themes/qtcde.themerc b/tdestyles/themes/qtcde.themerc
index 5f71e6a1e..5f71e6a1e 100644
--- a/kstyles/themes/qtcde.themerc
+++ b/tdestyles/themes/qtcde.themerc
diff --git a/kstyles/themes/qtmotif.themerc b/tdestyles/themes/qtmotif.themerc
index dfdc9b0dc..dfdc9b0dc 100644
--- a/kstyles/themes/qtmotif.themerc
+++ b/tdestyles/themes/qtmotif.themerc
diff --git a/kstyles/themes/qtmotifplus.themerc b/tdestyles/themes/qtmotifplus.themerc
index d12e5dc51..d12e5dc51 100644
--- a/kstyles/themes/qtmotifplus.themerc
+++ b/tdestyles/themes/qtmotifplus.themerc
diff --git a/kstyles/themes/qtplatinum.themerc b/tdestyles/themes/qtplatinum.themerc
index 08227bc4c..08227bc4c 100644
--- a/kstyles/themes/qtplatinum.themerc
+++ b/tdestyles/themes/qtplatinum.themerc
diff --git a/kstyles/themes/qtsgi.themerc b/tdestyles/themes/qtsgi.themerc
index 85cf8b7b0..85cf8b7b0 100644
--- a/kstyles/themes/qtsgi.themerc
+++ b/tdestyles/themes/qtsgi.themerc
diff --git a/kstyles/themes/qtwindows.themerc b/tdestyles/themes/qtwindows.themerc
index 68ee69815..68ee69815 100644
--- a/kstyles/themes/qtwindows.themerc
+++ b/tdestyles/themes/qtwindows.themerc
diff --git a/kstyles/utils/CMakeLists.txt b/tdestyles/utils/CMakeLists.txt
index 17411c0dc..17411c0dc 100644
--- a/kstyles/utils/CMakeLists.txt
+++ b/tdestyles/utils/CMakeLists.txt
diff --git a/kstyles/utils/Makefile.am b/tdestyles/utils/Makefile.am
index e949d7ef2..e949d7ef2 100644
--- a/kstyles/utils/Makefile.am
+++ b/tdestyles/utils/Makefile.am
diff --git a/kstyles/utils/installtheme/CMakeLists.txt b/tdestyles/utils/installtheme/CMakeLists.txt
index da9b81b9a..da9b81b9a 100644
--- a/kstyles/utils/installtheme/CMakeLists.txt
+++ b/tdestyles/utils/installtheme/CMakeLists.txt
diff --git a/kstyles/utils/installtheme/Makefile.am b/tdestyles/utils/installtheme/Makefile.am
index 84272a681..84272a681 100644
--- a/kstyles/utils/installtheme/Makefile.am
+++ b/tdestyles/utils/installtheme/Makefile.am
diff --git a/kstyles/utils/installtheme/main.cpp b/tdestyles/utils/installtheme/main.cpp
index 3ce63dfdf..d73a8c7d6 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/tdestyles/utils/installtheme/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
     TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
     TDEApplication qapp(false, false); //We don't  allow styles.. Kind of ironic, isn't it?
 
-    TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
+    TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("tdestyle/themes"));
     TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc");
 
     TQMap <TQString, TQString> themes; //Name->file mapping..
diff --git a/kstyles/web/Makefile.am b/tdestyles/web/Makefile.am
index 4047973e1..bfcf992bc 100644
--- a/kstyles/web/Makefile.am
+++ b/tdestyles/web/Makefile.am
@@ -5,6 +5,6 @@ webstyle_la_LIBADD    = $(LIB_TDEUI)
 webstyle_la_SOURCES   = webstyle.cpp plugin.cpp
 noinst_HEADERS        = webstyle.h 
 
-kstylewebdata_DATA = web.themerc
-kstylewebdatadir = $(kde_datadir)/kstyle/themes
-EXTRA_DIST = $(kstylewebdata_DATA)
+tdestylewebdata_DATA = web.themerc
+tdestylewebdatadir = $(kde_datadir)/tdestyle/themes
+EXTRA_DIST = $(tdestylewebdata_DATA)
diff --git a/kstyles/web/README b/tdestyles/web/README
index 42e198d00..42e198d00 100644
--- a/kstyles/web/README
+++ b/tdestyles/web/README
diff --git a/kstyles/web/plugin.cpp b/tdestyles/web/plugin.cpp
index bd4371ce3..bd4371ce3 100644
--- a/kstyles/web/plugin.cpp
+++ b/tdestyles/web/plugin.cpp
diff --git a/kstyles/web/web.themerc b/tdestyles/web/web.themerc
index 041d54da0..041d54da0 100644
--- a/kstyles/web/web.themerc
+++ b/tdestyles/web/web.themerc
diff --git a/kstyles/web/webstyle.cpp b/tdestyles/web/webstyle.cpp
index b3b461954..b3b461954 100644
--- a/kstyles/web/webstyle.cpp
+++ b/tdestyles/web/webstyle.cpp
diff --git a/kstyles/web/webstyle.h b/tdestyles/web/webstyle.h
index 0e4c59dbd..0e4c59dbd 100644
--- a/kstyles/web/webstyle.h
+++ b/tdestyles/web/webstyle.h
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 9eb829acc..f27bd0312 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -428,7 +428,7 @@ const char * const packages[] = {
 "tdelibs/knewstuff",
 "tdelibs/knotify",
 "tdelibs/tdespell",
-"tdelibs/kstyle",
+"tdelibs/tdestyle",
 "tdelibs/tdesycoca",
 "tdelibs/tdewallet",
 "tdelibs/qt",
diff --git a/win/common.pro b/win/common.pro
index 52478b898..f5c2f1af7 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -109,7 +109,7 @@ contains( TEMPLATE, lib ) {
 	!contains( CONFIG, trinitylib ) {
 	  DESTDIR = $$KDELIBDESTDIR
 	}
-	contains( CONFIG, kstyle ) {
+	contains( CONFIG, tdestyle ) {
 	  DESTDIR = $$KDEBINDESTDIR/lib/trinity/plugins/styles
 	  CONFIG += plugin
 	}
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro b/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro
index 21ab07a78..21ab07a78 100644
--- a/win/pro_files/kstyles/activeheart/widget-engine/genembed.pro
+++ b/win/pro_files/tdestyles/activeheart/widget-engine/genembed.pro
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro
index 9245377cc..9245377cc 100644
--- a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
+++ b/win/pro_files/tdestyles/activeheart/widget-engine/widget-engine.pro
diff --git a/win/pro_files/kstyles/common.pro b/win/pro_files/tdestyles/common.pro
index 6cc40111c..2f03e7d98 100644
--- a/win/pro_files/kstyles/common.pro
+++ b/win/pro_files/tdestyles/common.pro
@@ -1,12 +1,12 @@
 TEMPLATE	= lib
 
-CONFIG += kstyle
+CONFIG += tdestyle
 
 include( $(KDELIBS)/win/common.pro )
 
 
 # needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB 
+DEFINES += MAKE_TDESTYLE_LIB 
 
 LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro b/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro
index d9ca9d8c3..d9ca9d8c3 100644
--- a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
+++ b/win/pro_files/tdestyles/dotNET/dotnet/dotnet.pro
diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/tdestyles/highcolor/highcolor.pro
index 57bfca812..57bfca812 100644
--- a/win/pro_files/kstyles/highcolor/highcolor.pro
+++ b/win/pro_files/tdestyles/highcolor/highcolor.pro
diff --git a/win/pro_files/kstyles/keramik/genembed.pro b/win/pro_files/tdestyles/keramik/genembed.pro
index 21ab07a78..21ab07a78 100644
--- a/win/pro_files/kstyles/keramik/genembed.pro
+++ b/win/pro_files/tdestyles/keramik/genembed.pro
diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/tdestyles/keramik/keramik.pro
index 42094301c..42094301c 100644
--- a/win/pro_files/kstyles/keramik/keramik.pro
+++ b/win/pro_files/tdestyles/keramik/keramik.pro
diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/tdestyles/klegacy/klegacy.pro
index 1f280202c..1f280202c 100644
--- a/win/pro_files/kstyles/klegacy/klegacy.pro
+++ b/win/pro_files/tdestyles/klegacy/klegacy.pro
diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/tdestyles/kthemestyle/themestyle.pro
index fa55f19e3..55d61d97e 100644
--- a/win/pro_files/kstyles/kthemestyle/themestyle.pro
+++ b/win/pro_files/tdestyles/kthemestyle/themestyle.pro
@@ -7,7 +7,7 @@ TARGET		= kthemestyle$$KDEBUG
 SOURCES = \
 kthemestyle.cpp \
 kthemebase.cpp \
-kstyledirs.cpp
+tdestyledirs.cpp
 
 system( moc kthemestyle.h -o moc/kthemestyle.moc )
 system( moc kthemebase.h -o moc/kthemebase.moc )
diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/tdestyles/light/light.pro
index 025158c3a..025158c3a 100644
--- a/win/pro_files/kstyles/light/light.pro
+++ b/win/pro_files/tdestyles/light/light.pro
diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/tdestyles/plastik/plastik.pro
index 51937369c..51937369c 100644
--- a/win/pro_files/kstyles/plastik/plastik.pro
+++ b/win/pro_files/tdestyles/plastik/plastik.pro
diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro
index 0f7bab178..0f7bab178 100644
--- a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
+++ b/win/pro_files/tdestyles/slickerstyle/slicker/slicker.pro
diff --git a/win/pro_files/kstyles/kstyles.pro b/win/pro_files/tdestyles/tdestyles.pro
index c556acfaa..c556acfaa 100644
--- a/win/pro_files/kstyles/kstyles.pro
+++ b/win/pro_files/tdestyles/tdestyles.pro
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro
index 0424eb476..0424eb476 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
+++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/genembed.pro
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index 62b5d6b39..2d243f7de 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -11,7 +11,7 @@ unix {
 }
 
 
-CONFIG += kstyle
+CONFIG += tdestyle
 
 KW_CONFIG = release
 CONFIG -= debug
@@ -25,7 +25,7 @@ LIBS= #DONT BE DEPENDENT ON ANY OTHER LIBS
 CONFIG -= debug
 
 # needed to export library classes:
-DEFINES += MAKE_KSTYLE_LIB MAKE_TDEFX_LIB
+DEFINES += MAKE_TDESTYLE_LIB MAKE_TDEFX_LIB
 
 TARGET		= thinkeramik
 
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro
index 41181415f..41181415f 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
+++ b/win/pro_files/tdestyles/thinkeramik/widget-engine/widget-engine.pro
diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h
index b9c42bde4..98f055ae5 100644
--- a/win/tdelibs_export_win.h
+++ b/win/tdelibs_export_win.h
@@ -115,10 +115,10 @@
 #endif
 
 // all TDEStyle libs
-#ifdef MAKE_KSTYLE_LIB
-# define KSTYLE_EXPORT KDE_EXPORT
+#ifdef MAKE_TDESTYLE_LIB
+# define TDESTYLE_EXPORT KDE_EXPORT
 #else
-# define KSTYLE_EXPORT KDE_IMPORT
+# define TDESTYLE_EXPORT KDE_IMPORT
 #endif
 
 #ifdef MAKE_KMDI_LIB
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index b3dcd7695..25212f67a 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -27,8 +27,8 @@ echo
 cd win/9x && $make || exit 1
 cd "$pwd"
 
-if [ -d "kstyles/thinkeramik/widget-engine" ] ; then
-	additional="kstyles/thinkeramik/widget-engine/genembed kstyles/thinkeramik/widget-engine "
+if [ -d "tdestyles/thinkeramik/widget-engine" ] ; then
+	additional="tdestyles/thinkeramik/widget-engine/genembed tdestyles/thinkeramik/widget-engine "
 fi
 
 # all
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 2fe77ef36..39b8f9928 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -45,7 +45,7 @@ dcop/iceauth \
 tdefx \
 tdecore \
 tdeui \
-kstyles/thinkeramik/widget-engine \
+tdestyles/thinkeramik/widget-engine \
 kio \
 tderesources \
 tdeabc/vcard \