diff --git a/malloryclient/CMakeLists.txt b/malloryclient/CMakeLists.txt
index dee9313..a09c747 100644
--- a/malloryclient/CMakeLists.txt
+++ b/malloryclient/CMakeLists.txt
@@ -29,6 +29,8 @@ tde_add_kpart(twin_mallory AUTOMOC
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
+tde_conditional_add_subdirectory(BUILD_TCC_MODULE config)
+
 ### Data #######################################################################
 tde_create_translated_desktop(
   SOURCE mallory.desktop
diff --git a/malloryclient/config/CMakeLists.txt b/malloryclient/config/CMakeLists.txt
new file mode 100644
index 0000000..4903a84
--- /dev/null
+++ b/malloryclient/config/CMakeLists.txt
@@ -0,0 +1,26 @@
+################################################################################
+# twin-style-mallory                                                           #
+# ------------------                                                           #
+# This file is licensed under the terms of GNU GPL v3 or later.                #
+# Improvements and feedback are welcome.                                       #
+################################################################################
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIBRARY_DIRS}
+)
+
+### Libraries ##################################################################
+tde_add_kpart(twin_mallory_config AUTOMOC
+  SOURCES malloryconfig.cpp configdialog.ui
+  LINK tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/malloryclient/config/malloryconfig.cpp b/malloryclient/config/malloryconfig.cpp
index c482ff3..c3ec0c6 100644
--- a/malloryclient/config/malloryconfig.cpp
+++ b/malloryclient/config/malloryconfig.cpp
@@ -10,11 +10,11 @@
 #include <tdeconfig.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <ntqcheckbox.h>
-#include <ntqslider.h>
-#include <ntqspinbox.h>
-#include <ntqcombobox.h>
-#include <ntqwhatsthis.h>
+#include <tqcheckbox.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
+#include <tqcombobox.h>
+#include <tqwhatsthis.h>
 
 #include "malloryconfig.h"
 #include "configdialog.h"
@@ -34,15 +34,15 @@ MalloryConfig::MalloryConfig(TDEConfig* config, TQWidget* parent)
     load(config);
 
     // Setup the connections.
-    connect(m_dialog->m_borderSize, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
-    connect(m_dialog->m_titleSize, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
-    connect(m_dialog->m_buttonSize, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
-    connect(m_dialog->m_lessRounded, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_dialog->m_buttonStyle, SIGNAL(activated(int)), this, SIGNAL(changed()));
-    connect(m_dialog->m_resizeHandle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_dialog->m_superSize, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_dialog->m_titleShadow, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_dialog->m_titleShadowSize, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
+    connect(m_dialog->m_borderSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_titleSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_buttonSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_lessRounded, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_buttonStyle, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_resizeHandle, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_superSize, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_titleShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()));
+    connect(m_dialog->m_titleShadowSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(changed()));
 
 }
 
diff --git a/malloryclient/config/malloryconfig.h b/malloryclient/config/malloryconfig.h
index 64b3095..c452c64 100644
--- a/malloryclient/config/malloryconfig.h
+++ b/malloryclient/config/malloryconfig.h
@@ -10,7 +10,7 @@
 #ifndef MALLORYCONFIG_H
 #define MALLORYCONFIG_H
 
-#include <ntqobject.h>
+#include <tqobject.h>
 
 class TQButtonGroup;
 class TQGroupBox;
@@ -20,7 +20,7 @@ class ConfigDialog;
 
 class MalloryConfig : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MalloryConfig(TDEConfig* config, TQWidget* parent); ///< Constructor
     ~MalloryConfig(); ///< Destructor