Rename kwin to twin (part 1 of 2)

75 files changed, 200 insertions, 200 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d63a4999..e05167be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ option( BUILD_EMOTICONS "Build emoticons" ${BUILD_ALL} )
 option( BUILD_ICEWM_THEMES "Build icewm-themes" ${BUILD_ALL} )
 option( BUILD_ICON_THEMES "Build icon themes" ${BUILD_ALL} )
 option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} )
-option( BUILD_KWIN_STYLES "Build kwin styles" ${BUILD_ALL} )
+option( BUILD_KWIN_STYLES "Build twin styles" ${BUILD_ALL} )
 option( BUILD_KWORLDCLOCK "Build kworldclock" ${BUILD_ALL} )
 option( BUILD_SOUNDS "Build sounds" ${BUILD_ALL} )
 option( BUILD_STYLES "Build styles" ${BUILD_ALL} )
@@ -80,7 +80,7 @@ tde_conditional_add_subdirectory( BUILD_EMOTICONS emoticons )
 tde_conditional_add_subdirectory( BUILD_ICEWM_THEMES icewm-themes )
 tde_conditional_add_subdirectory( BUILD_ICON_THEMES IconThemes )
 tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver )
-tde_conditional_add_subdirectory( BUILD_KWIN_STYLES kwin-styles )
+tde_conditional_add_subdirectory( BUILD_KWIN_STYLES twin-styles )
 tde_conditional_add_subdirectory( BUILD_KWORLDCLOCK kworldclock )
 tde_conditional_add_subdirectory( BUILD_SOUNDS sounds )
 tde_conditional_add_subdirectory( BUILD_STYLES styles )
diff --git a/icewm-themes/MenschMaschine/CMakeLists.txt b/icewm-themes/MenschMaschine/CMakeLists.txt
index b1487754..4a057da5 100644
--- a/icewm-themes/MenschMaschine/CMakeLists.txt
+++ b/icewm-themes/MenschMaschine/CMakeLists.txt
@@ -23,4 +23,4 @@ install( FILES
 	titleAT.xpm titleIB.xpm titleIL.xpm
 	titleIM.xpm titleIR.xpm titleIT.xpm
 	default.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/icewm-themes/MenschMaschine )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/icewm-themes/MenschMaschine )
diff --git a/icewm-themes/MenschMaschine/Makefile.am b/icewm-themes/MenschMaschine/Makefile.am
index ea2f7011..8d87208a 100644
--- a/icewm-themes/MenschMaschine/Makefile.am
+++ b/icewm-themes/MenschMaschine/Makefile.am
@@ -4,5 +4,5 @@ pics_DATA = closeA.xpm closeI.xpm frameAB.xpm frameABL.xpm frameABR.xpm frameAL.
 	minimizeI.xpm restoreA.xpm restoreI.xpm titleAB.xpm titleAL.xpm titleAM.xpm titleAR.xpm titleAT.xpm \
 	titleIB.xpm titleIL.xpm titleIM.xpm titleIR.xpm titleIT.xpm default.theme
 
-picsdir = $(kde_datadir)/kwin/icewm-themes/MenschMaschine
+picsdir = $(kde_datadir)/twin/icewm-themes/MenschMaschine
 
diff --git a/icewm-themes/MenschMaschine/default.theme b/icewm-themes/MenschMaschine/default.theme
index f4d3ca41..934acf97 100644
--- a/icewm-themes/MenschMaschine/default.theme
+++ b/icewm-themes/MenschMaschine/default.theme
@@ -1,7 +1,7 @@
 # MenschMaschine
 # by qwertz     kraftw@gmx.de   for KDE2.2
 
-ThemeDescription="MenschMaschine(kwin)"
+ThemeDescription="MenschMaschine(twin)"
 ThemeAuthor="kraftw@gmx.de"
 Look=pixmap
 
diff --git a/icewm-themes/Model/CMakeLists.txt b/icewm-themes/Model/CMakeLists.txt
index 8759da46..a0845052 100644
--- a/icewm-themes/Model/CMakeLists.txt
+++ b/icewm-themes/Model/CMakeLists.txt
@@ -22,4 +22,4 @@ install( FILES
 	titleAL.xpm titleAM.xpm titleAT.xpm 
 	titleIB.xpm titleIL.xpm titleIM.xpm 
 	titleIT.xpm default.theme
-DESTINATION ${DATA_INSTALL_DIR}/kwin/icewm-themes/Model )
+DESTINATION ${DATA_INSTALL_DIR}/twin/icewm-themes/Model )
diff --git a/icewm-themes/Model/Makefile.am b/icewm-themes/Model/Makefile.am
index 81858be7..5208796a 100644
--- a/icewm-themes/Model/Makefile.am
+++ b/icewm-themes/Model/Makefile.am
@@ -5,4 +5,4 @@ pics_DATA = closeA.xpm closeI.xpm frameAB.xpm frameABL.xpm frameABR.xpm frameAL.
 	titleAB.xpm titleAL.xpm titleAM.xpm titleAT.xpm titleIB.xpm titleIL.xpm titleIM.xpm \
 	titleIT.xpm default.theme
 
-picsdir = $(kde_datadir)/kwin/icewm-themes/Model
+picsdir = $(kde_datadir)/twin/icewm-themes/Model
diff --git a/icewm-themes/Model/default.theme b/icewm-themes/Model/default.theme
index 21d2c527..ce20eea9 100644
--- a/icewm-themes/Model/default.theme
+++ b/icewm-themes/Model/default.theme
@@ -1,7 +1,7 @@
 # Model
 # by qwertz     kraftw@gmx.de   for KDE2.2
 
-ThemeDescription="Model(kwin)"
+ThemeDescription="Model(twin)"
 ThemeAuthor="kraftw@gmx.de"
 Look=pixmap
 
diff --git a/kwin-styles/CMakeLists.txt b/kwin-styles/CMakeLists.txt
index 7f3a5836..255bbf18 100644
--- a/kwin-styles/CMakeLists.txt
+++ b/kwin-styles/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-include( "${TDE_CMAKE_DIR}/kwin.cmake" )
+include( "${TDE_CMAKE_DIR}/twin.cmake" )
 
 add_subdirectory( cde )
 add_subdirectory( glow )
diff --git a/kwin-styles/Makefile.am b/kwin-styles/Makefile.am
index 82fda365..76abee7d 100644
--- a/kwin-styles/Makefile.am
+++ b/kwin-styles/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = kstep glow cde icewm openlook kde1 system riscos smooth-blend
 
 messages:
-	$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_art_clients.pot
+	$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/twin_art_clients.pot
diff --git a/kwin-styles/cde/CMakeLists.txt b/kwin-styles/cde/CMakeLists.txt
index ed7aa565..790ff84c 100644
--- a/kwin-styles/cde/CMakeLists.txt
+++ b/kwin-styles/cde/CMakeLists.txt
@@ -23,11 +23,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES cde.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES cde.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_cde ##################################
+##### twin3_cde ##################################
 
