diff --git a/acinclude.m4 b/acinclude.m4
index 752b7aa..7fdbc75 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; 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 "$trinity3ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   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
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    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, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    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, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/ksquirrel/imageedit/sq_imagefilter.ui.h b/ksquirrel/imageedit/sq_imagefilter.ui.h
index c5ffc3d..643b0a5 100644
--- a/ksquirrel/imageedit/sq_imagefilter.ui.h
+++ b/ksquirrel/imageedit/sq_imagefilter.ui.h
@@ -113,36 +113,36 @@ void SQ_ImageFilter::init()
 
 void SQ_ImageFilter::slotStartFiltering()
 {
-    SQ_Config *kconf = SQ_Config::instance();
-
-    kconf->setGroup("Image edit options");
-    kconf->writeEntry("filter_swapRGB", buttonGroupSwapRGB->selectedId());
-    kconf->writeEntry("filter_blend_color", pushBlendColor->color().name());
-    kconf->writeEntry("filter_blend_opacity", blendOpacity->value());
-    kconf->writeEntry("filter_fade_color", fadeColor->color().name());
-    kconf->writeEntry("filter_fade_value", fadeValue->value());
-    kconf->writeEntry("filter_desaturate_value", desaturateValue->value());
-    kconf->writeEntry("filter_threshold_value", thresholdValue->value());
-    kconf->writeEntry("filter_threshold_redeye", thresholdRE->value());
-    kconf->writeEntry("filter_solarize_value", solarizeValue->value());
-    kconf->writeEntry("filter_spread_value", spreadValue->value());
-    kconf->writeEntry("filter_swirl_value", swirlAngle->value());
-    kconf->writeEntry("filter_noise", buttonGroupNoise->selectedId());
-    kconf->writeEntry("filter_flatten_color1", flattenColor1->color().name());
-    kconf->writeEntry("filter_flatten_color2", flattenColor2->color().name());
-    kconf->writeEntry("filter_shade_azim", shadeAzim->value());
-    kconf->writeEntry("filter_shade_elev", shadeElev->value());
-    kconf->writeEntry("filter_shade_color", shadeColor->isChecked());
-    kconf->writeEntry("filter_blur_radius", blurRadius->value());
-    kconf->writeEntry("filter_blur_sigma", blurSigma->value());
-    kconf->writeEntry("filter_implode_factor", implodeFactor->value());
-    kconf->writeEntry("filter_egde_radius", edgeRadius->value());
-    kconf->writeEntry("filter_emboss_radius", embossRadius->value());
-    kconf->writeEntry("filter_emboss_sigma", embossSigma->value());
-    kconf->writeEntry("filter_sharpen_radius", sharpenRadius->value());
-    kconf->writeEntry("filter_sharpen_sigma", sharpenSigma->value());
-    kconf->writeEntry("filter_oil_radius", oilRadius->value());
-    kconf->writeEntry("filter_filter", listMain->currentItem());
+    SQ_Config *tdeconf = SQ_Config::instance();
+
+    tdeconf->setGroup("Image edit options");
+    tdeconf->writeEntry("filter_swapRGB", buttonGroupSwapRGB->selectedId());
+    tdeconf->writeEntry("filter_blend_color", pushBlendColor->color().name());
+    tdeconf->writeEntry("filter_blend_opacity", blendOpacity->value());
+    tdeconf->writeEntry("filter_fade_color", fadeColor->color().name());
+    tdeconf->writeEntry("filter_fade_value", fadeValue->value());
+    tdeconf->writeEntry("filter_desaturate_value", desaturateValue->value());
+    tdeconf->writeEntry("filter_threshold_value", thresholdValue->value());
+    tdeconf->writeEntry("filter_threshold_redeye", thresholdRE->value());
+    tdeconf->writeEntry("filter_solarize_value", solarizeValue->value());
+    tdeconf->writeEntry("filter_spread_value", spreadValue->value());
+    tdeconf->writeEntry("filter_swirl_value", swirlAngle->value());
+    tdeconf->writeEntry("filter_noise", buttonGroupNoise->selectedId());
+    tdeconf->writeEntry("filter_flatten_color1", flattenColor1->color().name());
+    tdeconf->writeEntry("filter_flatten_color2", flattenColor2->color().name());
+    tdeconf->writeEntry("filter_shade_azim", shadeAzim->value());
+    tdeconf->writeEntry("filter_shade_elev", shadeElev->value());
+    tdeconf->writeEntry("filter_shade_color", shadeColor->isChecked());
+    tdeconf->writeEntry("filter_blur_radius", blurRadius->value());
+    tdeconf->writeEntry("filter_blur_sigma", blurSigma->value());
+    tdeconf->writeEntry("filter_implode_factor", implodeFactor->value());
+    tdeconf->writeEntry("filter_egde_radius", edgeRadius->value());
+    tdeconf->writeEntry("filter_emboss_radius", embossRadius->value());
+    tdeconf->writeEntry("filter_emboss_sigma", embossSigma->value());
+    tdeconf->writeEntry("filter_sharpen_radius", sharpenRadius->value());
+    tdeconf->writeEntry("filter_sharpen_sigma", sharpenSigma->value());
+    tdeconf->writeEntry("filter_oil_radius", oilRadius->value());
+    tdeconf->writeEntry("filter_filter", listMain->currentItem());
 
     SQ_ImageFilterOptions opt;
  
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp
index a6737bc..49654c7 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp
@@ -13,10 +13,10 @@
 
 #include <tqvariant.h>
 #include <kdirlister.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqheader.h>
 #include <tqtimer.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <tqpushbutton.h>
diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/ksquirrel/ksquirrel-libs-configurator/klc.ui
index 12d89a9..d319b77 100644
--- a/ksquirrel/ksquirrel-libs-configurator/klc.ui
+++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui
@@ -151,13 +151,13 @@
     <tabstop>pushClose</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">kfileitem.h</include>
+    <include location="global" impldecl="in declaration">tdefileitem.h</include>
     <include location="global" impldecl="in declaration">kurl.h</include>
     <include location="global" impldecl="in implementation">kdirlister.h</include>
-    <include location="global" impldecl="in implementation">kio/job.h</include>
+    <include location="global" impldecl="in implementation">tdeio/job.h</include>
     <include location="global" impldecl="in implementation">tqheader.h</include>
     <include location="global" impldecl="in implementation">tqtimer.h</include>
-    <include location="global" impldecl="in implementation">kio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
     <include location="global" impldecl="in implementation">kapplication.h</include>
     <include location="global" impldecl="in implementation">dcopclient.h</include>
     <include location="local" impldecl="in implementation">klc.ui.h</include>
diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index 0c913a5..40fb667 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -52,7 +52,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <krun.h>
 #include <kanimwidget.h>
 #include <kglobalsettings.h>
@@ -60,8 +60,8 @@
 #include <tdemultitabbar.h>
 #include <kurlcompletion.h>
 #include <konq_pixmapprovider.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kinputdialog.h>
 #include <ksystemtray.h>
 #include <ksqueezedtextlabel.h>
@@ -142,15 +142,15 @@ KSquirrel::KSquirrel(TQWidget *parent, const char *name)
 
     // create TDEConfig instance.
     // It will help us to read and write config entries
-    kconf = new SQ_Config(TQT_TQOBJECT(this));
+    tdeconf = new SQ_Config(TQT_TQOBJECT(this));
 
     old_id = 0;
 
-    kconf->setGroup("Thumbnails");
+    tdeconf->setGroup("Thumbnails");
 
-    thumbSize = new SQ_ThumbnailSize(TQT_TQOBJECT(this), static_cast<SQ_ThumbnailSize::Size>(kconf->readNumEntry("size",
+    thumbSize = new SQ_ThumbnailSize(TQT_TQOBJECT(this), static_cast<SQ_ThumbnailSize::Size>(tdeconf->readNumEntry("size",
                             SQ_ThumbnailSize::Large)));
-    thumbSize->setExtended(kconf->readBoolEntry("extended", false));
+    thumbSize->setExtended(tdeconf->readBoolEntry("extended", false));
 
     sqFiltersName = 0;
     pCurrentURL = 0;
@@ -170,7 +170,7 @@ KSquirrel::~KSquirrel()
     delete sqFiltersExt;
     delete sqFiltersName;
     delete gl_view;
-    delete kconf;
+    delete tdeconf;
 }
 
 /*
@@ -181,7 +181,7 @@ void KSquirrel::handlePositionSize()
     TQPoint p_def(0,0);
     TQSize  sz_def(800, 600);
 
-    kconf->setGroup("Interface");
+    tdeconf->setGroup("Interface");
 
     TQPoint p = SQ_Config::instance()->readPointEntry("pos", &p_def);
     TQSize sz = SQ_Config::instance()->readSizeEntry("size", &sz_def);
@@ -198,14 +198,14 @@ void KSquirrel::slotOptions()
     // create dialog
     SQ_Options optd(this, "sq_options", true);
 
-    kconf->setGroup("Fileview");
-    old_disable = kconf->readBoolEntry("disable_dirs", false);
-    old_calc = kconf->readBoolEntry("calculate", true);
+    tdeconf->setGroup("Fileview");
+    old_disable = tdeconf->readBoolEntry("disable_dirs", false);
+    old_calc = tdeconf->readBoolEntry("calculate", true);
 
-    kconf->setGroup("Thumbnails");
+    tdeconf->setGroup("Thumbnails");
 
-    kconf->setGroup("GL view");
-    old_marks = kconf->readBoolEntry("marks", true);
+    tdeconf->setGroup("GL view");
+    old_marks = tdeconf->readBoolEntry("marks", true);
 
     // if user clicked "OK", apply new settings
     if(optd.start() == TQDialog::Accepted)
@@ -234,14 +234,14 @@ bool KSquirrel::eventFilter(TQObject *o, TQEvent *e)
         {
             kdDebug() << "Creating additional widgets..." << endl;
 
-            kconf->setGroup("Thumbnails");
-            SQ_PixmapCache::instance()->setCacheLimit(kconf->readNumEntry("cache", 1024*10));
+            tdeconf->setGroup("Thumbnails");
+            SQ_PixmapCache::instance()->setCacheLimit(tdeconf->readNumEntry("cache", 1024*10));
 
 #ifdef SQ_HAVE_KIPI
-            kconf->setGroup("Main");
+            tdeconf->setGroup("Main");
 
             // load KIPI plugins on demand ?
-            if(!kconf->readBoolEntry("kipi_ondemand", true))
+            if(!tdeconf->readBoolEntry("kipi_ondemand", true))
                 kipiManager->loadPlugins();
 #endif
 
@@ -260,10 +260,10 @@ bool KSquirrel::eventFilter(TQObject *o, TQEvent *e)
             if(SQ_HLOptions::instance()->have_directorybasket)
                 sideBar->addWidget(new SQ_DirectoryBasket, i18n("Folder basket"), "folder");
 
-            kconf->setGroup("Interface");
+            tdeconf->setGroup("Interface");
 
             // restore opened page in sidebar
-            int pg = kconf->readNumEntry("last page", -1);
+            int pg = tdeconf->readNumEntry("last page", -1);
 
             TQPushButton *b = sideBar->multiBar()->tab(pg);
 
@@ -271,7 +271,7 @@ bool KSquirrel::eventFilter(TQObject *o, TQEvent *e)
             {
                 pg = 0;
                 b = sideBar->multiBar()->tab(0);
-                kconf->writeEntry("last page", 0);
+                tdeconf->writeEntry("last page", 0);
             }
 
             if(pg >= 0 && b)
@@ -289,7 +289,7 @@ bool KSquirrel::eventFilter(TQObject *o, TQEvent *e)
  */
 void KSquirrel::closeEvent(TQCloseEvent *ev)
 {
-    kconf->setGroup("Main");
+    tdeconf->setGroup("Main");
 
     if((m_demo && !m_intray) || kapp->sessionSaving())
     {
@@ -302,7 +302,7 @@ void KSquirrel::closeEvent(TQCloseEvent *ev)
     else
     {
         // Minimize to tray ?
-        if(kconf->readBoolEntry("minimize to tray", false) || m_intray)
+        if(tdeconf->readBoolEntry("minimize to tray", false) || m_intray)
         {
             // Yes, let's hide to tray
             slotGotoTray();
@@ -359,7 +359,7 @@ void KSquirrel::createLocationToolbar(KToolBar *pTLocation)
     pTLocation->setItemAutoSized(3);
     pTLocation->insertButton("goto", 4, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotGo()), true, i18n("Go!"));
 
-    kconf->setGroup("History");
+    tdeconf->setGroup("History");
 
     // some additional setup
 
@@ -367,7 +367,7 @@ void KSquirrel::createLocationToolbar(KToolBar *pTLocation)
     pCurrentURL->setCompletionObject(new KURLCompletion(KURLCompletion::DirCompletion));
     pCurrentURL->setDuplicatesEnabled(false);
     pCurrentURL->setSizeLimit(20);
-    pCurrentURL->setHistoryItems(kconf->readListEntry("items"), true);
+    pCurrentURL->setHistoryItems(tdeconf->readListEntry("items"), true);
 }
 
 // Create menu with filters
@@ -378,17 +378,17 @@ void KSquirrel::initFilterMenu()
 
     TQString last;
 
-    kconf->setGroup("Filters");
+    tdeconf->setGroup("Filters");
 
     // create TQStringLists with names and extensions
     // of custom filters
     if(!sqFiltersName)
     {
-        sqFiltersName = new TQStringList(kconf->readListEntry("items"));
-        sqFiltersExt = new TQStringList(kconf->readListEntry("extensions"));
+        sqFiltersName = new TQStringList(tdeconf->readListEntry("items"));
+        sqFiltersExt = new TQStringList(tdeconf->readListEntry("extensions"));
 
         // last used filter
-        last = kconf->readEntry("last", "*");
+        last = tdeconf->readEntry("last", "*");
 
         // allow user to check/uncheck menuitems
         actionFilterMenu->setCheckable(true);
@@ -398,7 +398,7 @@ void KSquirrel::initFilterMenu()
 
     actionFilterMenu->clear();
     int id, Id = old_id;
-    bool both = kconf->readBoolEntry("menuitem both", true);
+    bool both = tdeconf->readBoolEntry("menuitem both", true);
     TQStringList quickInfo;
 
     // Get extensions and names of libraries' filters
@@ -511,7 +511,7 @@ void KSquirrel::slotSetFilter(int id)
 void KSquirrel::createWidgets(int createFirst)
 {
     // check if location toolbar should be separated
-    m_urlbox = kconf->readBoolEntry("has_url", false);
+    m_urlbox = tdeconf->readBoolEntry("has_url", false);
 
     // main TQVBox
     mainPage = new TQVBox(this, TQString::fromLatin1("SQ_BROWSER_VBOX"));
@@ -546,7 +546,7 @@ void KSquirrel::createWidgets(int createFirst)
     // create widgetstack containing views
     pWidgetStack = new SQ_WidgetStack(mainView, createFirst);
 
-    kconf->setGroup("Interface");
+    tdeconf->setGroup("Interface");
     TQValueList<int> sz = SQ_Config::instance()->readIntListEntry("splitter");
 
     if(sz.count() != 2)
@@ -842,8 +842,8 @@ void KSquirrel::createActions()
     pAThumbs->insert(new KActionSeparator(actionCollection()));
 
     pAThumbsE = new KToggleAction(i18n("Extended thumbnails"), "", CTRL+TQt::Key_E, 0, 0, actionCollection(), "SQ Extended thumbs");
-    kconf->setGroup("Thumbnails");
-    pAThumbsE->setChecked(kconf->readBoolEntry("extended", false));
+    tdeconf->setGroup("Thumbnails");
+    pAThumbsE->setChecked(tdeconf->readBoolEntry("extended", false));
     connect(pAThumbsE, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotExtendedToggled(bool)));
     pAThumbs->insert(pAThumbsE);
 
@@ -929,9 +929,9 @@ void KSquirrel::closeGLWidget()
     }
     else
     {
-        kconf->setGroup("GL view");
+        tdeconf->setGroup("GL view");
 
-        if(kconf->readBoolEntry("closeall", false))
+        if(tdeconf->readBoolEntry("closeall", false))
             SQ_GLWidget::window()->closeAllTabsFull();
     }
 }
@@ -940,10 +940,10 @@ void KSquirrel::closeGLWidget()
 void KSquirrel::initBookmarks()
 {
     // locate bookmarks file
-    TQString file = locate("data", "kfile/bookmarks.xml");
+    TQString file = locate("data", "tdefile/bookmarks.xml");
 
     if(file.isEmpty())
-        file = locateLocal("data", "kfile/bookmarks.xml");
+        file = locateLocal("data", "tdefile/bookmarks.xml");
 
     KBookmarkManager *bmanager = KBookmarkManager::managerForFile(file, false);
     bmanager->setUpdate(true);
@@ -1008,42 +1008,42 @@ void KSquirrel::applyDefaultSettings()
 {
     bool updateDirs;
 
-    kconf->setGroup("GL view");
+    tdeconf->setGroup("GL view");
 
     // set background color, zoom & move factors
     SQ_GLWidget::window()->setClearColor();
     SQ_GLWidget::window()->updateFactors();
 
     // Show/hide tickmarks if needed
-    if(old_marks != kconf->readBoolEntry("marks", true))
+    if(old_marks != tdeconf->readBoolEntry("marks", true))
         SQ_GLWidget::window()->updateGLA();
 
     gl_view->setupTabbar();
 
-    kconf->setGroup("Fileview");
+    tdeconf->setGroup("Fileview");
 
     // switching from 'off' to 'on' requires recalculating size
-    if(!old_calc && kconf->readBoolEntry("calculate", true))
+    if(!old_calc && tdeconf->readBoolEntry("calculate", true))
         pWidgetStack->diroperator()->calcTotalSize();
 
-    updateDirs = (old_disable != kconf->readBoolEntry("disable_dirs", false));
+    updateDirs = (old_disable != tdeconf->readBoolEntry("disable_dirs", false));
 
     updateDirs &= (bool)pWidgetStack->diroperator()->numDirs();
 
-    kconf->setGroup("Thumbnails");
-    bool lazy = kconf->readBoolEntry("lazy", true);
-    int lazyDelay = kconf->readNumEntry("lazy_delay", 500);
-    int lazyRows = kconf->readNumEntry("rows", 2);
+    tdeconf->setGroup("Thumbnails");
+    bool lazy = tdeconf->readBoolEntry("lazy", true);
+    int lazyDelay = tdeconf->readNumEntry("lazy_delay", 500);
+    int lazyRows = tdeconf->readNumEntry("rows", 2);
 
     pWidgetStack->updateGrid(updateDirs);
 
     // set cache limit for pixmap cache
-    SQ_PixmapCache::instance()->setCacheLimit(kconf->readNumEntry("cache", 1024*10));
+    SQ_PixmapCache::instance()->setCacheLimit(tdeconf->readNumEntry("cache", 1024*10));
 
-    kconf->setGroup("Main");
+    tdeconf->setGroup("Main");
 
-    if(kconf->readBoolEntry("sync", false))
-        kconf->sync();
+    if(tdeconf->readBoolEntry("sync", false))
+        tdeconf->sync();
 
     pWidgetStack->diroperator()->setLazy(lazy, lazyDelay, lazyRows);
 
@@ -1063,7 +1063,7 @@ void KSquirrel::slotFullScreen(bool full)
 {
     WId id = gl_view->winId();
 
-    kconf->setGroup("GL view");
+    tdeconf->setGroup("GL view");
 
     // avoid automatic image resizing
     gl_view->statusbar()->setShown(!full);
@@ -1084,47 +1084,47 @@ void KSquirrel::saveValues()
 {
     extool->writeEntries();
 
-    kconf->setGroup("Filters");
-    kconf->writeEntry("items", *sqFiltersName);
-    kconf->writeEntry("extensions", *sqFiltersExt);
-    kconf->writeEntry("last", pWidgetStack->nameFilter());
+    tdeconf->setGroup("Filters");
+    tdeconf->writeEntry("items", *sqFiltersName);
+    tdeconf->writeEntry("extensions", *sqFiltersExt);
+    tdeconf->writeEntry("last", pWidgetStack->nameFilter());
 
-    kconf->setGroup("Fileview");
+    tdeconf->setGroup("Fileview");
     pWidgetStack->saveState();
 
     if(SQ_HLOptions::instance()->have_imagebasket)
         if(!waitForShow)
             SQ_ImageBasket::instance()->saveConfig();
 
-    if(kconf->readBoolEntry("history", true) && pCurrentURL)
+    if(tdeconf->readBoolEntry("history", true) && pCurrentURL)
     {
-        kconf->setGroup("History");
-        kconf->writeEntry("items", pCurrentURL->historyItems());
+        tdeconf->setGroup("History");
+        tdeconf->writeEntry("items", pCurrentURL->historyItems());
     }
 
-    kconf->setGroup("GL view");
+    tdeconf->setGroup("GL view");
 
     if(!SQ_GLWidget::window()->fullscreen())
         gl_view->saveGeometry();
 
-    kconf->writeEntry("ignore", dynamic_cast<KToggleAction *>(SQ_GLWidget::window()->actionCollection()->action("if less"))->isChecked());
-    kconf->writeEntry("zoom type", SQ_GLWidget::window()->zoomType());
+    tdeconf->writeEntry("ignore", dynamic_cast<KToggleAction *>(SQ_GLWidget::window()->actionCollection()->action("if less"))->isChecked());
+    tdeconf->writeEntry("zoom type", SQ_GLWidget::window()->zoomType());
 
-    kconf->setGroup("Interface");
-    kconf->writeEntry("last view", pWidgetStack->diroperator()->viewType());
-    if(!waitForShow) kconf->writeEntry("last page", sideBar->currentPage());
-    kconf->writeEntry("pos", pos());
-    kconf->writeEntry("size", size());
-    kconf->writeEntry("has_url", pTLocation->isShown());
+    tdeconf->setGroup("Interface");
+    tdeconf->writeEntry("last view", pWidgetStack->diroperator()->viewType());
+    if(!waitForShow) tdeconf->writeEntry("last page", sideBar->currentPage());
+    tdeconf->writeEntry("pos", pos());
+    tdeconf->writeEntry("size", size());
+    tdeconf->writeEntry("has_url", pTLocation->isShown());
 
     // splitter sizes are saved automatically
     // only when all sidebar pages are closed
     if(sideBar->currentPage() != -1 && !waitForShow)
         saveLayout();
 
-    kconf->setGroup("Thumbnails");
-    kconf->writeEntry("size", thumbSize->value());
-    kconf->writeEntry("extended", thumbSize->extended());
+    tdeconf->setGroup("Thumbnails");
+    tdeconf->writeEntry("size", thumbSize->value());
+    tdeconf->writeEntry("extended", thumbSize->extended());
 }
 
 // Reload libraries from disk
@@ -1194,9 +1194,9 @@ void KSquirrel::finalActions()
 
     diskProg->flush();
 
-    kconf->setGroup("Thumbnails");
+    tdeconf->setGroup("Thumbnails");
 
-    bool create_splash = !waitForShow && !kconf->readBoolEntry("dont write", false) && !SQ_PixmapCache::instance()->empty();
+    bool create_splash = !waitForShow && !tdeconf->readBoolEntry("dont write", false) && !SQ_PixmapCache::instance()->empty();
 
     // create post splash
     if(create_splash)
@@ -1206,7 +1206,7 @@ void KSquirrel::finalActions()
     }
 
     // write config file to disk (it is currently in memory cache)
-    kconf->sync();
+    tdeconf->sync();
 
     // Save thumbnails from memory cache to disk
     if(create_splash)
@@ -1381,8 +1381,8 @@ void KSquirrel::resizeEvent(TQResizeEvent *e)
 
 void KSquirrel::continueLoading()
 {
-    kconf->setGroup("Interface");
-    int createFirst = kconf->readNumEntry("last view", 0);
+    tdeconf->setGroup("Interface");
+    int createFirst = tdeconf->readNumEntry("last view", 0);
 
     // create toolbar, menubar, tree, filemanager ...
     createWidgets(createFirst);
@@ -1470,9 +1470,9 @@ void KSquirrel::openFile(bool parseURL)
     }
     else
     {
-        kconf->setGroup("Fileview");
+        tdeconf->setGroup("Fileview");
 
-        if(kconf->readBoolEntry("run unknown", false))
+        if(tdeconf->readBoolEntry("run unknown", false))
             new KRun(url);
     }
 }
@@ -1808,10 +1808,10 @@ void KSquirrel::slotSlideShowStart()
     if(slideShowDir.isEmpty())
         slideShowDir = SQ_WidgetStack::instance()->url().prettyURL();
 
-    kconf->setGroup("Slideshow");
+    tdeconf->setGroup("Slideshow");
 
     // recursion ?
-    bool recurs = kconf->readBoolEntry("recurs", false);
+    bool recurs = tdeconf->readBoolEntry("recurs", false);
 
     listing = recurs ? TDEIO::listRecursive(slideShowDir, false, false)
                      : TDEIO::listDir(slideShowDir, false, false);
@@ -1892,11 +1892,11 @@ void KSquirrel::slideShowPrivate()
     disconnect(slideShowTimer, TQT_SIGNAL(timeout()), 0, 0);
     connect(slideShowTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowNextImage()));
 
-    kconf->setGroup("Slideshow");
+    tdeconf->setGroup("Slideshow");
 
     // determine delay
-    slideShowDelay = kconf->readNumEntry("delay", 1000);
-    slideShowRepeat = kconf->readNumEntry("repeat", 0);
+    slideShowDelay = tdeconf->readNumEntry("delay", 1000);
+    slideShowRepeat = tdeconf->readNumEntry("repeat", 0);
 
     if(slideShowDelay < 0)     slideShowDelay = 1000;
     if(slideShowRepeat < 0)    slideShowRepeat = 0;
@@ -2058,7 +2058,7 @@ void KSquirrel::slotStopSlideShow()
     slideShowItems.clear();
     slideShowDirection = KSquirrel::Default;
 
-    kconf->setGroup("Slideshow");
+    tdeconf->setGroup("Slideshow");
 
     SQ_SlideShowWidget::instance()->endSlideShow();
 }
@@ -2109,8 +2109,8 @@ void KSquirrel::saveLayout()
 {
     if(!waitForShow)
     {
-        kconf->setGroup("Interface");
-        kconf->writeEntry("splitter", mainView->sizes());
+        tdeconf->setGroup("Interface");
+        tdeconf->writeEntry("splitter", mainView->sizes());
     }
 }
 
@@ -2118,16 +2118,16 @@ void KSquirrel::configAnime(bool init)
 {
     KAnimWidget *anim = tools->animatedWidget(1000); // get animated widget, if exist
 
-    kconf->setGroup("Main");
+    tdeconf->setGroup("Main");
 
     // show animated logo in toolbar if needed
-    if(!kconf->readBoolEntry("anime_dont", false) && (init || (!init && !anim)))
+    if(!tdeconf->readBoolEntry("anime_dont", false) && (init || (!init && !anim)))
     {
         tools->insertAnimatedWidget(1000, TQT_TQOBJECT(this), TQT_SLOT(slotAnimatedClicked()), locate("data", "images/anime.png"));
         tools->alignItemRight(1000);
         tools->animatedWidget(1000)->start();
     }
-    else if(!init && kconf->readBoolEntry("anime_dont", false) && anim)
+    else if(!init && tdeconf->readBoolEntry("anime_dont", false) && anim)
         delete anim;
 }
 
diff --git a/ksquirrel/ksquirrel.h b/ksquirrel/ksquirrel.h
index 59ef3e2..9ce5335 100644
--- a/ksquirrel/ksquirrel.h
+++ b/ksquirrel/ksquirrel.h
@@ -27,7 +27,7 @@
 
 #include <kmainwindow.h>
 #include <dcopobject.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 
 // forward declarations
@@ -694,7 +694,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
         KToolBar    *pTLocation;
 
         // our config file
-        SQ_Config    *kconf;
+        SQ_Config    *tdeconf;
 
         // widget stack containing different views (Icon view, List view ...)
         SQ_WidgetStack    *pWidgetStack;
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index bf77ee1..9eda446 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -18,7 +18,7 @@
 #include <kaction.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/genericfactory.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/ksquirrel/ksquirrelpart/sq_config.cpp b/ksquirrel/ksquirrelpart/sq_config.cpp
index 8c16ce5..ea0fc4b 100644
--- a/ksquirrel/ksquirrelpart/sq_config.cpp
+++ b/ksquirrel/ksquirrelpart/sq_config.cpp
@@ -27,10 +27,10 @@ SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent)
 {
     m_instance = this;
 
-    kconf = new TDEConfig("ksquirrelrc");
+    tdeconf = new TDEConfig("ksquirrelrc");
 }
 
 SQ_Config::~SQ_Config()
 {
-    delete kconf;
+    delete tdeconf;
 }
diff --git a/ksquirrel/ksquirrelpart/sq_config.h b/ksquirrel/ksquirrelpart/sq_config.h
index eec2f0e..73cf0c4 100644
--- a/ksquirrel/ksquirrelpart/sq_config.h
+++ b/ksquirrel/ksquirrelpart/sq_config.h
@@ -19,7 +19,7 @@
 #define SQ_CONFIG_H
 
 #include <tqobject.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 
@@ -61,76 +61,76 @@ class SQ_Config : public TQObject
         void writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false );
 
     private:
-        TDEConfig *kconf;
+        TDEConfig *tdeconf;
         static SQ_Config *m_instance;
 };
 
 inline
