Initial TDE conversion

79 files changed, 777 insertions, 777 deletions

diff --git a/ChangeLog b/ChangeLog
index e0cc7c3..487ae87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,7 +111,7 @@
        in some situations.
      o The non-anonymous settings (e.g. cookies,javascript) were not getting
        restored properly in some cases. This was due to an eccentricity in
-       KConfig.
+       TDEConfig.
      o Be a little more aggressive with UPnP. Silently re-apply port
        forwarding to the UPnP router when (i) Tor tells us it has failed
        reachability tests, (ii) whenever the user presses play.
diff --git a/Doxyfile b/Doxyfile
index edf1c8f..0dc10c8 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = ktor.kdevelop
+PROJECT_NAME           = ktor.tdevelop
 PROJECT_NUMBER         = 0.1
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
diff --git a/TODO b/TODO
index 3b38201..425b3e4 100644
--- a/TODO
+++ b/TODO
@@ -35,12 +35,12 @@ make it easier to spot and add servers like these to the enemy server list.
         selected in drop-down?)
       - Leave 'server' grayed-out and unapplied until settings are applied?
 
-  - kdesudo is fucked. need to use the API.
+  - tdesudo is fucked. need to use the API.
 
   - Add a 'monitor' option - tork does not do any setconf'ing.
 
 
-  - Ability to import blocklists. - khotnewstuff?
+  - Ability to import blocklists. - tdehotnewstuff?
 
   * customized pktstat to report all non-tor traffic
     - non-tor traffic osd
@@ -68,8 +68,8 @@ TorkConfig::self()->config()->copyTo("profilename",TorkConfig::self()->config()
 
 
       //Load a profile
-      KConfig *tmpconfig;
-      tmpconfig = new KConfig("torkspecialrc", false, false);
+      TDEConfig *tmpconfig;
+      tmpconfig = new TDEConfig("torkspecialrc", false, false);
       tmpconfig->copyTo("torkspecialrctmp",TorkConfig::self()->config());
       now delete torkspecialrctmp
 
@@ -122,7 +122,7 @@ For 0.32:
 
 Sometime:
 
-  * use kpaaworddialog and kdesuclient for password requests
+  * use kpaaworddialog and tdesuclient for password requests
 
   - Re-tool kicker applet
 
@@ -298,7 +298,7 @@ options manually and on the fly.
 * Check torkify installation when launching torkify
 
 Minor
-* use kpaaworddialog and kdesuclient for password requests
+* use kpaaworddialog and tdesuclient for password requests
 * Toggle javascript and cookies from control button in konqueror
 * rename 'my network view'
 * Use RelayBandwidthRate
@@ -329,7 +329,7 @@ TODO SOMETIME
 * Re-write controller logic.
 * use kompile instead of arkollon
 * Split out tork.cpp a bit, at least a vagure gesture towards cleaner code
-* Find and squash as many bugs as possible in kconfig and elsewhere.
+* Find and squash as many bugs as possible in tdeconfig and elsewhere.
 * 'Configure KMail' wizard for Mixminion
 * filter log with right-click
 * Full-refresh-of-server-list button
@@ -417,7 +417,7 @@ if it is more than'. but that option is for clients, not servers.
 simultaneous connections allowed'. my maxconn doesn't actually perform this
 function. nothing does.
 * remove ASSERT: "(mode & KFile::Files) == 0"
-in/tmp/buildd/kdelibs-3.5.5a.dfsg.1/./kio/kfile/kurlrequester.cpp (311)
+in/tmp/buildd/tdelibs-3.5.5a.dfsg.1/./tdeio/tdefile/kurlrequester.cpp (311)
 
 
 In 0.19:
diff --git a/acinclude.m4 b/acinclude.m4
index 37a7f77..83343d9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
 dnl Please do not modify this file unless you expect your modifications to be
 dnl carried into every other module in the repository. 
 dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
+dnl Single-module modifications are best placed in configure.in for tdelibs
+dnl and tdebase or configure.in.in if present.
 
 # KDE_PATH_X_DIRECT
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
 [LIBS="$ac_save_LIBS"
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
+    /usr/X11/lib${tdelibsuff}           \
+    /usr/X11R6/lib${tdelibsuff}         \
+    /usr/X11R5/lib${tdelibsuff}         \
+    /usr/X11R4/lib${tdelibsuff}         \
                                         \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
+    /usr/lib${tdelibsuff}/X11           \
+    /usr/lib${tdelibsuff}/X11R6         \
+    /usr/lib${tdelibsuff}/X11R5         \
+    /usr/lib${tdelibsuff}/X11R4         \
                                         \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
+    /usr/local/X11/lib${tdelibsuff}     \
+    /usr/local/X11R6/lib${tdelibsuff}   \
+    /usr/local/X11R5/lib${tdelibsuff}   \
+    /usr/local/X11R4/lib${tdelibsuff}   \
                                         \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
+    /usr/local/lib${tdelibsuff}/X11     \
+    /usr/local/lib${tdelibsuff}/X11R6   \
+    /usr/local/lib${tdelibsuff}/X11R5   \
+    /usr/local/lib${tdelibsuff}/X11R4   \
                                         \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
+    /usr/X386/lib${tdelibsuff}          \
+    /usr/x386/lib${tdelibsuff}          \
+    /usr/XFree86/lib${tdelibsuff}/X11   \
                                         \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
+    /usr/lib${tdelibsuff}               \
+    /usr/local/lib${tdelibsuff}         \
+    /usr/unsupported/lib${tdelibsuff}   \
+    /usr/athena/lib${tdelibsuff}        \
+    /usr/local/x11r5/lib${tdelibsuff}   \
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
+    /lib/usr/lib${tdelibsuff}/X11       \
                                         \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
+    /usr/openwin/lib${tdelibsuff}       \
+    /usr/openwin/share/lib${tdelibsuff} \
     ; \
 do
 dnl Don't even attempt the hair of trying to link an X program!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_ERROR([your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log.])
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
-            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
+            KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
             AC_SUBST(MAKEKDEWIDGETS)
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -937,7 +937,7 @@ mips-sgi-irix6*)
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
+    ac_x_libraries="/usr/lib${tdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -1418,7 +1418,7 @@ qt_includes=""
 AC_ARG_WITH(qt-dir,
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
     [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
     ])
 
@@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
 AC_MSG_RESULT([$kde_cv_uic_plugins])
 if test "$kde_cv_uic_plugins" != yes; then
 	AC_MSG_ERROR([
-you need to install kdelibs first.
+you need to install tdelibs first.
 
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs. 
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
+If you did install tdelibs, then the Qt version that is picked up by
+this configure is not the same version you used to compile tdelibs. 
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 ])
@@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
 
 if test "$kde_qtver" = 1; then
   kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
+  kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
 ac_kde_libraries="$kde_libdir"
@@ -1824,7 +1824,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -1839,7 +1839,7 @@ else
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
 fi
 
-else dnl test -z $1, e.g. from kdelibs
+else dnl test -z $1, e.g. from tdelibs
 
   ac_cv_have_kde="have_kde=no"
 
@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
@@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
 
 if test $kde_qtver = 3; then
    case $host in 
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
+   AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KABC, "-ltdeabc")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
+   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_KFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
+   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
@@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
 else
   case "$1" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
+		kde_cv_proto_$1="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_$1=unknown
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
@@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none,auto[=default])]),
-            kdelibsuff=$enableval, kdelibsuff="auto")
+            tdelibsuff=$enableval, tdelibsuff="auto")
     
-    if test "$kdelibsuff" = "auto"; then
+    if test "$tdelibsuff" = "auto"; then
     
 cat > conftest.c << EOF
 #include <stdio.h>
@@ -3512,26 +3512,26 @@ int main() {
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
     s,.*/lib\([[^\/]]*\)/.*,\1, 
     p 
 }'`
 	rm -rf conftest.*
     fi	
 	
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
+       tdelibsuff=
     fi
-    if test -z "$kdelibsuff"; then
+    if test -z "$tdelibsuff"; then
         AC_MSG_RESULT([not using lib directory suffix])
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
     else
         if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
+            libdir="$libdir${tdelibsuff}"
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
         fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
     fi
 ])
 
@@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4556,7 +4556,7 @@ fi
 
 PYTHONINC=-I$python_incdir
 
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
 if test ! -r $python_libdir/libpython$version.so; then
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES],
   AC_SUBST(CONF_FILES)
 ])dnl
 
-dnl This sets the prefix, for arts and kdelibs
+dnl This sets the prefix, for arts and tdelibs
 dnl Do NOT use in any other module.
-dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
@@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX],
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
 
   KDE_SET_DEFAULT_BINDIRS
   if test "x$prefix" = "xNONE"; then
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
   else
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
     kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
     PATH="$kde_save_PATH"
   fi
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
                     This means it has been moved since you installed it.
-                    This won't work. Please recompile kdelibs for the new prefix.
+                    This won't work. Please recompile tdelibs for the new prefix.
                     ])
   fi
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX],
   AC_MSG_CHECKING([where to install])
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
   else
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
     given_prefix=$prefix
@@ -5661,7 +5661,7 @@ ssl_includes=""
 AC_ARG_WITH(ssl-dir,
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
     [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
     ])
 
 want_ssl=yes
@@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
   ac_ssl_includes="$ssl_incdir"
 
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
   if test ! "$ac_ssl_libraries" = "NO"; then
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
   fi
@@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
 dnl also defines KSTUFF_PKG_ERRORS on error
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
 
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
    if test "$prefix" != "$kde_libs_prefix"; then
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
    fi
    export PKG_CONFIG_PATH
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
diff --git a/configure.in b/configure.in
index e2293f6..9f9b43c 100644
--- a/configure.in
+++ b/configure.in
@@ -76,13 +76,13 @@ AC_MSG_CHECKING([for KDE version])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
-kdeversion_safe_LIBS="$LIBS"
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
+tdeversion_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
 CXXFLAGS="$CXXFLAGS $all_includes"
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
 #error KDE 3.2
 #endif
@@ -93,7 +93,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
 #error KDE 3.3
 #endif
@@ -104,7 +104,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
 #error KDE 3.4
 #endif
@@ -115,7 +115,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
 #error KDE 3.5.x (x < 2)
 #endif
@@ -124,8 +124,8 @@ AC_COMPILE_IFELSE([
 ,
         need_kde351_compat="yes"
 )
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
-LIBS="$kdeversion_safe_LIBS"
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
+LIBS="$tdeversion_safe_LIBS"
 AC_LANG_RESTORE
 
 if test "$need_kde32_compat" = "yes"; then
@@ -649,13 +649,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
   # And if so, warn when they don't match
   if test "$kde_libs_prefix" != "$given_prefix"; then
     # And if kde doesn't know about the prefix yet
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
     if test $? -ne 0; then
       echo ""
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi
diff --git a/configure.in.in b/configure.in.in
index 82b37ac..1b38786 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,13 +11,13 @@ AC_MSG_CHECKING([for KDE version])
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
-kdeversion_safe_LIBS="$LIBS"
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
+tdeversion_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
 CXXFLAGS="$CXXFLAGS $all_includes"
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
 #error KDE 3.2
 #endif
@@ -28,7 +28,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
 #error KDE 3.3
 #endif
@@ -39,7 +39,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
 #error KDE 3.4
 #endif
@@ -50,7 +50,7 @@ AC_COMPILE_IFELSE([
 )
 
 AC_COMPILE_IFELSE([
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
 #error KDE 3.5.x (x < 2)
 #endif
@@ -59,8 +59,8 @@ AC_COMPILE_IFELSE([
 ,
         need_kde351_compat="yes"
 )
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
-LIBS="$kdeversion_safe_LIBS"
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
+LIBS="$tdeversion_safe_LIBS"
 AC_LANG_RESTORE
 
 if test "$need_kde32_compat" = "yes"; then
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 51e9cc4..8e173c9 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY tork "<application>tork 0.1</application>">
   <!ENTITY kappname "&tork;"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -488,8 +488,8 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
-kdelibs, or kdebase.
+.Libraries or other software that is not included in tdesupport,
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/src/Makefile.am b/src/Makefile.am
index 07decfb..0c40e0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ METASOURCES = AUTO
 tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 
 # the libraries to link against.
-tork_LDADD   = $(LIB_KIO) $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(LIB_KDEUI) $(LIB_KDECORE) -lDCOP $(LIB_QT) \
+tork_LDADD   = $(LIB_KIO) $(LIB_KFILE) $(LIB_TDEHTML) $(geoiplib) $(LIB_TDEUI) $(LIB_TDECORE) -lDCOP $(LIB_QT) \
                upnp/libktupnp.la $(CRYPTO_LIBS)
 
 # which sources should be compiled for tork
diff --git a/src/arkollon/Makefile.am b/src/arkollon/Makefile.am
index ef01542..e0af4ce 100644
--- a/src/arkollon/Makefile.am
+++ b/src/arkollon/Makefile.am
@@ -26,7 +26,7 @@ torkarkollon_LDFLAGS = $(all_libraries)
 LIBS =
 #torkarkollon_LDFLAGS = 
 #torkarkollon_LDADD = $(LIB_QT) $(LIB_KFILE)
-torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE)
+torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_TDECORE)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/src/arkollon/torkarkollon.cpp b/src/arkollon/torkarkollon.cpp
index fa4a3d4..c4e6c30 100644
--- a/src/arkollon/torkarkollon.cpp
+++ b/src/arkollon/torkarkollon.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
 	// Check if we're root
 	if (getuid() != 0)
 	{
-		TQString command = "kdesu -t -i tork -n -c \"";
+		TQString command = "tdesu -t -i tork -n -c \"";
 		for (int i=0 ; i<app.argc() ; i++)
 		{
 			if (TQString(app.argv()[i]).contains(" "))
diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp
index ae6b94b..ec41827 100644
--- a/src/arkollon/wizard.cpp
+++ b/src/arkollon/wizard.cpp
@@ -114,7 +114,7 @@ Wizard::Wizard(TQWidget *parent, const char *name)
 	kdeDirProcess = new TQProcess(this);
 	connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady()));
 	connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents()));
-	kdeDirProcess->addArgument("kde-config");
+	kdeDirProcess->addArgument("tde-config");
 	kdeDirProcess->addArgument("--prefix");
 	if (!kdeDirProcess->start())
 		getInstalledComponents();
@@ -923,7 +923,7 @@ void Wizard::errorOccured()
 TQString Wizard::sub(TQString s)
 {
 	TQString tmp = s;
-	tmp.replace(TQRegExp("\\$KDEDIR"), kdeDir);
+	tmp.replace(TQRegExp("\\$TDEDIR"), kdeDir);
 	tmp.replace(TQRegExp("\\$HOMEDIR"), TQDir::homeDirPath());
 	tmp.replace(TQRegExp("~"), TQDir::homeDirPath());
 	tmp.replace(TQRegExp("\\$PREFIX"), "/usr/local");
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 341ab58..c53930f 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -67,23 +67,23 @@ email                : markey@web.de
 #include <ntqlistview.h>
 #include <ntqcheckbox.h>
 
-#include <kapplication.h> //kapp
+#include <tdeapplication.h> //kapp
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <dcopref.h>
-#include <kconfig.h>
-#include <kmessagebox.h>
+#include <tdeconfig.h>
+#include <tdemessagebox.h>
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC
 //////////////////////////////////////////////////////////////////////////////////////////
 
-TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config )
-        : KConfigDialog( parent, name, config ),m_parent(parent)
+TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config )
+        : TDEConfigDialog( parent, name, config ),m_parent(parent)
 {
     setWFlags( WDestructiveClose );
 
@@ -137,7 +137,7 @@ TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigS
         static_cast<TQLabel*>(label)->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Information ) );
     delete list;
 
-    //stop KFont Requesters getting stupidly large
+    //stop TDEFont Requesters getting stupidly large
     list = queryList( "TQLabel", "m_sampleLabel" );
     for( TQObject *label = list->first(); label; label = list->next() )
         static_cast<TQLabel*>(label)->setMaximumWidth( 250 );
@@ -229,19 +229,19 @@ void TorkConfigDialog::showPage( const TQCString& page )
 {
     for( uint index = 0; index < m_pageList.count(); index++ ) {
         if ( m_pageList[index]->name() == page ) {
-            KConfigDialog::showPage( index );
+            TDEConfigDialog::showPage( index );
             return;
         }
     }
 }
 
-/** Reimplemented from KConfigDialog */
+/** Reimplemented from TDEConfigDialog */
 void TorkConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage )
 {
     // Add the widget pointer to our list, for later reference
     m_pageList << page;
 
-    KConfigDialog::addPage( page, itemName, pixmapName, header, manage );
+    TDEConfigDialog::addPage( page, itemName, pixmapName, header, manage );
 }
 
 
@@ -258,7 +258,7 @@ void TorkConfigDialog::updateCustomSettings()
     //When settings are changed in the config dialog, this is called
     //to update all possibly changed values and apply them to Tor.
 
-    //TQListViews need to be handled outside of kconfigxt
+    //TQListViews need to be handled outside of tdeconfigxt
     TorkConfig::setQuickConfigure( m_quickconfig->QuickConfigure->currentItem() );
 
     TorkConfig::setAccountingStart(m_myserver->AccountingStart->currentText());
diff --git a/src/configdialog.h b/src/configdialog.h
index 45d4824..5e310b9 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -21,18 +21,18 @@ email                : markey@web.de
 
 #include <ntqmap.h>
 #include <ntqvaluelist.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class TQComboBox;
 class TQGroupBox;
 class TQVBox;
 
