diff --git a/deco/CMakeL10n.txt b/deco/CMakeL10n.txt
index b585ce4..61144bd 100644
--- a/deco/CMakeL10n.txt
+++ b/deco/CMakeL10n.txt
@@ -1,3 +1,7 @@
 ##### create translation templates ##############
 
-tde_l10n_auto_add_subdirectories( )
+tde_l10n_create_template(
+    CATALOG "messages/twin_baghira/"
+    SOURCES .
+    X-POT ${CMAKE_SOURCE_DIR}/../../../core/tde-i18n/template/messages/tdebase/twin_clients.pot
+)
diff --git a/deco/baghiraclient.cpp b/deco/baghiraclient.cpp
index 471e440..558ede3 100644
--- a/deco/baghiraclient.cpp
+++ b/deco/baghiraclient.cpp
@@ -297,6 +297,9 @@ void ResizeHandle::paintEvent ( TQPaintEvent * )
 // Constructor
 
 BaghiraFactory::BaghiraFactory() {
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_baghira");
+
     helpMask = TQBitmap( 14, 15, help_bits, true );
     jaguarDownMask = TQBitmap( 14, 15, jaguar2_bits, true );
     jaguarMenuDownMask = TQBitmap( 20, 15, jaguar_menu_down_bits, true );
diff --git a/deco/config/CMakeL10n.txt b/deco/config/CMakeL10n.txt
deleted file mode 100644
index e0bfdcd..0000000
--- a/deco/config/CMakeL10n.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-##### create translation templates ##############
-
-tde_l10n_create_template( "messages/twin_baghira_config/" )
diff --git a/deco/config/baghiraconfig.cpp b/deco/config/baghiraconfig.cpp
index 5d1c14d..2ea55a8 100644
--- a/deco/config/baghiraconfig.cpp
+++ b/deco/config/baghiraconfig.cpp
@@ -44,7 +44,8 @@ BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent)
 //     config_ = new TDEConfig("baghirarc");
 //     config_ = new TQSettings;
 //     config_->beginGroup("/baghira/Deco");
-    TDEGlobal::locale()->insertCatalogue("twin_baghira_config");
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_baghira");
 
     dialog_ = new ConfigDialog(parent);
     buttonDialog_ = new ButtonColors(parent, "Button Colors");
diff --git a/deco/config/baghiraconfig.cpp.new b/deco/config/baghiraconfig.cpp.new
index 5f2a29f..c03e90e 100644
--- a/deco/config/baghiraconfig.cpp.new
+++ b/deco/config/baghiraconfig.cpp.new
@@ -45,7 +45,8 @@ BaghiraConfig::BaghiraConfig(TDEConfig*, TQWidget* parent)
 //     config_ = new TDEConfig("baghirarc");
 //     config_ = new TQSettings;
 //     config_->beginGroup("/baghira/Deco");
-    TDEGlobal::locale()->insertCatalogue("twin_baghira_config");
+    TDEGlobal::locale()->insertCatalogue("twin_clients");
+    TDEGlobal::locale()->insertCatalogue("twin_baghira");
 
     dialog_ = new ConfigDialog(parent);
     buttonDialog_ = new ButtonColors(parent, "Button Colors");