-void SQ_Config::sync() { kconf->sync(); }
+void SQ_Config::sync() { tdeconf->sync(); }
 
 inline
-void SQ_Config::setGroup(const TQString &group) { kconf->setGroup(group) ; }
+void SQ_Config::setGroup(const TQString &group) { tdeconf->setGroup(group) ; }
 
 inline
-bool SQ_Config::hasGroup(const TQString &group) const { return kconf->hasGroup(group) ; }
+bool SQ_Config::hasGroup(const TQString &group) const { return tdeconf->hasGroup(group) ; }
 
 inline
-bool SQ_Config::deleteGroup(const TQString& group, bool bDeep, bool bGlobal) { return kconf->deleteGroup(group, bDeep, bGlobal) ; }
+bool SQ_Config::deleteGroup(const TQString& group, bool bDeep, bool bGlobal) { return tdeconf->deleteGroup(group, bDeep, bGlobal) ; }
 
 inline
-TQString SQ_Config::readEntry(const TQString& pKey,  const TQString& aDefault) const { return kconf->readEntry(pKey,  aDefault) ; }
+TQString SQ_Config::readEntry(const TQString& pKey,  const TQString& aDefault) const { return tdeconf->readEntry(pKey,  aDefault) ; }
 
 inline
-TQStringList SQ_Config::readListEntry(const TQString& pKey, char sep) const { return kconf->readListEntry(pKey, sep) ; }
+TQStringList SQ_Config::readListEntry(const TQString& pKey, char sep) const { return tdeconf->readListEntry(pKey, sep) ; }
 
 inline