-class TorkConfigDialog : public KConfigDialog
+class TorkConfigDialog : public TDEConfigDialog
 {
     Q_OBJECT
 
     public:
-        TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
+        TorkConfigDialog( TQWidget *parent, const char* name, TDEConfigSkeleton *config );
         ~TorkConfigDialog();
 
         void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName,
diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp
index 7505f6a..98b3bd6 100644
--- a/src/crashhandler.cpp
+++ b/src/crashhandler.cpp
@@ -14,11 +14,11 @@
 #include "torkconfig.h"
 #include "crashhandler.h"
 
-#include <kapplication.h> //invokeMailer()
+#include <tdeapplication.h> //invokeMailer()
 #include <kdebug.h>       //kdBacktrace()
-#include <kdeversion.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdeversion.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include <ntqfile.h>
 #include <ntqregexp.h>
@@ -95,7 +95,7 @@ namespace torK
                     "Version:    " TORK_VERSION "\n"
                     "Build date: " __DATE__ "\n"
                     "CC version: " __VERSION__ "\n" //assuming we're using GCC
-                    "KDElibs:    " KDE_VERSION_STRING "\n"
+                    "KDElibs:    " TDE_VERSION_STRING "\n"
                     "TQt:         %2\n"
                     "CPU count:  %6\n";
 
diff --git a/src/dndlistview.cpp b/src/dndlistview.cpp
index a218c9e..65fe852 100644
--- a/src/dndlistview.cpp
+++ b/src/dndlistview.cpp
@@ -24,7 +24,7 @@
 #include <ntqapplication.h>
 #include <ntqheader.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <ntqsimplerichtext.h>
diff --git a/src/firewallsproxies.ui.h b/src/firewallsproxies.ui.h
index f9ce6a5..77f5ff8 100644
--- a/src/firewallsproxies.ui.h
+++ b/src/firewallsproxies.ui.h
@@ -19,20 +19,20 @@
  ***************************************************************************/
 
 #include "torkconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <dom/html_misc.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
-KHTMLPart *filelist;
+TDEHTMLPart *filelist;
 
 void FirewallsProxies::init()
 {
 
-    filelist = new KHTMLPart();
+    filelist = new TDEHTMLPart();
 
     TQStringList existingMaps = TorkConfig::reachableAddresses();
     TQListViewItem *tm;
diff --git a/src/functions.cpp b/src/functions.cpp
index 694f905..cf0ec8d 100644
--- a/src/functions.cpp
+++ b/src/functions.cpp
@@ -21,8 +21,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 #include <ntqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <sys/time.h>
 #include <ntqdir.h>
@@ -39,7 +39,7 @@ namespace tk
 	
 	TQString BytesToString(Uint64 bytes,int precision)
 	{
-		KLocale* loc = KGlobal::locale();
+		TDELocale* loc = TDEGlobal::locale();
 		if (bytes >= 1024 * 1024 * 1024)
 			return i18n("%1 GB").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
 		else if (bytes >= 1024*1024)
@@ -52,7 +52,7 @@ namespace tk
 
 	TQString BytesPerSecToString(double bytes,int precision)
 	{
-		KLocale* loc = KGlobal::locale();
+		TDELocale* loc = TDEGlobal::locale();
 		if (bytes >= 1024 * 1024 * 1024)
 			return i18n("%1 GB/s").arg(loc->formatNumber(bytes / TO_GIG,precision < 0 ? 2 : precision));
 		else if (bytes >= 1024*1024)
@@ -65,14 +65,14 @@ namespace tk
 
 	TQString KBytesPerSecToString(double speed,int precision)
 	{
-		KLocale* loc = KGlobal::locale();
+		TDELocale* loc = TDEGlobal::locale();
 		return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
 	}
 
 
 	TQString DurationToString(Uint32 nsecs)
 	{
-		KLocale* loc = KGlobal::locale();
+		TDELocale* loc = TDEGlobal::locale();
 		TQTime t;
 		int ndays = nsecs / 86400;
 		t = t.addSecs(nsecs % 86400);
diff --git a/src/hiddensrvs.ui b/src/hiddensrvs.ui
index cb86f1c..d9c2f31 100644
--- a/src/hiddensrvs.ui
+++ b/src/hiddensrvs.ui
@@ -226,7 +226,7 @@
     <slot>addService( const TQString &amp; nick, const TQString &amp; publicport, const TQString &amp; actualaddress, const TQString &amp; toraddress, const TQString &amp; folder, const TQString &amp; servicefolder )</slot>
     <slot>deleteService_clicked()</slot>
     <slot>startService_clicked()</slot>
-    <slot>thttpdprocExited(KProcess *proc)</slot>
+    <slot>thttpdprocExited(TDEProcess *proc)</slot>
     <slot>servicesList_selectionChanged()</slot>
     <slot>startAllServices_clicked()</slot>
     <slot>testService_clicked()</slot>
diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h
index fd2930a..e2c10aa 100644
--- a/src/hiddensrvs.ui.h
+++ b/src/hiddensrvs.ui.h
@@ -20,14 +20,14 @@
 #include "torkconfig.h"
 #include "tork.h"
 #include "hidsrvwizard.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cstdlib>
 
 void MyHidden::init()
@@ -125,14 +125,14 @@ void MyHidden::startService_clicked()
                 << "-h " << servicesList->currentItem()->text(3).section(":",0,0)
                 << "-d " << servicesList->currentItem()->text(4);
 
- 	connect( thttpdproc, SIGNAL(processExited(KProcess *)),
- 			SLOT(thttpdprocExited(KProcess *)) );
+ 	connect( thttpdproc, SIGNAL(processExited(TDEProcess *)),
+ 			SLOT(thttpdprocExited(TDEProcess *)) );
 
 	thttpdproc->start(KProcIO::NotifyOnExit)    ;
 
 }
 
-void MyHidden::thttpdprocExited(KProcess *proc)
+void MyHidden::thttpdprocExited(TDEProcess *proc)
 {
     TQString caption;
     TQString message;
diff --git a/src/hidsrvwizard.ui.h b/src/hidsrvwizard.ui.h
index 3cb31a8..2cb1090 100644
--- a/src/hidsrvwizard.ui.h
+++ b/src/hidsrvwizard.ui.h
@@ -21,7 +21,7 @@
 #include "tork.h"
 #include "functions.h"
 #include <ntqtimer.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cstdlib>
 
 bool local;
diff --git a/src/hitwidget.cpp b/src/hitwidget.cpp
index f62d68e..dfd8c7c 100644
--- a/src/hitwidget.cpp
+++ b/src/hitwidget.cpp
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <ntqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ntqlayout.h>
 /*#include <konq_filetip.h>*/
 #include <ntqscrollview.h>
@@ -59,9 +59,9 @@ void HitWidget::setIcon(const TQString name)
 {
   m_icon = name;
   if (m_collapsed)
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeSmall));
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeSmall));
   else
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeLarge));
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeLarge));
 }
 
 void HitWidget::toggleCollapsed()
@@ -77,7 +77,7 @@ void HitWidget::setCollapsed(bool collapsed)
   if (collapsed) {
     toolButton1->setEnabled(true);
     m_was_collapsed = true;
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeSmall));
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeSmall));
 #if 0
     i18n("Expand");
     i18n("Collapse");
@@ -94,7 +94,7 @@ void HitWidget::setCollapsed(bool collapsed)
     m_collapsed = collapsed;
   }
   else {
-    icon->setPixmap(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeLarge));
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeLarge));
     toolButton1->setIconSet(SmallIconSet("2uparrow"));
     description->setHidden(false);
     properties->setHidden(false);
diff --git a/src/kerrylabel.cpp b/src/kerrylabel.cpp
index 9c85025..f758ffc 100644
--- a/src/kerrylabel.cpp
+++ b/src/kerrylabel.cpp
@@ -22,7 +22,7 @@
 #include "hitwidget.h"
 
 #include <ntqdragobject.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurl.h>
 #include <krun.h>
 /*
@@ -59,7 +59,7 @@ void KerryLabel::mousePressEvent(TQMouseEvent* ev)
 void KerryLabel::mouseMoveEvent(TQMouseEvent* ev)
 {
   if (dragInfo.state == diPending) {
-      int distance = KGlobalSettings::dndEventDelay();
+      int distance = TDEGlobalSettings::dndEventDelay();
       if ( ev->x() > dragInfo.start.x() + distance || ev->x() < dragInfo.start.x() - distance ||
            ev->y() > dragInfo.start.y() + distance || ev->y() < dragInfo.start.y() - distance) {
           doDrag();
@@ -94,7 +94,7 @@ void KerryLabel::doDrag()
 //     _items.append( &item );
 // 
 //     const KURL kurl(url());
-//     KActionCollection act(this);
+//     TDEActionCollection act(this);
 // 
 //     KonqPopupMenu * popupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items,
 //                                                    kurl, act, (KNewMenu*)NULL, this,
diff --git a/src/konqplugin/Makefile.am b/src/konqplugin/Makefile.am
index a00dedd..49b67ce 100644
--- a/src/konqplugin/Makefile.am
+++ b/src/konqplugin/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = khtml_tork.la
+kde_module_LTLIBRARIES = tdehtml_tork.la
 
-khtml_tork_la_METASOURCES = AUTO
-khtml_tork_la_SOURCES = tork_plug_in.cpp
-khtml_tork_la_LIBADD =  $(LIB_KHTML)
-khtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdehtml_tork_la_METASOURCES = AUTO
+tdehtml_tork_la_SOURCES = tork_plug_in.cpp
+tdehtml_tork_la_LIBADD =  $(LIB_TDEHTML)
+tdehtml_tork_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 KDE_ICON = AUTO
 
 part_DATA = tork_plug_in.rc tork_plug_in.desktop
-partdir = $(kde_datadir)/khtml/kpartplugins
+partdir = $(kde_datadir)/tdehtml/kpartplugins
 
diff --git a/src/konqplugin/tork_plug_in.cpp b/src/konqplugin/tork_plug_in.cpp
index 5064279..9d1f825 100644
--- a/src/konqplugin/tork_plug_in.cpp
+++ b/src/konqplugin/tork_plug_in.cpp
@@ -40,21 +40,21 @@
 #include <dcopref.h>
 #include <kdatastream.h>
 #include <kdebug.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <kaction.h>
+#include <tdeglobal.h>
+#include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 
 #include <dom/html_document.h>
 #include <dom/html_misc.h>
 #include <dom/dom_element.h>
 
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 
 #include <set>
 
@@ -62,32 +62,32 @@
 Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name )
     : Plugin( parent, name )
 {
-    TQPixmap pix = KGlobal::iconLoader()->loadIcon("tork",
-                                                  KIcon::MainToolbar);
-    KActionMenu *menu = new KActionMenu( i18n("Anonymity Manager"), pix,
+    TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("tork",
+                                                  TDEIcon::MainToolbar);
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Anonymity Manager"), pix,
                                          actionCollection(), "tork_menu" );
     menu->setDelayed( false );
     connect( menu->popupMenu(), SIGNAL( aboutToShow() ), SLOT( showPopup() ));
 
-    m_paToggleKDE=new KAction(i18n("Anonymize KDE"),
-                                           KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               KIcon::Small),
-                                           KShortcut(),
+    m_paToggleKDE=new TDEAction(i18n("Anonymize KDE"),
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",                                               TDEIcon::Small),
+                                           TDEShortcut(),
                                            this, SLOT(toggleKDE()),
                                            actionCollection(), "tork_konqueroron" );
 
     menu->insert( m_paToggleKDE );
 
 
-    KAction *m_firefox=new KAction(i18n("Re-Open Anonymously with Firefox"),
-                                           KGlobal::iconLoader()->loadIconSet("tork_firefox",                                               KIcon::Small),
-                                           KShortcut(),
+    TDEAction *m_firefox=new TDEAction(i18n("Re-Open Anonymously with Firefox"),
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_firefox",                                               TDEIcon::Small),
+                                           TDEShortcut(),
                                            this, SLOT(openWithFirefox()),
                                            actionCollection(), "tork_firefox" );
     menu->insert( m_firefox );
 
-    KAction *m_opera=new KAction(i18n("Re-Open Anonymously with Opera"),
-                                           KGlobal::iconLoader()->loadIconSet("tork_opera",                                               KIcon::Small),
-                                           KShortcut(),
+    TDEAction *m_opera=new TDEAction(i18n("Re-Open Anonymously with Opera"),
+                                           TDEGlobal::iconLoader()->loadIconSet("tork_opera",                                               TDEIcon::Small),
+                                           TDEShortcut(),
                                            this, SLOT(openWithOpera()),
                                            actionCollection(), "tork_opera" );
     menu->insert( m_opera );
@@ -115,12 +115,12 @@ void Tork_plug_in::showPopup()
     }
 
     if (anonymized){
-        m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
-                                                  KIcon::Small) );
+        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroroff",
+                                                  TDEIcon::Small) );
         m_paToggleKDE->setText( "De-Anonymize KDE" );
     }else{
-        m_paToggleKDE->setIconSet( KGlobal::iconLoader()->loadIconSet("tork_konqueroron",
-                                                  KIcon::Small) );
+        m_paToggleKDE->setIconSet( TDEGlobal::iconLoader()->loadIconSet("tork_konqueroron",
+                                                  TDEIcon::Small) );
         m_paToggleKDE->setText( "Anonymize KDE" );
     }
 }
@@ -141,7 +141,7 @@ void Tork_plug_in::openWithOpera()
 
 void Tork_plug_in::openWithBrowser(const TQString &browser)
 {
-    KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() );
+    TDEHTMLPart *htmlPart = static_cast<TDEHTMLPart*>( parent() );
     TQString url = htmlPart->toplevelURL().url();
 
     if (p_dcopServer->isApplicationRegistered ("tork")){
@@ -168,7 +168,7 @@ void Tork_plug_in::toggleKDE()
 KPluginFactory::KPluginFactory( TQObject* parent, const char* name )
         : KLibFactory( parent, name )
 {
-    s_instance = new KInstance("KPluginFactory");
+    s_instance = new TDEInstance("KPluginFactory");
 }
 
 TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
@@ -184,14 +184,14 @@ KPluginFactory::~KPluginFactory()
 
 extern "C"
 {
-    KDE_EXPORT void* init_khtml_tork()
+    KDE_EXPORT void* init_tdehtml_tork()
     {
-        KGlobal::locale()->insertCatalogue("tork");
+        TDEGlobal::locale()->insertCatalogue("tork");
         return new KPluginFactory;
     }
 
 }
 
-KInstance* KPluginFactory::s_instance = 0L;
+TDEInstance* KPluginFactory::s_instance = 0L;
 
 #include "tork_plug_in.moc"
diff --git a/src/konqplugin/tork_plug_in.desktop b/src/konqplugin/tork_plug_in.desktop
index 4b2c518..8355388 100644
--- a/src/konqplugin/tork_plug_in.desktop
+++ b/src/konqplugin/tork_plug_in.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-X-KDE-Library=khtml_tork
-X-KDE-PluginInfo-Author=Robert Hogan
-X-KDE-PluginInfo-Email=robert@roberthogan.net
-X-KDE-PluginInfo-Name=tork
-X-KDE-PluginInfo-Version=3.4
-X-KDE-PluginInfo-Website=http://tork.sourceforge.net
-X-KDE-PluginInfo-Category=Tools
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
+X-TDE-Library=tdehtml_tork
+X-TDE-PluginInfo-Author=Robert Hogan
+X-TDE-PluginInfo-Email=robert@roberthogan.net
+X-TDE-PluginInfo-Name=tork
+X-TDE-PluginInfo-Version=3.4
+X-TDE-PluginInfo-Website=http://tork.sourceforge.net
+X-TDE-PluginInfo-Category=Tools
+X-TDE-PluginInfo-Depends=
+X-TDE-PluginInfo-License=GPL
+X-TDE-PluginInfo-EnabledByDefault=true
 Name=TorK
 Type=Application
 Comment=Anonymity Manager
-Icon=khtml_tork
+Icon=tdehtml_tork
diff --git a/src/konqplugin/tork_plug_in.h b/src/konqplugin/tork_plug_in.h
index 63b9216..93d2069 100644
--- a/src/konqplugin/tork_plug_in.h
+++ b/src/konqplugin/tork_plug_in.h
@@ -38,19 +38,19 @@
 #ifndef __plugin_tork_plug_in_h
 #define __plugin_tork_plug_in_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 #include <dcopclient.h>
 #include <kurl.h>
 
-class KInstance;
+class TDEInstance;
 
 class Tork_plug_in : public KParts::Plugin
 {
     Q_OBJECT
 public:
     Tork_plug_in( TQObject* parent = 0, const char* name = 0 );
-    KAction *m_paToggleKDE ;
+    TDEAction *m_paToggleKDE ;
     DCOPClient* p_dcopServer;
     virtual ~Tork_plug_in();
 
@@ -75,7 +75,7 @@ public:
                                    const TQStringList &args = TQStringList() );
 
 private:
-    static KInstance* s_instance;
+    static TDEInstance* s_instance;
 };
 
 #endif
diff --git a/src/konqplugin/tork_plug_in.rc b/src/konqplugin/tork_plug_in.rc
index 8b803b5..5a61d95 100644
--- a/src/konqplugin/tork_plug_in.rc
+++ b/src/konqplugin/tork_plug_in.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui library="khtml_tork" name="khtml_tork" version="3" >
+<kpartgui library="tdehtml_tork" name="tdehtml_tork" version="3" >
 <MenuBar>
     <Menu name="tools"><Text>&amp;Tools</Text>
         <Action name="tork_menu"/>
diff --git a/src/kwidgetlistbox.cpp b/src/kwidgetlistbox.cpp
index fd4ec78..23300de 100644
--- a/src/kwidgetlistbox.cpp
+++ b/src/kwidgetlistbox.cpp
@@ -19,7 +19,7 @@
 
 #include "kwidgetlistbox.h"
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <hitwidget.h>
 
 KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
@@ -177,19 +177,19 @@ void KWidgetListbox::setItemColors(int index, bool even)
 
   if(index == selected())
   {
-    itm->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
-    itm->setPaletteForegroundColor(KGlobalSettings::highlightedTextColor());
+    itm->setPaletteBackgroundColor(TDEGlobalSettings::highlightColor());
+    itm->setPaletteForegroundColor(TDEGlobalSettings::highlightedTextColor());
   }
   else if(even)
   {
-    itm->setPaletteBackgroundColor(KGlobalSettings::baseColor());
-    itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+    itm->setPaletteBackgroundColor(TDEGlobalSettings::baseColor());
+    itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
   }
   else
   {
     itm->setPaletteBackgroundColor(
-        KGlobalSettings::alternateBackgroundColor());
-    itm->setPaletteForegroundColor(KGlobalSettings::textColor());
+        TDEGlobalSettings::alternateBackgroundColor());
+    itm->setPaletteForegroundColor(TDEGlobalSettings::textColor());
   }
 }
 
diff --git a/src/likeback.cpp b/src/likeback.cpp
index aade7ca..4ffb58e 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -18,15 +18,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.         *
  ***************************************************************************/
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kconfig.h>
-#include <kaction.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeconfig.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ntqlayout.h>
 #include <ntqtoolbutton.h>
 #include <kpushbutton.h>
@@ -65,10 +65,10 @@ LikeBackBar::LikeBackBar(LikeBack *likeBack)
 {
 	TQHBoxLayout *layout = new TQHBoxLayout(this);
 
-	TQIconSet likeIconSet    = kapp->iconLoader()->loadIconSet("likeback_like_tork",    KIcon::Small);
-	TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", KIcon::Small);
-	TQIconSet bugIconSet     = kapp->iconLoader()->loadIconSet("likeback_bug_tork",     KIcon::Small);
-	TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", KIcon::Small);
+	TQIconSet likeIconSet    = kapp->iconLoader()->loadIconSet("likeback_like_tork",    TDEIcon::Small);
+	TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", TDEIcon::Small);
+	TQIconSet bugIconSet     = kapp->iconLoader()->loadIconSet("likeback_bug_tork",     TDEIcon::Small);
+	TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", TDEIcon::Small);
 
 	m_likeButton = new TQToolButton(this, "likeback_like_tork");
 	m_likeButton->setIconSet(likeIconSet);
@@ -208,7 +208,7 @@ LikeBackPrivate::~LikeBackPrivate()
 /********** class LikeBack: **********/
 /*************************************/
 
-LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const KAboutData *aboutData)
+LikeBack::LikeBack(Button buttons, bool showBarByDefault, TDEConfig *config, const TDEAboutData *aboutData)
  : TQObject()
 {
 	// Initialize properties (1/2):
@@ -218,7 +218,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const
 	d->aboutData        = aboutData;
 	d->showBarByDefault = showBarByDefault;
 
-	// Use default KApplication config and aboutData if not provided:
+	// Use default TDEApplication config and aboutData if not provided:
 	if (d->config == 0)
 		d->config = kapp->config();
 	if (d->aboutData == 0)
@@ -364,20 +364,20 @@ LikeBack::Button LikeBack::buttons()
 	return d->buttons;
 }
 
-const KAboutData* LikeBack::aboutData()
+const TDEAboutData* LikeBack::aboutData()
 {
 	return d->aboutData;
 }
 
-KConfig* LikeBack::config()
+TDEConfig* LikeBack::config()
 {
 	return d->config;
 }
 
-KAction* LikeBack::sendACommentAction(KActionCollection *parent)
+TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent)
 {
 	if (d->action == 0)
-		d->action = new KAction(
+		d->action = new TDEAction(
 			i18n("&Send a Comment to Developers"), /*icon=*/"mail_new", /*shortcut=*/"",
 			this, SLOT(execCommentDialog()),
 			parent, "likeback_send_a_comment"
@@ -412,10 +412,10 @@ void LikeBack::setUserWantsToShowBar(bool showBar)
 void LikeBack::showInformationMessage()
 {
 	// Load and register the images needed by the message:
-	TQPixmap likeIcon    = kapp->iconLoader()->loadIcon("likeback_like_tork",    KIcon::Small);
-	TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::Small);
-	TQPixmap bugIcon     = kapp->iconLoader()->loadIcon("likeback_bug_tork",     KIcon::Small);
-	TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::Small);
+	TQPixmap likeIcon    = kapp->iconLoader()->loadIcon("likeback_like_tork",    TDEIcon::Small);
+	TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::Small);
+	TQPixmap bugIcon     = kapp->iconLoader()->loadIcon("likeback_bug_tork",     TDEIcon::Small);
+	TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::Small);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like",    likeIcon);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon);
 	TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug",     bugIcon);