-tde_add_kpart( kwin3_cde AUTOMOC
+tde_add_kpart( twin3_cde AUTOMOC
   SOURCES cdeclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/cde/Makefile.am b/kwin-styles/cde/Makefile.am
index 6bf41213..129a22bc 100644
--- a/kwin-styles/cde/Makefile.am
+++ b/kwin-styles/cde/Makefile.am
@@ -3,16 +3,16 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = kwin3_cde.la
+kde_module_LTLIBRARIES = twin3_cde.la
 
-kwin3_cde_la_SOURCES = cdeclient.cpp
-kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_cde_la_LIBADD = -ltdecorations
+twin3_cde_la_SOURCES = cdeclient.cpp
+twin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_cde_la_LIBADD = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = cdeclient.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = cde.desktop
 
 EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin-styles/cde/cde.desktop b/kwin-styles/cde/cde.desktop
index 410c666d..a5f1ac66 100644
--- a/kwin-styles/cde/cde.desktop
+++ b/kwin-styles/cde/cde.desktop
@@ -3,4 +3,4 @@ Name=CDE
 Name[af]=Cde
 Name[hi]=सीडीई
 Name[ne]=सीडीई
-X-KDE-Library=kwin3_cde
+X-KDE-Library=twin3_cde
diff --git a/kwin-styles/cde/cdeclient.cpp b/kwin-styles/cde/cdeclient.cpp
index d21f4770..03eb14fa 100644
--- a/kwin-styles/cde/cdeclient.cpp
+++ b/kwin-styles/cde/cdeclient.cpp
@@ -150,7 +150,7 @@ static int scaleCoord(int c)
 
 static void readConfig(CdeClientFactory *f)
 {
-    KConfig conf( "kwincderc" );
+    KConfig conf( "twincderc" );
 
     conf.setGroup("General");
     coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true );
diff --git a/kwin-styles/cde/config/CMakeLists.txt b/kwin-styles/cde/config/CMakeLists.txt
index 9064c2bd..5faec263 100644
--- a/kwin-styles/cde/config/CMakeLists.txt
+++ b/kwin-styles/cde/config/CMakeLists.txt
@@ -19,9 +19,9 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### kwin_cde_config (module) ###################
+##### twin_cde_config (module) ###################
 
-tde_add_kpart( kwin_cde_config AUTOMOC
+tde_add_kpart( twin_cde_config AUTOMOC
   SOURCES config.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/cde/config/Makefile.am b/kwin-styles/cde/config/Makefile.am
index d5c6da85..3e5bd243 100644
--- a/kwin-styles/cde/config/Makefile.am
+++ b/kwin-styles/cde/config/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_cde_config.la
+kde_module_LTLIBRARIES = twin_cde_config.la
 
-kwin_cde_config_la_SOURCES = config.cpp
-kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin_cde_config_la_LIBADD  = $(LIB_TDEUI)
+twin_cde_config_la_SOURCES = config.cpp
+twin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_cde_config_la_LIBADD  = $(LIB_TDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 
 
 ###KMAKE-start (don't edit or delete this block)
diff --git a/kwin-styles/cde/config/config.cpp b/kwin-styles/cde/config/config.cpp
index cf58377d..fcd2de42 100644
--- a/kwin-styles/cde/config/config.cpp
+++ b/kwin-styles/cde/config/config.cpp
@@ -13,18 +13,18 @@ extern "C" KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent
 
 
 /* NOTE: 
- * 'conf' 	is a pointer to the kwindecoration modules open kwin config,
+ * 'conf' 	is a pointer to the twindecoration modules open twin config,
  *			and is by default set to the "Style" group.
  *
  * 'parent'	is the parent of the TQObject, which is a VBox inside the
- *			Configure tab in kwindecoration
+ *			Configure tab in twindecoration
  */
 
 CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	cdeConfig = new KConfig("kwincderc");
-	KGlobal::locale()->insertCatalogue("kwin_art_clients");
+	cdeConfig = new KConfig("twincderc");
+	KGlobal::locale()->insertCatalogue("twin_art_clients");
 	
 	groupBox = new TQVBox( parent );
 	
@@ -57,7 +57,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
 //	connect( cbTitlebarButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
 	connect( bgAlign, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSelectionChanged(int)) );
 
-	// Make the widgets visible in kwindecoration
+	// Make the widgets visible in twindecoration
 	groupBox->show();
 }
 
@@ -80,8 +80,8 @@ void CdeConfig::slotSelectionChanged( int )
 	emit changed();
 }
 
-// Loads the configurable options from the kwinrc config file
-// It is passed the open config from kwindecoration to improve efficiency
+// Loads the configurable options from the twinrc config file
+// It is passed the open config from twindecoration to improve efficiency
 void CdeConfig::load( KConfig* /*conf*/ )
 {
 	cdeConfig->setGroup("General");
@@ -99,7 +99,7 @@ void CdeConfig::load( KConfig* /*conf*/ )
 }
 
 
-// Saves the configurable options to the kwinrc config file
+// Saves the configurable options to the twinrc config file
 void CdeConfig::save( KConfig* /*conf*/ )
 {
 	cdeConfig->setGroup("General");
diff --git a/kwin-styles/configure.in.in b/kwin-styles/configure.in.in
index 9759bdaa..e93b34e6 100644
--- a/kwin-styles/configure.in.in
+++ b/kwin-styles/configure.in.in
@@ -1,3 +1,3 @@
 if test "x$kde_use_qt_mac" = "xyes"; then
-	DO_NOT_COMPILE="$DO_NOT_COMPILE kwin-styles"
+	DO_NOT_COMPILE="$DO_NOT_COMPILE twin-styles"
 fi
diff --git a/kwin-styles/glow/CMakeLists.txt b/kwin-styles/glow/CMakeLists.txt
index f7d776be..76d0a23e 100644
--- a/kwin-styles/glow/CMakeLists.txt
+++ b/kwin-styles/glow/CMakeLists.txt
@@ -24,11 +24,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES glow.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES glow.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_glow ################################
+##### twin3_glow ################################
 
-tde_add_kpart( kwin3_glow AUTOMOC
+tde_add_kpart( twin3_glow AUTOMOC
   SOURCES glowbutton.cpp glowclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/glow/Makefile.am b/kwin-styles/glow/Makefile.am
index 2b477594..bb624e59 100644
--- a/kwin-styles/glow/Makefile.am
+++ b/kwin-styles/glow/Makefile.am
@@ -3,16 +3,16 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config themes
 
-kde_module_LTLIBRARIES = kwin3_glow.la
+kde_module_LTLIBRARIES = twin3_glow.la
 
-kwin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp
-kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_glow_la_LIBADD  = $(LIB_TDECORE) -ltdecorations
+twin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp
+twin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_glow_la_LIBADD  = $(LIB_TDECORE) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = glowclient.h glowbutton.h resources.h
 
-linkdir = $(kde_datadir)/kwin/
+linkdir = $(kde_datadir)/twin/
 link_DATA = glow.desktop
 
 EXTRA_DIST = $(link_DATA)
diff --git a/kwin-styles/glow/config/CMakeLists.txt b/kwin-styles/glow/config/CMakeLists.txt
index dffdbaa5..bfcc2633 100644
--- a/kwin-styles/glow/config/CMakeLists.txt
+++ b/kwin-styles/glow/config/CMakeLists.txt
@@ -19,9 +19,9 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### kwin_glow_config (module) ##################
+##### twin_glow_config (module) ##################
 
-tde_add_kpart( kwin_glow_config AUTOMOC
+tde_add_kpart( twin_glow_config AUTOMOC
   SOURCES glowconfigdialog.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/glow/config/Makefile.am b/kwin-styles/glow/config/Makefile.am
index ea82f75a..bf3d334b 100644
--- a/kwin-styles/glow/config/Makefile.am
+++ b/kwin-styles/glow/config/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_glow_config.la
+kde_module_LTLIBRARIES = twin_glow_config.la
 
-kwin_glow_config_la_SOURCES = glowconfigdialog.cpp
-kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin_glow_config_la_LIBADD = $(LIB_TDEUI)
+twin_glow_config_la_SOURCES = glowconfigdialog.cpp
+twin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_glow_config_la_LIBADD = $(LIB_TDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = glowconfigdialog.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 
 
 ###KMAKE-start (don't edit or delete this block)
diff --git a/kwin-styles/glow/config/glowconfigdialog.cpp b/kwin-styles/glow/config/glowconfigdialog.cpp
index 5d3b4487..f8ff62fd 100644
--- a/kwin-styles/glow/config/glowconfigdialog.cpp
+++ b/kwin-styles/glow/config/glowconfigdialog.cpp
@@ -54,8 +54,8 @@ extern "C"
 GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	: TQObject(parent)
 {
-	_glowConfig = new KConfig("kwinglowrc");
-	KGlobal::locale()->insertCatalogue("kwin_glow_config");
+	_glowConfig = new KConfig("twinglowrc");
+	KGlobal::locale()->insertCatalogue("twin_glow_config");
 
 	_main_group_box = new TQWidget(parent);
 	TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box);
@@ -273,7 +273,7 @@ void GlowConfigDialog::defaults()
 
 void GlowConfigDialog::slotLoadThemeList ()
 {
-	TQStringList dir_list=KGlobal::dirs()->findDirs("data", "kwin/glow-themes");
+	TQStringList dir_list=KGlobal::dirs()->findDirs("data", "twin/glow-themes");
 
 	TQStringList::ConstIterator it;
 
diff --git a/kwin-styles/glow/glow.desktop b/kwin-styles/glow/glow.desktop
index 6db539eb..9659e5d6 100644
--- a/kwin-styles/glow/glow.desktop
+++ b/kwin-styles/glow/glow.desktop
@@ -46,4 +46,4 @@ Name[vi]=Hào quang
 Name[xh]=Qukuqela
 Name[zh_CN]=光芒
 Name[zu]=Khanya
-X-KDE-Library=kwin3_glow
+X-KDE-Library=twin3_glow
diff --git a/kwin-styles/glow/glowclient.cpp b/kwin-styles/glow/glowclient.cpp
index 51c6e0d8..98133221 100644
--- a/kwin-styles/glow/glowclient.cpp
+++ b/kwin-styles/glow/glowclient.cpp
@@ -51,7 +51,7 @@ GlowClientConfig::GlowClientConfig()
 
 void GlowClientConfig::load(KDecorationFactory *factory)
 {
-	KConfig conf("kwinglowrc");
+	KConfig conf("twinglowrc");
 	conf.setGroup("General");
 
 	const TQColor defaultCloseButtonColor(DEFAULT_CLOSE_BUTTON_COLOR);
@@ -165,7 +165,7 @@ GlowClientGlobals::borderSizes() const
 void GlowClientGlobals::readTheme()
 {
 	TQString theme_config_file = KGlobal::dirs()->findResource ("data",
-			TQString("kwin/glow-themes/") + config()->themeName + "/" +
+			TQString("twin/glow-themes/") + config()->themeName + "/" +
 			config()->themeName + ".theme");
 	if (theme_config_file.isNull())
 	{
@@ -291,7 +291,7 @@ const TQString GlowClientGlobals::getPixmapTypeName(PixmapType type)
 bool GlowClientGlobals::createPixmap(PixmapType type, bool isActive)
 {
 	TQString theme_dir = KGlobal::dirs()->findResource ("data",
-			TQString("kwin/glow-themes/") + _config->themeName + "/");
+			TQString("twin/glow-themes/") + _config->themeName + "/");
 
 	TQColor glow_color;
 	TQColor color = options()->color(ColorButtonBg, isActive);
diff --git a/kwin-styles/glow/themes/default/CMakeLists.txt b/kwin-styles/glow/themes/default/CMakeLists.txt
index f7d98c0a..433e22b6 100644
--- a/kwin-styles/glow/themes/default/CMakeLists.txt
+++ b/kwin-styles/glow/themes/default/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     stickyon.png stickyon_glow.png
     stickyoff.png stickyoff_glow.png
     default.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/glow-themes/default )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/glow-themes/default )
diff --git a/kwin-styles/glow/themes/default/Makefile.am b/kwin-styles/glow/themes/default/Makefile.am
index 881b15d4..b3ef0fa5 100644
--- a/kwin-styles/glow/themes/default/Makefile.am
+++ b/kwin-styles/glow/themes/default/Makefile.am
@@ -1,4 +1,4 @@
-linkdir = $(kde_datadir)/kwin/glow-themes/default
+linkdir = $(kde_datadir)/twin/glow-themes/default
 link_DATA = \
 background.png \
 help.png help_glow.png \
diff --git a/kwin-styles/glow/themes/glass/CMakeLists.txt b/kwin-styles/glow/themes/glass/CMakeLists.txt
index bb02a73c..279668d3 100644
--- a/kwin-styles/glow/themes/glass/CMakeLists.txt
+++ b/kwin-styles/glow/themes/glass/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     stickyon.png stickyon_glow.png
     stickyoff.png stickyoff_glow.png
     glass.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/glow-themes/glass )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/glow-themes/glass )
diff --git a/kwin-styles/glow/themes/glass/Makefile.am b/kwin-styles/glow/themes/glass/Makefile.am
index f1d7e5d7..aeff2c35 100644
--- a/kwin-styles/glow/themes/glass/Makefile.am
+++ b/kwin-styles/glow/themes/glass/Makefile.am
@@ -1,4 +1,4 @@
-linkdir = $(kde_datadir)/kwin/glow-themes/glass
+linkdir = $(kde_datadir)/twin/glow-themes/glass
 link_DATA = \
 background.png \
 help.png help_glow.png \
diff --git a/kwin-styles/glow/themes/glass_huge/CMakeLists.txt b/kwin-styles/glow/themes/glass_huge/CMakeLists.txt
index cd98469f..92021eff 100644
--- a/kwin-styles/glow/themes/glass_huge/CMakeLists.txt
+++ b/kwin-styles/glow/themes/glass_huge/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     stickyon.png stickyon_glow.png
     stickyoff.png stickyoff_glow.png
     glass_huge.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/glow-themes/glass_huge )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/glow-themes/glass_huge )
diff --git a/kwin-styles/glow/themes/glass_huge/Makefile.am b/kwin-styles/glow/themes/glass_huge/Makefile.am
index b9631d1b..244f67a0 100644
--- a/kwin-styles/glow/themes/glass_huge/Makefile.am
+++ b/kwin-styles/glow/themes/glass_huge/Makefile.am
@@ -1,4 +1,4 @@
-linkdir = $(kde_datadir)/kwin/glow-themes/glass_huge
+linkdir = $(kde_datadir)/twin/glow-themes/glass_huge
 link_DATA = \
 background.png \
 help.png help_glow.png \
diff --git a/kwin-styles/glow/themes/glass_large/CMakeLists.txt b/kwin-styles/glow/themes/glass_large/CMakeLists.txt
index 7907f6ee..597d15c1 100644
--- a/kwin-styles/glow/themes/glass_large/CMakeLists.txt
+++ b/kwin-styles/glow/themes/glass_large/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     stickyon.png stickyon_glow.png
     stickyoff.png stickyoff_glow.png
     glass_large.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/glow-themes/glass_large )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/glow-themes/glass_large )
diff --git a/kwin-styles/glow/themes/glass_large/Makefile.am b/kwin-styles/glow/themes/glass_large/Makefile.am
index b884ff55..353e4b6f 100644
--- a/kwin-styles/glow/themes/glass_large/Makefile.am
+++ b/kwin-styles/glow/themes/glass_large/Makefile.am
@@ -1,4 +1,4 @@
-linkdir = $(kde_datadir)/kwin/glow-themes/glass_large
+linkdir = $(kde_datadir)/twin/glow-themes/glass_large
 link_DATA = \
 background.png \
 help.png help_glow.png \
diff --git a/kwin-styles/glow/themes/glass_verylarge/CMakeLists.txt b/kwin-styles/glow/themes/glass_verylarge/CMakeLists.txt
index 673e16a3..5fd50a91 100644
--- a/kwin-styles/glow/themes/glass_verylarge/CMakeLists.txt
+++ b/kwin-styles/glow/themes/glass_verylarge/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     stickyon.png stickyon_glow.png
     stickyoff.png stickyoff_glow.png
     glass_verylarge.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/glow-themes/glass_verylarge )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/glow-themes/glass_verylarge )
diff --git a/kwin-styles/glow/themes/glass_verylarge/Makefile.am b/kwin-styles/glow/themes/glass_verylarge/Makefile.am
index f6a5582c..ab67c5db 100644
--- a/kwin-styles/glow/themes/glass_verylarge/Makefile.am
+++ b/kwin-styles/glow/themes/glass_verylarge/Makefile.am
@@ -1,4 +1,4 @@
-linkdir = $(kde_datadir)/kwin/glow-themes/glass_verylarge
+linkdir = $(kde_datadir)/twin/glow-themes/glass_verylarge
 link_DATA = \
 background.png \
 help.png help_glow.png \
diff --git a/kwin-styles/glow/themes/square/CMakeLists.txt b/kwin-styles/glow/themes/square/CMakeLists.txt
index 26ea9ea7..0343fa2a 100644
--- a/kwin-styles/glow/themes/square/CMakeLists.txt
+++ b/kwin-styles/glow/themes/square/CMakeLists.txt
@@ -19,4 +19,4 @@ install( FILES
     stickyon.png stickyon_glow.png
     stickyoff.png stickyoff_glow.png
     square.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/glow-themes/square )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/glow-themes/square )
diff --git a/kwin-styles/glow/themes/square/Makefile.am b/kwin-styles/glow/themes/square/Makefile.am
index bcb698b0..01193d98 100644
--- a/kwin-styles/glow/themes/square/Makefile.am
+++ b/kwin-styles/glow/themes/square/Makefile.am
@@ -1,4 +1,4 @@
-linkdir = $(kde_datadir)/kwin/glow-themes/square
+linkdir = $(kde_datadir)/twin/glow-themes/square
 link_DATA = \
 background.png \
 help.png help_glow.png \
diff --git a/kwin-styles/icewm/CMakeLists.txt b/kwin-styles/icewm/CMakeLists.txt
index a156cb68..d59f42c9 100644
--- a/kwin-styles/icewm/CMakeLists.txt
+++ b/kwin-styles/icewm/CMakeLists.txt
@@ -24,11 +24,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES icewm.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES icewm.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_icewm ###############################
+##### twin3_icewm ###############################
 
-tde_add_kpart( kwin3_icewm AUTOMOC
+tde_add_kpart( twin3_icewm AUTOMOC
   SOURCES icewm.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/icewm/Makefile.am b/kwin-styles/icewm/Makefile.am
index 25d4e613..e067c531 100644
--- a/kwin-styles/icewm/Makefile.am
+++ b/kwin-styles/icewm/Makefile.am
@@ -2,16 +2,16 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config icewm-themes
 
-kde_module_LTLIBRARIES = kwin3_icewm.la
+kde_module_LTLIBRARIES = twin3_icewm.la
 
-kwin3_icewm_la_SOURCES = icewm.cpp
-kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_icewm_la_LIBADD  = $(LIB_TDEUI) -ltdecorations
+twin3_icewm_la_SOURCES = icewm.cpp
+twin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_icewm_la_LIBADD  = $(LIB_TDEUI) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = icewm.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = icewm.desktop
 
 EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin-styles/icewm/config/CMakeLists.txt b/kwin-styles/icewm/config/CMakeLists.txt
index f13613d0..9e2e118d 100644
--- a/kwin-styles/icewm/config/CMakeLists.txt
+++ b/kwin-styles/icewm/config/CMakeLists.txt
@@ -19,9 +19,9 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### kwin_icewm_config (module) ################
+##### twin_icewm_config (module) ################
 
-tde_add_kpart( kwin_icewm_config AUTOMOC
+tde_add_kpart( twin_icewm_config AUTOMOC
   SOURCES config.cpp
   LINK tdeui-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/icewm/config/Makefile.am b/kwin-styles/icewm/config/Makefile.am
index 5e026009..ca2d2552 100644
--- a/kwin-styles/icewm/config/Makefile.am
+++ b/kwin-styles/icewm/config/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_icewm_config.la
+kde_module_LTLIBRARIES = twin_icewm_config.la
 
-kwin_icewm_config_la_SOURCES = config.cpp
-kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) 
+twin_icewm_config_la_SOURCES = config.cpp
+twin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_icewm_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) 
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/kwin-styles/icewm/config/config.cpp b/kwin-styles/icewm/config/config.cpp
index 8b679d54..a0a2a8db 100644
--- a/kwin-styles/icewm/config/config.cpp
+++ b/kwin-styles/icewm/config/config.cpp
@@ -48,18 +48,18 @@ extern "C"
 
 // NOTE:
 // ==========================================================================
-// 'conf' 		is a pointer to the kwindecoration modules open kwin config,
+// 'conf' 		is a pointer to the twindecoration modules open twin config,
 //				and is by default set to the "Style" group.
 //
 // 'parent'		is the parent of the TQObject, which is a VBox inside the
-//				Configure tab in kwindecoration
+//				Configure tab in twindecoration
 // ==========================================================================
 
 IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	icewmConfig = new KConfig("kwinicewmrc");
-	KGlobal::locale()->insertCatalogue("kwin_art_clients");
+	icewmConfig = new KConfig("twinicewmrc");
+	KGlobal::locale()->insertCatalogue("twin_art_clients");
 
 	mainWidget = new TQVBox( parent );
 	mainWidget->setSpacing( KDialog::spacingHint() );
@@ -123,7 +123,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
 			 this, TQT_SLOT(slotSelectionChanged()) );
 
 	// Create the theme directory (if not found) ... and obtain the path as we do so.
-	localThemeString = KGlobal::dirs()->saveLocation("data", "kwin");
+	localThemeString = KGlobal::dirs()->saveLocation("data", "twin");
 	localThemeString += "/icewm-themes";
 	if (!TQFile::exists(localThemeString))
 		TQDir().mkdir(localThemeString);
@@ -139,7 +139,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
 	urlThemeString.replace( TQRegExp("~"), "$HOME" );
 	urlLabel->setURL( urlThemeString );
 
-	// Make the widgets visible in kwindecoration
+	// Make the widgets visible in twindecoration
 	mainWidget->show();
 
 	KDirWatch::self()->startScan();
@@ -158,14 +158,14 @@ IceWMConfig::~IceWMConfig()
 // Searches for all installed IceWM themes, and adds them to the listBox.
 void IceWMConfig::findIceWMThemes()
 {
-	TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin/icewm-themes");
+	TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin/icewm-themes");
 	TQStringList::ConstIterator it;
 
 	// Remove any old themes in the list (if any)
 	themeListBox->clear();
 	themeListBox->insertItem( i18n("Infadel #2 (default)") );
 
-	// Step through all kwin/icewm-themes directories...
+	// Step through all twin/icewm-themes directories...
 	for( it = dirList.begin(); it != dirList.end(); it++)
 	{
 		// List all directory names only...
@@ -175,7 +175,7 @@ void IceWMConfig::findIceWMThemes()
 			TQFileInfoListIterator it2( *d.entryInfoList() );
 			TQFileInfo* finfo;
 
-			// Step through all directories within the kwin/icewm-themes directory
+			// Step through all directories within the twin/icewm-themes directory
 			while( (finfo = it2.current()) )
 			{
 				// Ignore . and .. directories
@@ -223,7 +223,7 @@ void IceWMConfig::slotSelectionChanged()
 }
 
 
-// Loads the configurable options from the kwinicewmrc config file
+// Loads the configurable options from the twinicewmrc config file
 void IceWMConfig::load( KConfig* )
 {
 	icewmConfig->setGroup("General");
@@ -241,7 +241,7 @@ void IceWMConfig::load( KConfig* )
 }
 
 
-// Saves the configurable options to the kwinicewmrc config file
+// Saves the configurable options to the twinicewmrc config file
 void IceWMConfig::save( KConfig* )
 {
 	icewmConfig->setGroup("General");
diff --git a/kwin-styles/icewm/icewm-themes/CMakeLists.txt b/kwin-styles/icewm/icewm-themes/CMakeLists.txt
index 8a029357..367553ab 100644
--- a/kwin-styles/icewm/icewm-themes/CMakeLists.txt
+++ b/kwin-styles/icewm/icewm-themes/CMakeLists.txt
@@ -18,4 +18,4 @@ install( FILES
     minimizeA.xpm minimizeI.xpm restoreA.xpm restoreI.xpm
     rolldownA.xpm rolldownI.xpm rollupA.xpm rollupI.xpm
     default.theme
-  DESTINATION ${DATA_INSTALL_DIR}/kwin/icewm-themes )
+  DESTINATION ${DATA_INSTALL_DIR}/twin/icewm-themes )
diff --git a/kwin-styles/icewm/icewm-themes/Makefile.am b/kwin-styles/icewm/icewm-themes/Makefile.am
index 40290635..dcd5463a 100644
--- a/kwin-styles/icewm/icewm-themes/Makefile.am
+++ b/kwin-styles/icewm/icewm-themes/Makefile.am
@@ -7,6 +7,6 @@ pics_DATA = titleAB.xpm titleAJ.xpm titleAM.xpm titleAP.xpm titleAQ.xpm \
 			rolldownA.xpm rolldownI.xpm rollupA.xpm rollupI.xpm \
 			default.theme 
 
-picsdir = $(kde_datadir)/kwin/icewm-themes
+picsdir = $(kde_datadir)/twin/icewm-themes
 
 
diff --git a/kwin-styles/icewm/icewm-themes/default.theme b/kwin-styles/icewm/icewm-themes/default.theme
index 5c76117b..945a3824 100644
--- a/kwin-styles/icewm/icewm-themes/default.theme
+++ b/kwin-styles/icewm/icewm-themes/default.theme
@@ -19,12 +19,12 @@
 
 # PLEASE NOTE:
 # ============
-# Heavily modified by gallium for the purposes of kwin-icewm. 
+# Heavily modified by gallium for the purposes of twin-icewm. 
 # Please do not use this for icewm. Use the original icewm Infadel #2 instead.
-# The full Infadel #2 theme will still work with kwin-icewm as well, but
+# The full Infadel #2 theme will still work with twin-icewm as well, but
 # this trimmed version is included here for space reasons.
 
-ThemeDescription="Infadel/1.0.7(kwin)"
+ThemeDescription="Infadel/1.0.7(twin)"
 ThemeAuthor="xerithane@nerdfarm.org"
 Look=pixmap
 
diff --git a/kwin-styles/icewm/icewm.cpp b/kwin-styles/icewm/icewm.cpp
index 47386962..4b9a064b 100644
--- a/kwin-styles/icewm/icewm.cpp
+++ b/kwin-styles/icewm/icewm.cpp
@@ -120,7 +120,7 @@ bool validframe  			= false;
 bool useActiveShadow 		= false;
 bool useInActiveShadow 		= false;
 
-// KControl Settings - Read from kwinicewmrc config file or icewm theme
+// KControl Settings - Read from twinicewmrc config file or icewm theme
 bool themeTitleTextColors 	= true;		// Allow theme to set colors.
 										// kcontrol will have no effect
 
@@ -147,7 +147,7 @@ bool validPixmaps( TQPixmap* p[] )
 // ThemeHandler class
 //
 // This class allows us to free dynamic memory upon being reset, or unloaded
-// from kwin, so we don't leak big images everywhere, and handles the theme
+// from twin, so we don't leak big images everywhere, and handles the theme
 // initialisation / destruction in general.
 ////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -234,10 +234,10 @@ TQString ThemeHandler::reverseString( TQString s )
 }
 
 
-// This function reads the kwinicewmrc config file
+// This function reads the twinicewmrc config file
 void ThemeHandler::readConfig()
 {
-	KConfig conf("kwinicewmrc");
+	KConfig conf("twinicewmrc");
 	conf.setGroup("General");
 	themeName = conf.readEntry("CurrentTheme");
 	themeTitleTextColors = conf.readBoolEntry("ThemeTitleTextColors", true);
@@ -271,7 +271,7 @@ void ThemeHandler::initTheme()
 
 	// We use kconfig to read icewm config files...
 	// this is easy since icewm uses key=value pairs!
-	KConfig config( locate("data", TQString("kwin/icewm-themes/") +
+	KConfig config( locate("data", TQString("twin/icewm-themes/") +
 					themeName + TQString("default.theme")) );
 
 	// Load specifics, or use IceWM defaults instead.
@@ -496,7 +496,7 @@ void ThemeHandler::freePixmapGroup( TQPixmap* p[] )
 		p[Active] = NULL;
 		p[InActive] = NULL;
 	} else
-		qWarning("kwin-icewm: freePixmapGroup - invalid TQPixmap** 'p'\n");
+		qWarning("twin-icewm: freePixmapGroup - invalid TQPixmap** 'p'\n");
 }
 
 
@@ -583,9 +583,9 @@ static void draw3DRect(TQPainter &pnt, TQColor &col, int x, int y, int w, int h,
 void ThemeHandler::setPixmapButton( TQPixmap* p[], TQString s1, TQString s2)
 {
 	if ( p[Active] )
-		qWarning("kwin-icewm: setPixmap - should be null (1)\n");
+		qWarning("twin-icewm: setPixmap - should be null (1)\n");
 	if ( p[InActive] )
-		qWarning("kwin-icewm: setPixmap - should be null (2)\n");
+		qWarning("twin-icewm: setPixmap - should be null (2)\n");
 
 	TQString str = locate("appdata", TQString("icewm-themes/")
 				+ themeName + s1 + "A" + s2);
@@ -682,13 +682,13 @@ void ThemeHandler::setPixmap( TQPixmap* p[], TQString s1, TQString s2,
 							  bool stretch, bool stretchHoriz )
 {
 	if ( p[Active] )
-		qWarning("kwin-icewm: setPixmap - should be null (1)\n");
+		qWarning("twin-icewm: setPixmap - should be null (1)\n");
 	if ( p[InActive] )
-		qWarning("kwin-icewm: setPixmap - should be null (2)\n");
+		qWarning("twin-icewm: setPixmap - should be null (2)\n");
 
-	p[Active]   = new TQPixmap( locate("data", TQString("kwin/icewm-themes/")
+	p[Active]   = new TQPixmap( locate("data", TQString("twin/icewm-themes/")
 								+ themeName + s1 + "A" + s2) );
-	p[InActive] = new TQPixmap( locate("data", TQString("kwin/icewm-themes/")
+	p[InActive] = new TQPixmap( locate("data", TQString("twin/icewm-themes/")
 								+ themeName + s1 + "I" + s2) );
 
 	// Stretch the pixmap if requested.
@@ -726,7 +726,7 @@ bool ThemeHandler::isFrameValid()
 }
 
 
-// Resets the theme, and re-clients all kwin's wrapped windows.
+// Resets the theme, and re-clients all twin's wrapped windows.
 bool ThemeHandler::reset( unsigned long)
 {
 	initialized = false;
@@ -825,7 +825,7 @@ void IceWMButton::drawButton(TQPainter *pnt)
 				pnt->drawPixmap(0, 0, *p, 0, 0, width, titleBarHeight);
 		}
 	} else
-		qWarning("kwin-icewm: Can't paint a null pixmap button");
+		qWarning("twin-icewm: Can't paint a null pixmap button");
 }
 
 
@@ -1028,7 +1028,7 @@ void IceWMClient::addClientButtons( const TQString& s )
 					break; */
 
 				case 'r':
-					// NOTE: kwin doesn't have toggleShade() in clients.h !
+					// NOTE: twin doesn't have toggleShade() in clients.h !
 				    if ( validPixmaps(rollupPix) && !button[BtnRollup] )
 				    {
 						button[BtnRollup] = new IceWMButton(this, "shade",
diff --git a/kwin-styles/icewm/icewm.desktop b/kwin-styles/icewm/icewm.desktop
index 387caa0c..eeffdcc0 100644
--- a/kwin-styles/icewm/icewm.desktop
+++ b/kwin-styles/icewm/icewm.desktop
@@ -8,4 +8,4 @@ Name[th]=ตัวจัดการหน้าต่าง IceWM
 Name[vi]=Nước đá WM
 Name[xh]=UmkhenkceWM
 Name[zu]=Iqhwa leWM
-X-KDE-Library=kwin3_icewm
+X-KDE-Library=twin3_icewm
diff --git a/kwin-styles/kde1/CMakeLists.txt b/kwin-styles/kde1/CMakeLists.txt
index 0fdd3cf0..2cbae1eb 100644
--- a/kwin-styles/kde1/CMakeLists.txt
+++ b/kwin-styles/kde1/CMakeLists.txt
@@ -21,11 +21,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kde1.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES kde1.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_cde ##################################
+##### twin3_cde ##################################
 
-tde_add_kpart( kwin3_kde1 AUTOMOC
+tde_add_kpart( twin3_kde1 AUTOMOC
   SOURCES kde1client.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/kde1/Makefile.am b/kwin-styles/kde1/Makefile.am
index 3e60b337..131b71a4 100644
--- a/kwin-styles/kde1/Makefile.am
+++ b/kwin-styles/kde1/Makefile.am
@@ -1,16 +1,16 @@
 
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = kwin3_kde1.la
+kde_module_LTLIBRARIES = twin3_kde1.la
 
-kwin3_kde1_la_SOURCES = kde1client.cpp
-kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_kde1_la_LIBADD  = -ltdecorations
+twin3_kde1_la_SOURCES = kde1client.cpp
+twin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_kde1_la_LIBADD  = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = kde1client.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = kde1.desktop
 EXTRA_DIST = $(lnk_DATA)
 
diff --git a/kwin-styles/kde1/kde1.desktop b/kwin-styles/kde1/kde1.desktop
index d0f13924..e0a1ffad 100644
--- a/kwin-styles/kde1/kde1.desktop
+++ b/kwin-styles/kde1/kde1.desktop
@@ -4,4 +4,4 @@ Name[fa]=KDE ۱
 Name[hi]=केडीई 1
 Name[ne]=केडीई १
 Name[th]=โปรแกรมจัดการหน้าต่าง KDE 1
-X-KDE-Library=kwin3_kde1
+X-KDE-Library=twin3_kde1
diff --git a/kwin-styles/kde1/kde1client.cpp b/kwin-styles/kde1/kde1client.cpp
index a5a5e892..c6a7db98 100644
--- a/kwin-styles/kde1/kde1client.cpp
+++ b/kwin-styles/kde1/kde1client.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************
-kwin - the KDE window manager
+twin - the KDE window manager
 								
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
diff --git a/kwin-styles/kde1/kde1client.h b/kwin-styles/kde1/kde1client.h
index b97afc3e..adedfaaf 100644
--- a/kwin-styles/kde1/kde1client.h
+++ b/kwin-styles/kde1/kde1client.h
@@ -1,5 +1,5 @@
 /*****************************************************************
-kwin - the KDE window manager
+twin - the KDE window manager
 								
 Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
diff --git a/kwin-styles/kstep/CMakeLists.txt b/kwin-styles/kstep/CMakeLists.txt
index ae3d135a..4d55aa77 100644
--- a/kwin-styles/kstep/CMakeLists.txt
+++ b/kwin-styles/kstep/CMakeLists.txt
@@ -21,11 +21,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kstep.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES kstep.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_kstep ###############################
+##### twin3_kstep ###############################
 
-tde_add_kpart( kwin3_kstep AUTOMOC
+tde_add_kpart( twin3_kstep AUTOMOC
   SOURCES nextclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/kstep/Makefile.am b/kwin-styles/kstep/Makefile.am
index 365cfe0f..3fff6355 100644
--- a/kwin-styles/kstep/Makefile.am
+++ b/kwin-styles/kstep/Makefile.am
@@ -1,17 +1,17 @@
 
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = kwin3_kstep.la
+kde_module_LTLIBRARIES = twin3_kstep.la
 
-kwin3_kstep_la_SOURCES = nextclient.cpp
-kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-#kwin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-kwin3_kstep_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin3_kstep_la_SOURCES = nextclient.cpp
+twin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+#twin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin3_kstep_la_LIBADD = $(LIB_TDEUI) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = nextclient.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = kstep.desktop
 
 EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin-styles/kstep/kstep.desktop b/kwin-styles/kstep/kstep.desktop
index bf663c8c..87b9aaae 100644
--- a/kwin-styles/kstep/kstep.desktop
+++ b/kwin-styles/kstep/kstep.desktop
@@ -9,4 +9,4 @@ Name[th]=ตัวจัดการหน้าต่างสเต็ป - K
 Name[ven]=Tshitepe tsha K
 Name[xh]=Inqwanqwa le K
 Name[zu]=Izinga le K
-X-KDE-Library=kwin3_kstep
+X-KDE-Library=twin3_kstep
diff --git a/kwin-styles/openlook/CMakeLists.txt b/kwin-styles/openlook/CMakeLists.txt
index 851ec25f..061dd697 100644
--- a/kwin-styles/openlook/CMakeLists.txt
+++ b/kwin-styles/openlook/CMakeLists.txt
@@ -22,11 +22,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES openlook.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES openlook.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_openlook ############################
+##### twin3_openlook ############################
 
-tde_add_kpart( kwin3_openlook AUTOMOC
+tde_add_kpart( twin3_openlook AUTOMOC
   SOURCES OpenLook.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/openlook/Makefile.am b/kwin-styles/openlook/Makefile.am
index c3ec6c4a..32b41684 100644
--- a/kwin-styles/openlook/Makefile.am
+++ b/kwin-styles/openlook/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES                    = $(all_includes)
 
-kde_module_LTLIBRARIES      = kwin3_openlook.la
+kde_module_LTLIBRARIES      = twin3_openlook.la
 
-kwin3_openlook_la_SOURCES   = OpenLook.cpp
-kwin3_openlook_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_openlook_la_LIBADD    = -ltdecorations
+twin3_openlook_la_SOURCES   = OpenLook.cpp
+twin3_openlook_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_openlook_la_LIBADD    = -ltdecorations
 
 noinst_HEADERS              = OpenLook.h
 METASOURCES                 = AUTO
 
-linkdir                     = $(kde_datadir)/kwin/
+linkdir                     = $(kde_datadir)/twin/
 link_DATA                   = openlook.desktop
 
 EXTRA_DIST                  = $(link_DATA)
diff --git a/kwin-styles/openlook/OpenLook.cpp b/kwin-styles/openlook/OpenLook.cpp
index 294b678d..46398e30 100644
--- a/kwin-styles/openlook/OpenLook.cpp
+++ b/kwin-styles/openlook/OpenLook.cpp
@@ -1,5 +1,5 @@
 /*
-  'OpenLook' kwin client
+  'OpenLook' twin client
 
   Porting to trinity.2 API
     Copyright 2003 Luciano Montanaro <mikelima@cirulla.net>
diff --git a/kwin-styles/openlook/OpenLook.h b/kwin-styles/openlook/OpenLook.h
index d6a598ab..98db37af 100644
--- a/kwin-styles/openlook/OpenLook.h
+++ b/kwin-styles/openlook/OpenLook.h
@@ -1,5 +1,5 @@
 /*
-  'OpenLook' kwin client
+  'OpenLook' twin client
 
   Porting to trinity.2 API 
     Copyright 2003 Luciano Montanaro <mikelima@cirulla.net>
diff --git a/kwin-styles/openlook/openlook.desktop b/kwin-styles/openlook/openlook.desktop
index 575a583e..0ed25dcb 100644
--- a/kwin-styles/openlook/openlook.desktop
+++ b/kwin-styles/openlook/openlook.desktop
@@ -11,4 +11,4 @@ Name[ta]=திறந்தபார்வை
 Name[ven]=Vula wo sedza
 Name[vi]=Hình thức mở
 Name[zu]=Vula Ubone
-X-KDE-Library=kwin3_openlook
+X-KDE-Library=twin3_openlook
diff --git a/kwin-styles/riscos/CMakeLists.txt b/kwin-styles/riscos/CMakeLists.txt
index cba21db4..5b0e6d54 100644
--- a/kwin-styles/riscos/CMakeLists.txt
+++ b/kwin-styles/riscos/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES riscos.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES riscos.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_riscos ###############################
+##### twin3_riscos ###############################
 
 
-set( target kwin3_riscos )
+set( target twin3_riscos )
 
 set( ${target}_SRCS
   AboveButton.cpp Button.cpp
diff --git a/kwin-styles/riscos/Makefile.am b/kwin-styles/riscos/Makefile.am
index abf062d3..773c341b 100644
--- a/kwin-styles/riscos/Makefile.am
+++ b/kwin-styles/riscos/Makefile.am
@@ -4,8 +4,8 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = $(all_includes) 
 
-kwindir = $(kde_datadir)/kwin/
-kwin_DATA = riscos.desktop
+twindir = $(kde_datadir)/twin/
+twin_DATA = riscos.desktop
 
 noinst_HEADERS = AboveButton.h \
                  Button.h \
@@ -19,8 +19,8 @@ noinst_HEADERS = AboveButton.h \
                  Static.h \
                  StickyButton.h
 
-kde_module_LTLIBRARIES = kwin3_riscos.la
-kwin3_riscos_la_SOURCES = AboveButton.cpp \
+kde_module_LTLIBRARIES = twin3_riscos.la
+twin3_riscos_la_SOURCES = AboveButton.cpp \
                           Button.cpp \
                           CloseButton.cpp \
                           HelpButton.cpp \
@@ -31,9 +31,9 @@ kwin3_riscos_la_SOURCES = AboveButton.cpp \
                           Static.cpp \
                           StickyButton.cpp
 
-kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_riscos_la_LIBADD = $(LIB_TDEUI) -ltdecorations
-kwin3_riscos_la_METASOURCES = AUTO
+twin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_riscos_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin3_riscos_la_METASOURCES = AUTO
 
-EXTRA_DIST = $(kwin_DATA)
+EXTRA_DIST = $(twin_DATA)
 
diff --git a/kwin-styles/riscos/README b/kwin-styles/riscos/README
index 04ebd85d..39d1d959 100644
--- a/kwin-styles/riscos/README
+++ b/kwin-styles/riscos/README
@@ -25,7 +25,7 @@ Button One:
 
   Left button: TODO
                Lower window and drop focus. This is currently unimplemented
-               in kwin itself.
+               in twin itself.
 
 Button Two:
 
@@ -51,7 +51,7 @@ Titlebar:
 
   Right button: Menu
                 Note: Buttons are this way around for compatibility with
-                other kwin themes.
+                other twin themes.
 
 Button Three:
 
diff --git a/kwin-styles/riscos/riscos.desktop b/kwin-styles/riscos/riscos.desktop
index 194b3017..b58aefda 100644
--- a/kwin-styles/riscos/riscos.desktop
+++ b/kwin-styles/riscos/riscos.desktop
@@ -8,4 +8,4 @@ Name[th]=ระบบปฏิบัติการบนชิพ RISC
 Name[uk]=RISC ОС
 Name[xh]=i RISC OS
 Name[zu]=IRISC OS
-X-KDE-Library=kwin3_riscos
+X-KDE-Library=twin3_riscos
diff --git a/kwin-styles/smooth-blend/CREDITS b/kwin-styles/smooth-blend/CREDITS
index f473e2ea..a4481ec9 100644
--- a/kwin-styles/smooth-blend/CREDITS
+++ b/kwin-styles/smooth-blend/CREDITS
@@ -1,5 +1,5 @@
 Justin Berstler aka spasemunkie on kdelook.org - spasemunkie at gmail.com : for his buttons!
-Rick aka bitwit on kdelook.org - bitwit at digilanti.org : for his kwin_template
-David Johnson - david at usermode.org : for his example kwin tutorial
+Rick aka bitwit on kdelook.org - bitwit at digilanti.org : for his twin_template
+David Johnson - david at usermode.org : for his example twin tutorial
 Thomas Lübking aka thomas12777 on kdelook.org - baghira-style at gmx.net : for answering questions on getting pixmap buttons into code
 Scott Grayban aka sgrayban on kdelook.org : for testing and hosting the files to be downloaded
diff --git a/kwin-styles/smooth-blend/client/CMakeLists.txt b/kwin-styles/smooth-blend/client/CMakeLists.txt
index 5b75b64a..d59126f9 100644
--- a/kwin-styles/smooth-blend/client/CMakeLists.txt
+++ b/kwin-styles/smooth-blend/client/CMakeLists.txt
@@ -27,11 +27,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES smoothblend.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES smoothblend.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_smoothblend ##########################
+##### twin3_smoothblend ##########################
 
-tde_add_kpart( kwin3_smoothblend AUTOMOC
+tde_add_kpart( twin3_smoothblend AUTOMOC
   SOURCES smoothblend.cc
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/smooth-blend/client/Makefile.am b/kwin-styles/smooth-blend/client/Makefile.am
index 2309046e..056765d6 100644
--- a/kwin-styles/smooth-blend/client/Makefile.am
+++ b/kwin-styles/smooth-blend/client/Makefile.am
@@ -4,17 +4,17 @@ SUBDIRS = config
 
 KDE_CXXFLAGS = -DQT_PLUGIN
 
-INCLUDES = $(all_includes) -I$(kde_includes)/kwin
+INCLUDES = $(all_includes) -I$(kde_includes)/twin
 
-kwindir = $(kde_datadir)/kwin/
-kwin_DATA = smoothblend.desktop
+twindir = $(kde_datadir)/twin/
+twin_DATA = smoothblend.desktop
 
 noinst_HEADERS = smoothblend.h buttons.h
 
-kde_module_LTLIBRARIES = kwin3_smoothblend.la
-kwin3_smoothblend_la_SOURCES = smoothblend.cc
-kwin3_smoothblend_la_LIBADD = -ltdecorations
-kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_smoothblend_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin3_smoothblend.la
+twin3_smoothblend_la_SOURCES = smoothblend.cc
+twin3_smoothblend_la_LIBADD = -ltdecorations
+twin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_smoothblend_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(kwin3_smoothblend_la_METASOURCES)
+DISTCLEANFILES = $(twin3_smoothblend_la_METASOURCES)
diff --git a/kwin-styles/smooth-blend/client/config/CMakeLists.txt b/kwin-styles/smooth-blend/client/config/CMakeLists.txt
index 51502659..7a38efbb 100644
--- a/kwin-styles/smooth-blend/client/config/CMakeLists.txt
+++ b/kwin-styles/smooth-blend/client/config/CMakeLists.txt
@@ -23,9 +23,9 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### kwin_smoothblend_config (module) ##########
+##### twin_smoothblend_config (module) ##########
 
-tde_add_kpart( kwin_smoothblend_config AUTOMOC
+tde_add_kpart( twin_smoothblend_config AUTOMOC
   SOURCES configdialog.ui smoothblendconfig.cc
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/smooth-blend/client/config/Makefile.am b/kwin-styles/smooth-blend/client/config/Makefile.am
index 2f89fd8b..ba5cd314 100644
--- a/kwin-styles/smooth-blend/client/config/Makefile.am
+++ b/kwin-styles/smooth-blend/client/config/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES = $(all_includes)
 
 noinst_HEADERS = smoothblendconfig.h
 
-kde_module_LTLIBRARIES = kwin_smoothblend_config.la
-kwin_smoothblend_config_la_SOURCES = configdialog.ui smoothblendconfig.cc
-kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin_smoothblend_config_la_LIBADD = $(LIB_TDEUI)
-kwin_smoothblend_config_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin_smoothblend_config.la
+twin_smoothblend_config_la_SOURCES = configdialog.ui smoothblendconfig.cc
+twin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_smoothblend_config_la_LIBADD = $(LIB_TDEUI)
+twin_smoothblend_config_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(kwin_smoothblend_config_la_METASOURCES)
+DISTCLEANFILES = $(twin_smoothblend_config_la_METASOURCES)
diff --git a/kwin-styles/smooth-blend/client/config/smoothblendconfig.cc b/kwin-styles/smooth-blend/client/config/smoothblendconfig.cc
index 3ec445b9..f2ec3e68 100644
--- a/kwin-styles/smooth-blend/client/config/smoothblendconfig.cc
+++ b/kwin-styles/smooth-blend/client/config/smoothblendconfig.cc
@@ -29,8 +29,8 @@
 smoothblendConfig::smoothblendConfig(KConfig* config, TQWidget* parent)
         : TQObject(parent), config_(0), dialog_(0) {
     // create the configuration object
-    config_ = new KConfig("kwinsmoothblendrc");
-    KGlobal::locale()->insertCatalogue("kwin_smoothblend_config");
+    config_ = new KConfig("twinsmoothblendrc");
+    KGlobal::locale()->insertCatalogue("twin_smoothblend_config");
 
     // create and show the configuration dialog
     dialog_ = new ConfigDialog(parent);
diff --git a/kwin-styles/smooth-blend/client/smoothblend.cc b/kwin-styles/smooth-blend/client/smoothblend.cc
index 6e416dce..02efd047 100644
--- a/kwin-styles/smooth-blend/client/smoothblend.cc
+++ b/kwin-styles/smooth-blend/client/smoothblend.cc
@@ -118,7 +118,7 @@ bool smoothblendFactory::reset(unsigned long changed) {
 
 bool smoothblendFactory::readConfig() {
     // create a config object
-    KConfig config("kwinsmoothblendrc");
+    KConfig config("twinsmoothblendrc");
     config.setGroup("General");
 
     // grab settings
diff --git a/kwin-styles/smooth-blend/client/smoothblend.desktop b/kwin-styles/smooth-blend/client/smoothblend.desktop
index 047f92a1..6f26b6e0 100644
--- a/kwin-styles/smooth-blend/client/smoothblend.desktop
+++ b/kwin-styles/smooth-blend/client/smoothblend.desktop
@@ -37,4 +37,4 @@ Name[tr]=Düz Karışım
 Name[uk]=Гладке змішання
 Name[vi]=Trộn màu Mượt mà
 Name[zh_TW]=平順混合
-X-KDE-Library=kwin3_smoothblend
+X-KDE-Library=twin3_smoothblend
diff --git a/kwin-styles/system/CMakeLists.txt b/kwin-styles/system/CMakeLists.txt
index bc78b14c..09a3a966 100644
--- a/kwin-styles/system/CMakeLists.txt
+++ b/kwin-styles/system/CMakeLists.txt
@@ -21,11 +21,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES system.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES system.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_system ###############################
+##### twin3_system ###############################
 
-tde_add_kpart( kwin3_system AUTOMOC
+tde_add_kpart( twin3_system AUTOMOC
   SOURCES systemclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/system/Makefile.am b/kwin-styles/system/Makefile.am
index 584c2d10..5b401370 100644
--- a/kwin-styles/system/Makefile.am
+++ b/kwin-styles/system/Makefile.am
@@ -1,17 +1,17 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin3_system.la
+kde_module_LTLIBRARIES = twin3_system.la
 
-kwin3_system_la_SOURCES = systemclient.cpp
-kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-#kwin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-kwin3_system_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin3_system_la_SOURCES = systemclient.cpp
+twin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+#twin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin3_system_la_LIBADD = $(LIB_TDEUI) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = systemclient.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = system.desktop
 
 EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin-styles/system/system.desktop b/kwin-styles/system/system.desktop
index acadcdda..94156b29 100644
--- a/kwin-styles/system/system.desktop
+++ b/kwin-styles/system/system.desktop
@@ -24,4 +24,4 @@ Name[tr]=Sistem++
 Name[ven]=Sisitemu++
 Name[xh]=Indlela esetyenziswayo++
 Name[zu]=Indlela esetshenziswayo++
-X-KDE-Library=kwin3_system
+X-KDE-Library=twin3_system
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index df40c1a5..3f7b8b7e 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -1373,7 +1373,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 			break;
 		}
 
-	// Menu and dockwindow empty space
+	// Menu and doctwindow empty space
 	//
 		case CE_DockWindowEmptyArea:
 		case CE_MenuBarEmptyArea: