diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index a38114b2..0710eca9 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -1163,7 +1163,7 @@ BEGIN
 'KStdAction*' => 'kde_KStdAction*',
 'KStdGuiItem*' => 'kde_KStdGuiItem*',
 'KStringHandler*' => 'kde_KStringHandler*',
-'KStyle*'  => 'kde_KStyle*' ,
+'TDEStyle*'  => 'kde_TDEStyle*' ,
 'KSycoca*'  =>  'kde_KSycoca*' ,
 'KSycocaEntry*'  => 'kde_KSycocaEntry*' ,
 'KSycocaFactoryId'  => 'int' ,
diff --git a/kdejava/koala/org/kde/koala/KArrowButton.java b/kdejava/koala/org/kde/koala/KArrowButton.java
index bcec2fee..81e593ef 100644
--- a/kdejava/koala/org/kde/koala/KArrowButton.java
+++ b/kdejava/koala/org/kde/koala/KArrowButton.java
@@ -14,7 +14,7 @@ import org.kde.qt.TQPushButton;
  Draws a button which shows an arrow pointing into a certain direction. The
  arrow's alignment on the button depends on the direction it's pointing to,
  e.g. a left arrow is aligned at the left border, a upwards arrow at the top
- border. This class honors the currently configured KStyle when drawing
+ border. This class honors the currently configured TDEStyle when drawing
  the arrow.
 		@author Frerich Raabe
  
diff --git a/kdejava/koala/org/kde/koala/KDE.java b/kdejava/koala/org/kde/koala/KDE.java
index d1b1d1f9..825b65e3 100644
--- a/kdejava/koala/org/kde/koala/KDE.java
+++ b/kdejava/koala/org/kde/koala/KDE.java
@@ -375,7 +375,7 @@ public class KDE {
 	public static native TQDataStream op_write(TQDataStream s, int p);
 	public static native TQDataStream op_read(TQDataStream s, int p);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 			 Draws a Next-style button (solid black shadow with light and midlight highlight).
 			@param p The painter to use for drawing the button.
@@ -384,21 +384,21 @@ public class KDE {
 			@param sunken Whether to draw the button as sunken (pressed) or not.
 			@param fill The brush to use for filling the interior of the button.
 		                Pass <b>null</b> to prevent the button from being filled.
-		 		@short    {@link KStyle}  @c \#include @c <kdrawutil.
+		 		@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 	*/
 	public static native void kDrawNextButton(TQPainter p, TQRect r, TQColorGroup g, boolean sunken, TQBrush fill);
 	public static native void kDrawNextButton(TQPainter p, TQRect r, TQColorGroup g, boolean sunken);
 	public static native void kDrawNextButton(TQPainter p, TQRect r, TQColorGroup g);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 @overload
-		 		@short    {@link KStyle}  @overload
+		 		@short    {@link TDEStyle}  @overload
 	*/
 	public static native void kDrawNextButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g, boolean sunken, TQBrush fill);
 	public static native void kDrawNextButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g, boolean sunken);
 	public static native void kDrawNextButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 			 Draws a Be-style button.
 			@param p The painter to use for drawing the button.
@@ -407,22 +407,22 @@ public class KDE {
 			@param sunken Whether to draw the button as sunken (pressed) or not.
 			@param fill The brush to use for filling the interior of the button.
 		                Pass <b>null</b> to prevent the button from being filled.
-		 		@short    {@link KStyle}  @c \#include @c <kdrawutil.
+		 		@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 	*/
 	public static native void kDrawBeButton(TQPainter p, TQRect r, TQColorGroup g, boolean sunken, TQBrush fill);
 	public static native void kDrawBeButton(TQPainter p, TQRect r, TQColorGroup g, boolean sunken);
 	public static native void kDrawBeButton(TQPainter p, TQRect r, TQColorGroup g);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 		 @overload
-		 		@short    {@link KStyle}  @c \#include @c <kdrawutil.
+		 		@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 	*/
 	public static native void kDrawBeButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g, boolean sunken, TQBrush fill);
 	public static native void kDrawBeButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g, boolean sunken);
 	public static native void kDrawBeButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 			 Draws a rounded oval button. This function doesn't fill the button.
 		 See kRoundMaskRegion() for setting masks for fills.
