diff --git a/clients/Makefile.am b/clients/Makefile.am
index 1b99e6d802..2eea36f078 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1 +1 @@
-SUBDIRS = kde kstep system b2 laptop riscos modernsystem
+SUBDIRS = kde1 kstep system b2 laptop riscos modernsystem
diff --git a/clients/kde1/Makefile.am b/clients/kde1/Makefile.am
new file mode 100644
index 0000000000..a1b5d1efc4
--- /dev/null
+++ b/clients/kde1/Makefile.am
@@ -0,0 +1,15 @@
+
+INCLUDES = $(all_includes) 
+
+lib_LTLIBRARIES = libkwinkde1.la
+
+libkwinkde1_la_SOURCES = kde1client.cpp
+libkwinkde1_la_LIBADD = ../../kwin.la
+libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+
+METASOURCES = AUTO
+noinst_HEADERS = kde1client.h
+
+lnkdir = $(kde_datadir)/kwin/
+lnk_DATA = kde1.desktop
+EXTRA_DIST = $(lnk_DATA)
diff --git a/clients/kde1/kde1.desktop b/clients/kde1/kde1.desktop
new file mode 100644
index 0000000000..7102a7a97b
--- /dev/null
+++ b/clients/kde1/kde1.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Name=KDE 1
+X-KDE-Library=libkwinkde1
diff --git a/clients/kde1/kde1client.cpp b/clients/kde1/kde1client.cpp
new file mode 100644
index 0000000000..85a61a5ea3
--- /dev/null
+++ b/clients/kde1/kde1client.cpp
@@ -0,0 +1,523 @@
+/*****************************************************************
+kwin - the KDE window manager
+								
+Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
+******************************************************************/
+#include "kde1client.h"
+#include <qapplication.h>
+#include <qcursor.h>
+#include <qabstractlayout.h>
+#include <qlayout.h>
+#include <qtoolbutton.h>
+#include <qlabel.h>
+#include <qdrawutil.h>
+#include <qbitmap.h>
+#include <kdrawutil.h>
+#include <qdatetime.h>
+#include <qimage.h>
+#include "../../workspace.h"
+#include "../../options.h"
+
+#include "kde1client_bitmaps.h"
+
+extern "C"
+{
+  Client * allocate(Workspace * workSpace, WId winId)
+  {
+    return new StdClient(workSpace, winId);
+  }
+}
+
+
+static QPixmap* close_pix = 0;
+static QPixmap* maximize_pix = 0;
+static QPixmap* minimize_pix = 0;
+static QPixmap* normalize_pix = 0;
+static QPixmap* pinup_pix = 0;
+static QPixmap* pindown_pix = 0;
+static QPixmap* menu_pix = 0;
+
+static QPixmap* dis_close_pix = 0;
+static QPixmap* dis_maximize_pix = 0;
+static QPixmap* dis_minimize_pix = 0;
+static QPixmap* dis_normalize_pix = 0;
+static QPixmap* dis_pinup_pix = 0;
+static QPixmap* dis_pindown_pix = 0;
+static QPixmap* dis_menu_pix = 0;
+
+static QPixmap* question_mark_pix = 0;
+
+static bool pixmaps_created = FALSE;
+
+static void create_pixmaps();
+QPixmap* kwin_get_menu_pix_hack()
+{
+    create_pixmaps();
+    return menu_pix;
+}
+
+static void create_pixmaps()
+{
+    if ( pixmaps_created )
+        return;
+    pixmaps_created = true;
+    QColorGroup aGrp = options->colorGroup(Options::ButtonBg, true);
+    QColorGroup iGrp = options->colorGroup(Options::ButtonBg, false);
+
+    QPainter aPainter, iPainter;
+    close_pix = new QPixmap(16, 16);
+    dis_close_pix = new QPixmap(16, 16);
+    aPainter.begin(close_pix); iPainter.begin(dis_close_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, close_white_bits,
+                  NULL, NULL, close_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, close_white_bits,
+                  NULL, NULL, close_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    close_pix->setMask(QBitmap(16, 16, close_mask_bits, true));
+    dis_close_pix->setMask(*close_pix->mask());
+
+    minimize_pix = new QPixmap(16, 16);
+    dis_minimize_pix = new QPixmap(16, 16);
+    aPainter.begin(minimize_pix); iPainter.begin(dis_minimize_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, iconify_white_bits,
+                  NULL, NULL, iconify_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, iconify_white_bits,
+                  NULL, NULL, iconify_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    minimize_pix->setMask(QBitmap(16, 16, iconify_mask_bits, true));
+    dis_minimize_pix->setMask(*minimize_pix->mask());
+
+    maximize_pix = new QPixmap(16, 16);
+    dis_maximize_pix = new QPixmap(16, 16);
+    aPainter.begin(maximize_pix); iPainter.begin(dis_maximize_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, maximize_white_bits,
+                  NULL, NULL, maximize_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, maximize_white_bits,
+                  NULL, NULL, maximize_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    maximize_pix->setMask(QBitmap(16, 16, maximize_mask_bits, true));
+    dis_maximize_pix->setMask(*maximize_pix->mask());
+
+    normalize_pix = new QPixmap(16, 16);
+    dis_normalize_pix = new QPixmap(16, 16);
+    aPainter.begin(normalize_pix); iPainter.begin(dis_normalize_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, maximizedown_white_bits,
+                  NULL, NULL, maximizedown_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, maximizedown_white_bits,
+                  NULL, NULL, maximizedown_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    normalize_pix->setMask(QBitmap(16, 16, maximizedown_mask_bits, true));
+    dis_normalize_pix->setMask(*normalize_pix->mask());
+
+    menu_pix = new QPixmap(16, 16);
+    dis_menu_pix = new QPixmap(16, 16);
+    aPainter.begin(menu_pix); iPainter.begin(dis_menu_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, menu_white_bits,
+                  NULL, NULL, menu_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, menu_white_bits,
+                  NULL, NULL, menu_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    menu_pix->setMask(QBitmap(16, 16, menu_mask_bits, true));
+    dis_menu_pix->setMask(*menu_pix->mask());
+
+    pinup_pix = new QPixmap(16, 16);
+    dis_pinup_pix = new QPixmap(16, 16);
+    aPainter.begin(pinup_pix); iPainter.begin(dis_pinup_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, pinup_white_bits,
+                  pinup_gray_bits, NULL, pinup_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, pinup_white_bits,
+                  pinup_gray_bits, NULL, pinup_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    pinup_pix->setMask(QBitmap(16, 16, pinup_mask_bits, true));
+    dis_pinup_pix->setMask(*pinup_pix->mask());
+
+    pindown_pix = new QPixmap(16, 16);
+    dis_pindown_pix = new QPixmap(16, 16);
+    aPainter.begin(pindown_pix); iPainter.begin(dis_pindown_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, pindown_white_bits,
+                  pindown_gray_bits, NULL, pindown_dgray_bits, NULL, NULL);
+    kColorBitmaps(&iPainter, iGrp, 0, 0, 16, 16, true, pindown_white_bits,
+                  pindown_gray_bits, NULL, pindown_dgray_bits, NULL, NULL);
+    aPainter.end(); iPainter.end();
+    pindown_pix->setMask(QBitmap(16, 16, pindown_mask_bits, true));
+    dis_pindown_pix->setMask(*pindown_pix->mask());
+
+    question_mark_pix = new QPixmap(16, 16);
+    aPainter.begin(question_mark_pix);
+    kColorBitmaps(&aPainter, aGrp, 0, 0, 16, 16, true, help_light_bits,
+                  NULL, NULL, help_dark_bits, NULL, NULL);
+    aPainter.end();
+    question_mark_pix->setMask(QBitmap(16, 16, help_mask_bits, true));
+}
+
+void StdClient::slotReset()
+{
+    delete close_pix;
+    delete maximize_pix;
+    delete minimize_pix;
+    delete normalize_pix;
+    delete pinup_pix;
+    delete pindown_pix;
+    delete menu_pix;
+    delete dis_close_pix;
+    delete dis_maximize_pix;
+    delete dis_minimize_pix;
+    delete dis_normalize_pix;
+    delete dis_pinup_pix;
+    delete dis_pindown_pix;
+    delete dis_menu_pix;
+    delete question_mark_pix;
+    pixmaps_created = false;
+    create_pixmaps();
+
+    if(miniIcon().isNull())
+        button[0]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix);
+    button[1]->setIconSet(isSticky() ? isActive() ? *pindown_pix : *dis_pindown_pix :
+                          isActive() ? *pinup_pix : *dis_pinup_pix );
+    button[3]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix);
+    button[4]->setIconSet(isActive() ? *maximize_pix : *dis_maximize_pix);
+    button[5]->setIconSet(isActive() ? *close_pix : *dis_close_pix);
+    if (button[6])
+        button[6]->setIconSet( *question_mark_pix );
+
+    setFont(options->font(isActive() ));
+}
+
+
+StdClient::StdClient( Workspace *ws, WId w, QWidget *parent, const char *name )
+    : Client( ws, w, parent, name, WResizeNoErase )
+{
+    create_pixmaps();
+    setFont(options->font(isActive() ));
+    connect(options, SIGNAL(resetClients()), this, SLOT(slotReset()));
+
+    QGridLayout* g = new QGridLayout( this, 0, 0, 2 );
+    g->setRowStretch( 1, 10 );
+    g->addWidget( windowWrapper(), 1, 1 );
+    g->addItem( new QSpacerItem( 0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding ) );
+
+    g->addColSpacing(0, 1);
+    g->addColSpacing(2, 1);
+    g->addRowSpacing(2, 2);
+
+
+    button[0] = new QToolButton( this );
+    button[1] = new QToolButton( this );
+    button[2] = new QToolButton( this );
+    button[3] = new QToolButton( this );
+    button[4] = new ThreeButtonButton( this );
+    button[5] = new QToolButton( this );
+
+    QHBoxLayout* hb = new QHBoxLayout;
+    g->addLayout( hb, 0, 1 );
+    hb->addWidget( button[0] );
+    hb->addWidget( button[1] );
+    hb->addWidget( button[2] );
+
+    int fh = fontMetrics().lineSpacing();
+
+    titlebar = new QSpacerItem(10, fh, QSizePolicy::Expanding,
+			       QSizePolicy::Minimum );
+    hb->addItem( titlebar );
+
+    button[6] = 0;
+    if ( providesContextHelp() ) {
+	button[6] = new QToolButton( this );
+	hb->addWidget( button[6] ); // help  button
+	hb->addItem( new QSpacerItem( 5, 0, QSizePolicy::Fixed, QSizePolicy::Expanding ) );
+	button[6]->setIconSet( *question_mark_pix );
+	connect( button[6], SIGNAL( clicked() ), this, ( SLOT( contextHelp() ) ) );
+    }
+
+    hb->addWidget( button[3] );
+    hb->addWidget( button[4] );
+    hb->addWidget( button[5] );
+
+    for ( int i = 0; i < 7; i++) {
+	if ( !button[i] )
+	    continue;
+	button[i]->setBackgroundMode( PaletteBackground );
+	button[i]->setMouseTracking( TRUE );
+	button[i]->setAutoRaise( TRUE );
+	button[i]->setFocusPolicy( NoFocus );
+	button[i]->setFixedSize( 20, 20 );
+    }
+    if(miniIcon().isNull())
+        button[0]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix);
+    else
+        button[0]->setIconSet( miniIcon() );
+
+    connect( button[0], SIGNAL( pressed() ), this, SLOT( menuButtonPressed() ) );
+    button[0]->setPopupDelay( 0 );
+    button[0]->setPopup( workspace()->clientPopup( this ) );
+
+    button[1]->setIconSet(isSticky() ? isActive() ? *pindown_pix : *dis_pindown_pix :
+                          isActive() ? *pinup_pix : *dis_pinup_pix );
+    connect( button[1], SIGNAL( clicked() ), this, ( SLOT( toggleSticky() ) ) );
+    button[2]->hide();
+
+    button[3]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix);
+    connect( button[3], SIGNAL( clicked() ), this, ( SLOT( iconify() ) ) );
+    button[4]->setIconSet(isActive() ? *maximize_pix : *dis_maximize_pix);
+    connect( button[4], SIGNAL( clicked(int) ), this, ( SLOT( maxButtonClicked(int) ) ) );
+    button[5]->setIconSet(isActive() ? *close_pix : *dis_close_pix);
+    connect( button[5], SIGNAL( clicked() ), this, ( SLOT( closeWindow() ) ) );
+
+    if ( button[6] ) {
+    }
+
+
+    if ( isTransient() ) {
+	// lighter decoration for transient windows
+	button[1]->hide();
+	button[2]->hide();
+	button[3]->hide();
+	button[4]->hide();
+    }
+}
+
+void StdClient::activeChange(bool on)
+{
+    if(miniIcon().isNull())
+        button[0]->setIconSet(on ? *menu_pix : *dis_menu_pix);
+    button[1]->setIconSet(isSticky() ? on ? *pindown_pix : *dis_pindown_pix :
+                          on ? *pinup_pix : *dis_pinup_pix );
+    button[3]->setIconSet(on ? *minimize_pix : *dis_minimize_pix);
+    button[4]->setIconSet(on ? *maximize_pix : *dis_maximize_pix);
+    button[5]->setIconSet(on ? *close_pix : *dis_close_pix);
+    Client::activeChange(on);
+}
+
+
+StdClient::~StdClient()
+{
+}
+
+
+void StdClient::resizeEvent( QResizeEvent* e)
+{
+    Client::resizeEvent( e );
+    QRegion rr = rect();
+    QRect t = titlebar->geometry();
+    t.setTop( 0 );
+    QRegion r = rr.subtract( QRect( t.x()+1, 0, t.width()-2, 1 ) );
+    setMask( r );
+
+    if ( isVisibleToTLW() && !testWFlags( WNorthWestGravity )) {
+	// manual clearing without the titlebar (we selected WResizeNoErase )
+	QRect cr( 2, 2, width()-4, height()- 4 );
+	erase( QRegion( cr ).subtract( t ) );
+    }
+}
+
+/*!\reimp
+ */
+void StdClient::captionChange( const QString& )
+{
+    repaint( titlebar->geometry(), FALSE );
+}
+
+
+/*!\reimp
+ */
+void StdClient::maximizeChange( bool m )
+{
+    button[4]->setIconSet( m?*normalize_pix:*maximize_pix  );
+}
+
+
+/*!\reimp
+ */
+void StdClient::stickyChange( bool s)
+{
+    button[1]->setIconSet( s?*pindown_pix:*pinup_pix );
+}
+
+void StdClient::paintEvent( QPaintEvent* )
+{
+    QPainter p( this );
+    QRect t = titlebar->geometry();
+    QRegion r = rect();
+    r = r.subtract( t );
+    p.setClipRegion( r );
+    qDrawWinPanel( &p, rect(), colorGroup() );
+    t.setTop( 1 );
+    p.setClipRegion( t );
+    t.setTop( 0 );
+    p.fillRect( t, options->color(Options::TitleBar, isActive()));
+    p.setPen( options->color(Options::TitleBar, isActive()).light() );
+    p.drawLine(t.left(), t.top()+1,  t.right(), t.top()+1);
+    qDrawShadePanel( &p, t.x(), t.y(), t.width(), t.height(),
+                     colorGroup(), true, 1 );
+    t.setLeft( t.left() + 4 );
+    t.setRight( t.right() - 2 );
+    p.setPen(options->color(Options::Font, isActive()));
+    p.setFont(options->font(isActive()));
+    p.drawText( t, AlignLeft|AlignVCenter|SingleLine, caption() );
+}
+
+
+void StdClient::mouseDoubleClickEvent( QMouseEvent * e )
+{
+    if ( titlebar->geometry().contains( e->pos() ) )
+	workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
+    workspace()->requestFocus( this );
+}
+
+
+void StdClient::init()
+{
+    Client::init();
+    button[0]->setIconSet( miniIcon() );
+ }
+
+void StdClient::iconChange()
+{
+    if(miniIcon().isNull())
+        button[0]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix);
+    else
+        button[0]->setIconSet( miniIcon() );
+    button[0]->repaint( FALSE );
+}
+
+
+/*!
+  Indicates that the menu button has been clicked. One press shows
+  the window operation menu, a double click closes the window.
+ */
+void StdClient::menuButtonPressed()
+{
+    static QTime* t = 0;
+    static StdClient* tc = 0;
+    if ( !t )
+	t = new QTime;
+
+    if ( tc != this || t->elapsed() > QApplication::doubleClickInterval() )
+	button[0]->setPopup( workspace()->clientPopup( this ) );
+    else {
+	button[0]->setPopup( 0 );
+	closeWindow();
+    }
+    t->start();
+    tc = this;
+}
+
+
+void StdClient::maxButtonClicked( int button )
+{
+    switch ( button  ){
+    case MidButton:
+	maximize( MaximizeVertical );
+	break;
+    case RightButton:
+	maximize( MaximizeHorizontal );
+	break;
+    default: //LeftButton:
+	maximize( MaximizeFull );
+	break;
+    }
+}
+
+
+StdToolClient::StdToolClient( Workspace *ws, WId w, QWidget *parent, const char *name )
+    : Client( ws, w, parent, name )
+{
+    connect(options, SIGNAL(resetClients()), this, SLOT(slotReset()));
+    setFont(options->font(isActive(), true ));
+
+    QGridLayout* g = new QGridLayout( this, 0, 0, 2 );
+    g->setRowStretch( 1, 10 );
+    g->addWidget( windowWrapper(), 1, 1 );
+    g->addItem( new QSpacerItem( 0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding ) );
+
+    g->addColSpacing(0, 1);
+    g->addColSpacing(2, 1);
+    g->addRowSpacing(2, 2);
+    
+    closeBtn = new QToolButton( this );
+    connect( closeBtn, SIGNAL( clicked() ), this, ( SLOT( closeWindow() ) ) );
+    closeBtn->setFixedSize( 13, 13);
+    slotReset();
+    
+    QHBoxLayout* hb = new QHBoxLayout;
+    g->addLayout( hb, 0, 1 );
+
+    int fh = fontMetrics().lineSpacing()+2;
+
+    titlebar = new QSpacerItem(10, fh, QSizePolicy::Expanding,
+			       QSizePolicy::Minimum );
+    hb->addItem( titlebar );
+    hb->addWidget( closeBtn );
+}
+
+StdToolClient::~StdToolClient()
+{
+}
+
+void StdToolClient::resizeEvent( QResizeEvent* e )
+{
+    Client::resizeEvent( e );
+    QRegion r = rect();
+    QRect t = titlebar->geometry();
+    t.setTop( 0 );
+    r = r.subtract( QRect(0, 0, width(), 1) );
+    r = r.subtract (QRect( 0, 0, 1, t.height() ) );
+    r = r.subtract (QRect( width()-1, 0, 1, t.height() ) );
+    setMask( r );
+}
+
+void StdToolClient::paintEvent( QPaintEvent* )
+{
+    QPainter p( this );
+    QRect t = titlebar->geometry();
+    QRect r = rect();
+    qDrawWinPanel( &p, r, colorGroup() );
+    r.setTop( t.bottom()+1 );
+    qDrawWinPanel( &p, r, colorGroup() );
+    p.fillRect( QRect( QPoint(t.topLeft() ), QPoint( width() - t.left(), t.bottom() ) ), 
+		options->color(Options::TitleBar, isActive()));
+    p.setPen( options->color(Options::TitleBar, isActive()).light() );
+    t.setLeft( t.left() + 4 );
+    t.setRight( t.right() - 2 );
+    p.setPen(options->color(Options::Font, isActive()));
+    p.setFont(options->font(isActive(), true));
+    p.drawText( t, AlignLeft|AlignVCenter|SingleLine, caption() );
+}
+
+
+void StdToolClient::mouseDoubleClickEvent( QMouseEvent * e )
+{
+    if ( titlebar->geometry().contains( e->pos() ) )
+	workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
+    workspace()->requestFocus( this );
+}
+
+void StdToolClient::init() 
+{
+}
+
+void StdToolClient::captionChange( const QString& )
+{
+    repaint( titlebar->geometry(), FALSE );
+}
+ 
+void StdToolClient::activeChange( bool on )
+{
+    Client::activeChange(on);
+}
+
+
+void StdToolClient::slotReset()
+{
+    create_pixmaps();
+    QImage img = close_pix->convertToImage();
+    img = img.smoothScale( 12, 12 );
+    QPixmap pm;
+    pm.convertFromImage( img );
+    closeBtn->setPixmap( pm );
+    setFont(options->font(isActive(), true ));
+}
+
+
+
+#include "kde1client.moc"
diff --git a/clients/kde1/kde1client.h b/clients/kde1/kde1client.h
new file mode 100644
index 0000000000..90ee2576ca
--- /dev/null
+++ b/clients/kde1/kde1client.h
@@ -0,0 +1,110 @@
+/*****************************************************************
+kwin - the KDE window manager
+								
+Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
+******************************************************************/
+#ifndef STDCLIENT_H
+#define STDCLIENT_H
+#include "../../client.h"
+#include <qtoolbutton.h>
+class QLabel;
+class QSpacerItem;
+
+class StdClient : public Client
+{
+    Q_OBJECT
+public:
+    StdClient( Workspace *ws, WId w, QWidget *parent=0, const char *name=0 );
+    ~StdClient();
+protected:
+    void resizeEvent( QResizeEvent* );
+    void paintEvent( QPaintEvent* );
+
+    void mouseDoubleClickEvent( QMouseEvent * );
+    void init();
+    void captionChange( const QString& name );
+    void iconChange();
+    void maximizeChange( bool );
+    void stickyChange( bool );
+    void activeChange( bool );
+
+private slots:
+    void menuButtonPressed();
+    void maxButtonClicked( int );
+    void slotReset();
+
+private:
+    QToolButton* button[7];
+    QSpacerItem* titlebar;
+};
+
+class StdToolClient : public Client
+{
+    Q_OBJECT
+public:
+    StdToolClient( Workspace *ws, WId w, QWidget *parent=0, const char *name=0 );
+    ~StdToolClient();
+protected:
+    void resizeEvent( QResizeEvent* );
+    void paintEvent( QPaintEvent* );
+
+    void mouseDoubleClickEvent( QMouseEvent * );
+    void init();
+    void captionChange( const QString& name );
+    void activeChange( bool );
+
+private slots:
+    void slotReset();
+private:
+    QToolButton* closeBtn;
+    QSpacerItem* titlebar;
+};
+
+
+
+/*
+  Like QToolButton, but provides a clicked(int) signals that
+  has the last pressed mouse button as argument
+ */
+class ThreeButtonButton: public QToolButton
+{
+    Q_OBJECT
+public:
+  ThreeButtonButton ( QWidget *parent = 0, const char* name = 0)
+      : QToolButton( parent, name )
+    {
+	connect( this, SIGNAL( clicked() ), this, SLOT( handleClicked() ) );
+    }
+  ~ThreeButtonButton ()
+    {}
+
+signals:
+    void clicked( int );
+
+protected:
+    void mousePressEvent( QMouseEvent* e )
+    {
+	last_button = e->button();
+	QMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() );
+	QToolButton::mousePressEvent( &me );
+    }
+
+    void mouseReleaseEvent( QMouseEvent* e )
+    {
+	QMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() );
+	QToolButton::mouseReleaseEvent( &me );
+    }
+
+private slots:
+    void handleClicked()
+    {
+	emit clicked( last_button );
+    }
+
+private:
+    int last_button;
+
+};
+
+
+#endif
diff --git a/clients/kde1/kde1client_bitmaps.h b/clients/kde1/kde1client_bitmaps.h
new file mode 100644
index 0000000000..453f5db729
--- /dev/null
+++ b/clients/kde1/kde1client_bitmaps.h
@@ -0,0 +1,149 @@
+#ifndef __STDCLIENT_BITMAPS_H
+#define __STDCLIENT_BITMAPS_H
+
+/**
+ * The standard client has the capability to color it's titlebar buttons
+ * according to the new color scheme. In order to do this it needs a bitmap
+ * for each shade which it draws into a pixmap with the appropriate color.
+ * These are all the bitmaps.
+ */
+
+static unsigned char close_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x04, 0x10, 0x04, 0x08, 0x08, 0x04, 0x10, 0x02,
+  0x20, 0x01, 0x40, 0x00, 0x40, 0x00, 0x20, 0x01, 0x10, 0x02, 0x08, 0x04,
+  0x04, 0x08, 0x04, 0x10, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char close_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0x18, 0x30, 0x30, 0x18, 0x60, 0x0c,
+  0xc0, 0x06, 0x80, 0x03, 0x80, 0x03, 0xc0, 0x06, 0x60, 0x0c, 0x30, 0x18,
+  0x18, 0x30, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char close_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x1c, 0x38, 0x38, 0x1c, 0x70, 0x0e,
+  0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c,
+  0x1c, 0x38, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char iconify_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x03, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char iconify_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+
+static unsigned char iconify_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x03, 0x80, 0x02, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char maximize_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x04, 0x00, 0x04, 0x08, 0x04, 0x08,
+  0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0xf4, 0x0f,
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char maximize_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x08, 0x10, 0x08, 0x10,
+  0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10,
+  0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char maximize_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18, 0x0c, 0x18,
+  0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0xfc, 0x1f,
+  0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char maximizedown_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x08, 0x10,
+  0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10,
+  0x08, 0x10, 0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char maximizedown_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x04, 0x00, 0x04, 0x08,
+  0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08,
+  0xf4, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char maximizedown_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18,
+  0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18,
+  0xfc, 0x1f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char menu_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x3f, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char menu_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char menu_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pindown_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0x1f, 0xa0, 0x03,
+  0xb0, 0x01, 0x30, 0x01, 0xf0, 0x00, 0x70, 0x00, 0x20, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pindown_gray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c,
+  0x00, 0x0e, 0x00, 0x06, 0x00, 0x00, 0x80, 0x07, 0xc0, 0x03, 0xe0, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pindown_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x10, 0x70, 0x20, 0x50, 0x20,
+  0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e,
+  0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pindown_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f,
+  0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f,
+  0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  
+static unsigned char pinup_white_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x11,
+  0x3f, 0x15, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pinup_gray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0x0a, 0xbf, 0x0a, 0x80, 0x15, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pinup_dgray_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x40, 0x31, 0x40, 0x2e,
+  0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char pinup_mask_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f,
+  0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+static unsigned char help_mask_bits[] = {
+ 0x00,0x00,0x00,0x00,0xe0,0x03,0xf0,0x07,0x70,0x0e,0x60,0x0e,0x00,0x0f,0x80,
+ 0x07,0xc0,0x03,0xc0,0x01,0x80,0x01,0xc0,0x00,0xc0,0x01,0x80,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x4c,0x0b,0x08,0x58,0x65,0x09,0x08,0x90,0x00,0x00,
+ 0x00,0x09,0x04,0x00,0x00,0x72,0x6f,0x6f,0x74,0x00,0x24,0x31,0x24,0x47,0x6b,
+ 0x65,0x44,0x78,0x63 };
+
+static unsigned char help_dark_bits[] = {
+ 0x00,0x00,0x00,0x00,0xe0,0x03,0x30,0x06,0x30,0x06,0x00,0x06,0x00,0x03,0x80,
+ 0x01,0xc0,0x00,0xc0,0x00,0x00,0x00,0xc0,0x00,0xc0,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x65,0x64,0x28,0x29,0x00,0x00,0x00,0x00,0x90,0x00,0x00,
+ 0x00,0x21,0x00,0x00,0x00,0x34,0xfe,0x12,0x2b,0x00,0x00,0xff,0xff,0x58,0xc0,
+ 0x01,0x2b,0x45,0xfe };
+
+static unsigned char help_light_bits[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x01,0x40,0x08,0x60,0x08,0x00,0x0c,0x00,
+ 0x06,0x00,0x03,0x00,0x01,0x80,0x01,0x00,0x00,0x00,0x01,0x80,0x01,0x00,0x00,
+ 0x00,0x00,0x00,0x00,0x00,0x4c,0x0b,0x08,0x58,0x65,0x09,0x08,0x90,0x00,0x00,
+ 0x00,0x09,0x04,0x00,0x00,0x72,0x6f,0x6f,0x74,0x00,0x24,0x31,0x24,0x47,0x6b,
+ 0x65,0x44,0x78,0x63 };
+
+#endif
+