-int SQ_Config::readNumEntry(const TQString& pKey, int nDefault) const { return kconf->readNumEntry(pKey, nDefault) ; }
+int SQ_Config::readNumEntry(const TQString& pKey, int nDefault) const { return tdeconf->readNumEntry(pKey, nDefault) ; }
 
 inline
-bool SQ_Config::readBoolEntry(const TQString& pKey, bool bDefault) const { return kconf->readBoolEntry(pKey, bDefault ) ; }
+bool SQ_Config::readBoolEntry(const TQString& pKey, bool bDefault) const { return tdeconf->readBoolEntry(pKey, bDefault ) ; }
 
 inline
-TQRect SQ_Config::readRectEntry(const TQString& pKey, const TQRect* pDefault) const { return kconf->readRectEntry(pKey, pDefault) ; }
+TQRect SQ_Config::readRectEntry(const TQString& pKey, const TQRect* pDefault) const { return tdeconf->readRectEntry(pKey, pDefault) ; }
 
 inline
-TQPoint SQ_Config::readPointEntry(const TQString& pKey, const TQPoint* pDefault) const { return kconf->readPointEntry(pKey, pDefault) ; }
+TQPoint SQ_Config::readPointEntry(const TQString& pKey, const TQPoint* pDefault) const { return tdeconf->readPointEntry(pKey, pDefault) ; }
 
 inline
-TQSize SQ_Config::readSizeEntry(const TQString& pKey, const TQSize* pDefault) const { return kconf->readSizeEntry(pKey, pDefault) ; }
+TQSize SQ_Config::readSizeEntry(const TQString& pKey, const TQSize* pDefault) const { return tdeconf->readSizeEntry(pKey, pDefault) ; }
 
 inline
-double SQ_Config::readDoubleNumEntry(const TQString& pKey, double nDefault) const { return kconf->readDoubleNumEntry(pKey, nDefault); }
+double SQ_Config::readDoubleNumEntry(const TQString& pKey, double nDefault) const { return tdeconf->readDoubleNumEntry(pKey, nDefault); }
 
 inline