@@ -566,7 +566,7 @@ void LikeBack::askEmailAddress()
 		setEmailAddress(email);
 }
 
-// FIXME: Should be moved to KAboutData? Cigogne will also need it.
+// FIXME: Should be moved to TDEAboutData? Cigogne will also need it.
 bool LikeBack::isDevelopmentVersion(const TQString &version)
 {
 	return version.find("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 ||
@@ -577,17 +577,17 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 }
 
 /**
- * Code from KBugReport::slotConfigureEmail() in kdeui/kbugreport.cpp:
+ * Code from KBugReport::slotConfigureEmail() in tdeui/kbugreport.cpp:
  */
 /*void LikeBack::beginFetchingEmail()
 {
 	if (m_process)
 		return;
-	m_process = new KProcess();
-	*m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
-	connect( m_process, SIGNAL(processExited(KProcess*)), SLOT(fetchUserEmail()) );
+	m_process = new TDEProcess();
+	*m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
+	connect( m_process, SIGNAL(processExited(TDEProcess*)), SLOT(fetchUserEmail()) );
 	if (!m_process->start()) {
-		kdDebug() << "Couldn't start kcmshell.." << endl;
+		kdDebug() << "Couldn't start tdecmshell.." << endl;
 		delete m_process;
 		m_process = 0;
 		return;
@@ -596,7 +596,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
 }*/
 
 /**
- * Code from KBugReport::slotSetFrom() in kdeui/kbugreport.cpp:
+ * Code from KBugReport::slotSetFrom() in tdeui/kbugreport.cpp:
  */
 void LikeBack::fetchUserEmail()
 {
@@ -604,8 +604,8 @@ void LikeBack::fetchUserEmail()
 //	m_process = 0;
 //	m_configureEmail->setEnabled(true);
 
-	// ### KDE4: why oh why is KEmailSettings in kio?
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+	// ### KDE4: why oh why is KEmailSettings in tdeio?
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
 
 	// find out the default profile
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
@@ -668,7 +668,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 	TQWidget *buttons = new TQWidget(box);
 	TQGridLayout *buttonsGrid = new TQGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint());
 	if (m_likeBack->buttons() & LikeBack::Like) {
-		TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
+		TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *likeIcon = new TQLabel(buttons);
 		likeIcon->setPixmap(likePixmap);
 		likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -678,7 +678,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		m_group->insert(likeButton, LikeBack::Like);
 	}
 	if (m_likeBack->buttons() & LikeBack::Dislike) {
-		TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
+		TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *dislikeIcon = new TQLabel(buttons);
 		dislikeIcon->setPixmap(dislikePixmap);
 		dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -688,7 +688,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		m_group->insert(dislikeButton, LikeBack::Dislike);
 	}
 	if (m_likeBack->buttons() & LikeBack::Bug) {
-		TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
+		TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *bugIcon = new TQLabel(buttons);
 		bugIcon->setPixmap(bugPixmap);
 		bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -698,7 +698,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialC
 		m_group->insert(bugButton, LikeBack::Bug);
 	}
 	if (m_likeBack->buttons() & LikeBack::Feature) {
-		TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true);
+		TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0L, true);
 		TQLabel *featureIcon = new TQLabel(buttons);
 		featureIcon->setPixmap(featurePixmap);
 		featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
@@ -749,11 +749,11 @@ TQString LikeBackDialog::introductionText()
 		TQStringList locales = m_likeBack->acceptedLocales();
 		for (TQStringList::Iterator it = locales.begin(); it != locales.end(); ++it) {
 			TQString locale = *it;
-			if (KGlobal::locale()->language().startsWith(locale))
+			if (TDEGlobal::locale()->language().startsWith(locale))
 				languagesMessage = "";
 		}
 	} else {
-		if (!KGlobal::locale()->language().startsWith("en"))
+		if (!TDEGlobal::locale()->language().startsWith("en"))
 			languagesMessage = i18n("Please write in English.");
 	}
 
@@ -761,7 +761,7 @@ TQString LikeBackDialog::introductionText()
 		// TODO: Replace the URL with a localized one:
 		text += languagesMessage + " " +
 			i18n("You may be able to use an <a href=\"%1\">online translation tool</a>.")
-			.arg("http://www.google.com/language_tools?hl=" + KGlobal::locale()->language())
+			.arg("http://www.google.com/language_tools?hl=" + TDEGlobal::locale()->language())
 			+ " ";
 
 	// If both "I Like" and "I Dislike" buttons are shown and one is clicked:
@@ -811,7 +811,7 @@ void LikeBackDialog::send()
 		"protocol=" + KURL::encode_string("1.0")                              + '&' +
 		"type="     + KURL::encode_string(type)                               + '&' +
 		"version="  + KURL::encode_string(m_likeBack->aboutData()->version()) + '&' +
-		"locale="   + KURL::encode_string(KGlobal::locale()->language())      + '&' +
+		"locale="   + KURL::encode_string(TDEGlobal::locale()->language())      + '&' +
 		"window="   + KURL::encode_string(m_windowPath)                       + '&' +
 		"context="  + KURL::encode_string(m_context)                          + '&' +
 		"comment="  + KURL::encode_string(m_comment->text())                  + '&' +
diff --git a/src/likeback.h b/src/likeback.h
index e5d383a..e319e8d 100644
--- a/src/likeback.h
+++ b/src/likeback.h
@@ -23,10 +23,10 @@
 
 #include <ntqobject.h>
 
-class KConfig;
-class KAboutData;
-class KAction;
-class KActionCollection;
+class TDEConfig;
+class TDEAboutData;
+class TDEAction;
+class TDEActionCollection;
 
 class LikeBackPrivate;
 class LikeBackBar;
@@ -48,7 +48,7 @@ class LikeBackDialog;
  *
  * The LikeBack system has 5 components:
  * @li In the application: The comment dialog, where the user write a comment, select a type of comment, etc.
- * @li In the application: The KAction to plug in the Help menu. This action displays the comment dialog.
+ * @li In the application: The TDEAction to plug in the Help menu. This action displays the comment dialog.
  * @li In the application: The button-bar, that floats bellow titlebar of every windows of the application, and let the user to quickly show the comment dialog.
  *                         The button-bar can be hidden.
  * @li On the server: A PHP script that collects every comments that users send. The LikeBack object should be configured to contact that server.
@@ -64,7 +64,7 @@ class LikeBackDialog;
  *     // Comment the following line once you are sure all your windows have a name:
  *     likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows);
  *
- *     // This line should be called early in your KMainWindow constructor because it references actionCollection().
+ *     // This line should be called early in your TDEMainWindow constructor because it references actionCollection().
  *     // It should be called before createGUI() for the action to be plugged in the Help menu:
  *     likeBack->sendACommentAction(actionCollection());
  * @endcode
@@ -117,18 +117,18 @@ class LikeBack : public TQObject
 	 *                         The button-bar display is stored by version. On a new version, your default value will take effect again.
 	 *                         This allow you to disable the button-bar once the version is stable enought to be released as final.
 	 * @param config           Set the configuration file where to store the user email address and if the button-bar should be shown.
-	 *                         By default (null), the KApplication configuration object is used.
-	 * @param aboutData        Set the KAboutData instance used to get the application name and version. By default (null), the KApplication about data object is used.
+	 *                         By default (null), the TDEApplication configuration object is used.
+	 * @param aboutData        Set the TDEAboutData instance used to get the application name and version. By default (null), the TDEApplication about data object is used.
 	 *                         The application name is only used in the first-use information message.
 	 *                         The version is used to store the button-bar visibility per version (can be shown in a development version but not in a final one...)
 	 *                         and to send with the comment, so you can filter per version and know if a comment refers the latest version of the application or not.
 	 */
-	LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, KConfig *config = 0, const KAboutData *aboutData = 0);
+	LikeBack(Button buttons = DefaultButtons, bool showBarByDefault = false, TDEConfig *config = 0, const TDEAboutData *aboutData = 0);
 
 	/**
 	 * Destructor.
 	 * Also hide the button-bar, if it was shown.
-	 * Be careful, the KAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
+	 * Be careful, the TDEAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
 	 */
 	~LikeBack();
 
@@ -209,7 +209,7 @@ class LikeBack : public TQObject
 	TQ_UINT16 hostPort();
 
 	/**
-	 * Get the KAction letting user to show the comment dialog.
+	 * Get the TDEAction letting user to show the comment dialog.
 	 * You should plug it in your Help menu, just bellow the "Report a Bug" action, or replace it.
 	 * Adding the action below "Report a Bug" or replacing "Report a Bug" depends on your application and if you have a Bugzilla account.
 	 * If you do not have a Bugzilla account, LikeBack is a good way for your small application to get bug reports: remove "Report a Bug".
@@ -219,7 +219,7 @@ class LikeBack : public TQObject
 	 *       <Action name="likeback_send_a_comment" />
 	 * @endcode
 	 */
-	KAction* sendACommentAction(KActionCollection *parent = 0);
+	TDEAction* sendACommentAction(TDEActionCollection *parent = 0);
 
 	/**
 	 * @Returns The path of the currently active window. Each windows are separated with "~~".
@@ -280,7 +280,7 @@ class LikeBack : public TQObject
 	 * @param windowPath     The window path to send with the comment. If empty (the default), the current window path is took.
 	 *                       Separate window names with "~~". For instance "MainWindow~~NewFile~~FileOpen".
 	 *                       If you popup the dialog after an error occurred, you can put the error name in that field (if the window path has no sense in that context).
-	 *                       When the dialog is popuped up from the sendACommentAction() KAction, this value is "HelpMenu", because there is no way to know if the user
+	 *                       When the dialog is popuped up from the sendACommentAction() TDEAction, this value is "HelpMenu", because there is no way to know if the user
 	 *                       is commenting a thing he found/thinked about in a sub-dialog.
 	 * @param context        Not used for the moment. Will allow more fine-grained application status report.
 	 */
@@ -302,7 +302,7 @@ class LikeBack : public TQObject
 
   private slots:
 	/**
-	 * Slot triggered by the "Help -> Send a Comment to Developers" KAction.
+	 * Slot triggered by the "Help -> Send a Comment to Developers" TDEAction.
 	 * It popups the comment dialog, and set the window path to "HelpMenuAction",
 	 * because current window path has no meaning in that case.
 	 */
@@ -323,16 +323,16 @@ class LikeBack : public TQObject
 	void setUserWantsToShowBar(bool showBar);
 
 	/**
-	 * @Returns A pointer to the KAboutData used to determin the application name and version.
+	 * @Returns A pointer to the TDEAboutData used to determin the application name and version.
 	 * @See The LikeBack constructor for more information.
 	 */
-	const KAboutData *aboutData();
+	const TDEAboutData *aboutData();
 
 	/**
-	 * @Returns A pointer to the KConfig used to store user configuration (email address, if the button-bar should be shown).
+	 * @Returns A pointer to the TDEConfig used to store user configuration (email address, if the button-bar should be shown).
 	 * @See The LikeBack constructor for more information.
 	 */
-	KConfig *config();
+	TDEConfig *config();
 
 	/**
 	 * During the first comment sending, the user is invited to enter his email address for the developers to be able to contact him back.
diff --git a/src/likeback_private.h b/src/likeback_private.h
index d7be942..8f0e386 100644
--- a/src/likeback_private.h
+++ b/src/likeback_private.h
@@ -38,8 +38,8 @@ class LikeBackPrivate
 	LikeBackPrivate();
 	~LikeBackPrivate();
 	LikeBackBar             *bar;
-	KConfig                 *config;
-	const KAboutData        *aboutData;
+	TDEConfig                 *config;
+	const TDEAboutData        *aboutData;
 	LikeBack::Button         buttons;
 	TQString                  hostName;
 	TQString                  remotePath;
@@ -51,7 +51,7 @@ class LikeBackPrivate
 	bool                     showBar;
 	int                      disabledCount;
 	TQString                  fetchedEmail;
-	KAction                 *action;
+	TDEAction                 *action;
 };
 
 class LikeBackBar : public TQWidget
diff --git a/src/main.cpp b/src/main.cpp
index 55dfefd..7caf450 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,11 +25,11 @@
 #include "torkconfig.h"
 #include "functions.h"
 #include "newfirstrunwizard.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kconfigdialogmanager.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdelocale.h>
+#include <tdeconfigdialogmanager.h>
 
 static const char description[] =
     I18N_NOOP("<b>TorK - An Anonymity Manager for the KDE Desktop.</b>\n"
@@ -40,7 +40,7 @@ static const char description[] =
 static const char version[] = "";
 static const char title[] = "TorK 0.33";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[URL]", I18N_NOOP( "Document to open." ), 0 },
     { "toggleKDE", I18N_NOOP("Toggle Anonymous KDE"), 0 },
@@ -58,8 +58,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("tork", I18N_NOOP(title), version, description,
-    KAboutData::License_GPL, "(C) 2006 - 2008 Robert Hogan", 0, 0, "tork-users@lists.sf.net");
+    TDEAboutData about("tork", I18N_NOOP(title), version, description,
+    TDEAboutData::License_GPL, "(C) 2006 - 2008 Robert Hogan", 0, 0, "tork-users@lists.sf.net");
     about.addAuthor( "Robert Hogan", I18N_NOOP("Author and Maintainer"), "robert@roberthogan.net", "http://tork.anonymityanywhere.com" );
     about.addAuthor( "Corinna Habets", I18N_NOOP("Icons"), 0);
     about.addAuthor( "Contains code by: Matt Edman, Justin Hipple, Max Howell,", 0, "" );
@@ -82,9 +82,9 @@ int main(int argc, char **argv)
     about.addCredit( "Max Urgel", I18N_NOOP("German Translation"), "bitwisser@googlemail.com");
     about.addCredit( "Daniel Berthereau", I18N_NOOP("French Translation"),
                      "Daniel.Berthereau@free.fr");
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
-    KApplication app;
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
+    TDEApplication app;
 
 
     //Check for the existence of anonymizable/helper programs first.
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
     else
         widget->show();
 
-    //KCrash::setCrashHandler( torK::Crash::crashHandler );
+    //TDECrash::setCrashHandler( torK::Crash::crashHandler );
 
     return app.exec();
 }
diff --git a/src/maxmin.ui.h b/src/maxmin.ui.h
index 95d8a1e..1902c2e 100644
--- a/src/maxmin.ui.h
+++ b/src/maxmin.ui.h
@@ -19,8 +19,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 #include "torkconfig.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 
diff --git a/src/mixminion.ui b/src/mixminion.ui
index d82b2a1..8d081c7 100644
--- a/src/mixminion.ui
+++ b/src/mixminion.ui
@@ -148,7 +148,7 @@
     </widget>
 </widget>
 <customwidgets>
-    <widget class="KProcess">
+    <widget class="TDEProcess">
         <property name="name">
             <cstring>proc</cstring>
         </property>
@@ -181,7 +181,7 @@
     <slot>send_clicked()</slot>
     <slot>slotProg(  )</slot>
     <slot>receivedMixminionOutput( KProcIO * mixminionproc )</slot>
-    <slot>mixminionprocExited( KProcess * proc )</slot>
+    <slot>mixminionprocExited( TDEProcess * proc )</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
diff --git a/src/mixminion.ui.h b/src/mixminion.ui.h
index 03cf179..e5e7b94 100644
--- a/src/mixminion.ui.h
+++ b/src/mixminion.ui.h
@@ -19,7 +19,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 #include <kprocio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kdebug.h>
 #include <ntqregexp.h>
@@ -58,8 +58,8 @@ void MixMinionClient::send_clicked()
     *mixminionproc << "printf '" << messageBody->text() <<"' | mixminion  send -t " << toAddress->text() 
                 << " --subject '" << subject->text() << "'";
 
- 	connect( mixminionproc, SIGNAL(processExited(KProcess *)),
- 			SLOT(mixminionprocExited(KProcess *)) );
+ 	connect( mixminionproc, SIGNAL(processExited(TDEProcess *)),
+ 			SLOT(mixminionprocExited(TDEProcess *)) );
 	connect( mixminionproc, SIGNAL(readReady(KProcIO *)),
 		SLOT(receivedMixminionOutput(KProcIO *)) );
 
@@ -104,7 +104,7 @@ void MixMinionClient::receivedMixminionOutput(KProcIO *mixminionproc)
 }
 
 
-void MixMinionClient::mixminionprocExited(KProcess *proc)
+void MixMinionClient::mixminionprocExited(TDEProcess *proc)
 {
     TQString caption;
     TQString message;
diff --git a/src/newfirstrunwizard.ui.h b/src/newfirstrunwizard.ui.h
index 0480bec..a8fa9fc 100644
--- a/src/newfirstrunwizard.ui.h
+++ b/src/newfirstrunwizard.ui.h
@@ -23,7 +23,7 @@
 #include "crypto.h"
 #include "torclient.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ntqpushbutton.h>
 #include <ntqpixmap.h>
 #include <ntqtimer.h>
@@ -34,9 +34,9 @@
 #include <kdebug.h>
 #include <stdlib.h>
 #include <dcopref.h>
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <ntqvaluevector.h>
 
@@ -128,7 +128,7 @@ FirstRunWizard::init()
 
     serverName->setText("TorKServer");
     
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
 	TQString profile = TQString::fromLatin1("PROFILE_");
 	profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
@@ -379,18 +379,18 @@ FirstRunWizard::saveNonAnonymousProxySettings()
 {
 
 
-    KConfig* config = new KConfig("kioslaverc", false, false);
+    TDEConfig* config = new TDEConfig("tdeioslaverc", false, false);
     config->setGroup( "Proxy Settings" );
     OriginalHttpProxy = config->readEntry( "httpProxy" );
     OriginalHttpsProxy = config->readEntry( "httpsProxy" );
     OriginalProxyType = config->readEntry( "ProxyType" );
-    config = new KConfig("kcookiejarrc", false, false);
+    config = new TDEConfig("kcookiejarrc", false, false);
     config->setGroup( "Cookie Policy" );
     OriginalCookies = config->readEntry( "Cookies" );
-    config = new KConfig("kio_httprc", false, false);
+    config = new TDEConfig("tdeio_httprc", false, false);
     OriginalUseCache = config->readEntry( "UseCache" );
     OriginalSendUserAgent = config->readEntry( "SendUserAgent" );
-    config = new KConfig("konquerorrc", false, false);
+    config = new TDEConfig("konquerorrc", false, false);
     config->setGroup( "Java/JavaScript Settings" );
     OriginalEnableJavascript = config->readEntry( "EnableJavaScript" );
     OriginalEnableJava = config->readEntry( "EnableJava" );
@@ -413,7 +413,7 @@ FirstRunWizard::saveAnonymousProxySettings()
 
 
 
-    KConfig* config = new KConfig("kioslaverc", false, false);
+    TDEConfig* config = new TDEConfig("tdeioslaverc", false, false);
     config->setGroup( "Proxy Settings" );
     KonqHttpProxy = config->readEntry( "httpProxy" ).section(":",0,1);
     KonqHttpProxyPort = config->readEntry( "httpProxy" ).section(":",-1,-1).toInt();
@@ -435,20 +435,20 @@ void FirstRunWizard::TorLocation_textChanged( const TQString & text)
 
 void FirstRunWizard::pushButton1_clicked()
 {
-    KRun::runCommand( "kcmshell proxy" );
+    KRun::runCommand( "tdecmshell proxy" );
 
 }
 
 
 void FirstRunWizard::pushButton1_2_clicked()
 {
-    KRun::runCommand( "kcmshell proxy" );
+    KRun::runCommand( "tdecmshell proxy" );
 }
 
 
 void FirstRunWizard::pushButton1_3_clicked()
 {
-    KRun::runCommand( "kcmshell proxy" );
+    KRun::runCommand( "tdecmshell proxy" );
 }
 
 void FirstRunWizard::testTorAgain_clicked()
@@ -600,7 +600,7 @@ void FirstRunWizard::rootifyNetstat()
 
     KProcIO *catproc = new KProcIO();
     catproc->setUseShell(TRUE);
-    TQString whichCommand= TQString("kdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat);
+    TQString whichCommand= TQString("tdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat);
     *catproc<<whichCommand;
     catproc->start(KProcIO::NotifyOnExit,TRUE);
 
@@ -645,7 +645,7 @@ void FirstRunWizard::appendControlDirective(const TQString& text)
 		TQString directory = KURL(text).directory();
         KProcIO *catproc = new KProcIO();
         catproc->setUseShell(TRUE);
-        TQString whichCommand= TQString("kdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\""
+        TQString whichCommand= TQString("tdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\""
                                       " >> %2;killall -s HUP tor'\"").arg(directory).arg(text);
         *catproc<<whichCommand;
         catproc->start(KProcIO::NotifyOnExit,TRUE);
@@ -758,7 +758,7 @@ void FirstRunWizard::appendPrivoxyConfig(const TQString& text)
 
         KProcIO *catproc = new KProcIO();
         catproc->setUseShell(TRUE);
-        TQString whichCommand= TQString("kdesu -c \"sh -c 'printf \\\"%1\\\""
+        TQString whichCommand= TQString("tdesu -c \"sh -c 'printf \\\"%1\\\""
                                       " >> %2;killall -s HUP privoxy'\"")
                                       .arg(privoxyConf)
                                       .arg(text);
diff --git a/src/newstreamosd.cpp b/src/newstreamosd.cpp
index 6c52760..e8785e3 100644
--- a/src/newstreamosd.cpp
+++ b/src/newstreamosd.cpp
@@ -40,13 +40,13 @@
 #include "newstreamosd.h"
 #include "torkview.h"
 
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kcursor.h>
-#include <kconfig.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
+#include <tdepopupmenu.h>
 #include <ntqlistview.h>
 #include <ntqlayout.h>
 #include <ntqheader.h>
@@ -56,7 +56,7 @@
 #include <ntqapplication.h>
 #include <ntqframe.h>
 #include <ntqtoolbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <X11/Xlib.h>
@@ -197,7 +197,7 @@ void StreamOSD::renderOSD()
     infoList = new TQListView( this, "infoList" );
     infoList->addColumn(  "StreamID"  );
     infoList->addColumn(  "Host"  );
-    infoList->addColumn(  kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24   );
+    infoList->addColumn(  kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24   );
     infoList->addColumn(  "KB/s"  );
     infoList->addColumn(  "Exit"  );
     infoList->setColumnWidthMode(0, TQListView::Manual);
@@ -398,7 +398,7 @@ void StreamOSD::mousePressEvent( TQMouseEvent* e )
     m_dragging = true;
   }
 /*  else if( e->button() == RightButton ) {
-    KPopupMenu m;
+    TDEPopupMenu m;
     if( m.insertItem( i18n("Hide OSD") ) == m.exec( e->pos() ) )
       hide();
   }*/