diff --git a/translations/messages/twin_baghira/twin_baghira.pot b/translations/messages/twin_baghira/twin_baghira.pot
new file mode 100644
index 0000000..16309c6
--- /dev/null
+++ b/translations/messages/twin_baghira/twin_baghira.pot
@@ -0,0 +1,350 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2021-07-12 10:39+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+#, ignore-inconsistent
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+#, ignore-inconsistent
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: baghiraclient.cpp:1551
+msgid "<b><center>Baghira preview</center></b>"
+msgstr ""
+
+#: baghiraclient.cpp:1696 baghiraclient.cpp:2424
+msgid "Un-Sticky"
+msgstr ""
+
+#: baghiraclient.cpp:1776
+msgid "Keep Above/Below Others"
+msgstr ""
+
+#: config/configdialog.ui:16
+#, no-c-format
+msgid "Configure Baghira Window Decoration"
+msgstr ""
+
+#: config/configdialog.ui:33
+#, no-c-format
+msgid "Common Settings"
+msgstr ""
+
+#: config/configdialog.ui:52
+#, no-c-format
+msgid "Minimum Title Height"
+msgstr ""
+
+#: config/configdialog.ui:83
+#, no-c-format
+msgid ""
+"The Titlebar height will follow your font setting.<br>However, you can set a "
+"minmum value to extend the Titlebar if you prefer small fonts.<br>18 is the "
+"minimum due to the Buttons :)"
+msgstr ""
+
+#: config/configdialog.ui:93
+#, no-c-format
+msgid "Show resize grip"
+msgstr ""
+
+#: config/configdialog.ui:96
+#, no-c-format
+msgid ""
+"Starts in Brushed Metal mode instead of default, if the Style is set to "
+"Brushed Metal"
+msgstr ""
+
+#: config/configdialog.ui:104
+#, no-c-format
+msgid "Add auto spacing"
+msgstr ""
+
+#: config/configdialog.ui:112
+#, no-c-format
+msgid "Fullscreen maximized"
+msgstr ""
+
+#: config/configdialog.ui:115
+#, no-c-format
+msgid ""
+"Check this to have any window in fullscreen Mode - demaximize the window by "
+"clicking into the top right corner of your screen"
+msgstr ""
+
+#: config/configdialog.ui:123
+#, no-c-format
+msgid "Draw Comic Frame"
+msgstr ""
+
+#: config/configdialog.ui:126
+#, no-c-format
+msgid ""
+"Draws a black frame around the window (not the Titlebar).<br>Anyway i "
+"suggest to get the twin dropshadow patch."
+msgstr ""
+
+#: config/configdialog.ui:134
+#, no-c-format
+msgid "Hide deco for fixed size modal windows"
+msgstr ""
+
+#: config/configdialog.ui:142
+#, no-c-format
+msgid "Keep maximized resizable"
+msgstr ""
+
+#: config/configdialog.ui:150
+#, no-c-format
+msgid "Allow Easy Closing"
+msgstr ""
+
+#: config/configdialog.ui:153
+#, no-c-format
+msgid ""
+"Allows Closing by clicking into the top left or right corner <br> Close "
+"Button must be most left or right element (also no spacers) <br> Closes on "
+"Mouse Button release (so you have the chance to move the mouse away and keep "
+"the Window) <br> The Window must be active and maximized <br> Unfortunately "
+"you will not be able tho resize the Window from that corner"
+msgstr ""
+
+#: config/configdialog.ui:159 config/configdialog.ui:384
+#: config/configdialog.ui:566 config/configdialog.ui:1311
+#: config/configdialog.ui:1690 config/configdialog.ui:2392
+#: config/configdialog.ui:2643 config/customdecosettings.ui:429
+#, no-c-format
+msgid "Jaguar"
+msgstr ""
+
+#: config/configdialog.ui:164 config/configdialog.ui:561
+#: config/configdialog.ui:946 config/configdialog.ui:1306
+#: config/configdialog.ui:1685 config/configdialog.ui:2387
+#: config/configdialog.ui:2638 config/customdecosettings.ui:424
+#, no-c-format
+msgid "Panther"
+msgstr ""
+
+#: config/configdialog.ui:169
+#, no-c-format
+msgid "Brushed Metal"
+msgstr ""
+
+#: config/configdialog.ui:174 config/configdialog.ui:2073
+#, no-c-format
+msgid "Tiger"
+msgstr ""
+
+#: config/configdialog.ui:179 config/configdialog.ui:571
+#: config/configdialog.ui:1316 config/configdialog.ui:1695
+#: config/configdialog.ui:2397 config/configdialog.ui:2648
+#: config/customdecosettings.ui:434
+#, no-c-format
+msgid "Milk"
+msgstr ""
+
+#: config/configdialog.ui:191
+#, no-c-format
+msgid "Default Mode is"
+msgstr ""
+
+#: config/configdialog.ui:213
+#, no-c-format
+msgid ""
+"Try to remove application name\n"
+"from multipart titles"
+msgstr ""
+
+#: config/configdialog.ui:230
+#, no-c-format
+msgid "Use these buttons to set the alignment of the window title"
+msgstr ""
+
+#: config/configdialog.ui:311
+#, no-c-format
+msgid "None"
+msgstr ""
+
+#: config/configdialog.ui:355
+#, no-c-format
+msgid "Configure Button Colors"
+msgstr ""
+
+#: config/configdialog.ui:403 config/configdialog.ui:1197
+#: config/configdialog.ui:1576 config/configdialog.ui:2092
+#: config/configdialog.ui:2529 config/customdecosettings.ui:267
+#, no-c-format
+msgid "3D Intensity"
+msgstr ""
+
+#: config/configdialog.ui:449 config/configdialog.ui:965
+#: config/configdialog.ui:1527 config/configdialog.ui:3024
+#: config/customdecosettings.ui:218
+#, no-c-format
+msgid "Titleshadow Intensity"
+msgstr ""
+
+#: config/configdialog.ui:506 config/configdialog.ui:1251
+#: config/configdialog.ui:1630 config/configdialog.ui:2332
+#: config/configdialog.ui:2583 config/customdecosettings.ui:313
+#, no-c-format
+msgid "ButtonStyle"
+msgstr ""
+
+#: config/configdialog.ui:514 config/configdialog.ui:1259
+#: config/configdialog.ui:1638 config/configdialog.ui:2340
+#: config/configdialog.ui:2591 config/customdecosettings.ui:321
+#, no-c-format
+msgid "Active Titlebar Effect"
+msgstr ""
+
+#: config/configdialog.ui:525 config/configdialog.ui:1270
+#: config/configdialog.ui:1649 config/configdialog.ui:2351
+#: config/configdialog.ui:2602 config/customdecosettings.ui:332
+#, no-c-format
+msgid "Inactive Titlebar Effect"
+msgstr ""
+
+#: config/configdialog.ui:576 config/configdialog.ui:596
+#: config/configdialog.ui:640 config/configdialog.ui:1321
+#: config/configdialog.ui:1341 config/configdialog.ui:1385
+#: config/configdialog.ui:1700 config/configdialog.ui:1720
+#: config/configdialog.ui:1764 config/configdialog.ui:2402
+#: config/configdialog.ui:2653 config/configdialog.ui:2673
+#: config/configdialog.ui:2717 config/customdecosettings.ui:439
+#: config/customdecosettings.ui:459 config/customdecosettings.ui:503
+#, no-c-format
+msgid "Nostalgia"
+msgstr ""
+
+#: config/configdialog.ui:586 config/configdialog.ui:630
+#: config/configdialog.ui:1331 config/configdialog.ui:1375
+#: config/configdialog.ui:1710 config/configdialog.ui:1754
+#: config/configdialog.ui:2663 config/configdialog.ui:2707
+#: config/customdecosettings.ui:449 config/customdecosettings.ui:493
+#, no-c-format
+msgid "Gradient"
+msgstr ""
+
+#: config/configdialog.ui:591 config/configdialog.ui:635
+#: config/configdialog.ui:1336 config/configdialog.ui:1380
+#: config/configdialog.ui:1715 config/configdialog.ui:1759
+#: config/configdialog.ui:2668 config/configdialog.ui:2712
+#: config/customdecosettings.ui:454 config/customdecosettings.ui:498
+#, no-c-format
+msgid "Stippled"
+msgstr ""
+
+#: config/configdialog.ui:601 config/configdialog.ui:645
+#: config/configdialog.ui:1346 config/configdialog.ui:1390
+#: config/configdialog.ui:1725 config/configdialog.ui:1769
+#: config/configdialog.ui:2678 config/configdialog.ui:2722
+#: config/customdecosettings.ui:464 config/customdecosettings.ui:508
+#, no-c-format
+msgid "Glossy"
+msgstr ""
+
+#: config/configdialog.ui:606 config/configdialog.ui:650
+#: config/configdialog.ui:1351 config/configdialog.ui:1395
+#: config/configdialog.ui:1508 config/configdialog.ui:1730
+#: config/configdialog.ui:1774 config/configdialog.ui:2683
+#: config/configdialog.ui:2727 config/customdecosettings.ui:469
+#: config/customdecosettings.ui:513
+#, no-c-format
+msgid "Brushed"
+msgstr ""
+
+#: config/configdialog.ui:611 config/configdialog.ui:655
+#: config/configdialog.ui:1356 config/configdialog.ui:1400
+#: config/configdialog.ui:1735 config/configdialog.ui:1779
+#: config/configdialog.ui:2688 config/configdialog.ui:2732
+#: config/customdecosettings.ui:474 config/customdecosettings.ui:518
+#, no-c-format
+msgid "Scanlines"
+msgstr ""
+
+#: config/configdialog.ui:624 config/configdialog.ui:668
+#: config/configdialog.ui:1369 config/configdialog.ui:1413
+#: config/configdialog.ui:1748 config/configdialog.ui:1792
+#: config/configdialog.ui:2701 config/configdialog.ui:2745
+#: config/customdecosettings.ui:487 config/customdecosettings.ui:531
+#, no-c-format
+msgid "Select an effect for the titlebar to change its appearance"
+msgstr ""
+
+#: config/configdialog.ui:686 config/configdialog.ui:1431
+#: config/configdialog.ui:1810 config/configdialog.ui:2440
+#: config/configdialog.ui:2763 config/customdecosettings.ui:353
+#, no-c-format
+msgid "Colors"
+msgstr ""
+
+#: config/configdialog.ui:753 config/configdialog.ui:1006
+#: config/configdialog.ui:1877 config/configdialog.ui:2130
+#: config/configdialog.ui:2830 config/customdecosettings.ui:27
+#, no-c-format
+msgid "Round Corners"
+msgstr ""
+
+#: config/configdialog.ui:875 config/configdialog.ui:1145
+#: config/configdialog.ui:1991 config/configdialog.ui:2244
+#: config/configdialog.ui:2944 config/customdecosettings.ui:149
+#, no-c-format
+msgid "Border Size"
+msgstr ""
+
+#: config/configdialog.ui:936 config/configdialog.ui:1498
+#: config/configdialog.ui:2063 config/configdialog.ui:2492
+#: config/configdialog.ui:2513 config/customdecosettings.ui:558
+#, no-c-format
+msgid "Draw Icon"
+msgstr ""
+
+#: config/configdialog.ui:2414
+#, no-c-format
+msgid "(Gradient)"
+msgstr ""
+
+#: config/configdialog.ui:2422
+#, no-c-format
+msgid "(Scanlines)"
+msgstr ""
+
+#: config/configdialog.ui:2477
+#, no-c-format
+msgid "(Background)"
+msgstr ""
+
+#: config/configdialog.ui:2502
+#, no-c-format
+msgid "Special"
+msgstr ""
+
+#: config/customdecosettings.ui:16
+#, no-c-format
+msgid "CustomDecoSettings"
+msgstr ""
+
+#: config/customdecosettings.ui:572
+#, no-c-format
+msgid "Name"
+msgstr ""