-TQValueList<int> SQ_Config::readIntListEntry( const TQString& pKey ) const { return kconf->readIntListEntry(pKey); }
+TQValueList<int> SQ_Config::readIntListEntry( const TQString& pKey ) const { return tdeconf->readIntListEntry(pKey); }
 
 /**********************************************/
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQString& pValue, bool bPersistent, bool bGlobal, bool bNLS) { kconf->writeEntry( pKey, pValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQString& pValue, bool bPersistent, bool bGlobal, bool bNLS) { tdeconf->writeEntry( pKey, pValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQStringList &rValue, char sep, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, rValue, sep, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQStringList &rValue, char sep, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, rValue, sep, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, int nValue, bool bPersistent, bool bGlobal,  bool bNLS ) { kconf->writeEntry(pKey, nValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, int nValue, bool bPersistent, bool bGlobal,  bool bNLS ) { tdeconf->writeEntry(pKey, nValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, bool bValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, bValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, bool bValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, bValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQRect& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQRect& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQPoint& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQPoint& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQSize& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey,rValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQSize& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey,rValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry( const TQString& pKey, double nValue, bool bPersistent, bool bGlobal, char format, int precision, bool bNLS) { kconf->writeEntry(pKey, nValue, bPersistent, bGlobal, format, precision, bNLS); }
+void SQ_Config::writeEntry( const TQString& pKey, double nValue, bool bPersistent, bool bGlobal, char format, int precision, bool bNLS) { tdeconf->writeEntry(pKey, nValue, bPersistent, bGlobal, format, precision, bNLS); }
 
 inline
-void SQ_Config::writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent, bool bGlobal, bool bNLS) { kconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS); }
+void SQ_Config::writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent, bool bGlobal, bool bNLS) { tdeconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS); }
 
 #endif
diff --git a/ksquirrel/ksquirrelpart/sq_diroperator.h b/ksquirrel/ksquirrelpart/sq_diroperator.h
index 66a31b5..a882e56 100644
--- a/ksquirrel/ksquirrelpart/sq_diroperator.h
+++ b/ksquirrel/ksquirrelpart/sq_diroperator.h
@@ -18,7 +18,7 @@
 #ifndef SQ_DIROPERATOR_H
 #define SQ_DIROPERATOR_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqobject.h>
 
diff --git a/ksquirrel/ksquirrelpart/sq_downloader.cpp b/ksquirrel/ksquirrelpart/sq_downloader.cpp
index a201ab6..83d62ce 100644
--- a/ksquirrel/ksquirrelpart/sq_downloader.cpp
+++ b/ksquirrel/ksquirrelpart/sq_downloader.cpp
@@ -17,8 +17,8 @@
 
 #include <tqfile.h>
 
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 #include <ktempfile.h>
 
 #include "sq_libraryhandler.h"
diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.h b/ksquirrel/ksquirrelpart/sq_externaltool.h
index 83f739c..3093313 100644
--- a/ksquirrel/ksquirrelpart/sq_externaltool.h
+++ b/ksquirrel/ksquirrelpart/sq_externaltool.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqvaluevector.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class SQ_PopupMenu;
 
diff --git a/ksquirrel/ksquirrelpart/sq_filedialog.cpp b/ksquirrel/ksquirrelpart/sq_filedialog.cpp
index 3b883b5..5bfccdb 100644
--- a/ksquirrel/ksquirrelpart/sq_filedialog.cpp
+++ b/ksquirrel/ksquirrelpart/sq_filedialog.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 
 #include "sq_filedialog.h"
 
diff --git a/ksquirrel/ksquirrelpart/sq_filedialog.h b/ksquirrel/ksquirrelpart/sq_filedialog.h
index 6286c1b..7fe79cb 100644
--- a/ksquirrel/ksquirrelpart/sq_filedialog.h
+++ b/ksquirrel/ksquirrelpart/sq_filedialog.h
@@ -18,7 +18,7 @@
 #ifndef SQ_FILEDIALOG_H
 #define SQ_FILEDIALOG_H
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 /**
   *@author Baryshev Dmitry
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index e22a7fc..527df5f 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -34,13 +34,13 @@
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstringhandler.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ktempfile.h>
 #include <twin.h>
 #include <ktabbar.h>
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 1f0ef29..61651c1 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -36,7 +36,7 @@
 #include <kcursor.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kprinter.h>
 
 #include <algorithm>
diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h b/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
index c5ffc3d..643b0a5 100644
--- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
+++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui.h
@@ -113,36 +113,36 @@ void SQ_ImageFilter::init()
 
 void SQ_ImageFilter::slotStartFiltering()
 {
-    SQ_Config *kconf = SQ_Config::instance();
-
-    kconf->setGroup("Image edit options");
-    kconf->writeEntry("filter_swapRGB", buttonGroupSwapRGB->selectedId());
-    kconf->writeEntry("filter_blend_color", pushBlendColor->color().name());
-    kconf->writeEntry("filter_blend_opacity", blendOpacity->value());
-    kconf->writeEntry("filter_fade_color", fadeColor->color().name());
-    kconf->writeEntry("filter_fade_value", fadeValue->value());
-    kconf->writeEntry("filter_desaturate_value", desaturateValue->value());
-    kconf->writeEntry("filter_threshold_value", thresholdValue->value());
-    kconf->writeEntry("filter_threshold_redeye", thresholdRE->value());
-    kconf->writeEntry("filter_solarize_value", solarizeValue->value());
-    kconf->writeEntry("filter_spread_value", spreadValue->value());
-    kconf->writeEntry("filter_swirl_value", swirlAngle->value());
-    kconf->writeEntry("filter_noise", buttonGroupNoise->selectedId());
-    kconf->writeEntry("filter_flatten_color1", flattenColor1->color().name());
-    kconf->writeEntry("filter_flatten_color2", flattenColor2->color().name());
-    kconf->writeEntry("filter_shade_azim", shadeAzim->value());
-    kconf->writeEntry("filter_shade_elev", shadeElev->value());
-    kconf->writeEntry("filter_shade_color", shadeColor->isChecked());
-    kconf->writeEntry("filter_blur_radius", blurRadius->value());
-    kconf->writeEntry("filter_blur_sigma", blurSigma->value());
-    kconf->writeEntry("filter_implode_factor", implodeFactor->value());
-    kconf->writeEntry("filter_egde_radius", edgeRadius->value());
-    kconf->writeEntry("filter_emboss_radius", embossRadius->value());
-    kconf->writeEntry("filter_emboss_sigma", embossSigma->value());
-    kconf->writeEntry("filter_sharpen_radius", sharpenRadius->value());
-    kconf->writeEntry("filter_sharpen_sigma", sharpenSigma->value());
-    kconf->writeEntry("filter_oil_radius", oilRadius->value());
-    kconf->writeEntry("filter_filter", listMain->currentItem());
+    SQ_Config *tdeconf = SQ_Config::instance();
+
+    tdeconf->setGroup("Image edit options");
+    tdeconf->writeEntry("filter_swapRGB", buttonGroupSwapRGB->selectedId());
+    tdeconf->writeEntry("filter_blend_color", pushBlendColor->color().name());
+    tdeconf->writeEntry("filter_blend_opacity", blendOpacity->value());
+    tdeconf->writeEntry("filter_fade_color", fadeColor->color().name());
+    tdeconf->writeEntry("filter_fade_value", fadeValue->value());
+    tdeconf->writeEntry("filter_desaturate_value", desaturateValue->value());
+    tdeconf->writeEntry("filter_threshold_value", thresholdValue->value());
+    tdeconf->writeEntry("filter_threshold_redeye", thresholdRE->value());
+    tdeconf->writeEntry("filter_solarize_value", solarizeValue->value());
+    tdeconf->writeEntry("filter_spread_value", spreadValue->value());
+    tdeconf->writeEntry("filter_swirl_value", swirlAngle->value());
+    tdeconf->writeEntry("filter_noise", buttonGroupNoise->selectedId());
+    tdeconf->writeEntry("filter_flatten_color1", flattenColor1->color().name());
+    tdeconf->writeEntry("filter_flatten_color2", flattenColor2->color().name());
+    tdeconf->writeEntry("filter_shade_azim", shadeAzim->value());
+    tdeconf->writeEntry("filter_shade_elev", shadeElev->value());
+    tdeconf->writeEntry("filter_shade_color", shadeColor->isChecked());
+    tdeconf->writeEntry("filter_blur_radius", blurRadius->value());
+    tdeconf->writeEntry("filter_blur_sigma", blurSigma->value());
+    tdeconf->writeEntry("filter_implode_factor", implodeFactor->value());
+    tdeconf->writeEntry("filter_egde_radius", edgeRadius->value());
+    tdeconf->writeEntry("filter_emboss_radius", embossRadius->value());
+    tdeconf->writeEntry("filter_emboss_sigma", embossSigma->value());
+    tdeconf->writeEntry("filter_sharpen_radius", sharpenRadius->value());
+    tdeconf->writeEntry("filter_sharpen_sigma", sharpenSigma->value());
+    tdeconf->writeEntry("filter_oil_radius", oilRadius->value());
+    tdeconf->writeEntry("filter_filter", listMain->currentItem());
 
     SQ_ImageFilterOptions opt;
  
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
index c9e3e99..8156853 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
@@ -917,11 +917,11 @@
     <include location="global" impldecl="in declaration">tqpair.h</include>
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="global" impldecl="in declaration">kurl.h</include>
-    <include location="global" impldecl="in declaration">kio/job.h</include>
-    <include location="global" impldecl="in declaration">kfileitem.h</include>
+    <include location="global" impldecl="in declaration">tdeio/job.h</include>
+    <include location="global" impldecl="in declaration">tdefileitem.h</include>
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
-    <include location="global" impldecl="in implementation">kio/global.h</include>
+    <include location="global" impldecl="in implementation">tdeio/global.h</include>
     <include location="global" impldecl="in implementation">kpopupmenu.h</include>
     <include location="global" impldecl="in implementation">kstdaction.h</include>
     <include location="global" impldecl="in implementation">kaction.h</include>
diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp
index 4850c84..e2fc206 100644
--- a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp
+++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp
@@ -27,7 +27,7 @@
 
 #include <kstringhandler.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
@@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent)
 
     kdDebug() << "+SQ_LibraryHandler" << endl;
 
-    kconf = new TDEConfig("ksquirrel-codec-settings");
+    tdeconf = new TDEConfig("ksquirrel-codec-settings");
 
     load();
 }
@@ -62,7 +62,7 @@ SQ_LibraryHandler::~SQ_LibraryHandler()
 {
     clear();
 
-    delete kconf;
+    delete tdeconf;
 
     kdDebug() << "-SQ_LibraryHandler" << endl;
 }
@@ -417,7 +417,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
     if(lib->config.isEmpty())
         return;
 
-    kconf->setGroup(lib->quickinfo);
+    tdeconf->setGroup(lib->quickinfo);
 
     fmt_settings::iterator itEnd = lib->settings.end();
 
@@ -430,22 +430,22 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
         if((*it).second.type == settings_value::v_bool) // boolean
         {
            k.prepend("b");
-           kconf->writeEntry(k, (*it).second.bVal);
+           tdeconf->writeEntry(k, (*it).second.bVal);
         }
         else if((*it).second.type == settings_value::v_int) // integer
         {
             k.prepend("i");
-            kconf->writeEntry(k, (*it).second.iVal);
+            tdeconf->writeEntry(k, (*it).second.iVal);
         }
         else if((*it).second.type == settings_value::v_double) // double
          {
              k.prepend("d");
-             kconf->writeEntry(k, (*it).second.dVal);
+             tdeconf->writeEntry(k, (*it).second.dVal);
          }
         else // string
         {
             k.prepend("s");
-            kconf->writeEntry(k, (*it).second.sVal);
+            tdeconf->writeEntry(k, (*it).second.sVal);
         }
     }
 }
@@ -456,7 +456,7 @@ void SQ_LibraryHandler::readSettings(SQ_LIBRARY *lib)
     if(lib->config.isEmpty())
         return;
 
-    TQMap<TQString, TQString> map = kconf->entryMap(lib->quickinfo);
+    TQMap<TQString, TQString> map = tdeconf->entryMap(lib->quickinfo);
 
     if(!map.size())
     {
@@ -573,5 +573,5 @@ void SQ_LibraryHandler::sync()
     for(iterator it = begin();it != itEnd;++it)
         writeSettings(&(*it));
 
-    kconf->sync();
+    tdeconf->sync();
 }
diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.h b/ksquirrel/ksquirrelpart/sq_libraryhandler.h
index 0607a3f..8a3b25d 100644
--- a/ksquirrel/ksquirrelpart/sq_libraryhandler.h
+++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.h
@@ -120,7 +120,7 @@ class SQ_LibraryHandler : public TQObject, public TQValueVector<SQ_LIBRARY>
         void readSettings(SQ_LIBRARY *lib);
 
     private:
-        TDEConfig *kconf;
+        TDEConfig *tdeconf;
 
         static SQ_LibraryHandler *m_instance;
 };
diff --git a/ksquirrel/main.cpp b/ksquirrel/main.cpp
index c344c36..0115eba 100644
--- a/ksquirrel/main.cpp
+++ b/ksquirrel/main.cpp
@@ -23,7 +23,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp
index 86eef3d..fc88a39 100644
--- a/ksquirrel/sidebar/sq_categoriesview.cpp
+++ b/ksquirrel/sidebar/sq_categoriesview.cpp
@@ -22,16 +22,16 @@
 #include <tqfile.h>
 #include <tqheader.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ktoolbar.h>
 #include <kicontheme.h>
 #include <klocale.h>
 #include <kmimetype.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kpropertiesdialog.h>
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 #include <kmessagebox.h>
 
 #include "ksquirrel.h"
diff --git a/ksquirrel/sidebar/sq_categoriesview.h b/ksquirrel/sidebar/sq_categoriesview.h
index b70c486..45597e2 100644
--- a/ksquirrel/sidebar/sq_categoriesview.h
+++ b/ksquirrel/sidebar/sq_categoriesview.h
@@ -20,8 +20,8 @@
 
 #include <tqvbox.h>
 
-#include <kfiletreeview.h>
-#include <kfiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreebranch.h>
 
 class KToolBar;
 
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
index a8882c8..7c3399b 100644
--- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
+++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqdir.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kprocess.h>
@@ -45,10 +45,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdesktopfile.h>
 #include <kmimetype.h>
 #include <kglobalsettings.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <krun.h>
 #include <konq_operations.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdirwatch.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp
index 392107f..bbf3944 100644
--- a/ksquirrel/sidebar/sq_directorybasket.cpp
+++ b/ksquirrel/sidebar/sq_directorybasket.cpp
@@ -25,12 +25,12 @@
 #include <klocale.h>
 #include <kurldrag.h>
 #include <kmimetype.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kprogress.h>
 #include <kglobalsettings.h>
 
diff --git a/ksquirrel/sidebar/sq_directorybasket.h b/ksquirrel/sidebar/sq_directorybasket.h
index 4d7b382..b9725a2 100644
--- a/ksquirrel/sidebar/sq_directorybasket.h
+++ b/ksquirrel/sidebar/sq_directorybasket.h
@@ -18,8 +18,8 @@
 #ifndef SQ_DIRECTORYBASKET_H
 #define SQ_DIRECTORYBASKET_H
 
-#include <kfiletreeview.h>
-#include <kfiletreebranch.h>
+#include <tdefiletreeview.h>
+#include <tdefiletreebranch.h>
 
 #include "sq_treeviewmenu.h"
 
diff --git a/ksquirrel/sidebar/sq_imagebasket.cpp b/ksquirrel/sidebar/sq_imagebasket.cpp
index e4f130f..a34e8c3 100644
--- a/ksquirrel/sidebar/sq_imagebasket.cpp
+++ b/ksquirrel/sidebar/sq_imagebasket.cpp
@@ -18,13 +18,13 @@
 #include <tqfile.h>
 
 #include <kmdcodec.h>
-#include <kfileview.h>
+#include <tdefileview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kpopupmenu.h>
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <kpropertiesdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kapplication.h>
 #include <kmimetype.h>
 
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index 5d905dc..743f466 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -24,10 +24,10 @@
 #include <tqpainter.h>
 
 #include <klocale.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kpopupmenu.h>
 #include <kcolordialog.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
 
diff --git a/ksquirrel/sidebar/sq_threaddirlister.cpp b/ksquirrel/sidebar/sq_threaddirlister.cpp
index f8562d3..9ce3c65 100644
--- a/ksquirrel/sidebar/sq_threaddirlister.cpp
+++ b/ksquirrel/sidebar/sq_threaddirlister.cpp
@@ -26,7 +26,7 @@
 #include <tqdatetime.h>
 #include <tqapplication.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "sq_threaddirlister.h"
diff --git a/ksquirrel/sidebar/sq_treeview.h b/ksquirrel/sidebar/sq_treeview.h
index 59b1abc..c0a8667 100644
--- a/ksquirrel/sidebar/sq_treeview.h
+++ b/ksquirrel/sidebar/sq_treeview.h
@@ -20,7 +20,7 @@
 
 #include <tqstringlist.h>
 
-#include <kfiletreeview.h>
+#include <tdefiletreeview.h>
 #include <kurl.h>
 
 class KDirWatch;
diff --git a/ksquirrel/sidebar/sq_treeviewitem.h b/ksquirrel/sidebar/sq_treeviewitem.h
index 7c8419a..c51109c 100644
--- a/ksquirrel/sidebar/sq_treeviewitem.h
+++ b/ksquirrel/sidebar/sq_treeviewitem.h
@@ -18,7 +18,7 @@
 #ifndef SQ_TREEVIEWITEM_H
 #define SQ_TREEVIEWITEM_H
 
-#include <kfiletreeviewitem.h>
+#include <tdefiletreeviewitem.h>
 
 class KFileTreeBranch;
 
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp
index 6f30e2f..b0afd9b 100644
--- a/ksquirrel/sidebar/sq_treeviewmenu.cpp
+++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp
@@ -4,7 +4,7 @@
 
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kpropertiesdialog.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
diff --git a/ksquirrel/sq_archivehandler.cpp b/ksquirrel/sq_archivehandler.cpp
index e934925..84db8b7 100644
--- a/ksquirrel/sq_archivehandler.cpp
+++ b/ksquirrel/sq_archivehandler.cpp
@@ -13,7 +13,7 @@
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kurl.h>
 
@@ -45,7 +45,7 @@ void SQ_ArchiveHandler::fillProtocols()
     }
 
     // search for rar protocol (kio_rar from
-    // http://kde-apps.org/content/show.php/kio_rar?content=17527)
+    // http://kde-apps.org/content/show.php/tdeio_rar?content=17527)
     if(!TDEGlobal::dirs()->findResource("services", "rar.protocol").isEmpty())
     {
         insert("application/x-rar", "rar");
@@ -65,7 +65,7 @@ void SQ_ArchiveHandler::fillProtocols()
         insert("application/x-zip", "zip");
 
     // search for 7zip protocol (kio_p7zip
-    // from http://kde-apps.org/content/show.php/kio_p7zip?content=17829)
+    // from http://kde-apps.org/content/show.php/tdeio_p7zip?content=17829)
     if(!TDEGlobal::dirs()->findResource("services", "p7zip.protocol").isEmpty())
         insert("application/x-7z", "p7zip");
 }
diff --git a/ksquirrel/sq_config.cpp b/ksquirrel/sq_config.cpp
index 8c16ce5..ea0fc4b 100644
--- a/ksquirrel/sq_config.cpp
+++ b/ksquirrel/sq_config.cpp
@@ -27,10 +27,10 @@ SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent)
 {
     m_instance = this;
 
-    kconf = new TDEConfig("ksquirrelrc");
+    tdeconf = new TDEConfig("ksquirrelrc");
 }
 
 SQ_Config::~SQ_Config()
 {
-    delete kconf;
+    delete tdeconf;
 }
diff --git a/ksquirrel/sq_config.h b/ksquirrel/sq_config.h
index eec2f0e..73cf0c4 100644
--- a/ksquirrel/sq_config.h
+++ b/ksquirrel/sq_config.h
@@ -19,7 +19,7 @@
 #define SQ_CONFIG_H
 
 #include <tqobject.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 
@@ -61,76 +61,76 @@ class SQ_Config : public TQObject
         void writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false );
 
     private:
-        TDEConfig *kconf;
+        TDEConfig *tdeconf;
         static SQ_Config *m_instance;
 };
 
 inline
-void SQ_Config::sync() { kconf->sync(); }
+void SQ_Config::sync() { tdeconf->sync(); }
 
 inline
-void SQ_Config::setGroup(const TQString &group) { kconf->setGroup(group) ; }
+void SQ_Config::setGroup(const TQString &group) { tdeconf->setGroup(group) ; }
 
 inline
-bool SQ_Config::hasGroup(const TQString &group) const { return kconf->hasGroup(group) ; }
+bool SQ_Config::hasGroup(const TQString &group) const { return tdeconf->hasGroup(group) ; }
 
 inline
-bool SQ_Config::deleteGroup(const TQString& group, bool bDeep, bool bGlobal) { return kconf->deleteGroup(group, bDeep, bGlobal) ; }
+bool SQ_Config::deleteGroup(const TQString& group, bool bDeep, bool bGlobal) { return tdeconf->deleteGroup(group, bDeep, bGlobal) ; }
 
 inline
-TQString SQ_Config::readEntry(const TQString& pKey,  const TQString& aDefault) const { return kconf->readEntry(pKey,  aDefault) ; }
+TQString SQ_Config::readEntry(const TQString& pKey,  const TQString& aDefault) const { return tdeconf->readEntry(pKey,  aDefault) ; }
 
 inline
-TQStringList SQ_Config::readListEntry(const TQString& pKey, char sep) const { return kconf->readListEntry(pKey, sep) ; }
+TQStringList SQ_Config::readListEntry(const TQString& pKey, char sep) const { return tdeconf->readListEntry(pKey, sep) ; }
 
 inline
-int SQ_Config::readNumEntry(const TQString& pKey, int nDefault) const { return kconf->readNumEntry(pKey, nDefault) ; }
+int SQ_Config::readNumEntry(const TQString& pKey, int nDefault) const { return tdeconf->readNumEntry(pKey, nDefault) ; }
 
 inline
-bool SQ_Config::readBoolEntry(const TQString& pKey, bool bDefault) const { return kconf->readBoolEntry(pKey, bDefault ) ; }
+bool SQ_Config::readBoolEntry(const TQString& pKey, bool bDefault) const { return tdeconf->readBoolEntry(pKey, bDefault ) ; }
 
 inline
-TQRect SQ_Config::readRectEntry(const TQString& pKey, const TQRect* pDefault) const { return kconf->readRectEntry(pKey, pDefault) ; }
+TQRect SQ_Config::readRectEntry(const TQString& pKey, const TQRect* pDefault) const { return tdeconf->readRectEntry(pKey, pDefault) ; }
 
 inline
-TQPoint SQ_Config::readPointEntry(const TQString& pKey, const TQPoint* pDefault) const { return kconf->readPointEntry(pKey, pDefault) ; }
+TQPoint SQ_Config::readPointEntry(const TQString& pKey, const TQPoint* pDefault) const { return tdeconf->readPointEntry(pKey, pDefault) ; }
 
 inline
-TQSize SQ_Config::readSizeEntry(const TQString& pKey, const TQSize* pDefault) const { return kconf->readSizeEntry(pKey, pDefault) ; }
+TQSize SQ_Config::readSizeEntry(const TQString& pKey, const TQSize* pDefault) const { return tdeconf->readSizeEntry(pKey, pDefault) ; }
 
 inline
-double SQ_Config::readDoubleNumEntry(const TQString& pKey, double nDefault) const { return kconf->readDoubleNumEntry(pKey, nDefault); }
+double SQ_Config::readDoubleNumEntry(const TQString& pKey, double nDefault) const { return tdeconf->readDoubleNumEntry(pKey, nDefault); }
 
 inline
-TQValueList<int> SQ_Config::readIntListEntry( const TQString& pKey ) const { return kconf->readIntListEntry(pKey); }
+TQValueList<int> SQ_Config::readIntListEntry( const TQString& pKey ) const { return tdeconf->readIntListEntry(pKey); }
 
 /**********************************************/
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQString& pValue, bool bPersistent, bool bGlobal, bool bNLS) { kconf->writeEntry( pKey, pValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQString& pValue, bool bPersistent, bool bGlobal, bool bNLS) { tdeconf->writeEntry( pKey, pValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQStringList &rValue, char sep, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, rValue, sep, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQStringList &rValue, char sep, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, rValue, sep, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, int nValue, bool bPersistent, bool bGlobal,  bool bNLS ) { kconf->writeEntry(pKey, nValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, int nValue, bool bPersistent, bool bGlobal,  bool bNLS ) { tdeconf->writeEntry(pKey, nValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, bool bValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, bValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, bool bValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, bValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQRect& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQRect& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQPoint& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQPoint& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry(const TQString& pKey, const TQSize& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { kconf->writeEntry(pKey,rValue, bPersistent, bGlobal, bNLS ) ; }
+void SQ_Config::writeEntry(const TQString& pKey, const TQSize& rValue, bool bPersistent, bool bGlobal, bool bNLS ) { tdeconf->writeEntry(pKey,rValue, bPersistent, bGlobal, bNLS ) ; }
 
 inline
-void SQ_Config::writeEntry( const TQString& pKey, double nValue, bool bPersistent, bool bGlobal, char format, int precision, bool bNLS) { kconf->writeEntry(pKey, nValue, bPersistent, bGlobal, format, precision, bNLS); }
+void SQ_Config::writeEntry( const TQString& pKey, double nValue, bool bPersistent, bool bGlobal, char format, int precision, bool bNLS) { tdeconf->writeEntry(pKey, nValue, bPersistent, bGlobal, format, precision, bNLS); }
 
 inline
-void SQ_Config::writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent, bool bGlobal, bool bNLS) { kconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS); }
+void SQ_Config::writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent, bool bGlobal, bool bNLS) { tdeconf->writeEntry(pKey, rValue, bPersistent, bGlobal, bNLS); }
 
 #endif
diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp
index c08cc84..8837c13 100644
--- a/ksquirrel/sq_diroperator.cpp
+++ b/ksquirrel/sq_diroperator.cpp
@@ -616,7 +616,7 @@ void SQ_DirOperator::slotSetThumbSize(const TQString &size)
  *  Smart update. Store all file items, reset view,
  *  and transfer all items back.
  *
- *  Taken from tdelibs-3.2.3/kio/kfile/kdiroperator.cpp
+ *  Taken from tdelibs-3.2.3/tdeio/tdefile/kdiroperator.cpp
  */
 void SQ_DirOperator::smartUpdate()
 {
diff --git a/ksquirrel/sq_downloader.cpp b/ksquirrel/sq_downloader.cpp
index a201ab6..83d62ce 100644
--- a/ksquirrel/sq_downloader.cpp
+++ b/ksquirrel/sq_downloader.cpp
@@ -17,8 +17,8 @@
 
 #include <tqfile.h>
 
-#include <kio/job.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdefileitem.h>
 #include <ktempfile.h>
 
 #include "sq_libraryhandler.h"
diff --git a/ksquirrel/sq_dragprovider.h b/ksquirrel/sq_dragprovider.h
index 7607d09..5d9d08f 100644
--- a/ksquirrel/sq_dragprovider.h
+++ b/ksquirrel/sq_dragprovider.h
@@ -20,7 +20,7 @@
 
 #include <tqobject.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class TQWidget;
 
diff --git a/ksquirrel/sq_externaltool.h b/ksquirrel/sq_externaltool.h
index 83f739c..3093313 100644
--- a/ksquirrel/sq_externaltool.h
+++ b/ksquirrel/sq_externaltool.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqvaluevector.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class SQ_PopupMenu;
 
diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp
index a7db28c..1fbb8c6 100644
--- a/ksquirrel/sq_filedetailview.cpp
+++ b/ksquirrel/sq_filedetailview.cpp
@@ -23,7 +23,7 @@
 #include <tqcursor.h>
 
 #include <kpopupmenu.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <konq_filetip.h>
 
diff --git a/ksquirrel/sq_filedetailview.h b/ksquirrel/sq_filedetailview.h
index b34625f..276fbb1 100644
--- a/ksquirrel/sq_filedetailview.h
+++ b/ksquirrel/sq_filedetailview.h
@@ -18,7 +18,7 @@
 #ifndef SQ_FILEDETAILVIEW_H
 #define SQ_FILEDETAILVIEW_H
 
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 
 class KonqFileTip;
 
diff --git a/ksquirrel/sq_filedialog.cpp b/ksquirrel/sq_filedialog.cpp
index 3b883b5..5bfccdb 100644
--- a/ksquirrel/sq_filedialog.cpp
+++ b/ksquirrel/sq_filedialog.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 
 #include "sq_filedialog.h"
 
diff --git a/ksquirrel/sq_filedialog.h b/ksquirrel/sq_filedialog.h
index 6286c1b..7fe79cb 100644
--- a/ksquirrel/sq_filedialog.h
+++ b/ksquirrel/sq_filedialog.h
@@ -18,7 +18,7 @@
 #ifndef SQ_FILEDIALOG_H
 #define SQ_FILEDIALOG_H
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 /**
   *@author Baryshev Dmitry
diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/ksquirrel/sq_fileiconviewbase.cpp
index 632709e..1aad6b7 100644
--- a/ksquirrel/sq_fileiconviewbase.cpp
+++ b/ksquirrel/sq_fileiconviewbase.cpp
@@ -24,8 +24,8 @@
 
 #include <kglobalsettings.h>
 #include <kaction.h>
-#include <kfileitem.h>
-#include <kio/job.h>
+#include <tdefileitem.h>
+#include <tdeio/job.h>
 #include <konq_filetip.h>
 
 #include "ksquirrel.h"
diff --git a/ksquirrel/sq_fileiconviewbase.h b/ksquirrel/sq_fileiconviewbase.h
index 9433bca..19252ef 100644
--- a/ksquirrel/sq_fileiconviewbase.h
+++ b/ksquirrel/sq_fileiconviewbase.h
@@ -18,7 +18,7 @@
 #ifndef SQ_FILEICONVIEWBASE_H
 #define SQ_FILEICONVIEWBASE_H
 
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 
 class KonqFileTip;
 
diff --git a/ksquirrel/sq_filethumbviewitem.h b/ksquirrel/sq_filethumbviewitem.h
index 3a8edad..adddb67 100644
--- a/ksquirrel/sq_filethumbviewitem.h
+++ b/ksquirrel/sq_filethumbviewitem.h
@@ -20,7 +20,7 @@
 
 #include <tqpixmap.h>
 
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 
 /*
  *  SQ_FileThumbViewItem represents a thumbnail item in SQ_FileThumbView.
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index e22a7fc..527df5f 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -34,13 +34,13 @@
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstringhandler.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ktempfile.h>
 #include <twin.h>
 #include <ktabbar.h>
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 1f0ef29..61651c1 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -36,7 +36,7 @@
 #include <kcursor.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kprinter.h>
 
 #include <algorithm>
diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui
index 699dae4..43ce70d 100644
--- a/ksquirrel/sq_imageproperties.ui
+++ b/ksquirrel/sq_imageproperties.ui
@@ -917,11 +917,11 @@
     <include location="global" impldecl="in declaration">tqpair.h</include>
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="global" impldecl="in declaration">kurl.h</include>
-    <include location="global" impldecl="in declaration">kio/job.h</include>
-    <include location="global" impldecl="in declaration">kfileitem.h</include>
+    <include location="global" impldecl="in declaration">tdeio/job.h</include>
+    <include location="global" impldecl="in declaration">tdefileitem.h</include>
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
-    <include location="global" impldecl="in implementation">kio/global.h</include>
+    <include location="global" impldecl="in implementation">tdeio/global.h</include>
     <include location="global" impldecl="in implementation">kpopupmenu.h</include>
     <include location="global" impldecl="in implementation">kstdaction.h</include>
     <include location="global" impldecl="in implementation">kaction.h</include>
diff --git a/ksquirrel/sq_kipiinterface.cpp b/ksquirrel/sq_kipiinterface.cpp
index 12ec92b..edb1185 100644
--- a/ksquirrel/sq_kipiinterface.cpp
+++ b/ksquirrel/sq_kipiinterface.cpp
@@ -19,11 +19,11 @@
 
 #ifdef SQ_HAVE_KIPI
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kfileview.h>
-#include <kfileiconview.h>
+#include <tdefileview.h>
+#include <tdefileiconview.h>
 #include <kdirlister.h>
 
 #include <libkipi/imagecollectionshared.h>
diff --git a/ksquirrel/sq_libraryhandler.cpp b/ksquirrel/sq_libraryhandler.cpp
index 4850c84..e2fc206 100644
--- a/ksquirrel/sq_libraryhandler.cpp
+++ b/ksquirrel/sq_libraryhandler.cpp
@@ -27,7 +27,7 @@
 
 #include <kstringhandler.h>
 #include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kurl.h>
@@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent)
 
     kdDebug() << "+SQ_LibraryHandler" << endl;
 
-    kconf = new TDEConfig("ksquirrel-codec-settings");
+    tdeconf = new TDEConfig("ksquirrel-codec-settings");
 
     load();
 }
@@ -62,7 +62,7 @@ SQ_LibraryHandler::~SQ_LibraryHandler()
 {
     clear();
 
-    delete kconf;
+    delete tdeconf;
 
     kdDebug() << "-SQ_LibraryHandler" << endl;
 }
@@ -417,7 +417,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
     if(lib->config.isEmpty())
         return;
 
-    kconf->setGroup(lib->quickinfo);
+    tdeconf->setGroup(lib->quickinfo);
 
     fmt_settings::iterator itEnd = lib->settings.end();
 
@@ -430,22 +430,22 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
         if((*it).second.type == settings_value::v_bool) // boolean
         {
            k.prepend("b");
-           kconf->writeEntry(k, (*it).second.bVal);
+           tdeconf->writeEntry(k, (*it).second.bVal);
         }
         else if((*it).second.type == settings_value::v_int) // integer
         {
             k.prepend("i");
-            kconf->writeEntry(k, (*it).second.iVal);
+            tdeconf->writeEntry(k, (*it).second.iVal);
         }
         else if((*it).second.type == settings_value::v_double) // double
          {
              k.prepend("d");
-             kconf->writeEntry(k, (*it).second.dVal);
+             tdeconf->writeEntry(k, (*it).second.dVal);
          }
         else // string
         {
             k.prepend("s");
-            kconf->writeEntry(k, (*it).second.sVal);
+            tdeconf->writeEntry(k, (*it).second.sVal);
         }
     }
 }
@@ -456,7 +456,7 @@ void SQ_LibraryHandler::readSettings(SQ_LIBRARY *lib)
     if(lib->config.isEmpty())
         return;
 
-    TQMap<TQString, TQString> map = kconf->entryMap(lib->quickinfo);
+    TQMap<TQString, TQString> map = tdeconf->entryMap(lib->quickinfo);
 
     if(!map.size())
     {
@@ -573,5 +573,5 @@ void SQ_LibraryHandler::sync()
     for(iterator it = begin();it != itEnd;++it)
         writeSettings(&(*it));
 
-    kconf->sync();
+    tdeconf->sync();
 }
diff --git a/ksquirrel/sq_libraryhandler.h b/ksquirrel/sq_libraryhandler.h
index 0607a3f..8a3b25d 100644
--- a/ksquirrel/sq_libraryhandler.h
+++ b/ksquirrel/sq_libraryhandler.h
@@ -120,7 +120,7 @@ class SQ_LibraryHandler : public TQObject, public TQValueVector<SQ_LIBRARY>
         void readSettings(SQ_LIBRARY *lib);
 
     private:
-        TDEConfig *kconf;
+        TDEConfig *tdeconf;
 
         static SQ_LibraryHandler *m_instance;
 };
diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/ksquirrel/sq_navigatordropmenu.cpp
index 89d767d..c8694ad 100644
--- a/ksquirrel/sq_navigatordropmenu.cpp
+++ b/ksquirrel/sq_navigatordropmenu.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 #include <kaction.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstringhandler.h>
 
 #include "ksquirrel.h"
diff --git a/ksquirrel/sq_options.ui.h b/ksquirrel/sq_options.ui.h
index 5f3d2c2..81062fe 100644
--- a/ksquirrel/sq_options.ui.h
+++ b/ksquirrel/sq_options.ui.h
@@ -24,126 +24,126 @@ void SQ_Options::init()
 {
     buttonOk->setIconSet(SQ_IconLoader::instance()->loadIcon("ok", KIcon::Desktop, KIcon::SizeSmall));
     int tp;
-    SQ_Config *kconf = SQ_Config::instance();
+    SQ_Config *tdeconf = SQ_Config::instance();
     TQColor color;
 
     pagesNumber->setRange(1, 1000, 1, true);
 
-    kconf->setGroup("Main");
+    tdeconf->setGroup("Main");
 
-    checkKIPIDemand->setChecked(kconf->readBoolEntry("kipi_ondemand", true));
-    tp = kconf->readNumEntry("applyto", SQ_CodecSettings::Both);
+    checkKIPIDemand->setChecked(tdeconf->readBoolEntry("kipi_ondemand", true));
+    tp = tdeconf->readNumEntry("applyto", SQ_CodecSettings::Both);
     buttonGroupCS->setButton(tp);
-    checkMinimize->setChecked(kconf->readBoolEntry("minimize to tray", false));
-    checkSync->setChecked(kconf->readBoolEntry("sync", false));
-    checkSplash->setChecked(kconf->readBoolEntry("splash", true));
-    checkAnime->setChecked(kconf->readBoolEntry("anime_dont", false));
-    checkTreat->setChecked(kconf->readBoolEntry("treat", true));
+    checkMinimize->setChecked(tdeconf->readBoolEntry("minimize to tray", false));
+    checkSync->setChecked(tdeconf->readBoolEntry("sync", false));
+    checkSplash->setChecked(tdeconf->readBoolEntry("splash", true));
+    checkAnime->setChecked(tdeconf->readBoolEntry("anime_dont", false));
+    checkTreat->setChecked(tdeconf->readBoolEntry("treat", true));
 
     KFile::Mode mode = static_cast<KFile::Mode>(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
 
-    kconf->setGroup("Fileview");
+    tdeconf->setGroup("Fileview");
 
-    tp = kconf->readNumEntry("sync type", 0);
+    tp = tdeconf->readNumEntry("sync type", 0);
     buttonGroupSync->setButton(tp);
-    tp = kconf->readNumEntry("set path", 0);
+    tp = tdeconf->readNumEntry("set path", 0);
     buttonGroupSetPath->setButton(tp);
-    kURLReqOpenCustom->setURL(kconf->readEntry("custom directory", "/"));
+    kURLReqOpenCustom->setURL(tdeconf->readEntry("custom directory", "/"));
 
     spinLines->setRange(1, 20, 1, true);
-    spinLines->setValue(kconf->readNumEntry("tooltips_lines", 6));
-    checkTooltipPreview->setChecked(kconf->readBoolEntry("tooltips_preview", false));
-    checkTooltips->setChecked(kconf->readBoolEntry("tooltips", false));
-    checkInactive->setChecked(kconf->readBoolEntry("tooltips_inactive", true));
-    checkSaveHistory->setChecked(kconf->readBoolEntry("history", true));
-    checkRunUnknown->setChecked(kconf->readBoolEntry("run unknown", false));
-    checkSupportAr->setChecked(kconf->readBoolEntry("archives", true));
-    checkJumpFirst->setChecked(kconf->readBoolEntry("tofirst", true));
-    checkDisableDirs->setChecked(kconf->readBoolEntry("disable_dirs", false));
-    checkCalc->setChecked(kconf->readBoolEntry("calculate", true));
-    checkDrag->setChecked(kconf->readBoolEntry("drag", true));
+    spinLines->setValue(tdeconf->readNumEntry("tooltips_lines", 6));
+    checkTooltipPreview->setChecked(tdeconf->readBoolEntry("tooltips_preview", false));
+    checkTooltips->setChecked(tdeconf->readBoolEntry("tooltips", false));
+    checkInactive->setChecked(tdeconf->readBoolEntry("tooltips_inactive", true));
+    checkSaveHistory->setChecked(tdeconf->readBoolEntry("history", true));
+    checkRunUnknown->setChecked(tdeconf->readBoolEntry("run unknown", false));
+    checkSupportAr->setChecked(tdeconf->readBoolEntry("archives", true));
+    checkJumpFirst->setChecked(tdeconf->readBoolEntry("tofirst", true));
+    checkDisableDirs->setChecked(tdeconf->readBoolEntry("disable_dirs", false));
+    checkCalc->setChecked(tdeconf->readBoolEntry("calculate", true));
+    checkDrag->setChecked(tdeconf->readBoolEntry("drag", true));
 
 // Init GLView page
-    kconf->setGroup("GL view");
+    tdeconf->setGroup("GL view");
 
     TQPixmap p1;
-    checkProgress->setChecked(kconf->readBoolEntry("progressiv", true));
-    checkDrawQuads->setChecked(kconf->readBoolEntry("alpha_bkgr", true));
-    checkMarks->setChecked(kconf->readBoolEntry("marks", true));    
+    checkProgress->setChecked(tdeconf->readBoolEntry("progressiv", true));
+    checkDrawQuads->setChecked(tdeconf->readBoolEntry("alpha_bkgr", true));
+    checkMarks->setChecked(tdeconf->readBoolEntry("marks", true));    
 
     // tabs
-    checkTabs->setChecked(kconf->readBoolEntry("tabs", false));    
-    checkTabAsk->setChecked(kconf->readBoolEntry("tabs_ask", false));    
-    checkTabClose->setChecked(kconf->readBoolEntry("tabs_close", true));    
-    checkCloseAll->setChecked(kconf->readBoolEntry("closeall", false));    
+    checkTabs->setChecked(tdeconf->readBoolEntry("tabs", false));    
+    checkTabAsk->setChecked(tdeconf->readBoolEntry("tabs_ask", false));    
+    checkTabClose->setChecked(tdeconf->readBoolEntry("tabs_close", true));    
+    checkCloseAll->setChecked(tdeconf->readBoolEntry("closeall", false));    
 
-    tp = kconf->readNumEntry("double_click", 0);
+    tp = tdeconf->readNumEntry("double_click", 0);
     buttonGroupDC->setButton(tp);
-    tp = kconf->readNumEntry("load_pages", 0);
+    tp = tdeconf->readNumEntry("load_pages", 0);
     buttonGroupPages->setButton(tp);
     pagesNumber->setEnabled(tp == 2);
-    tp = kconf->readNumEntry("load_pages_number", 1);
+    tp = tdeconf->readNumEntry("load_pages_number", 1);
     pagesNumber->setValue(tp);
 
-    tp = kconf->readNumEntry("GL view background type", 1);
+    tp = tdeconf->readNumEntry("GL view background type", 1);
     buttonGroupColor->setButton(tp);
     widgetStack4->raiseWidget(tp);
 
     kColorSystem->setColor(colorGroup().color(TQColorGroup::Base));
 
-    tp = kconf->readNumEntry("zoom limit", 1);
+    tp = tdeconf->readNumEntry("zoom limit", 1);
     buttonGroupZoomLimit->setButton(tp);
-    spinZoomMin->setValue(kconf->readNumEntry("zoom_min", 1));
-    spinZoomMax->setValue(kconf->readNumEntry("zoom_max", 10000));
+    spinZoomMin->setValue(tdeconf->readNumEntry("zoom_min", 1));
+    spinZoomMax->setValue(tdeconf->readNumEntry("zoom_max", 10000));
 
-    custpixmap = kconf->readEntry("GL view custom texture", "");
+    custpixmap = tdeconf->readEntry("GL view custom texture", "");
     kURLReqCustomTexture->setURL(custpixmap);
 
     if(!custpixmap.isEmpty())
         slotValidateCustomTexture();
 
-    tp = kconf->readNumEntry("scroll", 0);
+    tp = tdeconf->readNumEntry("scroll", 0);
     buttonGroupScrolling->setButton(tp);
     sliderAngle->setRange(0, 180, 1, true);
-    sliderAngle->setValue(kconf->readNumEntry("angle", 90));
+    sliderAngle->setValue(tdeconf->readNumEntry("angle", 90));
     spinZoomFactor->setRange(0, 300, 1, true);
-    spinZoomFactor->setValue(kconf->readNumEntry("zoom", 25));
+    spinZoomFactor->setValue(tdeconf->readNumEntry("zoom", 25));
     sliderMove->setRange(1, 50, 1, true);
-    sliderMove->setValue(kconf->readNumEntry("move", 5));
+    sliderMove->setValue(tdeconf->readNumEntry("move", 5));
 
-    color.setNamedColor(kconf->readEntry("GL view background", "#4e4e4e"));
+    color.setNamedColor(tdeconf->readEntry("GL view background", "#4e4e4e"));
     kColorGLbackground->setColor(color);
 
-    kconf->setGroup("Sidebar");
+    tdeconf->setGroup("Sidebar");
 
-    tp = kconf->readNumEntry("recursion_type", 0);
+    tp = tdeconf->readNumEntry("recursion_type", 0);
     buttonGroupRecurs->setButton(tp);
-    checkDevice->setChecked(kconf->readBoolEntry("mount_device", false));
-    checkMountOptions->setChecked(kconf->readBoolEntry("mount_options", false));
-    checkMountFS->setChecked(kconf->readBoolEntry("mount_fstype", true));
-    color.setNamedColor(kconf->readEntry("preview_background", "#4e4e4e"));
+    checkDevice->setChecked(tdeconf->readBoolEntry("mount_device", false));
+    checkMountOptions->setChecked(tdeconf->readBoolEntry("mount_options", false));
+    checkMountFS->setChecked(tdeconf->readBoolEntry("mount_fstype", true));
+    color.setNamedColor(tdeconf->readEntry("preview_background", "#4e4e4e"));
     previewColor->setColor(color);
-    color.setNamedColor(kconf->readEntry("preview_text", "#ffffff"));
+    color.setNamedColor(tdeconf->readEntry("preview_text", "#ffffff"));
     previewTextColor->setColor(color);
-    preview->setChecked(kconf->readBoolEntry("preview", true));
-    checkPreviewText->setChecked(kconf->readBoolEntry("preview_text_enable", true));
-    previewDont->setChecked(kconf->readBoolEntry("preview_dont", true));
+    preview->setChecked(tdeconf->readBoolEntry("preview", true));
+    checkPreviewText->setChecked(tdeconf->readBoolEntry("preview_text_enable", true));
+    previewDont->setChecked(tdeconf->readBoolEntry("preview_dont", true));
     previewDelay->setRange(50, 2000, 50, true);
-    previewDelay->setValue(kconf->readNumEntry("preview_delay", 400));
+    previewDelay->setValue(tdeconf->readNumEntry("preview_delay", 400));
 
-    kconf->setGroup("Thumbnails");
+    tdeconf->setGroup("Thumbnails");
 
     spinCacheSize->setRange(0, 104857, 10, true);
     spinMargin->setRange(0, 20, 1, true);
-    spinMargin->setValue(kconf->readNumEntry("margin", 2));
-    spinCacheSize->setValue(kconf->readNumEntry("cache", 1024*5));
-    checkNoWriteThumbs->setChecked(kconf->readBoolEntry("dont write", false));
-    checkMark->setChecked(kconf->readBoolEntry("mark", false));
-    checkLazy->setChecked(kconf->readBoolEntry("lazy", true));
+    spinMargin->setValue(tdeconf->readNumEntry("margin", 2));
+    spinCacheSize->setValue(tdeconf->readNumEntry("cache", 1024*5));
+    checkNoWriteThumbs->setChecked(tdeconf->readBoolEntry("dont write", false));
+    checkMark->setChecked(tdeconf->readBoolEntry("mark", false));
+    checkLazy->setChecked(tdeconf->readBoolEntry("lazy", true));
     spinLazy->setRange(10, 5000, 100, true);
-    spinLazy->setValue(kconf->readNumEntry("lazy_delay", 500));
+    spinLazy->setValue(tdeconf->readNumEntry("lazy_delay", 500));
     spinRows->setRange(0, 5, 1, true);
-    spinRows->setValue(kconf->readNumEntry("rows", 2));
+    spinRows->setValue(tdeconf->readNumEntry("rows", 2));
 
     new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("display", KIcon::Desktop, KIcon::SizeMedium), i18n("General"));    
     new SQ_IconListItem(listMain, SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, KIcon::SizeMedium), i18n("Filing"));
@@ -169,11 +169,11 @@ void SQ_Options::init()
     kURLReqOpenCustom->setMode(mode);
 
     // restore selection page
-    kconf->setGroup("Main");
-    listMain->setCurrentItem(kconf->readNumEntry("options_last", 0));    
-    tabNav->setCurrentPage(kconf->readNumEntry("options_last_tabNav", 0));
-    tabGL->setCurrentPage(kconf->readNumEntry("options_last_tabGL", 0));
-    tabSidebar->setCurrentPage(kconf->readNumEntry("options_last_tabSidebar", 0));
+    tdeconf->setGroup("Main");
+    listMain->setCurrentItem(tdeconf->readNumEntry("options_last", 0));    
+    tabNav->setCurrentPage(tdeconf->readNumEntry("options_last_tabNav", 0));
+    tabGL->setCurrentPage(tdeconf->readNumEntry("options_last_tabGL", 0));
+    tabSidebar->setCurrentPage(tdeconf->readNumEntry("options_last_tabSidebar", 0));
 
     if(!SQ_HLOptions::instance()->have_mountview)
         tabSidebar->setTabEnabled(tabSidebar->page(1), false);
@@ -189,79 +189,79 @@ int SQ_Options::start()
 	static_cast<KIPI::ConfigWidget *>(kipi)->apply();
 #endif
 
-        SQ_Config *kconf = SQ_Config::instance();
-
-        kconf->setGroup("Fileview");
-        kconf->writeEntry("set path", buttonGroupSetPath->selectedId());
-        kconf->writeEntry("custom directory", kURLReqOpenCustom->url());
-        kconf->writeEntry("sync type", buttonGroupSync->selectedId());
-        kconf->writeEntry("history", checkSaveHistory->isChecked());
-        kconf->writeEntry("run unknown", checkRunUnknown->isChecked());
-        kconf->writeEntry("archives", checkSupportAr->isChecked());
-        kconf->writeEntry("tofirst", checkJumpFirst->isChecked());
-        kconf->writeEntry("disable_dirs", checkDisableDirs->isChecked());
-        kconf->writeEntry("calculate", checkCalc->isChecked());
-        kconf->writeEntry("drag", checkDrag->isChecked());
-        kconf->writeEntry("tooltips", checkTooltips->isChecked());
-        kconf->writeEntry("tooltips_inactive", checkInactive->isChecked());
-        kconf->writeEntry("tooltips_lines", spinLines->value());
-        kconf->writeEntry("tooltips_preview", checkTooltipPreview->isChecked());
-
-        kconf->setGroup("Main");
-        kconf->writeEntry("applyto", buttonGroupCS->selectedId());
-        kconf->writeEntry("minimize to tray", checkMinimize->isChecked());
-        kconf->writeEntry("sync", checkSync->isChecked());
-        kconf->writeEntry("splash", checkSplash->isChecked());
-        kconf->writeEntry("anime_dont", checkAnime->isChecked());
-        kconf->writeEntry("kipi_ondemand", checkKIPIDemand->isChecked());
-        kconf->writeEntry("treat", checkTreat->isChecked());
-        kconf->writeEntry("options_last", listMain->currentItem());
-        kconf->writeEntry("options_last_tabGL", tabGL->currentPageIndex());
-        kconf->writeEntry("options_last_tabNav", tabNav->currentPageIndex());
-        kconf->writeEntry("options_last_tabSidebar", tabSidebar->currentPageIndex());
-
-        kconf->setGroup("Thumbnails");
-        kconf->writeEntry("margin", spinMargin->value());
-        kconf->writeEntry("cache", spinCacheSize->value());
-        kconf->writeEntry("dont write", checkNoWriteThumbs->isChecked());
-        kconf->writeEntry("mark", checkMark->isChecked());
-        kconf->writeEntry("lazy", checkLazy->isChecked());
-        kconf->writeEntry("lazy_delay", spinLazy->value());
-        kconf->writeEntry("rows", spinRows->value());
-
-        kconf->setGroup("GL view");
-        kconf->writeEntry("double_click", buttonGroupDC->selectedId());
-        kconf->writeEntry("load_pages", buttonGroupPages->selectedId());
-        kconf->writeEntry("load_pages_number", pagesNumber->value());
-        kconf->writeEntry("GL view background", kColorGLbackground->color().name());
-        kconf->writeEntry("GL view custom texture", custpixmap);
-        kconf->writeEntry("GL view background type", buttonGroupColor->selectedId());
-        kconf->writeEntry("zoom limit", buttonGroupZoomLimit->selectedId());
-        kconf->writeEntry("alpha_bkgr", checkDrawQuads->isChecked());
-        kconf->writeEntry("marks", checkMarks->isChecked());
-        kconf->writeEntry("progressiv", checkProgress->isChecked());
-        kconf->writeEntry("scroll", buttonGroupScrolling->selectedId());
-        kconf->writeEntry("angle", sliderAngle->value());
-        kconf->writeEntry("zoom", spinZoomFactor->value());
-        kconf->writeEntry("zoom_min", spinZoomMin->value());
-        kconf->writeEntry("zoom_max", spinZoomMax->value());
-        kconf->writeEntry("move", sliderMove->value());
-        kconf->writeEntry("tabs", checkTabs->isChecked());
-        kconf->writeEntry("tabs_ask", checkTabAsk->isChecked());
-        kconf->writeEntry("tabs_close", checkTabClose->isChecked());
-        kconf->writeEntry("closeall", checkCloseAll->isChecked());    
-
-        kconf->setGroup("Sidebar");
-        kconf->writeEntry("recursion_type", buttonGroupRecurs->selectedId());
-        kconf->writeEntry("mount_device", checkDevice->isChecked());
-        kconf->writeEntry("mount_options", checkMountOptions->isChecked());
-        kconf->writeEntry("mount_fstype", checkMountFS->isChecked());
-        kconf->writeEntry("preview_background", previewColor->color().name());
-        kconf->writeEntry("preview_text", previewTextColor->color().name());
-        kconf->writeEntry("preview_text_enable", checkPreviewText->isChecked());
-        kconf->writeEntry("preview_delay", previewDelay->value());
-        kconf->writeEntry("preview_dont", previewDont->isChecked());
-        kconf->writeEntry("preview", preview->isChecked());
+        SQ_Config *tdeconf = SQ_Config::instance();
+
+        tdeconf->setGroup("Fileview");
+        tdeconf->writeEntry("set path", buttonGroupSetPath->selectedId());
+        tdeconf->writeEntry("custom directory", kURLReqOpenCustom->url());
+        tdeconf->writeEntry("sync type", buttonGroupSync->selectedId());
+        tdeconf->writeEntry("history", checkSaveHistory->isChecked());
+        tdeconf->writeEntry("run unknown", checkRunUnknown->isChecked());
+        tdeconf->writeEntry("archives", checkSupportAr->isChecked());
+        tdeconf->writeEntry("tofirst", checkJumpFirst->isChecked());
+        tdeconf->writeEntry("disable_dirs", checkDisableDirs->isChecked());
+        tdeconf->writeEntry("calculate", checkCalc->isChecked());
+        tdeconf->writeEntry("drag", checkDrag->isChecked());
+        tdeconf->writeEntry("tooltips", checkTooltips->isChecked());
+        tdeconf->writeEntry("tooltips_inactive", checkInactive->isChecked());
+        tdeconf->writeEntry("tooltips_lines", spinLines->value());
+        tdeconf->writeEntry("tooltips_preview", checkTooltipPreview->isChecked());
+
+        tdeconf->setGroup("Main");
+        tdeconf->writeEntry("applyto", buttonGroupCS->selectedId());
+        tdeconf->writeEntry("minimize to tray", checkMinimize->isChecked());
+        tdeconf->writeEntry("sync", checkSync->isChecked());
+        tdeconf->writeEntry("splash", checkSplash->isChecked());
+        tdeconf->writeEntry("anime_dont", checkAnime->isChecked());
+        tdeconf->writeEntry("kipi_ondemand", checkKIPIDemand->isChecked());
+        tdeconf->writeEntry("treat", checkTreat->isChecked());
+        tdeconf->writeEntry("options_last", listMain->currentItem());
+        tdeconf->writeEntry("options_last_tabGL", tabGL->currentPageIndex());
+        tdeconf->writeEntry("options_last_tabNav", tabNav->currentPageIndex());
+        tdeconf->writeEntry("options_last_tabSidebar", tabSidebar->currentPageIndex());
+
+        tdeconf->setGroup("Thumbnails");
+        tdeconf->writeEntry("margin", spinMargin->value());
+        tdeconf->writeEntry("cache", spinCacheSize->value());
+        tdeconf->writeEntry("dont write", checkNoWriteThumbs->isChecked());
+        tdeconf->writeEntry("mark", checkMark->isChecked());
+        tdeconf->writeEntry("lazy", checkLazy->isChecked());
+        tdeconf->writeEntry("lazy_delay", spinLazy->value());
+        tdeconf->writeEntry("rows", spinRows->value());
+
+        tdeconf->setGroup("GL view");
+        tdeconf->writeEntry("double_click", buttonGroupDC->selectedId());
+        tdeconf->writeEntry("load_pages", buttonGroupPages->selectedId());
+        tdeconf->writeEntry("load_pages_number", pagesNumber->value());
+        tdeconf->writeEntry("GL view background", kColorGLbackground->color().name());
+        tdeconf->writeEntry("GL view custom texture", custpixmap);
+        tdeconf->writeEntry("GL view background type", buttonGroupColor->selectedId());
+        tdeconf->writeEntry("zoom limit", buttonGroupZoomLimit->selectedId());
+        tdeconf->writeEntry("alpha_bkgr", checkDrawQuads->isChecked());
+        tdeconf->writeEntry("marks", checkMarks->isChecked());
+        tdeconf->writeEntry("progressiv", checkProgress->isChecked());
+        tdeconf->writeEntry("scroll", buttonGroupScrolling->selectedId());
+        tdeconf->writeEntry("angle", sliderAngle->value());
+        tdeconf->writeEntry("zoom", spinZoomFactor->value());
+        tdeconf->writeEntry("zoom_min", spinZoomMin->value());
+        tdeconf->writeEntry("zoom_max", spinZoomMax->value());
+        tdeconf->writeEntry("move", sliderMove->value());
+        tdeconf->writeEntry("tabs", checkTabs->isChecked());
+        tdeconf->writeEntry("tabs_ask", checkTabAsk->isChecked());
+        tdeconf->writeEntry("tabs_close", checkTabClose->isChecked());
+        tdeconf->writeEntry("closeall", checkCloseAll->isChecked());    
+
+        tdeconf->setGroup("Sidebar");
+        tdeconf->writeEntry("recursion_type", buttonGroupRecurs->selectedId());
+        tdeconf->writeEntry("mount_device", checkDevice->isChecked());
+        tdeconf->writeEntry("mount_options", checkMountOptions->isChecked());
+        tdeconf->writeEntry("mount_fstype", checkMountFS->isChecked());
+        tdeconf->writeEntry("preview_background", previewColor->color().name());
+        tdeconf->writeEntry("preview_text", previewTextColor->color().name());
+        tdeconf->writeEntry("preview_text_enable", checkPreviewText->isChecked());
+        tdeconf->writeEntry("preview_delay", previewDelay->value());
+        tdeconf->writeEntry("preview_dont", previewDont->isChecked());
+        tdeconf->writeEntry("preview", preview->isChecked());
     }
 
     return result;
diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp
index b4a63b4..0d5be40 100644
--- a/ksquirrel/sq_slideshowwidget.cpp
+++ b/ksquirrel/sq_slideshowwidget.cpp
@@ -31,7 +31,7 @@
 
 #include <kcursor.h>
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kglobalsettings.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui
index aec657a..8de42e2 100644
--- a/ksquirrel/sq_thumbnailcachemaster.ui
+++ b/ksquirrel/sq_thumbnailcachemaster.ui
@@ -229,15 +229,15 @@
     <tabstop>pushClose</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">kio/job.h</include>
+    <include location="global" impldecl="in declaration">tdeio/job.h</include>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
     <include location="global" impldecl="in implementation">kdirsize.h</include>
     <include location="local" impldecl="in implementation">sq_viewcache.h</include>
     <include location="local" impldecl="in implementation">sq_pixmapcache.h</include>
     <include location="local" impldecl="in implementation">sq_dirthumbs.h</include>
     <include location="local" impldecl="in implementation">sq_iconloader.h</include>
-    <include location="global" impldecl="in implementation">kio/global.h</include>
-    <include location="global" impldecl="in implementation">kio/job.h</include>
+    <include location="global" impldecl="in implementation">tdeio/global.h</include>
+    <include location="global" impldecl="in implementation">tdeio/job.h</include>
     <include location="local" impldecl="in implementation">sq_thumbnailcachemaster.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp
index 04f7379..1f405da 100644
--- a/ksquirrel/sq_thumbnailloadjob.cpp
+++ b/ksquirrel/sq_thumbnailloadjob.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <tqdatetime.h>
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
diff --git a/ksquirrel/sq_thumbnailloadjob.h b/ksquirrel/sq_thumbnailloadjob.h
index 6162c73..90d643f 100644
--- a/ksquirrel/sq_thumbnailloadjob.h
+++ b/ksquirrel/sq_thumbnailloadjob.h
@@ -26,7 +26,7 @@
 
 #include <tqimage.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "sq_thumbnailinfo.h"
 
diff --git a/ksquirrel/sq_thumbnailsunused.cpp b/ksquirrel/sq_thumbnailsunused.cpp
index 372c315..59957bb 100644
--- a/ksquirrel/sq_thumbnailsunused.cpp
+++ b/ksquirrel/sq_thumbnailsunused.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "sq_thumbnailsunused.h"
 
diff --git a/ksquirrel/sq_widgetstack.cpp b/ksquirrel/sq_widgetstack.cpp
index b57cb17..d0f1808 100644
--- a/ksquirrel/sq_widgetstack.cpp
+++ b/ksquirrel/sq_widgetstack.cpp
@@ -31,8 +31,8 @@
 #include <kstandarddirs.h>
 #include <kstdaccel.h>
 #include <klocale.h>
-#include <kio/job.h>
-#include <kfiledialog.h>
+#include <tdeio/job.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstringhandler.h>
 
diff --git a/ksquirrel/sq_widgetstack.h b/ksquirrel/sq_widgetstack.h
index 2311167..a117154 100644
--- a/ksquirrel/sq_widgetstack.h
+++ b/ksquirrel/sq_widgetstack.h
@@ -22,7 +22,7 @@
 #include <tqstring.h>
 
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "sq_diroperator.h"