diff --git a/doc/kmplot/man-kmplot.1.docbook b/doc/kmplot/man-kmplot.1.docbook
index 27b053fc..cefb50a6 100644
--- a/doc/kmplot/man-kmplot.1.docbook
+++ b/doc/kmplot/man-kmplot.1.docbook
@@ -60,7 +60,7 @@ url="help:/kmplot">help:/kmplot</ulink>
 
 <refsect1>
 <title>Authors</title>
-<para>&kmplot; was written by <personname><firstname>Klaus-Dieter</firstname><surname>M&ouml;ller</surname></personname> <email>kdmoeller@foni.net</email>, &Matthias.Messmer; &Matthias.Messmer.mail; and <personname><firstname>Fredrik</firstname><surname>Edemar</surname></personname> <email>f_edemar@linux.se</email></para>
+<para>&kmplot; was written by <personname><firstname>Klaus-Dieter</firstname><surname>M&ouml;ller</surname></personname> <email>tdmoeller@foni.net</email>, &Matthias.Messmer; &Matthias.Messmer.mail; and <personname><firstname>Fredrik</firstname><surname>Edemar</surname></personname> <email>f_edemar@linux.se</email></para>
 </refsect1>
 
 </refentry>
diff --git a/doc/kmplot/settings-colors.png b/doc/kmplot/settings-colors.png
index 54a2c289..64f69045 100644
Binary files a/doc/kmplot/settings-colors.png and b/doc/kmplot/settings-colors.png differ
diff --git a/kanagram/images/graphics_sources.tar.gz b/kanagram/images/graphics_sources.tar.gz
index c430a622..6ee3fd57 100644
Binary files a/kanagram/images/graphics_sources.tar.gz and b/kanagram/images/graphics_sources.tar.gz differ
diff --git a/kgeography/data/flags/sweden.png b/kgeography/data/flags/sweden.png
index 9e21cef0..316cf9b6 100644
Binary files a/kgeography/data/flags/sweden.png and b/kgeography/data/flags/sweden.png differ
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 5a736097..90e9c54a 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -2,7 +2,7 @@
 * KmPlot - a math. function plotter for the KDE-Desktop
 *
 * Copyright (C) 1998, 1999  Klaus-Dieter Möller
-*               2000, 2002 kdmoeller@foni.net
+*               2000, 2002 tdmoeller@foni.net
 *
 * This file is part of the KDE Project.
 * KmPlot is part of the KDE-EDU Project.
diff --git a/kmplot/kmplot/main.cpp b/kmplot/kmplot/main.cpp
index 594f3a95..3b96b884 100644
--- a/kmplot/kmplot/main.cpp
+++ b/kmplot/kmplot/main.cpp
@@ -61,7 +61,7 @@ int main( int argc, char **argv )
 	    "http://edu.kde.org/kmplot/" );
 	aboutData.addAuthor(
 	    "Klaus-Dieter Möller", I18N_NOOP( "Original Author" ) ,
-	    "kdmoeller@foni.net" );
+	    "tdmoeller@foni.net" );
 	aboutData.addAuthor(
 	    "Matthias Meßmer", I18N_NOOP( "GUI" ) ,
 	    "bmlmessmer@web.de" );
diff --git a/kturtle/file.txt b/kturtle/file.txt
index b3e13796..0037b68a 100644
--- a/kturtle/file.txt
+++ b/kturtle/file.txt
@@ -16,7 +16,7 @@ The following packages will be REMOVED:
   tdeartwork-style tdeartwork-theme-desktop tdeartwork-theme-window tdebase
   tdebase-bin tdebase-data tdebase-kio-plugins tdelibs tdelibs-bin tdelibs-data
   tdelibs4 tdelibs4-doc tdepim tdepim-kfile-plugins tdepim-libs tdeprint
-  kdesktop kdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper
+  kdesktop tdm kfind kgpgcertmanager khelpcenter kicker kitchensync klipper
   kmail kmailcvt kmenuedit knode knotes konqueror konqueror-nsplugins konsole
   kontact korganizer korn kpager kpersonalizer kpilot kscreensaver ksmserver
   ksplash ksync ksysguard ksysguardd ktip ktnef twin libarts1 libarts1-dev