@@ -465,7 +465,7 @@ TQPoint StreamOSD::fixupPosition( const TQPoint& pp )
 }
 
 
-void StreamOSD::readSettings( KConfigBase* c )
+void StreamOSD::readSettings( TDEConfigBase* c )
 {
   TQString oldGroup = c->group();
   if (m_tortraffic)
@@ -480,7 +480,7 @@ void StreamOSD::readSettings( KConfigBase* c )
 }
 
 
-void StreamOSD::saveSettings( KConfigBase* c )
+void StreamOSD::saveSettings( TDEConfigBase* c )
 {
   TQString oldGroup = c->group();
   if (m_tortraffic)
diff --git a/src/newstreamosd.h b/src/newstreamosd.h
index 95705a9..a2f332b 100644
--- a/src/newstreamosd.h
+++ b/src/newstreamosd.h
@@ -26,7 +26,7 @@
 
 class TQPaintEvent;
 class TQMouseEvent;
-class KConfigBase;
+class TDEConfigBase;
 class TQHBox;
 class TQListView;
 class TQToolButton;
@@ -49,8 +49,8 @@ class StreamOSD : public TQWidget
   int screen() const { return m_screen; }
   const TQPoint& position() const { return m_position; }
 
-  void readSettings( KConfigBase* );
-  void saveSettings( KConfigBase* );
+  void readSettings( TDEConfigBase* );
+  void saveSettings( TDEConfigBase* );
 
  signals:
   void requestHideMonitor();
diff --git a/src/paranoia.ui.h b/src/paranoia.ui.h
index 088b7c0..84f32d6 100644
--- a/src/paranoia.ui.h
+++ b/src/paranoia.ui.h
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 #include "torkconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kdebug.h>
diff --git a/src/quickconfig.ui.h b/src/quickconfig.ui.h
index 167b2b9..acdcd22 100644
--- a/src/quickconfig.ui.h
+++ b/src/quickconfig.ui.h
@@ -21,14 +21,14 @@
 
 
 #include "torkconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kdebug.h>
 #include <dcopref.h>
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 
 void QuickConfig::init()
diff --git a/src/running.ui.h b/src/running.ui.h
index f3c17b3..ecf991c 100644
--- a/src/running.ui.h
+++ b/src/running.ui.h
@@ -21,7 +21,7 @@
 
 //dummy
 #include "torkconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kdebug.h>
diff --git a/src/server.ui.h b/src/server.ui.h
index d46af71..4ef573e 100644
--- a/src/server.ui.h
+++ b/src/server.ui.h
@@ -21,7 +21,7 @@
 #include "tork.h"
 #include "torkconfig.h"
 #include "upnpmanager.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
diff --git a/src/serverwizard.ui.h b/src/serverwizard.ui.h
index 20cc9e6..a8fe5d9 100644
--- a/src/serverwizard.ui.h
+++ b/src/serverwizard.ui.h
@@ -18,7 +18,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <ntqstringlist.h>
 #include "tork.h"
@@ -37,7 +37,7 @@ void ServerWizard::init()
         displayDiscoveredRouters();
 
     serverName->setText("TorKServer");
-	KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+	TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
 	emailConf.setGroup(TQString::fromLatin1("Defaults"));
 	TQString profile = TQString::fromLatin1("PROFILE_");
 	profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default"));
diff --git a/src/testprivacyproxy.cpp b/src/testprivacyproxy.cpp
index fbf878d..ef19b06 100644
--- a/src/testprivacyproxy.cpp
+++ b/src/testprivacyproxy.cpp
@@ -27,7 +27,7 @@
 #include "torkconfig.h"
 
 #include <ntqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <ntqfile.h>
 #include <sys/socket.h>
diff --git a/src/testprivacyproxy.h b/src/testprivacyproxy.h
index 7f74c9a..1f512f2 100644
--- a/src/testprivacyproxy.h
+++ b/src/testprivacyproxy.h
@@ -32,7 +32,7 @@
 #include <ntqsocket.h>
 #include <ntqtextstream.h>
 #include <kdebug.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <ntqlistview.h>
 #include "torkconfig.h"
 
diff --git a/src/tor_ioslave/Makefile.am b/src/tor_ioslave/Makefile.am
index c64d2ff..cf4d26e 100644
--- a/src/tor_ioslave/Makefile.am
+++ b/src/tor_ioslave/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES    = $(all_includes)
 LIBS =
 
-kde_module_LTLIBRARIES = kio_torioslave.la
+kde_module_LTLIBRARIES = tdeio_torioslave.la
 
-kio_torioslave_la_SOURCES = torioslave.cpp
-kio_torioslave_la_LIBADD = -lkio        
-kio_torioslave_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
+tdeio_torioslave_la_SOURCES = torioslave.cpp
+tdeio_torioslave_la_LIBADD = -ltdeio        
+tdeio_torioslave_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
 
 protocol_DATA = torioslave.protocol
 protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_torioslave.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_torioslave.pot
diff --git a/src/tor_ioslave/torioslave.cpp b/src/tor_ioslave/torioslave.cpp
index ac4a901..429ced0 100644
--- a/src/tor_ioslave/torioslave.cpp
+++ b/src/tor_ioslave/torioslave.cpp
@@ -32,39 +32,39 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kprocio.h>
 
 #include "torioslave.h"
 
-using namespace KIO;
+using namespace TDEIO;
 
 
-kio_torProtocol::kio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket)
-    : SlaveBase("kio_tor", pool_socket, app_socket)
+tdeio_torProtocol::tdeio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket)
+    : SlaveBase("tdeio_tor", pool_socket, app_socket)
 {
 }
 
 
-kio_torProtocol::~kio_torProtocol()
+tdeio_torProtocol::~tdeio_torProtocol()
 {
 }
 
 
-void kio_torProtocol::get(const KURL& url )
+void tdeio_torProtocol::get(const KURL& url )
 {
 
     TQString wait;
@@ -138,7 +138,7 @@ void kio_torProtocol::get(const KURL& url )
 }
 
 
-void kio_torProtocol::mimetype(const KURL & /*url*/)
+void tdeio_torProtocol::mimetype(const KURL & /*url*/)
 {
     mimeType("text/html");
     finished();
@@ -149,19 +149,19 @@ extern "C"
 {
     int kdemain(int argc, char **argv)
     {
-        KInstance instance( "kio_tor" );
+        TDEInstance instance( "tdeio_tor" );
         
-        kdDebug(7101) << "*** Starting kio_tor " << endl;
+        kdDebug(7101) << "*** Starting tdeio_tor " << endl;
         
         if (argc != 4) {
-            kdDebug(7101) << "Usage: kio_tor  protocol domain-socket1 domain-socket2" << endl;
+            kdDebug(7101) << "Usage: tdeio_tor  protocol domain-socket1 domain-socket2" << endl;
             exit(-1);
         }
         
-        kio_torProtocol slave(argv[2], argv[3]);
+        tdeio_torProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
         
-        kdDebug(7101) << "*** kio_tor Done" << endl;
+        kdDebug(7101) << "*** tdeio_tor Done" << endl;
         return 0;
     }
 } 
diff --git a/src/tor_ioslave/torioslave.h b/src/tor_ioslave/torioslave.h
index 0bb1556..5668e3f 100644
--- a/src/tor_ioslave/torioslave.h
+++ b/src/tor_ioslave/torioslave.h
@@ -26,16 +26,16 @@
 #include <ntqcstring.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class TQCString;
 
-class kio_torProtocol : public KIO::SlaveBase
+class tdeio_torProtocol : public TDEIO::SlaveBase
 {
 public:
-    kio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket);
-    virtual ~kio_torProtocol();
+    tdeio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket);
+    virtual ~tdeio_torProtocol();
     virtual void mimetype(const KURL& url);
     virtual void get(const KURL& url);
 };
diff --git a/src/tor_ioslave/torioslave.protocol b/src/tor_ioslave/torioslave.protocol
index efb6111..5514d94 100644
--- a/src/tor_ioslave/torioslave.protocol
+++ b/src/tor_ioslave/torioslave.protocol
@@ -1,29 +1,29 @@
 [Protocol]
-exec=kio_torioslave
+exec=tdeio_torioslave
 protocol=tor
 input=none
 output=stream
 reading=true
 defaultMimetype=text/html
 Icon=tork_tor
-Description=A kioslave for tor
-Description[da]=En kioslave til tor
+Description=A tdeioslave for tor
+Description[da]=En tdeioslave til tor
 Description[de]=Ein Ein-/Ausgabemodul für tor
-Description[es]=Un kioslave para tor
+Description[es]=Un tdeioslave para tor
 Description[et]=tor IO-moodul
 Description[fr]=Un module d'entrée / sortie pour tor
 Description[hu]=tor-támogató KIOslave
-Description[it]=Un kioslave per tor
+Description[it]=Un tdeioslave per tor
 Description[nl]=Kioslave voor tor
-Description[pl]=kioslave dla tor
-Description[pt]=Um 'kioslave' para tor
-Description[pt_BR]=Um kioslave para tor
+Description[pl]=tdeioslave dla tor
+Description[pt]=Um 'tdeioslave' para tor
+Description[pt_BR]=Um tdeioslave para tor
 Description[ru]=Обработчик ввода-вывода для tor
-Description[sl]=kioslave za tor
+Description[sl]=tdeioslave za tor
 Description[sr]=KIOSlave за tor
 Description[sr@Latn]=KIOSlave za tor
 Description[sv]=En I/O-slav för tor
-Description[tr]=tor için bir kioslave
-Description[uk]=Підлеглий В/В (kioslave) для tor
-Description[xx]=xxA kioslave for torxx
-Description[zh_CN]=tor 的 kioslave
+Description[tr]=tor için bir tdeioslave
+Description[uk]=Підлеглий В/В (tdeioslave) для tor
+Description[xx]=xxA tdeioslave for torxx
+Description[zh_CN]=tor 的 tdeioslave
diff --git a/src/torclient.cpp b/src/torclient.cpp
index 1411076..1652ed2 100644
--- a/src/torclient.cpp
+++ b/src/torclient.cpp
@@ -31,7 +31,7 @@
 #include "functions.h"
 
 #include <ntqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <ntqfile.h>
 #include <sys/socket.h>
@@ -858,7 +858,7 @@ void TorClient::parseServer(const TQString &info)
 
     }else if (info.left(6) == "uptime"){
         //from the clever ktorrent
-        KLocale* loc = KGlobal::locale();
+        TDELocale* loc = TDEGlobal::locale();
         TQTime t;
         int nsecs = info.section(" ",1).toInt();
         int ndays = (nsecs) / 86400;
@@ -1143,8 +1143,8 @@ void TorClient::applySettingsToRunningTor()
     }
 
 //     kdDebug() << "1" << endl;
-    KConfigSkeletonItem::List items = TorkConfig::self()->items();
-    KConfigSkeletonItem::List::ConstIterator it;
+    TDEConfigSkeletonItem::List items = TorkConfig::self()->items();
+    TDEConfigSkeletonItem::List::ConstIterator it;
     
     for( it = items.begin(); it != items.end(); ++it ) {
         if (elementShouldBeUsed((*it))){
@@ -1213,7 +1213,7 @@ void TorClient::applySettingsToRunningTor()
 
 }
 
-bool TorClient::elementShouldBeUsed(const KConfigSkeletonItem* it)
+bool TorClient::elementShouldBeUsed(const TDEConfigSkeletonItem* it)
 {
 
         //Maxmin Settings are always applied, defaults if 'let Tor decide' selected.
@@ -1239,7 +1239,7 @@ bool TorClient::elementShouldBeUsed(const KConfigSkeletonItem* it)
     return false;
 }
 
-bool TorClient::noSpecialProcessing(const KConfigSkeletonItem* it)
+bool TorClient::noSpecialProcessing(const TDEConfigSkeletonItem* it)
 {
 
     if (((*it).name() == "PublishServerDescriptor") && (TorkConfig::bridgeRelay())){
diff --git a/src/torclient.h b/src/torclient.h
index bb64476..01bd5d2 100644
--- a/src/torclient.h
+++ b/src/torclient.h
@@ -32,13 +32,13 @@
 #include <ntqsocket.h>
 #include <ntqtextstream.h>
 #include <kdebug.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <ntqlistview.h>
 #include "torkconfig.h"
 
 
-class KConfigSkeleton;
-class KConfigSkeletonItem;
+class TDEConfigSkeleton;
+class TDEConfigSkeletonItem;
 
 class PrevConfig
     {
@@ -234,8 +234,8 @@ private:
     bool m_resolvingServerAddress;
     bool geoip_db;
     TQString m_currentTorVersion;
-    bool elementShouldBeUsed(const KConfigSkeletonItem* it);
-    bool noSpecialProcessing(const KConfigSkeletonItem* it);
+    bool elementShouldBeUsed(const TDEConfigSkeletonItem* it);
+    bool noSpecialProcessing(const TDEConfigSkeletonItem* it);
     bool readCookie();
     TQString ds_identity;
     TQString ds_fp_identity;
diff --git a/src/tork.cpp b/src/tork.cpp
index 00a5a47..2c56e0a 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -27,39 +27,39 @@
 #include <ntqtimer.h>
 #include <ntqgroupbox.h>
 
-#include <kconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeconfigdialog.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kdeversion.h>
-#include <kmenubar.h>
+#include <tdeversion.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <ksqueezedtextlabel.h>
 #include <kedittoolbar.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <krun.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopref.h>
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kpassivepopup.h>
-#include <kio/netaccess.h>
-#include <khtml_part.h>
+#include <tdeio/netaccess.h>
+#include <tdehtml_part.h>
 #include <dom/html_misc.h>
 #include <kurl.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <ktip.h>
-#include <kwin.h>
+#include <twin.h>
 #include <knotifyclient.h>
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 
 #include <ntqtooltip.h>
 #include <ntqlabel.h>
@@ -69,7 +69,7 @@
 #include <ntqhostaddress.h>
 #include <dcopref.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #ifndef EXTERNAL_GEOIP
 # include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
@@ -96,7 +96,7 @@
 
 #include "../config.h"
 
-tork *kmain = 0L;
+tork *tdemain = 0L;
 
 using namespace tk;
 
@@ -117,7 +117,7 @@ TQValueVector<TQString> countryType(256);
 
 tork::tork()
     : DCOPObject( "DCOPTork" ),
-      KMainWindow( 0, "TorK" ),
+      TDEMainWindow( 0, "TorK" ),
       m_view(new torkView(this)),
       m_printer(0),
       m_servererrornag(true),
@@ -142,7 +142,7 @@ tork::tork()
          kapp->dcopClient()->setDefaultObject( objId() );
 //     }
 
-	kmain = this;
+	tdemain = this;
     client = 0L;
     childproc = 0L;
     privoxyproc = 0L;
@@ -215,7 +215,7 @@ tork::tork()
      // Comment the following line once you are sure all your windows have a name:
      likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows);
 
-     // This line should be called early in your KMainWindow constructor because it references actionCollection().
+     // This line should be called early in your TDEMainWindow constructor because it references actionCollection().
      // It should be called before createGUI() for the action to be plugged in the Help menu:
      likeBack->sendACommentAction(actionCollection());
 
@@ -236,7 +236,7 @@ tork::tork()
 	//currentChanged(0);
 	//applySettings(false);
 
-    // tell the KMainWindow that this is indeed the main widget
+    // tell the TDEMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
 
 	setStandardToolBarMenuEnabled(true);
@@ -323,10 +323,10 @@ tork::tork()
     showTipOnStart();
     turnOffKDE();
 
-	if ((KApplication::kApplication()->isRestored()))
+	if ((TDEApplication::kApplication()->isRestored()))
         startEverything();
 
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
     if( args->isSet( "toggleKDE" ) ){
         startEverything();
         enableKDE(true);
@@ -386,11 +386,11 @@ tork::tork()
       toolBar("TorToolBar")->toggleButton(toolBar("TorToolBar")->idAt(2));
       toolBar("MoreToolBar")->show();
     }else{
-      toolBar("TorToolBar")->setIconText( KToolBar::IconTextRight, false );
+      toolBar("TorToolBar")->setIconText( TDEToolBar::IconTextRight, false );
       m_ModeButton->plug( toolBar("TorToolBar") );
       toolBar("TorToolBar")->setToggle(toolBar("TorToolBar")->idAt(2),true);
       toolBar("MoreToolBar")->hide();
-      toolBar("TorToolBar")->setIconText( KToolBar::IconOnly, false );
+      toolBar("TorToolBar")->setIconText( TDEToolBar::IconOnly, false );
     }
 
 }
@@ -411,7 +411,7 @@ void tork::prepareToShut()
         client = 0L;
     }
 
-    KConfig* config = new KConfig("kioslaverc", false, false);
+    TDEConfig* config = new TDEConfig("tdeioslaverc", false, false);
     config->setGroup( "Proxy Settings" );
     config->writeEntry( "httpProxy", TorkConfig::originalHttpProxy() );
     config->writeEntry( "httpsProxy", TorkConfig::originalHttpsProxy() );
@@ -421,7 +421,7 @@ void tork::prepareToShut()
     //delete config;
     // Inform all running io-slaves about the changes...
     // if we cannot update, ioslaves inform the end user...
-    if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null))
+    if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString::null))
     {
         TQString caption = i18n("Update Failed");
         TQString message = i18n("You have to restart the running applications "
@@ -457,7 +457,7 @@ void tork::prepareToShut()
         privoxytest = 0L;
     }
 
-    m_view->m_osd->saveSettings(KGlobal::config());
+    m_view->m_osd->saveSettings(TDEGlobal::config());
 
     TorkConfig::writeConfig();
 
@@ -480,14 +480,14 @@ void tork::shuttingDown()
 
 
     if (m_DNSTorified){
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("<b>You are now in "
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>You are now in "
                              "FailSafe Mode</b>. <br> You need to be in Normal Mode before "
                              "you can close TorK."));
         return;
     }
 
 