@@ -430,19 +430,19 @@ public class KDE {
 			@param r Specifies the rect in which to draw the button.
 			@param g Specifies the shading colors.
 			@param sunken Whether to draw the button as sunken (pressed) or not.
-		 		@short    {@link KStyle}  @c \#include @c <kdrawutil.
+		 		@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 	*/
 	public static native void kDrawRoundButton(TQPainter p, TQRect r, TQColorGroup g, boolean sunken);
 	public static native void kDrawRoundButton(TQPainter p, TQRect r, TQColorGroup g);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 @overload
-		 		@short    {@link KStyle}  @overload
+		 		@short    {@link TDEStyle}  @overload
 	*/
 	public static native void kDrawRoundButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g, boolean sunken);
 	public static native void kDrawRoundButton(TQPainter p, int x, int y, int w, int h, TQColorGroup g);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 			 Sets a region to the pixels covered by a round button of the given
 		 size. You can use this to set clipping regions.
@@ -451,13 +451,13 @@ public class KDE {
 			@param y The Y coordinate of the button.
 			@param w The width of the button.
 			@param h The height of the button.
-				@short    {@link KStyle}  @c \#include @c <kdrawutil.
+				@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 		@see #kDrawRoundButton
 		@see #kDrawRoundMask
 	*/
 	public static native void kRoundMaskRegion(TQRegion r, int x, int y, int w, int h);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 			 Paints the pixels covered by a round button of the given size with
 		 Qt.color1. This function is useful in TQStyle.drawControlMask().
@@ -468,12 +468,12 @@ public class KDE {
 			@param h The height of the button.
 			@param clear Whether to clear the rectangle specified by <code></code>(x, y, w, h) to
 		               Qt.color0 before drawing the mask.
-		 		@short    {@link KStyle}  @c \#include @c <kdrawutil.
+		 		@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 	*/
 	public static native void kDrawRoundMask(TQPainter p, int x, int y, int w, int h, boolean clear);
 	public static native void kDrawRoundMask(TQPainter p, int x, int y, int w, int h);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 			 Paints the provided bitmaps in the painter, using the supplied colorgroup for
 		 the foreground colors. There's one bitmap for each color. If you want to skip
@@ -490,7 +490,7 @@ public class KDE {
 			@param darkColor The bitmap to use for the dark part.
 			@param blackColor The bitmap to use for the black part.
 			@param whiteColor The bitmap to use for the white part.
-				@short    {@link KStyle}  @c \#include @c <kdrawutil.
+				@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 		@see org.kde.qt.TQColorGroup
 	*/
 	public static native void kColorBitmaps(TQPainter p, TQColorGroup g, int x, int y, TQBitmap lightColor, TQBitmap midColor, TQBitmap midlightColor, TQBitmap darkColor, TQBitmap blackColor, TQBitmap whiteColor);
@@ -501,10 +501,10 @@ public class KDE {
 	public static native void kColorBitmaps(TQPainter p, TQColorGroup g, int x, int y, TQBitmap lightColor);
 	public static native void kColorBitmaps(TQPainter p, TQColorGroup g, int x, int y);
 	/**	
-		 {@link KStyle}
+		 {@link TDEStyle}
 		 <code>#include</code> <code>&lt;kdrawutil.h&gt;</code>
 		 @overload
-		 		@short    {@link KStyle}  @c \#include @c <kdrawutil.
+		 		@short    {@link TDEStyle}  @c \#include @c <kdrawutil.
 	*/
 	public static native void kColorBitmaps(TQPainter p, TQColorGroup g, int x, int y, int w, int h, boolean isXBitmaps, char[] lightColor, char[] midColor, char[] midlightColor, char[] darkColor, char[] blackColor, char[] whiteColor);
 	public static native void kColorBitmaps(TQPainter p, TQColorGroup g, int x, int y, int w, int h, boolean isXBitmaps, char[] lightColor, char[] midColor, char[] midlightColor, char[] darkColor, char[] blackColor);