diff --git a/CMakeLists.txt b/CMakeLists.txt
index b647309..7b948ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,12 @@ option( WITH_ALL_OPTIONS "Enable all optional support" OFF
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
 
 
+##### user requested modules
+
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )
+
+
 ##### configure checks
 
 include( ConfigureChecks.cmake )
@@ -64,7 +70,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 add_subdirectory( client )
 add_subdirectory( themes )
 
+
+##### other data
+
+tde_conditional_add_project_translations( BUILD_TRANSLATIONS )
+
+
 ##### write configure files
 
 configure_file( config.h.cmake config.h @ONLY )
-
diff --git a/client/CMakeL10n.txt b/client/CMakeL10n.txt
index b7dc64b..c76af0e 100644
--- a/client/CMakeL10n.txt
+++ b/client/CMakeL10n.txt
@@ -1,6 +1,12 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "messages/twin_deKorator/"
+    SOURCES .
+    X-POT ${CMAKE_SOURCE_DIR}/../../../core/tde-i18n/template/messages/tdebase/twin_clients.pot
+)
+
 tde_l10n_create_template(
     CATALOG "desktop_files/twin-style-deKorator-desktops"
     SOURCES deKorator.desktop
 )
-
-tde_l10n_auto_add_subdirectories( )
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 1377087..6374694 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -22,7 +22,7 @@ tde_add_kpart( twin3_deKorator AUTOMOC
 
   SOURCES
         deKoratorclient.cpp
-	shadow.cpp
+        shadow.cpp
   LINK
      tdecore-shared
      tdeui-shared
@@ -34,7 +34,7 @@ tde_add_kpart( twin3_deKorator AUTOMOC
 
 ##### other data
 
-install(
-    FILES deKorator.desktop
+tde_create_translated_desktop(
+    SOURCE deKorator.desktop
     DESTINATION ${DATA_INSTALL_DIR}/twin
 )
diff --git a/client/config/CMakeL10n.txt b/client/config/CMakeL10n.txt
deleted file mode 100644
index 019282a..0000000
--- a/client/config/CMakeL10n.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template( "messages/twin_deKorator_config" )
diff --git a/client/config/CMakeLists.txt b/client/config/CMakeLists.txt
index c303eb4..e51806d 100644
--- a/client/config/CMakeLists.txt
+++ b/client/config/CMakeLists.txt
@@ -19,7 +19,7 @@ tde_add_kpart( twin_deKorator_config AUTOMOC
   SOURCES
         deKoratorconfig.cpp
         configdialog.ui
-	themes.cpp
+        themes.cpp
   LINK
      tdecore-shared
      tdeui-shared
diff --git a/client/config/deKoratorconfig.cpp b/client/config/deKoratorconfig.cpp
index db3d638..1904a9a 100644
--- a/client/config/deKoratorconfig.cpp
+++ b/client/config/deKoratorconfig.cpp
@@ -31,6 +31,10 @@
 // Boston, MA 02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////
 
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
+#endif
+
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
@@ -61,9 +65,8 @@ DeKoratorConfig::DeKoratorConfig( TDEConfig* config, TQWidget* parent )
 {
     // create the configuration object
     config_ = new TDEConfig( "twindeKoratorrc" );
-    TDEGlobal::locale() ->insertCatalogue( "twin_deKorator_config" );
-
-
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_deKorator");
 
     // create and show the configuration dialog
     dialog_ = new ConfigDialog( parent );
@@ -455,7 +458,7 @@ void DeKoratorConfig::setTheme()
 
 extern "C"
 {
-    TQObject * allocate_config( TDEConfig * config, TQWidget * parent )
+    KDE_EXPORT TQObject * allocate_config( TDEConfig * config, TQWidget * parent )
     {
         return ( new DeKoratorConfig( config, parent ) );
     }
diff --git a/client/config/themes.cpp b/client/config/themes.cpp
index 5525b6a..1688874 100644
--- a/client/config/themes.cpp
+++ b/client/config/themes.cpp
@@ -31,7 +31,9 @@
 // Boston, MA 02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////
 
-#include <config.h>
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/client/config/themes.moc.cpp b/client/config/themes.moc.cpp
deleted file mode 100644
index 9e25331..0000000
--- a/client/config/themes.moc.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-** IconThemesConfig meta object code from reading C++ file 'themes.h'
-**
-** Created: Wed Dec 7 20:20:14 2005
-**      by: The TQt MOC ($Id: qt/moc_yacc.cpp   3.3.5   edited Sep 2 14:41 $)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#undef QT_NO_COMPAT
-#include "themes.h"
-#include <tqmetaobject.h>
-#include <tqapplication.h>
-
-#include <private/qucomextra_p.h>
-#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.5. It"
-#error "cannot be used with the include files from this version of TQt."
-#error "(The moc has changed too much.)"
-#endif
-
-const char *IconThemesConfig::className() const
-{
-    return "IconThemesConfig";
-}
-
-TQMetaObject *IconThemesConfig::metaObj = 0;
-static TQMetaObjectCleanUp cleanUp_IconThemesConfig( "IconThemesConfig", &IconThemesConfig::staticMetaObject );
-
-#ifndef QT_NO_TRANSLATION
-TQString IconThemesConfig::tr( const char *s, const char *c )
-{
-    if ( tqApp )
-	return tqApp->translate( "IconThemesConfig", s, c, TQApplication::DefaultCodec );
-    else
-	return TQString::fromLatin1( s );
-}
-#ifndef QT_NO_TRANSLATION_UTF8
-TQString IconThemesConfig::trUtf8( const char *s, const char *c )
-{
-    if ( tqApp )
-	return tqApp->translate( "IconThemesConfig", s, c, TQApplication::UnicodeUTF8 );
-    else
-	return TQString::fromUtf8( s );
-}
-#endif // QT_NO_TRANSLATION_UTF8
-
-#endif // QT_NO_TRANSLATION
-
-TQMetaObject* IconThemesConfig::staticMetaObject()
-{
-    if ( metaObj )
-	return metaObj;
-    TQMetaObject* parentObject = TDECModule::staticMetaObject();
-    static const TQUParameter param_slot_0[] = {
-	{ "item", &static_QUType_ptr, "TQListViewItem", TQUParameter::In }
-    };
-    static const TQUMethod slot_0 = {"themeSelected", 1, param_slot_0 };
-    static const TQUMethod slot_1 = {"installNewTheme", 0, 0 };
-    static const TQUMethod slot_2 = {"removeSelectedTheme", 0, 0 };
-    static const TQMetaData slot_tbl[] = {
-	{ "themeSelected(TQListViewItem*)", &slot_0, TQMetaData::Protected },
-	{ "installNewTheme()", &slot_1, TQMetaData::Protected },
-	{ "removeSelectedTheme()", &slot_2, TQMetaData::Protected }
-    };
-    metaObj = TQMetaObject::new_metaobject(
-	"IconThemesConfig", parentObject,
-	slot_tbl, 3,
-	0, 0,
-#ifndef QT_NO_PROPERTIES
-	0, 0,
-	0, 0,
-#endif // QT_NO_PROPERTIES
-	0, 0 );
-    cleanUp_IconThemesConfig.setMetaObject( metaObj );
-    return metaObj;
-}
-
-void* IconThemesConfig::tqt_cast( const char* clname )
-{
-    if ( !qstrcmp( clname, "IconThemesConfig" ) )
-	return this;
-    return TDECModule::tqt_cast( clname );
-}
-
-bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o )
-{
-    switch ( _id - staticMetaObject()->slotOffset() ) {
-    case 0: themeSelected((TQListViewItem*)static_QUType_ptr.get(_o+1)); break;
-    case 1: installNewTheme(); break;
-    case 2: removeSelectedTheme(); break;
-    default:
-	return TDECModule::tqt_invoke( _id, _o );
-    }
-    return TRUE;
-}
-
-bool IconThemesConfig::tqt_emit( int _id, TQUObject* _o )
-{
-    return TDECModule::tqt_emit(_id,_o);
-}
-#ifndef QT_NO_PROPERTIES
-
-bool IconThemesConfig::tqt_property( int id, int f, TQVariant* v)
-{
-    return TDECModule::tqt_property( id, f, v);
-}
-
-bool IconThemesConfig::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }
-#endif // QT_NO_PROPERTIES
diff --git a/client/config/themes.moc.loT b/client/config/themes.moc.loT
deleted file mode 100644
index f7771d1..0000000
--- a/client/config/themes.moc.loT
+++ /dev/null
@@ -1,7 +0,0 @@
-# themes.moc.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5a (1.1240 2003/06/26 06:55:19)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
diff --git a/client/deKorator.desktop b/client/deKorator.desktop
index afc4c60..00683d7 100644
--- a/client/deKorator.desktop
+++ b/client/deKorator.desktop
@@ -1,5 +1,3 @@
-# KDE Desktop Entry
 [Desktop Entry]
-Encoding=UTF-8
 Name=DeKorator
 X-TDE-Library=twin3_deKorator
diff --git a/client/deKoratorclient.cpp b/client/deKoratorclient.cpp
index c92cb02..406248d 100644
--- a/client/deKoratorclient.cpp
+++ b/client/deKoratorclient.cpp
@@ -31,9 +31,9 @@
 // Boston, MA 02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////
 
-
-
-
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
+#endif
 
 #include "deKoratorclient.h"
 
@@ -176,9 +176,12 @@ TQString DeKoratorFactory::buttonsPath_ = "";
 TQString DeKoratorFactory::masksPath_ = "";
 
 
-extern "C" KDecorationFactory* create_factory()
+extern "C"
 {
-    return new DeKorator::DeKoratorFactory();
+    KDE_EXPORT KDecorationFactory* create_factory()
+    {
+        return new DeKorator::DeKoratorFactory();
+    }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -187,6 +190,9 @@ extern "C" KDecorationFactory* create_factory()
 // Constructor
 DeKoratorFactory::DeKoratorFactory()
 {
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_deKorator");
+
     readConfig();
     initialized_ = TRUE;
 
diff --git a/client/shadow.cpp b/client/shadow.cpp
index 09b813a..c9b81fa 100644
--- a/client/shadow.cpp
+++ b/client/shadow.cpp
@@ -31,6 +31,10 @@
 // Boston, MA 02110-1301, USA.
 ///////////////////////////////////////////////////////////////////////
 
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
+#endif
+
 #include "shadow.h"
 #include <tqcolor.h>
 
diff --git a/client/themes.moc.cpp b/client/themes.moc.cpp
deleted file mode 100644
index f685683..0000000
--- a/client/themes.moc.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-** IconThemesConfig meta object code from reading C++ file 'themes.h'
-**
-** Created: Wed Dec 7 21:43:34 2005
-**      by: The TQt MOC ($Id: qt/moc_yacc.cpp   3.3.5   edited Sep 2 14:41 $)
-**
-** WARNING! All changes made in this file will be lost!
-*****************************************************************************/
-
-#undef QT_NO_COMPAT
-#include "themes.h"
-#include <tqmetaobject.h>
-#include <tqapplication.h>
-
-#include <private/qucomextra_p.h>
-#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26)
-#error "This file was generated using the moc from 3.3.5. It"
-#error "cannot be used with the include files from this version of TQt."
-#error "(The moc has changed too much.)"
-#endif
-
-const char *IconThemesConfig::className() const
-{
-    return "IconThemesConfig";
-}
-
-TQMetaObject *IconThemesConfig::metaObj = 0;
-static TQMetaObjectCleanUp cleanUp_IconThemesConfig( "IconThemesConfig", &IconThemesConfig::staticMetaObject );
-
-#ifndef QT_NO_TRANSLATION
-TQString IconThemesConfig::tr( const char *s, const char *c )
-{
-    if ( tqApp )
-	return tqApp->translate( "IconThemesConfig", s, c, TQApplication::DefaultCodec );
-    else
-	return TQString::fromLatin1( s );
-}
-#ifndef QT_NO_TRANSLATION_UTF8
-TQString IconThemesConfig::trUtf8( const char *s, const char *c )
-{
-    if ( tqApp )
-	return tqApp->translate( "IconThemesConfig", s, c, TQApplication::UnicodeUTF8 );
-    else
-	return TQString::fromUtf8( s );
-}
-#endif // QT_NO_TRANSLATION_UTF8
-
-#endif // QT_NO_TRANSLATION
-
-TQMetaObject* IconThemesConfig::staticMetaObject()
-{
-    if ( metaObj )
-	return metaObj;
-    TQMetaObject* parentObject = TDECModule::staticMetaObject();
-    static const TQUParameter param_slot_0[] = {
-	{ "item", &static_QUType_ptr, "TQListViewItem", TQUParameter::In }
-    };
-    static const TQUMethod slot_0 = {"themeSelected", 1, param_slot_0 };
-    static const TQUMethod slot_1 = {"installNewTheme", 0, 0 };
-    static const TQUMethod slot_2 = {"removeSelectedTheme", 0, 0 };
-    static const TQMetaData slot_tbl[] = {
-	{ "themeSelected(TQListViewItem*)", &slot_0, TQMetaData::Protected },
-	{ "installNewTheme()", &slot_1, TQMetaData::Protected },
-	{ "removeSelectedTheme()", &slot_2, TQMetaData::Protected }
-    };
-    metaObj = TQMetaObject::new_metaobject(
-	"IconThemesConfig", parentObject,
-	slot_tbl, 3,
-	0, 0,
-#ifndef QT_NO_PROPERTIES
-	0, 0,
-	0, 0,
-#endif // QT_NO_PROPERTIES
-	0, 0 );
-    cleanUp_IconThemesConfig.setMetaObject( metaObj );
-    return metaObj;
-}
-
-void* IconThemesConfig::tqt_cast( const char* clname )
-{
-    if ( !qstrcmp( clname, "IconThemesConfig" ) )
-	return this;
-    return TDECModule::tqt_cast( clname );
-}
-
-bool IconThemesConfig::tqt_invoke( int _id, TQUObject* _o )
-{
-    switch ( _id - staticMetaObject()->slotOffset() ) {
-    case 0: themeSelected((TQListViewItem*)static_QUType_ptr.get(_o+1)); break;
-    case 1: installNewTheme(); break;
-    case 2: removeSelectedTheme(); break;
-    default:
-	return TDECModule::tqt_invoke( _id, _o );
-    }
-    return TRUE;
-}
-
-bool IconThemesConfig::tqt_emit( int _id, TQUObject* _o )
-{
-    return TDECModule::tqt_emit(_id,_o);
-}
-#ifndef QT_NO_PROPERTIES
-
-bool IconThemesConfig::tqt_property( int id, int f, TQVariant* v)
-{
-    return TDECModule::tqt_property( id, f, v);
-}
-
-bool IconThemesConfig::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }
-#endif // QT_NO_PROPERTIES
diff --git a/translations/desktop_files/twin-style-deKorator-desktops.pot b/translations/desktop_files/twin-style-deKorator-desktops.pot
index f8a2dc6..ca97e9b 100644
--- a/translations/desktop_files/twin-style-deKorator-desktops.pot
+++ b/translations/desktop_files/twin-style-deKorator-desktops.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-26 18:09+0300\n"
+"POT-Creation-Date: 2021-07-12 19:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Name
-#: deKorator.desktop:4
+#: deKorator.desktop:2
 msgid "DeKorator"
 msgstr ""
diff --git a/translations/messages/twin_deKorator_config.pot b/translations/messages/twin_deKorator/twin_deKorator.pot
similarity index 67%
rename from translations/messages/twin_deKorator_config.pot
rename to translations/messages/twin_deKorator/twin_deKorator.pot
index 83c0ae7..819b0d8 100644
--- a/translations/messages/twin_deKorator_config.pot
+++ b/translations/messages/twin_deKorator/twin_deKorator.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-06-26 18:10+0300\n"
+"POT-Creation-Date: 2021-07-12 19:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,500 +27,483 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: themes.cpp:168
+#: config/themes.cpp:170
 msgid "Drag or Type Theme URL"
 msgstr ""
 
-#: themes.cpp:181
+#: config/themes.cpp:183
 #, c-format
 msgid "Unable to find the deKorator theme archive %1."
 msgstr ""
 
-#: themes.cpp:183
+#: config/themes.cpp:185
 msgid ""
 "Unable to download deKorator theme archive;\n"
 "please check that address %1 is correct."
 msgstr ""
 
-#: themes.cpp:193
+#: config/themes.cpp:195
 msgid "The file is not a valid deKorator theme archive."
 msgstr ""
 
-#: themes.cpp:205
+#: config/themes.cpp:207
 msgid ""
 "A problem occurred during the installation process; however, most of the "
 "themes in the archive have been installed"
 msgstr ""
 
-#: themes.cpp:231
+#: config/themes.cpp:233
 msgid "Installing icon themes"
 msgstr ""
 
-#: themes.cpp:248
+#: config/themes.cpp:250
 msgid "<qt>Installing <strong>%1</strong> theme</qt>"
 msgstr ""
 
-#: themes.cpp:330
+#: config/themes.cpp:332
 msgid ""
-"<qt>Are you sure you want to remove the <strong>%1</strong> "
-"theme?<br><br>This will delete the files installed by this theme.</qt>"
+"<qt>Are you sure you want to remove the <strong>%1</strong> theme?"
+"<br><br>This will delete the files installed by this theme.</qt>"
 msgstr ""
 
-#: themes.cpp:336
+#: config/themes.cpp:338
 msgid "Confirmation"
 msgstr ""
 
-#: configdialog.ui:16
-#, no-c-format
-msgid "Config Dialog"
+#: deKoratorclient.cpp:1703
+msgid "Dekorator preview (Version 0.3)"
 msgstr ""
 
-#: configdialog.ui:31
-#, no-c-format
-msgid "M&isc"
+#: deKoratorclient.cpp:1776 deKoratorclient.cpp:1976
+msgid "Un-Sticky"
 msgstr ""
 
-#: configdialog.ui:48
+#: config/configdialog.ui:31
 #, no-c-format
-msgid "Decoration Settings"
+msgid "M&isc"
 msgstr ""
 
-#: configdialog.ui:59
+#: config/configdialog.ui:48
 #, no-c-format
-msgid "Title &Alignment"
+msgid "Decoration Settings"
 msgstr ""
 
-#: configdialog.ui:62
+#: config/configdialog.ui:62
 #, no-c-format
 msgid "Use these buttons to set the alignment of the window title"
 msgstr ""
 
-#: configdialog.ui:73
+#: config/configdialog.ui:73
 #, no-c-format
 msgid "L&eft"
 msgstr ""
 
-#: configdialog.ui:76 configdialog.ui:1755
+#: config/configdialog.ui:76 config/configdialog.ui:1755
 #, no-c-format
 msgid "Alt+E"
 msgstr ""
 
-#: configdialog.ui:87
+#: config/configdialog.ui:87
 #, no-c-format
 msgid "&Center"
 msgstr ""
 
-#: configdialog.ui:90
+#: config/configdialog.ui:90
 #, no-c-format
 msgid "Alt+C"
 msgstr ""
 
-#: configdialog.ui:104
+#: config/configdialog.ui:104
 #, no-c-format
 msgid "Ri&ght"
 msgstr ""
 
-#: configdialog.ui:107
+#: config/configdialog.ui:107
 #, no-c-format
 msgid "Alt+G"
 msgstr ""
 
-#: configdialog.ui:120
+#: config/configdialog.ui:120
 #, no-c-format
 msgid "Text Shadow"
 msgstr ""
 
-#: configdialog.ui:131
+#: config/configdialog.ui:131
 #, no-c-format
 msgid "&Use shadowed text"
 msgstr ""
 
-#: configdialog.ui:134 configdialog.ui:638
-#: configdialog.ui:1582
+#: config/configdialog.ui:134 config/configdialog.ui:638
+#: config/configdialog.ui:1582
 #, no-c-format
 msgid "Alt+U"
 msgstr ""
 
-#: configdialog.ui:153 configdialog.ui:550
+#: config/configdialog.ui:153 config/configdialog.ui:550
 #, no-c-format
 msgid "Active"
 msgstr ""
 
-#: configdialog.ui:175 configdialog.ui:283
-#: configdialog.ui:397
+#: config/configdialog.ui:175 config/configdialog.ui:283
+#: config/configdialog.ui:397
 #, no-c-format
 msgid "X :"
 msgstr ""
 
-#: configdialog.ui:200 configdialog.ui:308
-#: configdialog.ui:416
+#: config/configdialog.ui:200 config/configdialog.ui:308
+#: config/configdialog.ui:416
 #, no-c-format
 msgid "Y :"
 msgstr ""
 
-#: configdialog.ui:235 configdialog.ui:343
+#: config/configdialog.ui:235 config/configdialog.ui:343
 #, no-c-format
 msgid "Color"
 msgstr ""
 
-#: configdialog.ui:261 configdialog.ui:585
+#: config/configdialog.ui:261 config/configdialog.ui:585
 #, no-c-format
 msgid "Inactive"
 msgstr ""
 
-#: configdialog.ui:370
+#: config/configdialog.ui:370
 #, no-c-format
 msgid "Pressed Buttons Shift"
 msgstr ""
 
-#: configdialog.ui:458
+#: config/configdialog.ui:458
 #, no-c-format
 msgid "Use menu button image insted o&f the app icon"
 msgstr ""
 
-#: configdialog.ui:461 configdialog.ui:564
-#: configdialog.ui:599
+#: config/configdialog.ui:461 config/configdialog.ui:564
+#: config/configdialog.ui:599
 #, no-c-format
 msgid "Alt+F"
 msgstr ""
 
-#: configdialog.ui:469
+#: config/configdialog.ui:469
 #, no-c-format
 msgid "Ignore app icon colorizing"
 msgstr ""
 
-#: configdialog.ui:477
+#: config/configdialog.ui:477
 #, no-c-format
 msgid "Close &window by by double clicking the menu button"
 msgstr ""
 
-#: configdialog.ui:480
+#: config/configdialog.ui:480
 #, no-c-format
 msgid "Alt+W"
 msgstr ""
 
-#: configdialog.ui:488
+#: config/configdialog.ui:488
 #, no-c-format
 msgid "Show &bottom border when window is shaded"
 msgstr ""
 
-#: configdialog.ui:491 configdialog.ui:575
-#: configdialog.ui:610
+#: config/configdialog.ui:491 config/configdialog.ui:575
+#: config/configdialog.ui:610
 #, no-c-format
 msgid "Alt+B"
 msgstr ""
 
-#: configdialog.ui:520
+#: config/configdialog.ui:520
 #, no-c-format
 msgid "Color&s"
 msgstr ""
 
-#: configdialog.ui:531
+#: config/configdialog.ui:531
 #, no-c-format
 msgid "Colors"
 msgstr ""
 
-#: configdialog.ui:561 configdialog.ui:596
+#: config/configdialog.ui:561 config/configdialog.ui:596
 #, no-c-format
 msgid "Colorize &frames"
 msgstr ""
 
-#: configdialog.ui:572 configdialog.ui:607
+#: config/configdialog.ui:572 config/configdialog.ui:607
 #, no-c-format
 msgid "Colorize &buttons"
 msgstr ""
 
-#: configdialog.ui:624
+#: config/configdialog.ui:624
 #, no-c-format
 msgid "Hover Effects"
 msgstr ""
 
-#: configdialog.ui:635
+#: config/configdialog.ui:635
 #, no-c-format
 msgid "&Use buttons animation"
 msgstr ""
 
-#: configdialog.ui:654
+#: config/configdialog.ui:654
 #, no-c-format
 msgid "Animate Effect"
 msgstr ""
 
-#: configdialog.ui:663
+#: config/configdialog.ui:663
 #, no-c-format
 msgid "Intensity"
 msgstr ""
 
-#: configdialog.ui:668
+#: config/configdialog.ui:668
 #, no-c-format
 msgid "Blend"
 msgstr ""
 
-#: configdialog.ui:673
+#: config/configdialog.ui:673
 #, no-c-format
 msgid "Solarize"
 msgstr ""
 
-#: configdialog.ui:678
+#: config/configdialog.ui:678
 #, no-c-format
 msgid "Fade"
 msgstr ""
 
-#: configdialog.ui:683
+#: config/configdialog.ui:683
 #, no-c-format
 msgid "Trashed"
 msgstr ""
 
-#: configdialog.ui:688
+#: config/configdialog.ui:688
 #, no-c-format
 msgid "Hue Shift"
 msgstr ""
 
-#: configdialog.ui:714
+#: config/configdialog.ui:714
 #, no-c-format
 msgid "Steps :"
 msgstr ""
 
-#: configdialog.ui:739
+#: config/configdialog.ui:739
 #, no-c-format
 msgid "Interval"
 msgstr ""
 
-#: configdialog.ui:763
+#: config/configdialog.ui:763
 #, no-c-format
 msgid "Keep Animating"
 msgstr ""
 
-#: configdialog.ui:773
+#: config/configdialog.ui:773
 #, no-c-format
 msgid "Hover And Press Effect"
 msgstr ""
 
-#: configdialog.ui:782
+#: config/configdialog.ui:782
 #, no-c-format
 msgid "To Gray"
 msgstr ""
 
-#: configdialog.ui:787
+#: config/configdialog.ui:787
 #, no-c-format
 msgid "Colorize"
 msgstr ""
 
-#: configdialog.ui:792
+#: config/configdialog.ui:792
 #, no-c-format
 msgid "DeSaturate"
 msgstr ""
 
-#: configdialog.ui:797
+#: config/configdialog.ui:797
 #, no-c-format
 msgid "To Gamma"
 msgstr ""
 
-#: configdialog.ui:802
+#: config/configdialog.ui:802
 #, no-c-format
 msgid "Use Image Colors"
 msgstr ""
 
-#: configdialog.ui:822
+#: config/configdialog.ui:822
 #, no-c-format
 msgid "Amount :"
 msgstr ""
 
-#: configdialog.ui:847
+#: config/configdialog.ui:847
 #, no-c-format
 msgid "Highlight Colors"
 msgstr ""
 
-#: configdialog.ui:874
+#: config/configdialog.ui:874
 #, no-c-format
 msgid "Active color"
 msgstr ""
 
-#: configdialog.ui:900
+#: config/configdialog.ui:900
 #, no-c-format
 msgid "Inactive color"
 msgstr ""
 
-#: configdialog.ui:924
+#: config/configdialog.ui:924
 #, no-c-format
 msgid "Colorizing Method"
 msgstr ""
 
-#: configdialog.ui:943
+#: config/configdialog.ui:943
 #, no-c-format
 msgid "Deco's"
 msgstr ""
 
-#: configdialog.ui:949 configdialog.ui:987
+#: config/configdialog.ui:949 config/configdialog.ui:987
 #, no-c-format
 msgid "Liquid Method"
 msgstr ""
 
-#: configdialog.ui:954 configdialog.ui:992
+#: config/configdialog.ui:954 config/configdialog.ui:992
 #, no-c-format
 msgid "Kde Method"
 msgstr ""
 
-#: configdialog.ui:959 configdialog.ui:997
+#: config/configdialog.ui:959 config/configdialog.ui:997
 #, no-c-format
 msgid "Hue Adgustment"
 msgstr ""
 
-#: configdialog.ui:981 configdialog.ui:1032
+#: config/configdialog.ui:981 config/configdialog.ui:1032
 #, no-c-format
 msgid "Buttons"
 msgstr ""
 
-#: configdialog.ui:1043
+#: config/configdialog.ui:1043
 #, no-c-format
 msgid "Use custom buttons colors"
 msgstr ""
 
-#: configdialog.ui:1054
+#: config/configdialog.ui:1054
 #, no-c-format
 msgid "Custom Buttons Colors"
 msgstr ""
 
-#: configdialog.ui:1065
+#: config/configdialog.ui:1065
 #, no-c-format
 msgid "Apply custom colors to:"
 msgstr ""
 
-#: configdialog.ui:1081
+#: config/configdialog.ui:1081
 #, no-c-format
 msgid "Active buttons"
 msgstr ""
 
-#: configdialog.ui:1089
+#: config/configdialog.ui:1089
 #, no-c-format
 msgid "InActive buttons"
 msgstr ""
 
-#: configdialog.ui:1166
+#: config/configdialog.ui:1166
 #, no-c-format
 msgid "Max"
 msgstr ""
 
-#: configdialog.ui:1218
-#, no-c-format
-msgid "Sticky"
-msgstr ""
-
-#: configdialog.ui:1244
+#: config/configdialog.ui:1244
 #, no-c-format
 msgid "Above"
 msgstr ""
 
-#: configdialog.ui:1270
+#: config/configdialog.ui:1270
 #, no-c-format
 msgid "Below"
 msgstr ""
 
-#: configdialog.ui:1296
-#, no-c-format
-msgid "Shade"
-msgstr ""
-
-#: configdialog.ui:1332
+#: config/configdialog.ui:1332
 #, no-c-format
 msgid "Min"
 msgstr ""
 
-#: configdialog.ui:1384
-#, no-c-format
-msgid "Menu"
-msgstr ""
-
-#: configdialog.ui:1410
+#: config/configdialog.ui:1410
 #, no-c-format
 msgid "Sticky Down"
 msgstr ""
 
-#: configdialog.ui:1436
+#: config/configdialog.ui:1436
 #, no-c-format
 msgid "Above Down"
 msgstr ""
 
-#: configdialog.ui:1462
+#: config/configdialog.ui:1462
 #, no-c-format
 msgid "Below Down"
 msgstr ""
 
-#: configdialog.ui:1488
+#: config/configdialog.ui:1488
 #, no-c-format
 msgid "Shade Down"
 msgstr ""
 
-#: configdialog.ui:1531
+#: config/configdialog.ui:1531
 #, no-c-format
 msgid "&Paths"
 msgstr ""
 
-#: configdialog.ui:1542
+#: config/configdialog.ui:1542
 #, no-c-format
 msgid "Tiles Path's"
 msgstr ""
 
-#: configdialog.ui:1553
+#: config/configdialog.ui:1553
 #, no-c-format
 msgid "Frames tiles Path"
 msgstr ""
 
-#: configdialog.ui:1566
+#: config/configdialog.ui:1566
 #, no-c-format
 msgid "Buttons tiles path"
 msgstr ""
 
-#: configdialog.ui:1579
+#: config/configdialog.ui:1579
 #, no-c-format
 msgid "&Use Masks"
 msgstr ""
 
-#: configdialog.ui:1593
+#: config/configdialog.ui:1593
 #, no-c-format
 msgid "Masks tiles path"
 msgstr ""
 
-#: configdialog.ui:1630
+#: config/configdialog.ui:1630
 #, no-c-format
 msgid "&Themes"
 msgstr ""
 
-#: configdialog.ui:1641
+#: config/configdialog.ui:1641
 #, no-c-format
 msgid "Preview"
 msgstr ""
 
-#: configdialog.ui:1688
+#: config/configdialog.ui:1688
 #, no-c-format
 msgid "This is a Screen shot of what TDM will look like when you go to log in."
 msgstr ""
 
-#: configdialog.ui:1715
+#: config/configdialog.ui:1715
 #, no-c-format
 msgid "Theme Name"
 msgstr ""
 
-#: configdialog.ui:1744
+#: config/configdialog.ui:1744
 #, no-c-format
 msgid "Install Ne&w Theme"
 msgstr ""
 
-#: configdialog.ui:1752
+#: config/configdialog.ui:1752
 #, no-c-format
 msgid "R&emove Theme"
 msgstr ""
 
-#: configdialog.ui:1763
+#: config/configdialog.ui:1763
 #, no-c-format
 msgid "&Use This Theme"
 msgstr ""
 
-#: configdialog.ui:1766
+#: config/configdialog.ui:1766
 #, no-c-format
 msgid "Alt+M"
 msgstr ""
 
-#: configdialog.ui:1789
+#: config/configdialog.ui:1789
 #, no-c-format
 msgid ""
 "****** Summary ******\n"
@@ -534,13 +517,11 @@ msgid ""
 "deKorator comes with:\n"
 "    * default-theme - Used by default, illustrates some of deKorator's\n"
 "      features.\n"
-"    * ugly-theme - It's purpose is to understand the way deKorator paints "
-"the\n"
-"      decorations.\n"
-"    * template-theme - this theme  is meant to be a template theme for other "
-"themes,this theme features all possible buttons.\n"
 "    * Bushido-Yellow-theme - shows how masking can be done.\n"
 "\n"
+"Some more themes are available in the extra/ directory of the source\n"
+"distribution.\n"
+"\n"
 "****** Names ******\n"
 "deKorator expects the same directory structure and file names as the ones "
 "in\n"
@@ -554,12 +535,11 @@ msgid ""
 "deKorator determines the 4 borders' sizes from:\n"
 "\n"
 "|Property \t\t\t|Source\t\t\t\t|\n"
-"-----------------------------------------------------------------------------"
-"-------------------\n"
+"------------------------------------------------------------------------------------------------\n"
 "|the left border width   \t\t|midLeftFrameBg's width\t\t|\n"
 "|the right border width  \t\t|midRightFrameBg's width\t|\n"
 "|the top bar height      \t\t|midTitleBg's height      \t\t|\n"
-"|the bottom border height\t|midBottomFrameBg's height\t|\n"
+"|the bottom border height        \t|midBottomFrameBg's height\t|\n"
 "\n"
 "All parts that build up a specific border should be in the same width or "
 "height\n"
@@ -628,21 +608,21 @@ msgid ""
 "Allways start up building your theme from the template-theme.\n"
 msgstr ""
 
-#: configdialog.ui:1974
+#: config/configdialog.ui:1974
 #, no-c-format
 msgid ""
-"<p align=\"center\"><h3>deKorator Window's Decoration Version "
-"0.3</h3></p><br>\n"
+"<p align=\"center\"><h3>deKorator Window's Decoration Version 0.3</h3></"
+"p><br>\n"
 "\n"
 "\n"
 "\n"
 "<p align=\"center\">Art Designer:  jon clarke AKA  ArbitraryReason<br>  \n"
-"Email: <a href=\"mailto:jjclarke2003@yahoo.com\"><font "
-"color=\"#ff0000\">jjclarke2003@yahoo.com</font></a><br>\n"
+"Email: <a href=\"mailto:jjclarke2003@yahoo.com\"><font color="
+"\"#ff0000\">jjclarke2003@yahoo.com</font></a><br>\n"
 "<p align=\"center\">Theme contributer: Zoran Karavla AKA  the-error<br>  \n"
-"Email: <a href=\"mailto:webmaster@the-error.net\"><font "
-"color=\"#ff0000\">webmaster@the-error.net</font></a><br>\n"
+"Email: <a href=\"mailto:webmaster@the-error.net\"><font color="
+"\"#ff0000\">webmaster@the-error.net</font></a><br>\n"
 "<p align=\"center\">Author: moty rahamim<br>\n"
-"Email: <a href=\"mailto:moty.rahamim@gmail.com\"><font "
-"color=\"#ff0000\">moty.rahamim@gmail.com</font></a></p>"
+"Email: <a href=\"mailto:moty.rahamim@gmail.com\"><font color="
+"\"#ff0000\">moty.rahamim@gmail.com</font></a></p>"
 msgstr ""