-    KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", "TorK Has Closed And Returned "
+    KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", "TorK Has Closed And Returned "
                          "KDE To Its Non-Anonymous State! Goodbye!");
 
     prepareToShut();
@@ -502,42 +502,42 @@ void tork::setupActions()
   	_tray = new TrayIcon(this);
 	_tray->setPixmap(KSystemTray::loadIcon("tork_pressplay"));
 	connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown()));
-	KPopupMenu *conf_menu = _tray->contextMenu();
-    torkConfigure = new KAction(i18n("&Configure TorK"), "configure", 0,
+	TDEPopupMenu *conf_menu = _tray->contextMenu();
+    torkConfigure = new TDEAction(i18n("&Configure TorK"), "configure", 0,
                     this, SLOT(optionsPreferences()),actionCollection(),"configure_tor");
 
-	torkStart = new KAction(i18n("Connect To Tor"), "tork_play", 0,this,
+	torkStart = new TDEAction(i18n("Connect To Tor"), "tork_play", 0,this,
                             SLOT(startEverything()),actionCollection(),"start_tor");
-    torkStop = new KAction(i18n("Disconnect From Tor"),"tork_stop", 0,this,
+    torkStop = new TDEAction(i18n("Disconnect From Tor"),"tork_stop", 0,this,
                             SLOT(stopTorGracefully()),actionCollection(),"stop_tor");
-    enableKonqi = new KAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this,
+    enableKonqi = new TDEAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this,
                               SLOT(toggleKDESetting()),actionCollection(),"enable_konqi");
-    enableTormon = new KAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this,
+    enableTormon = new TDEAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this,
                                SLOT(toggleTorMon()),actionCollection(),"enable_tormon");
-    browseHiddenServices = new KAction(i18n("Browse Hidden Services"),"tork_tor", 0,this,
+    browseHiddenServices = new TDEAction(i18n("Browse Hidden Services"),"tork_tor", 0,this,
                                SLOT(hiddenServices()),actionCollection(),"hidden_services");
-    browseNetworkList = new KAction(i18n("Browse Tor Network Status"),"info", 0,this,
+    browseNetworkList = new TDEAction(i18n("Browse Tor Network Status"),"info", 0,this,
                                     SLOT(networkList()),actionCollection(),"network_list");
 #ifndef LIVECD
-	torkUpdateTork = new KAction(i18n("Download Tork"), "tork_green", 0,this,
+	torkUpdateTork = new TDEAction(i18n("Download Tork"), "tork_green", 0,this,
                                  SLOT(updateTork()),actionCollection(),"update_tork");
-	torkUpdateStable = new KAction(i18n("Download Tor (Stable Version)"), "tork_tor", 0,this,
+	torkUpdateStable = new TDEAction(i18n("Download Tor (Stable Version)"), "tork_tor", 0,this,
                                    SLOT(updateTorStable()),actionCollection(),"update_torstable");
-	torkUpdateUnstable = new KAction(i18n("Download Tor (Experimental Version)"), "tork_tor", 0,this,
+	torkUpdateUnstable = new TDEAction(i18n("Download Tor (Experimental Version)"), "tork_tor", 0,this,
                               SLOT(updateTorUnstable()),actionCollection(),"update_torunstable");
-	torkUpdatePrivoxy = new KAction(i18n("Download Privoxy (Proxy)"), "proxy", 0,this,
+	torkUpdatePrivoxy = new TDEAction(i18n("Download Privoxy (Proxy)"), "proxy", 0,this,
                                   SLOT(updatePrivoxy()),actionCollection(),"update_privoxy");
 #endif
-	torkFirstRunWizard = new KAction(i18n("First Run Wizard"), "wizard", 0,this,
+	torkFirstRunWizard = new TDEAction(i18n("First Run Wizard"), "wizard", 0,this,
                                      SLOT(runWizard()),actionCollection(),"firstrun_wizard");
-	toggleTorbar = new KAction(i18n("Toggle Tor Bar"), "tork_tor", 0,this,
+	toggleTorbar = new TDEAction(i18n("Toggle Tor Bar"), "tork_tor", 0,this,
                                      SLOT(toggleTorBar()),actionCollection(),"toggle_torbar");
 
 	connect(m_view->TorkTabs,SIGNAL(currentChanged( TQWidget* )),SLOT(currentTabChanged( TQWidget* )));
 
     //Servers Filter
 
-    m_ServerFilterButton = new KActionMenu( i18n( "Servers" ), "filter", actionCollection() );
+    m_ServerFilterButton = new TDEActionMenu( i18n( "Servers" ), "filter", actionCollection() );
     m_ServerFilterButton->setDelayed( false );
     m_ServerFilterMenu = m_ServerFilterButton->popupMenu();
     m_ServerFilterMenu->insertItem( i18n( "All" ), this, SLOT( filterServers( int ) ), 0, 0 );
@@ -558,17 +558,17 @@ void tork::setupActions()
     m_ServerFilterMenu->setItemChecked( 0, true );
 
 
-    m_CountryMenu =  new KPopupMenu( this );
+    m_CountryMenu =  new TDEPopupMenu( this );
     m_ServerFilterMenu->insertItem( i18n( "Show Countries" ), m_CountryMenu );
 
-    m_CountryMenuEU =  new KPopupMenu( this );
-    m_CountryMenuAF =  new KPopupMenu( this );
-    m_CountryMenuAS =  new KPopupMenu( this );
-    m_CountryMenuNA =  new KPopupMenu( this );
-    m_CountryMenuAN =  new KPopupMenu( this );
-    m_CountryMenuSA =  new KPopupMenu( this );
-    m_CountryMenuNN =  new KPopupMenu( this );
-    m_CountryMenuOC =  new KPopupMenu( this );
+    m_CountryMenuEU =  new TDEPopupMenu( this );
+    m_CountryMenuAF =  new TDEPopupMenu( this );
+    m_CountryMenuAS =  new TDEPopupMenu( this );
+    m_CountryMenuNA =  new TDEPopupMenu( this );
+    m_CountryMenuAN =  new TDEPopupMenu( this );
+    m_CountryMenuSA =  new TDEPopupMenu( this );
+    m_CountryMenuNN =  new TDEPopupMenu( this );
+    m_CountryMenuOC =  new TDEPopupMenu( this );
 
     continentMapList["EU"] = m_CountryMenuEU;
     continentMapList["AF"] = m_CountryMenuAF;
@@ -599,7 +599,7 @@ void tork::setupActions()
     m_view->serverFilter->setHidden(true);
 
     // Launch Filter
-    m_LaunchMenuButton = new KActionMenu( i18n( "Launch" ), "tork_tor", actionCollection() );
+    m_LaunchMenuButton = new TDEActionMenu( i18n( "Launch" ), "tork_tor", actionCollection() );
     m_LaunchMenuButton->setDelayed( false );
     m_LaunchMenu = m_LaunchMenuButton->popupMenu();
     m_LaunchMenu->insertItem( SmallIcon("tork_mail"), i18n( "Anonymous Email" ), m_view, 
@@ -627,7 +627,7 @@ void tork::setupActions()
                                   this,SLOT( torkify( int )), 0, 4 );
 
     // Log Filter
-    m_LogFilterButton = new KActionMenu( i18n( "Tor Log" ), "filter", actionCollection() );
+    m_LogFilterButton = new TDEActionMenu( i18n( "Tor Log" ), "filter", actionCollection() );
     m_LogFilterButton->setDelayed( false );
     m_LogFilterMenu = m_LogFilterButton->popupMenu();
     m_LogFilterMenu->insertItem( i18n( "All" ), this, SLOT( filterLog( int ) ), 0, 0 );
@@ -638,11 +638,11 @@ void tork::setupActions()
     m_LogFilterMenu->setItemChecked( 0, true );
 
     // Traffic Filter
-    m_TrafficFilterButton = new KActionMenu( i18n( "Traffic" ), "filter", actionCollection() );
+    m_TrafficFilterButton = new TDEActionMenu( i18n( "Traffic" ), "filter", actionCollection() );
     m_TrafficFilterButton->setDelayed( false );
     m_TrafficFilterMenu = m_TrafficFilterButton->popupMenu();
-    m_TorTrafficFilterMenu =  new KPopupMenu( this );
-    m_NonTorTrafficFilterMenu =  new KPopupMenu( this );
+    m_TorTrafficFilterMenu =  new TDEPopupMenu( this );
+    m_NonTorTrafficFilterMenu =  new TDEPopupMenu( this );
 
     m_TrafficFilterMenu->insertItem( i18n( "Tor Traffic" ), m_TorTrafficFilterMenu );
     m_TrafficFilterMenu->insertItem( i18n( "Non-Tor Traffic" ), m_NonTorTrafficFilterMenu );
@@ -687,23 +687,23 @@ void tork::setupActions()
     m_NonTorTrafficFilterMenu->setItemChecked( 0, true );
 
 
-    m_IdentityButton = new KAction(i18n("Change Identity"),"tork_identity", 0,this,
+    m_IdentityButton = new TDEAction(i18n("Change Identity"),"tork_identity", 0,this,
                                    SLOT(useNewIdentity()),actionCollection());
 
     //Pseudonymity Buttons
 
-    m_PseudoButton = new KActionMenu( i18n( "Be From.." ), "tork_internet",
+    m_PseudoButton = new TDEActionMenu( i18n( "Be From.." ), "tork_internet",
                                       actionCollection() );
     m_PseudoButton->setDelayed( false );
     m_PseudoMenu = m_PseudoButton->popupMenu();
-    m_PseudoMenuEU =  new KPopupMenu( this );
-    m_PseudoMenuAF =  new KPopupMenu( this );
-    m_PseudoMenuAS =  new KPopupMenu( this );
-    m_PseudoMenuNA =  new KPopupMenu( this );
-    m_PseudoMenuAN =  new KPopupMenu( this );
-    m_PseudoMenuSA =  new KPopupMenu( this );
-    m_PseudoMenuNN =  new KPopupMenu( this );
-    m_PseudoMenuOC =  new KPopupMenu( this );
+    m_PseudoMenuEU =  new TDEPopupMenu( this );
+    m_PseudoMenuAF =  new TDEPopupMenu( this );
+    m_PseudoMenuAS =  new TDEPopupMenu( this );
+    m_PseudoMenuNA =  new TDEPopupMenu( this );
+    m_PseudoMenuAN =  new TDEPopupMenu( this );
+    m_PseudoMenuSA =  new TDEPopupMenu( this );
+    m_PseudoMenuNN =  new TDEPopupMenu( this );
+    m_PseudoMenuOC =  new TDEPopupMenu( this );
 
     continentMap["EU"] = m_PseudoMenuEU;
     continentMap["AF"] = m_PseudoMenuAF;
@@ -728,7 +728,7 @@ void tork::setupActions()
     m_PseudoMenu->setItemChecked(999,true);
 
     // Server Button
-    m_ServerButton = new KActionMenu( i18n( "Run Server" ), "server", actionCollection() );
+    m_ServerButton = new TDEActionMenu( i18n( "Run Server" ), "server", actionCollection() );
     m_ServerButton->setDelayed( false );
     m_ServerButtonMenu = m_ServerButton->popupMenu();
     m_ServerButtonMenu->insertItem( i18n( "None" ), this, SLOT( configureServer( int ) ), 0, 0 );
@@ -739,9 +739,9 @@ void tork::setupActions()
     m_ServerButtonMenu->insertItem( i18n( "To Defeat Censorship Of Tor" ), this, 
                                     SLOT( configureServer( int ) ), 0, 3 );
     m_ServerButtonMenu->insertSeparator();
-    m_ServerButtonMenu->insertItem( KGlobal::iconLoader()->loadIconSet("configure", KIcon::Small),
+    m_ServerButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("configure", TDEIcon::Small),
                         i18n( "Configure Server" ), this, SLOT( configureServer( int ) ), 0, 4 );
-    m_ServerButtonMenu->insertItem( KGlobal::iconLoader()->loadIconSet("tork_agent", KIcon::Small),
+    m_ServerButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("tork_agent", TDEIcon::Small),
                         i18n( "Manage Hidden Services" ), this, SLOT( configureServer( int ) ), 0, 5 );
 
     m_ServerButtonMenu->setItemChecked( 0, true );
@@ -749,24 +749,24 @@ void tork::setupActions()
     m_ServerButtonMenu->setItemEnabled( 4, !TorkConfig::clientOnly() );
 
     // Server Button
-    m_SecurityButton = new KActionMenu( i18n( "Fail-Safe" ), "tork_penguin", actionCollection() );
+    m_SecurityButton = new TDEActionMenu( i18n( "Fail-Safe" ), "tork_penguin", actionCollection() );
     m_SecurityButton->setDelayed( false );
     m_SecurityButtonMenu = m_SecurityButton->popupMenu();
-    m_SecurityButtonMenu->insertItem( KGlobal::iconLoader()->loadIconSet("tork_penguin", KIcon::Small),
+    m_SecurityButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("tork_penguin", TDEIcon::Small),
                                    i18n( "None" ), this, SLOT( configureSecurity( int ) ), 0, 0 );
-    m_SecurityButtonMenu->insertItem(KGlobal::iconLoader()->loadIconSet("tork_agent", KIcon::Small),
+    m_SecurityButtonMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("tork_agent", TDEIcon::Small),
                             i18n( "DNS FailSafe" ), this, SLOT( configureSecurity( int ) ), 0, 1 );
-    m_SecurityButtonMenu->insertItem(  KGlobal::iconLoader()->loadIconSet("gv", KIcon::Small),
+    m_SecurityButtonMenu->insertItem(  TDEGlobal::iconLoader()->loadIconSet("gv", TDEIcon::Small),
                           i18n( "System FailSafe" ),this, SLOT( configureSecurity( int ) ), 0, 2 );
     m_SecurityButtonMenu->insertSeparator();
-    m_SecurityButtonMenu->insertItem( KGlobal::iconLoader()->loadIconSet("configure",
-         KIcon::Small),i18n( "Configure FailSafe" ), this, SLOT( configureSecurity( int ) ), 0, 3 );
+    m_SecurityButtonMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("configure",
+         TDEIcon::Small),i18n( "Configure FailSafe" ), this, SLOT( configureSecurity( int ) ), 0, 3 );
     m_SecurityButtonMenu->setItemChecked( 0, true );
 
-    m_UnCensorButton = new KAction(i18n("Un-Censor"),"tork_uncensor", 0,this,
+    m_UnCensorButton = new TDEAction(i18n("Un-Censor"),"tork_uncensor", 0,this,
                                    SLOT(showFirewallEvasion()),actionCollection());
 
-	torkTip = new KAction(i18n("Tip of the Day"), "idea", 0,this,
+	torkTip = new TDEAction(i18n("Tip of the Day"), "idea", 0,this,
                           SLOT(showTip()),actionCollection(),"help_show_tip");
 
     //set up all other actions
@@ -784,11 +784,11 @@ void tork::setupActions()
 
     createGUI();
 
-    m_ModeButton = new KAction(i18n("More Options"),"add", 0,this,
+    m_ModeButton = new TDEAction(i18n("More Options"),"add", 0,this,
                                SLOT(switchMode()),actionCollection());
 
     //Set Up Advanced Toolbar
-    toolBar("MoreToolBar")->setIconText( KToolBar::IconTextRight, false );
+    toolBar("MoreToolBar")->setIconText( TDEToolBar::IconTextRight, false );
     m_PseudoButton->plug( toolBar("MoreToolBar") );
     m_ServerButton->plug( toolBar("MoreToolBar") );
 #ifndef LIVECD
@@ -796,15 +796,15 @@ void tork::setupActions()
     m_SecurityButton->plug( toolBar("MoreToolBar") );
     #endif
 #endif
-    toolBar("MoreToolBar")->setIconText( KToolBar::IconOnly, false );
+    toolBar("MoreToolBar")->setIconText( TDEToolBar::IconOnly, false );
 
     //Set Up Core Toolbar
-    toolBar("TorToolBar")->setIconText( KToolBar::IconTextRight, false );
+    toolBar("TorToolBar")->setIconText( TDEToolBar::IconTextRight, false );
     m_UnCensorButton->plug( toolBar("TorToolBar") );
 #ifndef LIVECD
     //m_IdentityButton->plug( toolBar("TorToolBar") );
 #endif
-    toolBar("TorToolBar")->setIconText( KToolBar::IconOnly, false );
+    toolBar("TorToolBar")->setIconText( TDEToolBar::IconOnly, false );
 
 
     m_PseudoButton->setToolTip( i18n( "Pretend you're using the Internet <br> in another country." ) );
@@ -914,7 +914,7 @@ void tork::applyPseudonymity( int country_id )
     }
 
     // Update Menu
-	for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu )
+	for ( TQMap<TQString, TDEPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu )
 	{
         for (unsigned int index = 0; index != menu.data()->count(); ++index){
                 menu.data()->setItemChecked( menu.data()->idAt(index),false);
@@ -1002,7 +1002,7 @@ void
 tork::currentTabChanged(TQWidget* cur )  //SLOT
 {
 
-    toolBar()->setIconText( KToolBar::IconTextRight, false );
+    toolBar()->setIconText( TDEToolBar::IconTextRight, false );
 
     if (cur == prev)
         return;
@@ -1032,7 +1032,7 @@ tork::currentTabChanged(TQWidget* cur )  //SLOT
 
     }
 
-    toolBar()->setIconText( KToolBar::IconOnly, false );
+    toolBar()->setIconText( TDEToolBar::IconOnly, false );
 	m_ServerFilterButton->setToolTip( i18n( "Filter the List of Servers." ) );
 	m_LaunchMenuButton->setToolTip( i18n( "Launch anonymized applications <br> with a single click." ) );
 	m_LogFilterButton->setToolTip( i18n( "Filter Log Messages by Type." ) );
@@ -1142,7 +1142,7 @@ tork::switchMode()  //SLOT
 
     if (TorkConfig::advancedMode()){
       m_ModeButton->unplug( toolBar("TorToolBar") );
-      toolBar("TorToolBar")->setIconText( KToolBar::IconOnly, false );
+      toolBar("TorToolBar")->setIconText( TDEToolBar::IconOnly, false );
       m_ModeButton->plug( toolBar("TorToolBar") );
       toolBar("TorToolBar")->setToggle(toolBar("TorToolBar")->idAt(2),true);
       toolBar("TorToolBar")->toggleButton(toolBar("TorToolBar")->idAt(2));
@@ -1150,7 +1150,7 @@ tork::switchMode()  //SLOT
 
     }else{
       m_ModeButton->unplug( toolBar("TorToolBar") );
-      toolBar("TorToolBar")->setIconText( KToolBar::IconTextRight, false );
+      toolBar("TorToolBar")->setIconText( TDEToolBar::IconTextRight, false );
       m_ModeButton->plug( toolBar("TorToolBar") );
       toolBar("MoreToolBar")->hide();
     }
@@ -1277,11 +1277,11 @@ tork::configureSecurity( int id )  //SLOT
 
     filterproc = new KProcIO();
     filterproc->setUseShell(TRUE);
-    TQString filterCommand= TQString("kdesu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c "
+    TQString filterCommand= TQString("tdesu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c "
                                     "'%3'").arg(filterRequest).arg(iconstring).arg(cmd);
 	connect( filterproc, SIGNAL(readReady(KProcIO * )),
 		SLOT(processFilter(KProcIO * )) );
-	connect( filterproc, SIGNAL(processExited(KProcess *)),
+	connect( filterproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(filterExited()) );
 
     *filterproc<<filterCommand;
@@ -1339,7 +1339,7 @@ void tork::filterExited()
             client->enableTransPort(false);
         }
         m_SecurityButton->setIconSet(SmallIconSet("tork_penguin"));
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("You are now in <b>Normal Mode</b>. <br> Tor and TorK will operate normally."));
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("You are now in <b>Normal Mode</b>. <br> Tor and TorK will operate normally."));
         break;
 	case 1:
         m_DNSTorified = true;
@@ -1348,7 +1348,7 @@ void tork::filterExited()
             client->enableTransPort(true);
         }
         m_SecurityButton->setIconSet(SmallIconSet("tork_agent"));
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("You are now in <b>DNS FailSafe Mode</b>. <br> All DNS queries will be routed through Tor."));
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("You are now in <b>DNS FailSafe Mode</b>. <br> All DNS queries will be routed through Tor."));
         break;
 	case 2:
         m_DNSTorified = true;
@@ -1357,7 +1357,7 @@ void tork::filterExited()
             client->enableTransPort(true);
         }
         m_SecurityButton->setIconSet(SmallIconSet("gv"));
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("You are now in <b>System FailSafe Mode</b>. <br> Tor will use new routes for every new connection as often as possible. <br> All secure traffic will be routed through Tor."));
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("You are now in <b>System FailSafe Mode</b>. <br> Tor will use new routes for every new connection as often as possible. <br> All secure traffic will be routed through Tor."));
         break;
     default:
         break;
@@ -1435,7 +1435,7 @@ tork::filterCountries( int id )  //SLOT
 
 
     // Display servers for each selected country 
-	for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMapList.begin(); 
+	for ( TQMap<TQString, TDEPopupMenu*>::Iterator menu = continentMapList.begin(); 
           menu != continentMapList.end(); ++menu ){
        if (m_CountryMenu->isItemChecked(251)){ // If 'All' selected, deselect all items
            for (unsigned int index = 0; index != menu.data()->count(); ++index){
@@ -1526,7 +1526,7 @@ tork::filterServers( int id )  //SLOT
         }
 
         for ( TQMap<TQString, 
-              KPopupMenu*>::Iterator menu = continentMapList.begin(); 
+              TDEPopupMenu*>::Iterator menu = continentMapList.begin(); 
               menu != continentMapList.end(); ++menu ){
             TQListView* tmp = dynamic_cast<TQListView*>(m_view->serverList);
             filterView(countryType, tmp, menu.data(), 255, 4);
@@ -1558,7 +1558,7 @@ tork::filterServers( int id )  //SLOT
 
 void
 tork::filterView( TQValueVector<TQString> &possibleValues, TQListView* &view, 
-                  KPopupMenu* &menu, int id, int column ){
+                  TDEPopupMenu* &menu, int id, int column ){
 
     if (possibleValues[id] == "All"){
         TQListViewItemIterator it(view);
@@ -1601,7 +1601,7 @@ tork::filterView( TQValueVector<TQString> &possibleValues, TQListView* &view,
 
 void
 tork::filterViewServers( TQValueVector<TQString> &possibleValues, 
-                         TQListView* &view, KPopupMenu* &menu, int ,
+                         TQListView* &view, TDEPopupMenu* &menu, int ,
                          int column) //SLOT
 {
 
@@ -1692,14 +1692,14 @@ void tork::optionsConfigureKeys()
 void tork::optionsConfigureToolbars()
 {
 	// use the standard toolbar editor
-    #if defined(KDE_MAKE_VERSION)
-    # if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
-        saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    #if defined(TDE_MAKE_VERSION)
+    # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
+        saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
     # else
-        saveMainWindowSettings(KGlobal::config());
+        saveMainWindowSettings(TDEGlobal::config());
     # endif
     #else
-        saveMainWindowSettings(KGlobal::config());
+        saveMainWindowSettings(TDEGlobal::config());
     #endif
     KEditToolbar dlg(factory());
     connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(newToolbarConfig()));
@@ -1712,14 +1712,14 @@ void tork::newToolbarConfig()
     // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
 	createGUI();
 
-    #if defined(KDE_MAKE_VERSION)
-    # if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
-        applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    #if defined(TDE_MAKE_VERSION)
+    # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
+        applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
     # else
-        applyMainWindowSettings(KGlobal::config());
+        applyMainWindowSettings(TDEGlobal::config());
     # endif
     #else
-        applyMainWindowSettings(KGlobal::config());
+        applyMainWindowSettings(TDEGlobal::config());
     #endif
 
 }
@@ -1728,8 +1728,8 @@ void tork::copyOldConfig()
 {
 
     TorkConfig::writeConfig();
-    KConfigSkeletonItem::List pitems(TorkConfig::self()->items());
-    KConfigSkeletonItem::List::ConstIterator it;
+    TDEConfigSkeletonItem::List pitems(TorkConfig::self()->items());
+    TDEConfigSkeletonItem::List::ConstIterator it;
     PrevConfig::PrevConfigList::iterator tp;
     
     for( it = pitems.begin(); it != pitems.end(); ++it ) {
@@ -1762,12 +1762,12 @@ void tork::optionsPreferences()
     copyOldConfig();
 
 
-    TorkConfigDialog* dialog = (TorkConfigDialog*) KConfigDialog::exists( "settings" );
+    TorkConfigDialog* dialog = (TorkConfigDialog*) TDEConfigDialog::exists( "settings" );
     
     if( !dialog )
     {
 
-        //KConfigDialog didn't find an instance of this dialog, so lets create it :
+        //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
         dialog = new TorkConfigDialog( this, "settings", TorkConfig::self() );
 
     }
@@ -1791,11 +1791,11 @@ void tork::openConfig(const TQCString& page)
 	//
 	// compare the names of the widgets in the .ui file 
 	// to the names of the variables in the .kcfg file
-    TorkConfigDialog* dialog = (TorkConfigDialog*) KConfigDialog::exists( "settings" );
+    TorkConfigDialog* dialog = (TorkConfigDialog*) TDEConfigDialog::exists( "settings" );
 
     if( !dialog )
     {
-        //KConfigDialog didn't find an instance of this dialog, so lets create it :
+        //TDEConfigDialog didn't find an instance of this dialog, so lets create it :
         dialog = new TorkConfigDialog( this, "settings", TorkConfig::self() );
     }
 
@@ -1942,7 +1942,7 @@ void tork::startTor()
 
     *childproc << TorkConfig::torLocation() << " -f " + torConfFile;
 
-	connect( childproc, SIGNAL(processExited(KProcess *)),
+	connect( childproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(childExited()) );
 	connect( childproc, SIGNAL(readReady(KProcIO *)),
 		SLOT(receivedOutput(KProcIO *)) );
@@ -1974,7 +1974,7 @@ void tork::stopTor()
 {
 
     if (m_DNSTorified){
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("<b>You are now in FailSafe Mode</b>. <br> You need to be in Normal Mode before you can stop Tor."));
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>You are now in FailSafe Mode</b>. <br> You need to be in Normal Mode before you can stop Tor."));
         return;
     }
 
@@ -2013,7 +2013,7 @@ void tork::stopTor()
 
     //Reset Country filter menu to 'All' checked
 
-	for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMapList.begin(); menu != continentMapList.end(); ++menu ){
+	for ( TQMap<TQString, TDEPopupMenu*>::Iterator menu = continentMapList.begin(); menu != continentMapList.end(); ++menu ){
            for (unsigned int index = 0; index != menu.data()->count(); ++index){
                menu.data()->setItemChecked( menu.data()->idAt(index), false ); 
            }
@@ -2028,7 +2028,7 @@ void tork::stopTor()
 
     //Reset Pseudonymity filter menu to 'All' checked
 
-	for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu )
+	for ( TQMap<TQString, TDEPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu )
 	{
         for (unsigned int index = 0; index != menu.data()->count(); ++index){
                 menu.data()->setItemChecked( menu.data()->idAt(index),false);
@@ -2361,8 +2361,8 @@ void tork::writeCustomOptions2(TQTextStream &ts)
     }
 
 
-    KConfigSkeletonItem::List items = TorkConfig::self()->items();
-    KConfigSkeletonItem::List::ConstIterator it;
+    TDEConfigSkeletonItem::List items = TorkConfig::self()->items();
+    TDEConfigSkeletonItem::List::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
         kdDebug() << (*it)->name()  << endl;
         if (elementShouldBeUsed((*it))){
@@ -2403,7 +2403,7 @@ void tork::writeCustomOptions2(TQTextStream &ts)
 
 }
 
-bool tork::elementShouldBeUsed(const KConfigSkeletonItem* it)
+bool tork::elementShouldBeUsed(const TDEConfigSkeletonItem* it)
 {
 
 
@@ -2425,7 +2425,7 @@ bool tork::elementShouldBeUsed(const KConfigSkeletonItem* it)
     return false;
 }
 
-bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, TQTextStream &ts)
+bool tork::noSpecialProcessing(const TDEConfigSkeletonItem* it, TQTextStream &ts)
 {
 
     if (((*it).name() == "DirListenAddress") ||
@@ -2636,7 +2636,7 @@ void tork::privoxyExited()
         died = true;
 
     if (privoxyproc != 0L){
-        disconnect( privoxyproc, SIGNAL(processExited(KProcess *)),
+        disconnect( privoxyproc, SIGNAL(processExited(TDEProcess *)),
  			this,SLOT(privoxyExited()) );
         delete privoxyproc;
         privoxyproc = 0L;
@@ -2748,7 +2748,7 @@ void tork::startPrivoxy()
     }
 
     if (privoxyproc != 0L){
-        disconnect( privoxyproc, SIGNAL(processExited(KProcess *)),
+        disconnect( privoxyproc, SIGNAL(processExited(TDEProcess *)),
  			this,SLOT(privoxyExited()) );
         delete privoxyproc;
         privoxyproc = 0L;
@@ -2772,7 +2772,7 @@ void tork::startPrivoxy()
     *privoxyproc << TorkConfig::privoxyLocation() <<  " --user " << getenv("USER") 
                  << " --no-daemon --pidfile " << privoxypid << " " << privoxyConfFile;
 
- 	connect( privoxyproc, SIGNAL(processExited(KProcess *)),
+ 	connect( privoxyproc, SIGNAL(processExited(TDEProcess *)),
  			SLOT(privoxyExited()) );
 
 	privoxyproc->start(KProcIO::NotifyOnExit)    ;
@@ -3178,7 +3178,7 @@ void tork::copyCookie()
     KProcIO *catproc = new KProcIO();
     catproc->setUseShell(TRUE);
     TQString whichCommand= TQString(
-                          "kdesu -c '"
+                          "tdesu -c '"
                           "mkdir -p -m 600 %1/.tor;"
                           "cp -u /var/lib/tor/control_auth_cookie %2/.tor/control_auth_cookie;"
                           "cp -u /usr/local/var/lib/tor/control_auth_cookie %3/.tor/control_auth_cookie;"
@@ -3365,9 +3365,9 @@ void tork::toggleKDESetting()
     setKDE(TorkConfig::kDEUsesTor());
 
     if (TorkConfig::kDEUsesTor())
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
     else
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
         "Non-Anonymous Use! <br> Close Konqueror completely and do not use it non-anonymously for a while. <br>"
         "This is because malicious websites could gain access to information from your anonymous "
         "session."));
@@ -3380,9 +3380,9 @@ void tork::enableKDE(bool enable)
     setKDE(TorkConfig::kDEUsesTor());
 
     if (TorkConfig::kDEUsesTor())
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
     else
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
        "Non-Anonymous Use! <br>Close Konqueror completely and do not use it non-anonymously for a while. <br>"
        "This is because malicious websites could gain access to information from your anonymous "
        "session."));
@@ -3427,7 +3427,7 @@ void tork::setKDE(bool set)
   if (!m_view->konqitem)
       return;
 
-  KConfig* config = new KConfig("kioslaverc", false, false);
+  TDEConfig* config = new TDEConfig("tdeioslaverc", false, false);
   config->setGroup( "Proxy Settings" );
   if (set){
     config->writeEntry( "httpProxy", TQString("%1:%2")
@@ -3441,15 +3441,15 @@ void tork::setKDE(bool set)
                         .arg(TorkConfig::konqFtpProxyPort()) );
     config->writeEntry( "ProxyType", "1" );
     config->sync();
-    config = new KConfig("kcookiejarrc", false, false);
+    config = new TDEConfig("kcookiejarrc", false, false);
     config->setGroup( "Cookie Policy" );
-    //KConfig doesn't return a bool, just a text representation of the bool
+    //TDEConfig doesn't return a bool, just a text representation of the bool
     TorkConfig::setOriginalCookies(config->readEntry( "Cookies" )
                                    == "true" ? true : false);
     config->writeEntry( "Cookies", !TorkConfig::disableCookies() );
     TorkConfig::writeConfig();
     config->sync();
-    config = new KConfig("kio_httprc", false, false);
+    config = new TDEConfig("tdeio_httprc", false, false);
     TorkConfig::setOriginalUseCache(config->readEntry( "UseCache" )
                                     == "true" ? true : false);
     TorkConfig::setOriginalSendUserAgent(config->readEntry("SendUserAgent" )
@@ -3459,7 +3459,7 @@ void tork::setKDE(bool set)
                         !TorkConfig::disableBrowserIdentification() );
     TorkConfig::writeConfig();
     config->sync();
-    config = new KConfig("konquerorrc", false, false);
+    config = new TDEConfig("konquerorrc", false, false);
     config->setGroup( "Java/JavaScript Settings" );
     TorkConfig::setOriginalEnableJavascript(config->readEntry( "EnableJavaScript" )
                                             == "true" ? true : false);
@@ -3479,19 +3479,19 @@ void tork::setKDE(bool set)
     config->writeEntry( "ProxyType", TorkConfig::originalProxyType() );
     config->sync();
 
-    config = new KConfig("kcookiejarrc", false, false);
+    config = new TDEConfig("kcookiejarrc", false, false);
     config->setGroup( "Cookie Policy" );
     config->writeEntry( "Cookies", TorkConfig::originalCookies() );
     config->sync();
 
-    config = new KConfig("kio_httprc", false, false);
+    config = new TDEConfig("tdeio_httprc", false, false);
     config->writeEntry( "UseCache", TorkConfig::originalUseCache() );
     config->writeEntry( "SendUserAgent", TorkConfig::originalSendUserAgent() );
     config->sync();
     kdDebug() << "UseCache" << config->readEntry( "UseCache" )
               << endl;
 
-    config = new KConfig("konquerorrc", false, false);
+    config = new TDEConfig("konquerorrc", false, false);
     config->setGroup( "Java/JavaScript Settings" );
     config->writeEntry( "EnableJavaScript", TorkConfig::originalEnableJavascript() );
     config->writeEntry( "EnableJava", TorkConfig::originalEnableJava() );
@@ -3502,7 +3502,7 @@ void tork::setKDE(bool set)
 
   // Inform all running io-slaves about the changes...
   // if we cannot update, ioslaves inform the end user...
-  if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null))
+  if (!DCOPRef("*", "TDEIO::Scheduler").send("reparseSlaveConfiguration", TQString::null))
   {
     TQString caption = i18n("Update Failed");
     TQString message = i18n("You have to restart the running applications "
@@ -3627,13 +3627,13 @@ void tork::showWarning( display_status_t &msg, const TQString &headline,const TQ
 
     m_tooltip->display();
 
-    if (!kmain->isActiveWindow()){
+    if (!tdemain->isActiveWindow()){
 
         KPassivePopup *pop;
     
         TQPoint pnt;
-        pop = new KPassivePopup( kmain->_tray );
-        pnt = kmain->_tray->pos();
+        pop = new KPassivePopup( tdemain->_tray );
+        pnt = tdemain->_tray->pos();
         pop->setTimeout(15000);
         pop->setView( i18n("%1").arg(headline),i18n("See TorK window for details.") );
         pop->show(TQPoint(pnt));
@@ -3689,13 +3689,13 @@ void tork::askQuestion(display_status_t &msg, const TQString &headline,const TQS
 
     m_tooltip->display();
 
-    if (!kmain->isActiveWindow()){
+    if (!tdemain->isActiveWindow()){
 
         KPassivePopup *pop;
     
         TQPoint pnt;
-        pop = new KPassivePopup( kmain->_tray );
-        pnt = kmain->_tray->pos();
+        pop = new KPassivePopup( tdemain->_tray );
+        pnt = tdemain->_tray->pos();
         pop->setTimeout(15000);
         pop->setView( i18n("%1").arg(headline),i18n("%1 See TorK window for details.").arg(body) );
         pop->show(TQPoint(pnt));
@@ -3836,7 +3836,7 @@ void tork::torClosedConnection()
 
 
     if (m_DNSTorified){
-        KNotifyClient::event(kmain->_tray->winId(),"TorDisabled",
+        KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled",
                              i18n("<b>You are still in"
         " FailSafe Mode</b>. <br> If Tor is still running its capacity to route FailSafe traffic <br> will"
         " remain enabled. Enter your password to return <br> the rest of your system to Normal Mode."));
@@ -3953,7 +3953,7 @@ void tork::startNetStat()
 
     *netstatproc << netstatcmd;
 
-	connect( netstatproc, SIGNAL(processExited(KProcess *)),
+	connect( netstatproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(netStatExited()) );
 	connect( netstatproc, SIGNAL(readReady(KProcIO *)),
 		SLOT(receivedNetStatOutput(KProcIO *)) );
@@ -4337,10 +4337,10 @@ void tork::resetTor()
 {
     KProcIO *catproc = new KProcIO();
     catproc->setUseShell(TRUE);
-    TQString whichCommand= "kdesu -c 'killall -s HUP tor'";
+    TQString whichCommand= "tdesu -c 'killall -s HUP tor'";
     *catproc<<whichCommand;
     catproc->start(KProcIO::NotifyOnExit,TRUE);
-	connect( catproc, SIGNAL(processExited(KProcess *)),
+	connect( catproc, SIGNAL(processExited(TDEProcess *)),
 			SLOT(resetExited()) );
 
 } 
diff --git a/src/tork.desktop b/src/tork.desktop
index 8518c14..85d9a8b 100644
--- a/src/tork.desktop
+++ b/src/tork.desktop
@@ -3,7 +3,7 @@ Name=TorK
 GenericName=Anonymity Manager
 Comment=An Anonymity Manager for KDE
 Type=Application
-Categories=Qt;KDE;Network;FileTransfer
+Categories=Qt;TDE;Network;FileTransfer
 Terminal=false
 Icon=tork
 Exec=tork %i %m -caption "%c" %u
diff --git a/src/tork.h b/src/tork.h
index 4219fd8..1ad1497 100644
--- a/src/tork.h
+++ b/src/tork.h
@@ -27,9 +27,9 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
-#include <kmainwindow.h>
-#include <ktempfile.h>
+#include <tdeapplication.h>
+#include <tdemainwindow.h>
+#include <tdetempfile.h>
 
 #include "torkview.h"
 #include "torclient.h"
@@ -40,9 +40,9 @@
 #include "dcoptork.h"
 #include "testprivacyproxy.h"
 
-#include <kconfigskeleton.h>
-#include <kwinmodule.h>
-#include <kpopupmenu.h>
+#include <tdeconfigskeleton.h>
+#include <twinmodule.h>
+#include <tdepopupmenu.h>
 #include <ntqvaluevector.h>
 
 #include "update.h"
@@ -51,9 +51,9 @@
 #include "hiddensrvs.h"
 
 class KPrinter;
-class KToggleAction;
-class KPopupMenu;
-class KActionMenu;
+class TDEToggleAction;
+class TDEPopupMenu;
+class TDEActionMenu;
 class KURL;
 class TrayIcon;
 class TQLabel;
@@ -62,8 +62,8 @@ class TorClient;
 class TQPoint;
 class StatGraph;
 class TorkConfig;
-class KConfigSkeleton;
-class KConfigSkeletonItem;
+class TDEConfigSkeleton;
+class TDEConfigSkeletonItem;
 class KTempFile;
 class KWindModule;
 class UPnPManager;
@@ -89,7 +89,7 @@ typedef enum display_status_t {
  * @author Robert Hogan <robert@roberthogan.net>
  * @version 0.03
  */
-class tork : public KMainWindow, virtual public DCOPTork
+class tork : public TDEMainWindow, virtual public DCOPTork
 {
     Q_OBJECT
 public:
@@ -108,7 +108,7 @@ public:
     TrayIcon *_tray;
     TQDict<TQListViewItem> inodes;
     bool connectedToTor(){return (client!=0) ? true : false;};
-    KPopupMenu* m_LaunchMenu;
+    TDEPopupMenu* m_LaunchMenu;
     void anonymousFirefox(){m_view->anonymousFirefox();};
     void anonymousOpera(){m_view->anonymousOpera();};
     void anonymousEmail(){m_view->sendAnonymousEmail(); hide();};
@@ -287,13 +287,13 @@ private:
     void showWarning( display_status_t &msg, const TQString &headline,const TQString &torsaid,const TQString &thismeans, const TQString &type, const TQString &icon, bool always, bool showstopper);
     void askQuestion(display_status_t &msg, const TQString &headline,const TQString &torsaid,const TQString &body,const TQString &question,void (tork::*pt2Func)(), const TQString &type, const TQString &icon, bool persistent, bool showstopper);
     void processQueue();
-    bool elementShouldBeUsed(const KConfigSkeletonItem* it);
-    bool noSpecialProcessing(const KConfigSkeletonItem* it, TQTextStream &ts);
+    bool elementShouldBeUsed(const TDEConfigSkeletonItem* it);
+    bool noSpecialProcessing(const TDEConfigSkeletonItem* it, TQTextStream &ts);
     TQString doHashPassword();
     bool queryClose();
     void prepareToShut();
-    void filterViewServers( TQValueVector<TQString> &possibleValues, TQListView* &view, KPopupMenu* &menu, int id, int column );
-    void filterView( TQValueVector<TQString> &possibleValues, TQListView* &view, KPopupMenu* &menu, int id, int column );
+    void filterViewServers( TQValueVector<TQString> &possibleValues, TQListView* &view, TDEPopupMenu* &menu, int id, int column );
+    void filterView( TQValueVector<TQString> &possibleValues, TQListView* &view, TDEPopupMenu* &menu, int id, int column );
     TQString createFailSafeCommand( const TQStringList &filterRules, bool set );
     void updateServerClientStatusBar(const TQStringList &client, const TQStringList &server);
     void updateToolBar();
@@ -301,59 +301,59 @@ private:
 private:
 
     KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
-    KAction *torkConfigure;
-    KAction *torkStop;
-    KAction *torkStart;
-    KAction *torkUpdateTork;
-    KAction *torkUpdateStable;
-    KAction *torkUpdateUnstable;
-    KAction *torkUpdatePrivoxy;
-    KAction *torkFirstRunWizard;
-    KAction *torkTip;
-    KAction *enableKonqi;
-    KAction *enableTormon;
-    //KAction *toggleParanoid;
-    KAction *browseHiddenServices;
-    KAction *browseNetworkList;
-    KAction *toggleTorbar;
-    KActionMenu* m_ServerFilterButton;
-    KActionMenu* m_LaunchMenuButton;
-    KActionMenu* m_LogFilterButton;
-    KActionMenu* m_TrafficFilterButton;
-    KPopupMenu* m_ServerFilterMenu;
-    KPopupMenu* m_LogFilterMenu;
-    KPopupMenu* m_TrafficFilterMenu;
-    KPopupMenu* m_TorTrafficFilterMenu;
-    KPopupMenu* m_NonTorTrafficFilterMenu;
-    KPopupMenu* m_IPFilterMenu;
-    KPopupMenu* m_PseudoMenu;
-    KPopupMenu* m_PseudoMenuEU;
-    KPopupMenu* m_PseudoMenuSA;
-    KPopupMenu* m_PseudoMenuAS;
-    KPopupMenu* m_PseudoMenuNA;
-    KPopupMenu* m_PseudoMenuAN;
-    KPopupMenu* m_PseudoMenuAF;
-    KPopupMenu* m_PseudoMenuNN;
-    KPopupMenu* m_PseudoMenuOC;
-    KActionMenu* m_PseudoButton;
-    KAction* m_IdentityButton;
-    KAction* m_ModeButton;
-    KAction* m_UnCensorButton;
-    KPopupMenu* m_CountryMenu;
-    KPopupMenu* m_CountryMenuEU;
-    KPopupMenu* m_CountryMenuSA;
-    KPopupMenu* m_CountryMenuAS;
-    KPopupMenu* m_CountryMenuNA;
-    KPopupMenu* m_CountryMenuAN;
-    KPopupMenu* m_CountryMenuAF;
-    KPopupMenu* m_CountryMenuNN;
-    KPopupMenu* m_CountryMenuOC;
-    KActionMenu* m_ServerButton;
-    KPopupMenu* m_ServerButtonMenu;
-    KActionMenu* m_SecurityButton;
-    KPopupMenu* m_SecurityButtonMenu;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
+    TDEAction *torkConfigure;
+    TDEAction *torkStop;
+    TDEAction *torkStart;
+    TDEAction *torkUpdateTork;
+    TDEAction *torkUpdateStable;
+    TDEAction *torkUpdateUnstable;
+    TDEAction *torkUpdatePrivoxy;
+    TDEAction *torkFirstRunWizard;
+    TDEAction *torkTip;
+    TDEAction *enableKonqi;
+    TDEAction *enableTormon;
+    //TDEAction *toggleParanoid;
+    TDEAction *browseHiddenServices;
+    TDEAction *browseNetworkList;
+    TDEAction *toggleTorbar;
+    TDEActionMenu* m_ServerFilterButton;
+    TDEActionMenu* m_LaunchMenuButton;
+    TDEActionMenu* m_LogFilterButton;
+    TDEActionMenu* m_TrafficFilterButton;
+    TDEPopupMenu* m_ServerFilterMenu;
+    TDEPopupMenu* m_LogFilterMenu;
+    TDEPopupMenu* m_TrafficFilterMenu;
+    TDEPopupMenu* m_TorTrafficFilterMenu;
+    TDEPopupMenu* m_NonTorTrafficFilterMenu;
+    TDEPopupMenu* m_IPFilterMenu;
+    TDEPopupMenu* m_PseudoMenu;
+    TDEPopupMenu* m_PseudoMenuEU;
+    TDEPopupMenu* m_PseudoMenuSA;
+    TDEPopupMenu* m_PseudoMenuAS;
+    TDEPopupMenu* m_PseudoMenuNA;
+    TDEPopupMenu* m_PseudoMenuAN;
+    TDEPopupMenu* m_PseudoMenuAF;
+    TDEPopupMenu* m_PseudoMenuNN;
+    TDEPopupMenu* m_PseudoMenuOC;
+    TDEActionMenu* m_PseudoButton;
+    TDEAction* m_IdentityButton;
+    TDEAction* m_ModeButton;
+    TDEAction* m_UnCensorButton;
+    TDEPopupMenu* m_CountryMenu;
+    TDEPopupMenu* m_CountryMenuEU;
+    TDEPopupMenu* m_CountryMenuSA;
+    TDEPopupMenu* m_CountryMenuAS;
+    TDEPopupMenu* m_CountryMenuNA;
+    TDEPopupMenu* m_CountryMenuAN;
+    TDEPopupMenu* m_CountryMenuAF;
+    TDEPopupMenu* m_CountryMenuNN;
+    TDEPopupMenu* m_CountryMenuOC;
+    TDEActionMenu* m_ServerButton;
+    TDEPopupMenu* m_ServerButtonMenu;
+    TDEActionMenu* m_SecurityButton;
+    TDEPopupMenu* m_SecurityButtonMenu;
 
 	TQLabel* m_statusInfo;
 	TQLabel* m_statusTransfer;
@@ -379,8 +379,8 @@ private:
     display_status_t* m_msg;
     KProcIO *hashproc;
     TQString m_hashedpassword;
-    KConfigSkeletonItem::List previtems;
-    KConfigSkeleton pcopy;
+    TDEConfigSkeletonItem::List previtems;
+    TDEConfigSkeleton pcopy;
     PrevConfig::PrevConfigList prevlist;
     TorkUpdate* updater;
     KTempFile* tfTor;
@@ -389,8 +389,8 @@ private:
     TQWidget* prev;
 
     TQValueList<TQListViewItem*> ordinaryServerList;
-    TQMap<TQString,KPopupMenu*> continentMap;
-    TQMap<TQString,KPopupMenu*> continentMapList;
+    TQMap<TQString,TDEPopupMenu*> continentMap;
+    TQMap<TQString,TDEPopupMenu*> continentMapList;
     TQStringList discoveredRouters;
 
     int filterId;
@@ -429,7 +429,7 @@ private:
 };
 
 
-extern tork *kmain;
+extern tork *tdemain;
 
 #endif // _TORK_H_
 
diff --git a/src/tork.kcfgc b/src/tork.kcfgc
index fd797c4..4672c06 100644
--- a/src/tork.kcfgc
+++ b/src/tork.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=torkconfig.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/src/tork_downloadwithfirefox.desktop b/src/tork_downloadwithfirefox.desktop
index c374e6b..88d9849 100644
--- a/src/tork_downloadwithfirefox.desktop
+++ b/src/tork_downloadwithfirefox.desktop
@@ -4,7 +4,7 @@ Actions=TorkDownload;
 Icon=tork_firefox
 ServiceTypes=all/allfiles
 ExcludeServiceTypes=kdedevice/*
-X-KDE-ShowIfRunning=tork
+X-TDE-ShowIfRunning=tork
 
 [Desktop Action TorkDownload]
 Exec=dcop tork DCOPTork startEverything;dcop tork DCOPTork anonymizedFirefox %U;
diff --git a/src/tork_downloadwithkonqueror.desktop b/src/tork_downloadwithkonqueror.desktop
index e23144d..dac692f 100644
--- a/src/tork_downloadwithkonqueror.desktop
+++ b/src/tork_downloadwithkonqueror.desktop
@@ -4,7 +4,7 @@ Actions=TorkDownload;
 Icon=konqueror
 ServiceTypes=all/allfiles
 ExcludeServiceTypes=kdedevice/*
-X-KDE-ShowIfRunning=tork
+X-TDE-ShowIfRunning=tork
 
 [Desktop Action TorkDownload]
 Exec=konqueror tor:%U;
diff --git a/src/tork_downloadwithopera.desktop b/src/tork_downloadwithopera.desktop
index 8b21fd1..7e31adc 100644
--- a/src/tork_downloadwithopera.desktop
+++ b/src/tork_downloadwithopera.desktop
@@ -4,7 +4,7 @@ Actions=TorkDownload;
 Icon=tork_opera
 ServiceTypes=all/allfiles
 ExcludeServiceTypes=kdedevice/*
-X-KDE-ShowIfRunning=tork
+X-TDE-ShowIfRunning=tork
 
 [Desktop Action TorkDownload]
 Exec=dcop tork DCOPTork startEverything;dcop tork DCOPTork anonymizedOpera %U;
diff --git a/src/torkactivelabel.cpp b/src/torkactivelabel.cpp
index 1fae5a2..4fad736 100644
--- a/src/torkactivelabel.cpp
+++ b/src/torkactivelabel.cpp
@@ -24,7 +24,7 @@
 #include <ntqapplication.h>
 #include <ntqheader.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 TorkActiveLabel::TorkActiveLabel( const TQString &text,TQWidget * parent, const char * name) :
diff --git a/src/torkapplet/Makefile.am b/src/torkapplet/Makefile.am
index 4542d3b..284fb27 100644
--- a/src/torkapplet/Makefile.am
+++ b/src/torkapplet/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kickermenu_tork.la
 
 kickermenu_tork_la_SOURCES = tork_mnu.cpp ../functions.cpp
 kickermenu_tork_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_tork_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDECORE) -lDCOP $(LIB_QT)
+kickermenu_tork_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDECORE) -lDCOP $(LIB_QT)
 
 kickermenu_tork_la_METASOURCES = AUTO
 
diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp
index f44912b..29e96b0 100644
--- a/src/torkapplet/tork_mnu.cpp
+++ b/src/torkapplet/tork_mnu.cpp
@@ -29,11 +29,11 @@
 #include <ntqfileinfo.h>
 #include <ntqstringlist.h>
 
-#include <kapplication.h>
-#include <kglobal.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kio/global.h>
-#include <klocale.h>
+#include <tdeio/global.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kshell.h>
 #include <ksimpleconfig.h>
@@ -41,7 +41,7 @@
 #include <dcopref.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 
 #include "tork_mnu.h"
@@ -62,7 +62,7 @@ TorkMenu::TorkMenu(TQWidget *parent, const char *name, const TQStringList& /* ar
 
 TorkMenu::~TorkMenu()
 {
-    KGlobal::locale()->removeCatalogue("libkickermenu_tork");
+    TDEGlobal::locale()->removeCatalogue("libkickermenu_tork");
     p_dcopServer->detach();
     delete p_dcopServer;
 
diff --git a/src/torkapplet/torkmenu.desktop b/src/torkapplet/torkmenu.desktop
index a30c5d7..3f813e2 100644
--- a/src/torkapplet/torkmenu.desktop
+++ b/src/torkapplet/torkmenu.desktop
@@ -4,5 +4,5 @@ Type=Application
 Comment=Menu For Managing TorK
 Icon=tork
 
-X-KDE-Library=kickermenu_tork
-X-KDE-AuthorizeAction=shell_access
+X-TDE-Library=kickermenu_tork
+X-TDE-AuthorizeAction=shell_access
diff --git a/src/torkconfig.kcfgc b/src/torkconfig.kcfgc
index b298a03..590a8a0 100644
--- a/src/torkconfig.kcfgc
+++ b/src/torkconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=torkconfig.kcfg
 ClassName=TorkConfig
 Singleton=true
diff --git a/src/torkview.cpp b/src/torkview.cpp
index c5e8ed7..6a238e6 100644
--- a/src/torkview.cpp
+++ b/src/torkview.cpp
@@ -24,7 +24,7 @@
 #include "torkview.h"
 #include "tork.h"
 #include "torclient.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqlabel.h>
 #include <ntqlistview.h>
 #include "dndlistview.h"
@@ -52,10 +52,10 @@
 #include <kmimetype.h>
 #include <ksystemtray.h>
 #include <kprocio.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <ntqregexp.h>
 #include <ntqsplitter.h>
@@ -163,10 +163,10 @@ torkView::torkView(TQWidget *parent)
 
 
     m_osd = new StreamOSD(this, true);
-    m_osd->readSettings(KGlobal::config());
+    m_osd->readSettings(TDEGlobal::config());
 
     m_nontorosd = new StreamOSD(this, false);
-    m_nontorosd->readSettings(KGlobal::config());
+    m_nontorosd->readSettings(TDEGlobal::config());
 
     //Icons showing the status of the stream
     streamStatusIcon["SUCCEEDED"] = TQPixmap(SmallIcon("tork_green"));
@@ -335,17 +335,17 @@ void torkView::anonymizedFirefox(const TQString& url)
         }else{
             emit processWarning("cantreadprofiles",i18n("Can't read %1")
                     .arg(TQString("%1/profiles.ini").arg(firefoxdir)));
-            KIO::NetAccess::del(torkfirefox,0L);
+            TDEIO::NetAccess::del(torkfirefox,0L);
             return;
         }
     
         TQString originalprofile = line.replace("Path=","");
         TQString originalfirefox = TQString("%1/%2").arg(firefoxdir).arg(originalprofile);
     
-        if (!KIO::NetAccess::dircopy(originalfirefox,torkfirefox, 0L))
+        if (!TDEIO::NetAccess::dircopy(originalfirefox,torkfirefox, 0L))
         {
             emit processWarning("cantcopyprofile",i18n("Can't copy %1").arg(originalfirefox));
-            KIO::NetAccess::del(torkfirefox,0L);
+            TDEIO::NetAccess::del(torkfirefox,0L);
             return;
         }
 
@@ -365,7 +365,7 @@ void torkView::anonymizedFirefox(const TQString& url)
         }else{
             emit processWarning("cantreadprofiles",i18n("Can't read %1")
                     .arg(TQString("%1/profiles.ini").arg(firefoxdir)));
-            KIO::NetAccess::del(torkfirefox,0L);
+            TDEIO::NetAccess::del(torkfirefox,0L);
             return;
         }
 
@@ -439,7 +439,7 @@ void torkView::anonymizedFirefox(const TQString& url)
 
     }else{
         emit processWarning("cantwritefirefoxsettings", i18n("Can't write to %1").arg(TQString("%1/prefs.js").arg(torkfirefox)));
-        KIO::NetAccess::del(torkfirefox,0L);
+        TDEIO::NetAccess::del(torkfirefox,0L);
         return;
     }
 
@@ -461,7 +461,7 @@ void torkView::anonymizedOpera(const TQString& url)
     TQString torkopera = TQString("%1/.opera-tork").arg(getenv("HOME"));
     TQDir torkdir(torkopera);
     if (!torkdir.exists())
-        KIO::NetAccess::dircopy(originalopera,torkopera,0L);
+        TDEIO::NetAccess::dircopy(originalopera,torkopera,0L);
 
     TQFile inf(TQString("%1/.opera-tork/opera6.ini").arg(getenv("HOME")));
     if ( inf.open(IO_WriteOnly | IO_Append) ) {
@@ -1116,7 +1116,7 @@ TQPixmap torkView::streamProgram(const TQString &program)
 {
 
     
-    TQString prog = KGlobal::iconLoader()->iconPath(program, KIcon::Small, true);
+    TQString prog = TDEGlobal::iconLoader()->iconPath(program, TDEIcon::Small, true);
     if (prog.isEmpty())
         return SmallIcon( "exec" );
     else
@@ -1428,14 +1428,14 @@ void torkView::displayError( const TQString &caption, const TQString &infol)
     KPassivePopup* pop;
 
     TQPoint pnt;
-    if (kmain->isActiveWindow()){
-        pop = new KPassivePopup( kmain );
-        pnt = kmain->pos() += kmain->m_view->pos() += kmain->m_view->circuitList->pos() +=
-                kmain->m_view->circuitList->getMousePos() += kmain->m_view->splitter3->pos() += 
-                kmain->m_view->splitter4->pos() += kmain->m_view->groupBox1->pos();
+    if (tdemain->isActiveWindow()){
+        pop = new KPassivePopup( tdemain );
+        pnt = tdemain->pos() += tdemain->m_view->pos() += tdemain->m_view->circuitList->pos() +=
+                tdemain->m_view->circuitList->getMousePos() += tdemain->m_view->splitter3->pos() += 
+                tdemain->m_view->splitter4->pos() += tdemain->m_view->groupBox1->pos();
     }else{
-        pop = new KPassivePopup( kmain->_tray );
-        pnt = kmain->_tray->pos();
+        pop = new KPassivePopup( tdemain->_tray );
+        pnt = tdemain->_tray->pos();
     }
     pop->setView( caption,info );
     pop->show(TQPoint(pnt));
@@ -1450,12 +1450,12 @@ void torkView::displayServer( const TQString &caption, const TQString &info)
     KPassivePopup* pop;
 
     TQPoint pnt;
-    if (kmain->isActiveWindow()){
+    if (tdemain->isActiveWindow()){
         pop = new KPassivePopup( serverList );
-        //pnt = kmain->pos()  -= kmain->m_view->serverList->getMousePos() -= kmain->m_view->serverList->getMousePos() -= kmain->m_view->serverList->getMousePos();
+        //pnt = tdemain->pos()  -= tdemain->m_view->serverList->getMousePos() -= tdemain->m_view->serverList->getMousePos() -= tdemain->m_view->serverList->getMousePos();
     }else{
-        pop = new KPassivePopup( kmain->_tray );
-        pnt = kmain->_tray->pos();
+        pop = new KPassivePopup( tdemain->_tray );
+        pnt = tdemain->_tray->pos();
     }
     pop->setView( caption,info );
     //pop->show(TQPoint(pnt));
@@ -1471,7 +1471,7 @@ void torkView::showServerBW(const TQString &fp )
     TQString tmpFile;
     fl = TQString("http://www.noreply.org/tor-running-routers/%1/node-traf-%2.png")
                 .arg(fp.left(2)).arg(fp);
-    KIO::NetAccess::download( fl, tmpFile, 0L );
+    TDEIO::NetAccess::download( fl, tmpFile, 0L );
     kapp->processEvents();
     streamList-> setPaletteBackgroundPixmap( TQPixmap(tmpFile) );
 }
diff --git a/src/torkview_base.ui b/src/torkview_base.ui
index 3131411..c2905f5 100644
--- a/src/torkview_base.ui
+++ b/src/torkview_base.ui
@@ -263,7 +263,7 @@
                                         </sizepolicy>
                                     </property>
                                 </widget>
-                                <widget class="KListViewSearchLine" row="0" column="1">
+                                <widget class="TDEListViewSearchLine" row="0" column="1">
                                     <property name="name">
                                         <cstring>serverFilter</cstring>
                                     </property>
diff --git a/src/torkview_base.ui.h b/src/torkview_base.ui.h
index c15965d..4cabe40 100644
--- a/src/torkview_base.ui.h
+++ b/src/torkview_base.ui.h
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <ntqclipboard.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include "torkconfig.h"
@@ -47,7 +47,7 @@ ResolveColMap resolveColMap;
 void torkview_base::init()
 {
 
-    serverFilter->setListView((KListView *)serverList);
+    serverFilter->setListView((TDEListView *)serverList);
     TQValueList<int> tmp;
     tmp << 1;
     serverFilter->setSearchColumns(tmp);
@@ -57,7 +57,7 @@ void torkview_base::init()
                     serverFilter, SLOT(clear()) );
 
     serverList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", 
-                           KIcon::Small),"", 24 );
+                           TDEIcon::Small),"", 24 );
     serverList->addColumn( "Server" );
     serverList->addColumn( "FP" );
     serverList->addColumn( "conditions" );
@@ -80,7 +80,7 @@ void torkview_base::init()
     streamList->addColumn( "ID" );
     streamList->addColumn(  tr2i18n("Source")  );
     streamList->addColumn(  tr2i18n("Host/Port")  );
-    streamList->addColumn(  kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24  );
+    streamList->addColumn(  kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24  );
     streamList->addColumn(  tr2i18n("Speed")  );
     streamList->addColumn(  tr2i18n("Exit")  );
     streamList->addColumn(  tr2i18n("Circuit")  );
@@ -93,7 +93,7 @@ void torkview_base::init()
 
 
     circuitList->addColumn( tr2i18n( "ID" ) );
-    circuitList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24 );
+    circuitList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
     circuitList->addColumn( tr2i18n( "Path" ) );
     circuitList->setSelectionMode( TQListView::Extended );
     circuitList->setColumnWidthMode(0, TQListView::Manual);
@@ -102,7 +102,7 @@ void torkview_base::init()
     circuitList->setResizeMode( TQListView::LastColumn );
 
 
-    ORList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24 );
+    ORList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", TDEIcon::Small),"", 24 );
     ORList->addColumn( tr2i18n( "Server" ) );
     ORList->setSelectionMode( TQListView::Extended );
     ORList->setColumnWidthMode(0, TQListView::Manual);
@@ -211,8 +211,8 @@ void torkview_base::serverList_contextMenuRequested( TQListViewItem *, const TQP
         return;
 
     TQPopupMenu *menu = new TQPopupMenu( serverList );
-    TQPopupMenu *m_ThisSession =  new KPopupMenu( this );
-    TQPopupMenu *m_ThisPerm =  new KPopupMenu( this );
+    TQPopupMenu *m_ThisSession =  new TDEPopupMenu( this );
+    TQPopupMenu *m_ThisPerm =  new TDEPopupMenu( this );
 
     menu->clear();
     menu->insertItem( i18n("For This Session Only"), m_ThisSession );
diff --git a/src/torservers.ui.h b/src/torservers.ui.h
index 0468241..aca99b1 100644
--- a/src/torservers.ui.h
+++ b/src/torservers.ui.h
@@ -20,7 +20,7 @@
  ***************************************************************************/
 #include "torkconfig.h"
 #include "crypto.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kdebug.h>
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index 4422bf0..6884564 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -41,11 +41,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kapplication.h>
+#include <tdelocale.h>
+#include <tdeapplication.h>
 #include "trayicon.h"
 #include <ntqtooltip.h>
 #include <kpassivepopup.h>
@@ -178,7 +178,7 @@ void TrayIcon::updateStats(const TQString & downloadBandwidthHist,
 	
 }
 
-SetMaxRate::SetMaxRate( tork *parent, const char *name):KPopupMenu(parent, name)
+SetMaxRate::SetMaxRate( tork *parent, const char *name):TDEPopupMenu(parent, name)
 {
     m_parent = parent;
     m_rate = TorkConfig::bandwidthRate();
diff --git a/src/trayicon.h b/src/trayicon.h
index 977a6ce..29d5204 100644
--- a/src/trayicon.h
+++ b/src/trayicon.h
@@ -43,7 +43,7 @@
 
 
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ntqpainter.h>
 #include <kurl.h>
 #include <tork.h>
@@ -84,7 +84,7 @@ private:
 };
 
 
-class SetMaxRate : public KPopupMenu
+class SetMaxRate : public TDEPopupMenu
 {
 		Q_OBJECT
 	public:
diff --git a/src/update.cpp b/src/update.cpp
index d406ac4..43f4a8d 100644
--- a/src/update.cpp
+++ b/src/update.cpp
@@ -23,27 +23,27 @@
 
 #include <kstaticdeleter.h>
 
-#include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdelocale.h>
+#include <tdeio/netaccess.h>
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <ntqcheckbox.h>
 #include <kbuttonbox.h>
 #include <kurlcompletion.h>
 #include <kcombobox.h>
 #include <ntqlayout.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksystemtray.h>
 #include <ktar.h>
 #include <kprogress.h>
 #include <kprocio.h>
 #include <knotifyclient.h>
 #include <dom/html_misc.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kuser.h>
 
@@ -75,7 +75,7 @@ const char *mirrors[] = {
 };
 
 TorkUpdate::TorkUpdate(TQWidget *parent, const char *name)
-    : TQWidget(parent, name),filelist(new KHTMLPart(this))
+    : TQWidget(parent, name),filelist(new TDEHTMLPart(this))
 {
 
 }
@@ -141,7 +141,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
             dlLocation = TQString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension);
 
         TQString tmpFile;
-        if ( !KIO::NetAccess::download( dlLocation, tmpFile, 0L ) ){
+        if ( !TDEIO::NetAccess::download( dlLocation, tmpFile, 0L ) ){
             KMessageBox::information (0,i18n("Couldn't download %1.").arg(component));
             delete timer;
             timer=0;
@@ -153,7 +153,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
 
         TQString tmpFile2;
         if (!dlLocationSig.isEmpty()){
-            if ( !KIO::NetAccess::download( dlLocationSig, tmpFile2, 0L ) ){
+            if ( !TDEIO::NetAccess::download( dlLocationSig, tmpFile2, 0L ) ){
                 KMessageBox::information (0,i18n("Couldn't download %1 signature file.").arg(component));
                 delete timer;
                 timer=0;
@@ -216,7 +216,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
         entry = tar.directory()->entries();
         tar.close();
         // remove the temp file
-        //KIO::NetAccess::removeTempFile( tmpFile );
+        //TDEIO::NetAccess::removeTempFile( tmpFile );
     
         delete timer;
         timer=0;
@@ -256,7 +256,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
                 break;
             case 5 : 
 
-                KProcess* arkollonproc = new KShellProcess();
+                TDEProcess* arkollonproc = new KShellProcess();
 
                 KMessageBox::information (this,i18n( "<p><b>If this the first time you've compiled software then here are a few useful tips:</b><br>"
                     "1. Any error messages in the log file with the words 'KDE', 'TQt','curl' or 'X' in them mean that you need to install "
@@ -266,7 +266,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
 
                  TQString command;
                 if (component == "Mixminion")
-                    command = TQString("kdesu -i tork -c 'xterm -hold -e \"cd %1;make install;printf \\\"If there were errors try downloading and installing Mixminion from the Mixminion homepage. If the installation looks successful try sending an anonymous mail to yourself. Close the window to continue.\\\"\"'").arg(configure);
+                    command = TQString("tdesu -i tork -c 'xterm -hold -e \"cd %1;make install;printf \\\"If there were errors try downloading and installing Mixminion from the Mixminion homepage. If the installation looks successful try sending an anonymous mail to yourself. Close the window to continue.\\\"\"'").arg(configure);
                 else if (component == "privoxy")
                     command = TQString("cd %1; autoheader;autoconf;torkarkollon %2").arg(configure).arg(configure);
                 else
@@ -274,7 +274,7 @@ void TorkUpdate::downloadComponent(TQString component, TQString version, TQStrin
 
                 *arkollonproc << command;
 
-                connect( arkollonproc, SIGNAL(processExited(KProcess *)), SLOT(torkInstallationExited(KProcess *)) );
+                connect( arkollonproc, SIGNAL(processExited(TDEProcess *)), SLOT(torkInstallationExited(TDEProcess *)) );
                 arkollonproc->start();
         }
     }
@@ -429,7 +429,7 @@ void TorkUpdate::slotProg()
 }
 
 
-void TorkUpdate::torkInstallationExited(KProcess* arkollonproc)
+void TorkUpdate::torkInstallationExited(TDEProcess* arkollonproc)
 {
 
     arkollonproc = 0;
@@ -487,7 +487,7 @@ void TorkUpdate::getLatestVersionFromSFHack(KURL url)
 
 
     if (!filelist)
-        filelist = new KHTMLPart();
+        filelist = new TDEHTMLPart();
 
     connect( filelist, SIGNAL( completed() ), this,
 		SLOT( parseSFPageHack() ) );
diff --git a/src/update.h b/src/update.h
index 857f472..c23c978 100644
--- a/src/update.h
+++ b/src/update.h
@@ -27,11 +27,11 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h> //stack allocated
 #include <kurl.h>       //stack allocated
 #include <kresolver.h> // namespace
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 
 namespace DOM {
@@ -42,11 +42,11 @@ namespace DOM {
 using namespace KNetwork;
 
 class KURL;
-class KProcess;
+class TDEProcess;
 class KURLRequester;
 class KProgressDialog;
 class KProcIO;
-class KHTMLPart;
+class TDEHTMLPart;
 
 /**
  * This class serves as the main window for TorkUpdate.  It handles the
@@ -82,7 +82,7 @@ public slots:
 
 private slots:
     void slotProg();
-    void torkInstallationExited(KProcess *arkollonproc);
+    void torkInstallationExited(TDEProcess *arkollonproc);
     void resolved(KResolverResults result);
     void parseSFPage();
     void parseSFPageHack();
@@ -99,7 +99,7 @@ private:
     void completedSearchForUpdates(const TQString &component, const TQString &extension);
     double numericizeVersion(TQString &version);
     TQString getMirror();
-    KProcess *childproc;
+    TDEProcess *childproc;
     KProcIO *versionproc;
     TQString tempFileName;
     TQString errorMessage;
@@ -114,7 +114,7 @@ private:
     KResolver m_resolver;
     TQString currentTorVersion;
     bool m_alpha;
-    KHTMLPart *filelist;
+    TDEHTMLPart *filelist;
 private:
     KDirLister tor_lister;
     KURL       tor_url;
diff --git a/src/upnp/exitoperation.cpp b/src/upnp/exitoperation.cpp
index 8eedb7a..6df1224 100644
--- a/src/upnp/exitoperation.cpp
+++ b/src/upnp/exitoperation.cpp
@@ -29,16 +29,16 @@ namespace kt
 	ExitOperation::~ExitOperation()
 	{}
 
-	ExitJobOperation::ExitJobOperation(KIO::Job* j)
+	ExitJobOperation::ExitJobOperation(TDEIO::Job* j)
 	{
-		connect(j,SIGNAL(result(KIO::Job*)),this,SLOT(onResult( KIO::Job* )));
+		connect(j,SIGNAL(result(TDEIO::Job*)),this,SLOT(onResult( TDEIO::Job* )));
 	}
 	
 	ExitJobOperation::~ExitJobOperation()
 	{
 	}
 	
-	void ExitJobOperation::onResult(KIO::Job* )
+	void ExitJobOperation::onResult(TDEIO::Job* )
 	{
 		operationFinished(this);
 	}
diff --git a/src/upnp/exitoperation.h b/src/upnp/exitoperation.h
index 4a27911..d969c6c 100644
--- a/src/upnp/exitoperation.h
+++ b/src/upnp/exitoperation.h
@@ -21,7 +21,7 @@
 #define KTEXITOPERATION_H
 
 #include <ntqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace kt
 {
@@ -49,18 +49,18 @@ namespace kt
 	};
 
 	/**
-	 * Exit operation which waits for a KIO::Job
+	 * Exit operation which waits for a TDEIO::Job
 	 */
 	class ExitJobOperation : public ExitOperation
 	{
 		Q_OBJECT
 	public:
-		ExitJobOperation(KIO::Job* j);
+		ExitJobOperation(TDEIO::Job* j);
 		virtual ~ExitJobOperation();
 		
 		virtual bool deleteAllowed() const {return false;}
 	private slots:
-		virtual void onResult(KIO::Job* j);
+		virtual void onResult(TDEIO::Job* j);
 	};
 }
 
diff --git a/src/upnp/upnpmcastsocket.cpp b/src/upnp/upnpmcastsocket.cpp
index 70853de..ff87432 100644
--- a/src/upnp/upnpmcastsocket.cpp
+++ b/src/upnp/upnpmcastsocket.cpp
@@ -28,8 +28,8 @@
 #include <arpa/inet.h>
 #include <netinet/ip.h>
 #include <ntqstringlist.h>
-#include <ksocketdevice.h>
-#include <ksocketaddress.h>
+#include <tdesocketdevice.h>
+#include <tdesocketaddress.h>
 /*#include <util/log.h>
 #include <torrent/globals.h>*/
 #include <ntqfile.h>
diff --git a/src/upnp/upnprouter.cpp b/src/upnp/upnprouter.cpp
index 8e39f33..e5764b5 100644
--- a/src/upnp/upnprouter.cpp
+++ b/src/upnp/upnprouter.cpp
@@ -18,13 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <ntqstringlist.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include "httprequest.h"
 #include "upnprouter.h"
 #include "upnpdescriptionparser.h"
@@ -139,7 +139,7 @@ namespace kt
 		services.append(s);
 	}
 	
-	void UPnPRouter::downloadFinished(KIO::Job* j)
+	void UPnPRouter::downloadFinished(TDEIO::Job* j)
 	{
 		if (j->error())
 		{
@@ -154,8 +154,8 @@ namespace kt
 		if (!ret)
 		{
 			kdDebug()  << "Error parsing router description !" << endl;
-			TQString dest = KGlobal::dirs()->saveLocation("data","tork") + "upnp_failure";
-			KIO::file_copy(target,dest,-1,true,false,false);
+			TQString dest = TDEGlobal::dirs()->saveLocation("data","tork") + "upnp_failure";
+			TDEIO::file_copy(target,dest,-1,true,false,false);
 		}
 		else
 		{
@@ -169,8 +169,8 @@ namespace kt
 	void UPnPRouter::downloadXMLFile()
 	{
 		// downlaod XML description into a temporary file in /tmp
-		KIO::Job* job = KIO::file_copy(location,tmp_file,-1,true,false,false);
-		connect(job,SIGNAL(result(KIO::Job *)),this,SLOT(downloadFinished( KIO::Job* )));
+		TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false);
+		connect(job,SIGNAL(result(TDEIO::Job *)),this,SLOT(downloadFinished( TDEIO::Job* )));
 	}
 	
 	void UPnPRouter::debugPrintData()
@@ -465,7 +465,7 @@ namespace kt
 namespace bt
 {
 
-	WaitJob::WaitJob(Uint32 millis) : KIO::Job(false)
+	WaitJob::WaitJob(Uint32 millis) : TDEIO::Job(false)
 	{
 		connect(&timer,SIGNAL(timeout()),this,SLOT(timerDone()));
 		timer.start(millis,true);
@@ -510,14 +510,14 @@ namespace bt
 	
 	void WaitJob::execute(WaitJob* job)
 	{
-		KIO::NetAccess::synchronousRun(job,0);
+		TDEIO::NetAccess::synchronousRun(job,0);
 	}
 	
 	void SynchronousWait(Uint32 millis)
 	{
 		kdDebug() << "SynchronousWait" << endl;
 		WaitJob* j = new WaitJob(millis);
-		KIO::NetAccess::synchronousRun(j,0);
+		TDEIO::NetAccess::synchronousRun(j,0);
 	}
 
 
diff --git a/src/upnp/upnprouter.h b/src/upnp/upnprouter.h
index 8ae321e..d0590b9 100644
--- a/src/upnp/upnprouter.h
+++ b/src/upnp/upnprouter.h
@@ -21,7 +21,7 @@
 #define KTUPNPROUTER_H
 
 #include <ntqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ntqvaluelist.h>
 #include "exitoperation.h"
 #include <kurl.h>
@@ -41,7 +41,7 @@ namespace bt
 	 * Job to wait for a certain amount of time or until one or more ExitOperation's have
 	 * finished.
 	*/
-	class WaitJob : public KIO::Job
+	class WaitJob : public TDEIO::Job
 	{
 		Q_OBJECT
 	public:
@@ -90,7 +90,7 @@ namespace net
 {
     class ForwardPortList;
 }
-namespace KIO
+namespace TDEIO
 {
 	class Job;
 }
@@ -265,7 +265,7 @@ namespace kt
 		void onReplyOK(bt::HTTPRequest* r,const TQString &,bool);
 		void onReplyError(bt::HTTPRequest* r,const TQString &,bool);
 		void onError(bt::HTTPRequest* r,bool);
-		void downloadFinished(KIO::Job* j);
+		void downloadFinished(TDEIO::Job* j);
 		
 		
 		
diff --git a/src/upnpmanager.cpp b/src/upnpmanager.cpp
index d249c68..ff20746 100644
--- a/src/upnpmanager.cpp
+++ b/src/upnpmanager.cpp
@@ -22,7 +22,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "upnpmanager.h"
 #include "kdebug.h"
 
@@ -162,7 +162,7 @@ UPnPManager* UPnPManager::manager = 0;
 
 	void UPnPManager::unload()
 	{
-/*		TQString routers_file = KGlobal::dirs()->saveLocation("data","tork") + "routers";
+/*		TQString routers_file = TDEGlobal::dirs()->saveLocation("data","tork") + "routers";
 		sock->saveRouters(routers_file);*/
 		sock->close();
 		delete sock;
diff --git a/src/usability.ui.h b/src/usability.ui.h
index b4866c0..dbf59e1 100644
--- a/src/usability.ui.h
+++ b/src/usability.ui.h
@@ -22,7 +22,7 @@
 
 #include "torkconfig.h"
 #include "portsandnames.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ntqtooltip.h>
 #include <ntqpopupmenu.h>
 #include <kdebug.h>
diff --git a/tork.kdevelop b/tork.kdevelop
index 4ddcd37..ed5e77c 100644
--- a/tork.kdevelop
+++ b/tork.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Robert Hogan</author>
     <email>robert@roberthogan.net</email>
@@ -308,4 +308,4 @@
     <customTagfilePath>/backup/robert/Development/tork/tags</customTagfilePath>
     <activeTagsFiles/>
   </ctagspart>
-</kdevelop>
+</tdevelop>