From 6b8fca511cba1e4d11c99d5f3f2c965b83f551e4 Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Mon, 24 Jan 2005 18:02:34 +0000
Subject: copyright date

---
 src/FbTk/App.cc                 | 2 +-
 src/FbTk/App.hh                 | 2 +-
 src/FbTk/Button.cc              | 2 +-
 src/FbTk/Button.hh              | 2 +-
 src/FbTk/Color.cc               | 2 +-
 src/FbTk/Color.hh               | 2 +-
 src/FbTk/Command.hh             | 2 +-
 src/FbTk/CompareEqual.hh        | 2 +-
 src/FbTk/Compose.hh             | 2 +-
 src/FbTk/EventHandler.hh        | 2 +-
 src/FbTk/EventManager.cc        | 2 +-
 src/FbTk/EventManager.hh        | 2 +-
 src/FbTk/FbDrawable.cc          | 2 +-
 src/FbTk/FbDrawable.hh          | 2 +-
 src/FbTk/FbPixmap.cc            | 2 +-
 src/FbTk/FbPixmap.hh            | 2 +-
 src/FbTk/FbWindow.cc            | 2 +-
 src/FbTk/FbWindow.hh            | 2 +-
 src/FbTk/FileUtil.cc            | 2 +-
 src/FbTk/FileUtil.hh            | 2 +-
 src/FbTk/Font.cc                | 2 +-
 src/FbTk/Font.hh                | 2 +-
 src/FbTk/FontImp.hh             | 2 +-
 src/FbTk/GContext.cc            | 2 +-
 src/FbTk/GContext.hh            | 2 +-
 src/FbTk/I18n.cc                | 2 +-
 src/FbTk/I18n.hh                | 2 +-
 src/FbTk/Image.cc               | 2 +-
 src/FbTk/Image.hh               | 2 +-
 src/FbTk/ImageControl.cc        | 2 +-
 src/FbTk/ImageImlib2.cc         | 2 +-
 src/FbTk/ImageXPM.cc            | 2 +-
 src/FbTk/ImageXPM.hh            | 2 +-
 src/FbTk/KeyUtil.cc             | 2 +-
 src/FbTk/KeyUtil.hh             | 2 +-
 src/FbTk/Layer.hh               | 2 +-
 src/FbTk/LayerItem.hh           | 2 +-
 src/FbTk/MacroCommand.cc        | 2 +-
 src/FbTk/MacroCommand.hh        | 2 +-
 src/FbTk/Menu.cc                | 2 +-
 src/FbTk/Menu.hh                | 2 +-
 src/FbTk/MenuIcon.cc            | 2 +-
 src/FbTk/MenuIcon.hh            | 2 +-
 src/FbTk/MenuItem.cc            | 2 +-
 src/FbTk/MenuItem.hh            | 2 +-
 src/FbTk/MenuSeparator.cc       | 2 +-
 src/FbTk/MenuSeparator.hh       | 2 +-
 src/FbTk/MenuTheme.cc           | 2 +-
 src/FbTk/MenuTheme.hh           | 2 +-
 src/FbTk/MultLayers.cc          | 2 +-
 src/FbTk/MultLayers.hh          | 2 +-
 src/FbTk/MultiButtonMenuItem.cc | 2 +-
 src/FbTk/MultiButtonMenuItem.hh | 2 +-
 src/FbTk/NotCopyable.hh         | 2 +-
 src/FbTk/Observer.cc            | 2 +-
 src/FbTk/Observer.hh            | 2 +-
 src/FbTk/PixmapWithMask.hh      | 2 +-
 src/FbTk/RefCount.hh            | 2 +-
 src/FbTk/Resource.cc            | 2 +-
 src/FbTk/Resource.hh            | 2 +-
 src/FbTk/SignalHandler.cc       | 2 +-
 src/FbTk/SignalHandler.hh       | 2 +-
 src/FbTk/SimpleCommand.hh       | 2 +-
 src/FbTk/StringUtil.cc          | 2 +-
 src/FbTk/StringUtil.hh          | 2 +-
 src/FbTk/Subject.cc             | 2 +-
 src/FbTk/Subject.hh             | 2 +-
 src/FbTk/Text.cc                | 2 +-
 src/FbTk/Text.hh                | 2 +-
 src/FbTk/TextBox.cc             | 2 +-
 src/FbTk/TextBox.hh             | 2 +-
 src/FbTk/TextButton.cc          | 2 +-
 src/FbTk/Texture.cc             | 2 +-
 src/FbTk/TextureRender.cc       | 2 +-
 src/FbTk/TextureRender.hh       | 2 +-
 src/FbTk/Theme.cc               | 2 +-
 src/FbTk/Theme.hh               | 2 +-
 src/FbTk/ThemeItems.cc          | 2 +-
 src/FbTk/Timer.cc               | 2 +-
 src/FbTk/Timer.hh               | 2 +-
 src/FbTk/Transparent.cc         | 2 +-
 src/FbTk/Transparent.hh         | 2 +-
 src/FbTk/XFontImp.cc            | 2 +-
 src/FbTk/XFontImp.hh            | 2 +-
 src/FbTk/XLayer.cc              | 2 +-
 src/FbTk/XLayer.hh              | 2 +-
 src/FbTk/XLayerItem.cc          | 2 +-
 src/FbTk/XLayerItem.hh          | 2 +-
 src/FbTk/XftFontImp.cc          | 2 +-
 src/FbTk/XftFontImp.hh          | 2 +-
 src/FbTk/XmbFontImp.cc          | 2 +-
 src/FbTk/XmbFontImp.hh          | 2 +-
 src/FbTk/XrmDatabaseHelper.hh   | 2 +-
 93 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc
index c48ccb1..8ced4a1 100644
--- a/src/FbTk/App.cc
+++ b/src/FbTk/App.cc
@@ -1,5 +1,5 @@
 // App.cc
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/App.hh b/src/FbTk/App.hh
index 3889713..a520e1c 100644
--- a/src/FbTk/App.hh
+++ b/src/FbTk/App.hh
@@ -1,5 +1,5 @@
 // App.hh
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index a3783dc..c48b355 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -1,5 +1,5 @@
 // Button.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Button.hh b/src/FbTk/Button.hh
index e167f1c..66cd2b5 100644
--- a/src/FbTk/Button.hh
+++ b/src/FbTk/Button.hh
@@ -1,5 +1,5 @@
 // Button.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index ef8aef6..7d050d3 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -1,5 +1,5 @@
 // Color.cc for Fluxbox window manager
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Color.hh b/src/FbTk/Color.hh
index 4ee36d4..61a0170 100644
--- a/src/FbTk/Color.hh
+++ b/src/FbTk/Color.hh
@@ -1,5 +1,5 @@
 // Color.hh for Fluxbox Window Manager 
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen@users.sourceforge.net)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // from Image.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
diff --git a/src/FbTk/Command.hh b/src/FbTk/Command.hh
index 4a20add..391aa78 100644
--- a/src/FbTk/Command.hh
+++ b/src/FbTk/Command.hh
@@ -1,5 +1,5 @@
 // Command.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/CompareEqual.hh b/src/FbTk/CompareEqual.hh
index d7ce7f2..e91700e 100644
--- a/src/FbTk/CompareEqual.hh
+++ b/src/FbTk/CompareEqual.hh
@@ -1,5 +1,5 @@
 // CompareEqual.hh
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Compose.hh b/src/FbTk/Compose.hh
index 97cf33e..ebc9db9 100644
--- a/src/FbTk/Compose.hh
+++ b/src/FbTk/Compose.hh
@@ -1,5 +1,5 @@
 // Composer.hh
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh
index ceb8878..4ae1aa5 100644
--- a/src/FbTk/EventHandler.hh
+++ b/src/FbTk/EventHandler.hh
@@ -1,5 +1,5 @@
 // EventHandler.cc for Fluxbox Window Manager
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index ec16385..e469724 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -1,5 +1,5 @@
 // EventManager.cc
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index 48a2492..5bbaa00 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -1,5 +1,5 @@
 // EventManager.hh
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FbDrawable.cc b/src/FbTk/FbDrawable.cc
index 50bb690..3e31719 100644
--- a/src/FbTk/FbDrawable.cc
+++ b/src/FbTk/FbDrawable.cc
@@ -1,5 +1,5 @@
 // FbDrawable.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh
index e2f68f5..0aeeb9a 100644
--- a/src/FbTk/FbDrawable.hh
+++ b/src/FbTk/FbDrawable.hh
@@ -1,5 +1,5 @@
 // FbDrawable.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index bcb176b..9fd9860 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -1,5 +1,5 @@
 // FbPixmap.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FbPixmap.hh b/src/FbTk/FbPixmap.hh
index 9e0d4e0..c00aa99 100644
--- a/src/FbTk/FbPixmap.hh
+++ b/src/FbTk/FbPixmap.hh
@@ -1,5 +1,5 @@
 // FbPixmap.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index ec4bdc9..416671c 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -1,5 +1,5 @@
 // FbWindow.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2002-2005 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index d2b52f2..a72ea26 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -1,5 +1,5 @@
 // FbWindow.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FileUtil.cc b/src/FbTk/FileUtil.cc
index 26b6e78..a91de42 100644
--- a/src/FbTk/FileUtil.cc
+++ b/src/FbTk/FileUtil.cc
@@ -1,5 +1,5 @@
 // FileUtil.cc
-// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh
index 718ccb8..664c26d 100644
--- a/src/FbTk/FileUtil.hh
+++ b/src/FbTk/FileUtil.hh
@@ -1,5 +1,5 @@
 // FileUtil.hh
-// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index c7193f7..e1fa88e 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -1,5 +1,5 @@
 // Font.cc
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh
index f6742cb..3b04790 100644
--- a/src/FbTk/Font.hh
+++ b/src/FbTk/Font.hh
@@ -1,5 +1,5 @@
 // Font.cc for FbTk
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh
index 4cdf839..d659377 100644
--- a/src/FbTk/FontImp.hh
+++ b/src/FbTk/FontImp.hh
@@ -1,5 +1,5 @@
 // FontImp.cc for FbTk
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/GContext.cc b/src/FbTk/GContext.cc
index 838c92e..38f3e70 100644
--- a/src/FbTk/GContext.cc
+++ b/src/FbTk/GContext.cc
@@ -1,5 +1,5 @@
 // GContext.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/GContext.hh b/src/FbTk/GContext.hh
index 4d8da3d..e54a5cd 100644
--- a/src/FbTk/GContext.hh
+++ b/src/FbTk/GContext.hh
@@ -1,5 +1,5 @@
 // GContext.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc
index 68ded40..6f44c70 100644
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@@ -1,5 +1,5 @@
 // I18n.hh for Fluxbox Window Manager
-// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // I18n.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 32d6e19..8fbb7ab 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -1,5 +1,5 @@
 // i18n.hh for Fluxbox Window Manager
-// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // i18n.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index bc08c6c..28ca541 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -1,5 +1,5 @@
 // Image.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Image.hh b/src/FbTk/Image.hh
index eaa66ae..b0f3ecc 100644
--- a/src/FbTk/Image.hh
+++ b/src/FbTk/Image.hh
@@ -1,5 +1,5 @@
 // Image.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index 88e769c..06c3dae 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -1,5 +1,5 @@
 // ImageControl.cc for FbTk - Fluxbox Toolkit
-// Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxbox at users.sourceforge.net)
+// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxbox at users.sourceforge.net)
 //
 // Image.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc
index 8a610e9..ca47209 100644
--- a/src/FbTk/ImageImlib2.cc
+++ b/src/FbTk/ImageImlib2.cc
@@ -1,5 +1,5 @@
 // ImageImlib2.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 Mathias Gumz <akira at fluxbox dot org>
+// Copyright (c) 2004 - 2005 Mathias Gumz <akira at fluxbox dot org>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/ImageXPM.cc b/src/FbTk/ImageXPM.cc
index 8a58640..8cd0775 100644
--- a/src/FbTk/ImageXPM.cc
+++ b/src/FbTk/ImageXPM.cc
@@ -1,5 +1,5 @@
 // ImageXPM.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/ImageXPM.hh b/src/FbTk/ImageXPM.hh
index 6a9cba4..3816d5c 100644
--- a/src/FbTk/ImageXPM.hh
+++ b/src/FbTk/ImageXPM.hh
@@ -1,5 +1,5 @@
 // ImageXPM.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index d120a12..7760254 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -1,5 +1,5 @@
 // KeyUtil.cc for FbTk
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh
index eb31e38..4cafcdd 100644
--- a/src/FbTk/KeyUtil.hh
+++ b/src/FbTk/KeyUtil.hh
@@ -1,5 +1,5 @@
 // KeyUtil.hh for FbTk
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index 0feac6e..3e206b2 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -1,5 +1,5 @@
 // Layer.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
index c90ce0d..b6f4df9 100644
--- a/src/FbTk/LayerItem.hh
+++ b/src/FbTk/LayerItem.hh
@@ -1,5 +1,5 @@
 // LayerItem.hh for fluxbox 
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 17766cd..3592a0c 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -1,5 +1,5 @@
 // MacroCommand.cc for FbTk
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/MacroCommand.hh b/src/FbTk/MacroCommand.hh
index 65a5cb8..97cc5d5 100644
--- a/src/FbTk/MacroCommand.hh
+++ b/src/FbTk/MacroCommand.hh
@@ -1,5 +1,5 @@
 // MacroCommand.hh for FbTk
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 7f01c77..34f876f 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -1,5 +1,5 @@
 // Menu.cc for FbTk - Fluxbox Toolkit 
-// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Basemenu.cc for blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index de10d0f..f95728a 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -1,5 +1,5 @@
 // Menu.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Basemenu.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/MenuIcon.cc b/src/FbTk/MenuIcon.cc
index 516a981..acdc333 100644
--- a/src/FbTk/MenuIcon.cc
+++ b/src/FbTk/MenuIcon.cc
@@ -1,5 +1,5 @@
 // MenuIcon.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2004 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MenuIcon.hh b/src/FbTk/MenuIcon.hh
index 4c8ced2..dd68b18 100644
--- a/src/FbTk/MenuIcon.hh
+++ b/src/FbTk/MenuIcon.hh
@@ -1,5 +1,5 @@
 // MenuIcon.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //                 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index da57257..1f3125c 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -1,5 +1,5 @@
 // MenuItem.cc for FbTk - Fluxbox Toolkit
-// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 3c70377..fe2800c 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -1,5 +1,5 @@
 // MenuItem.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/MenuSeparator.cc b/src/FbTk/MenuSeparator.cc
index 1e6c4c8..a82ccdb 100644
--- a/src/FbTk/MenuSeparator.cc
+++ b/src/FbTk/MenuSeparator.cc
@@ -1,5 +1,5 @@
 // MenuSeparator.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2004 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //                 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MenuSeparator.hh b/src/FbTk/MenuSeparator.hh
index c343fea..e9c739b 100644
--- a/src/FbTk/MenuSeparator.hh
+++ b/src/FbTk/MenuSeparator.hh
@@ -1,5 +1,5 @@
 // MenuSeparator.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden (rathnor at users.sourceforge.net)
 //                 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc
index e4f3e3b..bf4cfc6 100644
--- a/src/FbTk/MenuTheme.cc
+++ b/src/FbTk/MenuTheme.cc
@@ -1,5 +1,5 @@
 // MenuTheme.cc for FbTk
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index 53f7e37..90ffa76 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -1,5 +1,5 @@
 // MenuTheme.hh for FbTk
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc
index 179778f..93373ae 100644
--- a/src/FbTk/MultLayers.cc
+++ b/src/FbTk/MultLayers.cc
@@ -1,5 +1,5 @@
 // MultLayers.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
index 0226836..b42e347 100644
--- a/src/FbTk/MultLayers.hh
+++ b/src/FbTk/MultLayers.hh
@@ -1,5 +1,5 @@
 // MultLayers.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc
index beb65c0..fb1f9ce 100644
--- a/src/FbTk/MultiButtonMenuItem.cc
+++ b/src/FbTk/MultiButtonMenuItem.cc
@@ -1,5 +1,5 @@
 // MultiButtonMenuItem.cc for FbTk
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/MultiButtonMenuItem.hh b/src/FbTk/MultiButtonMenuItem.hh
index ffd3e4b..ccefff9 100644
--- a/src/FbTk/MultiButtonMenuItem.hh
+++ b/src/FbTk/MultiButtonMenuItem.hh
@@ -1,5 +1,5 @@
 // MultiButtonMenuItem.hh for FbTk
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/NotCopyable.hh b/src/FbTk/NotCopyable.hh
index 50919e4..4c67b88 100644
--- a/src/FbTk/NotCopyable.hh
+++ b/src/FbTk/NotCopyable.hh
@@ -1,5 +1,5 @@
 // NotCopyable.hh
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Observer.cc b/src/FbTk/Observer.cc
index 0d1da50..1c53a18 100644
--- a/src/FbTk/Observer.cc
+++ b/src/FbTk/Observer.cc
@@ -1,5 +1,5 @@
 // Observer.cc for FbTk
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Observer.hh b/src/FbTk/Observer.hh
index 0e4ab4c..a8ce90e 100644
--- a/src/FbTk/Observer.hh
+++ b/src/FbTk/Observer.hh
@@ -1,5 +1,5 @@
 // Observer.hh for FbTk
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@fluxbox.org)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/PixmapWithMask.hh b/src/FbTk/PixmapWithMask.hh
index 85bf385..5a36376 100644
--- a/src/FbTk/PixmapWithMask.hh
+++ b/src/FbTk/PixmapWithMask.hh
@@ -1,5 +1,5 @@
 // PixmapWithMask.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/RefCount.hh b/src/FbTk/RefCount.hh
index 837bfd2..96d64d8 100644
--- a/src/FbTk/RefCount.hh
+++ b/src/FbTk/RefCount.hh
@@ -1,5 +1,5 @@
 // RefCount.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index 13876a3..5fdc5f4 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -1,5 +1,5 @@
 // Resource.cc
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 9798ce0..c27d9e4 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -1,5 +1,5 @@
 // Resource.hh
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc
index 2745294..253734f 100644
--- a/src/FbTk/SignalHandler.cc
+++ b/src/FbTk/SignalHandler.cc
@@ -1,5 +1,5 @@
 // SignalHandler.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/SignalHandler.hh b/src/FbTk/SignalHandler.hh
index ab56d15..23bac97 100644
--- a/src/FbTk/SignalHandler.hh
+++ b/src/FbTk/SignalHandler.hh
@@ -1,5 +1,5 @@
 // SignalHandler.hh for FbTk
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/SimpleCommand.hh b/src/FbTk/SimpleCommand.hh
index 04add98..8cc7283 100644
--- a/src/FbTk/SimpleCommand.hh
+++ b/src/FbTk/SimpleCommand.hh
@@ -1,5 +1,5 @@
 // SimpleCommand.hh for FbTk
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index 7b4131b..c3580ec 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -1,5 +1,5 @@
 // StringUtil.cc for fluxbox
-// Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen<at>fluxbox<dot>org)
+// Copyright (c) 2001 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 2e2bed2..2b0a930 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -1,5 +1,5 @@
 // StringUtil.hh for fluxbox 
-// Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen(at)fluxbox<dot>org)
+// Copyright (c) 2001 - 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Subject.cc b/src/FbTk/Subject.cc
index dca1845..0badf66 100644
--- a/src/FbTk/Subject.cc
+++ b/src/FbTk/Subject.cc
@@ -1,5 +1,5 @@
 // Subject.cc for FbTk
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen<at>users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Subject.hh b/src/FbTk/Subject.hh
index d3580a8..f9a28ff 100644
--- a/src/FbTk/Subject.hh
+++ b/src/FbTk/Subject.hh
@@ -1,5 +1,5 @@
 // Subject.hh for FbTk
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen<at>users.sourceforge.net)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc
index 1fef7a2..dfbd680 100644
--- a/src/FbTk/Text.cc
+++ b/src/FbTk/Text.cc
@@ -1,5 +1,5 @@
 // Text.cc for FbTk - text utils
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Text.hh b/src/FbTk/Text.hh
index 9a3f1ef..977c85a 100644
--- a/src/FbTk/Text.hh
+++ b/src/FbTk/Text.hh
@@ -1,5 +1,5 @@
 // Text.hh for FbTk - text utils
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc
index 2a7000a..0db8856 100644
--- a/src/FbTk/TextBox.cc
+++ b/src/FbTk/TextBox.cc
@@ -1,5 +1,5 @@
 // TextBox.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh
index 62045ee..cba7c24 100644
--- a/src/FbTk/TextBox.hh
+++ b/src/FbTk/TextBox.hh
@@ -1,5 +1,5 @@
 // TextBox.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 0373183..794acd5 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -1,5 +1,5 @@
 // TextButton.cc for Fluxbox Window Manager
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen[at]fluxbox.org)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc
index 1677790..44df2cb 100644
--- a/src/FbTk/Texture.cc
+++ b/src/FbTk/Texture.cc
@@ -1,5 +1,5 @@
 // Texture.hh for Fluxbox Window Manager 
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // from Image.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index 0adb8e1..219f0f2 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -1,5 +1,5 @@
 // TextureRender.cc for fluxbox
-// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // from Image.cc for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh
index 490b014..d0fee21 100644
--- a/src/FbTk/TextureRender.hh
+++ b/src/FbTk/TextureRender.hh
@@ -1,5 +1,5 @@
 // TextureRender.hh for fluxbox
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Image.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 5225686..7f6e9dc 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -1,5 +1,5 @@
 // Theme.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index 338c24b..affd60a 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -1,5 +1,5 @@
 // Theme.hh for FbTk - Fluxbox ToolKit
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index f55c162..6b24baf 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -1,5 +1,5 @@
 // ThemeItems.cc for FbTk - Fluxbox ToolKit
-// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index 78a861f..fe3fa28 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -1,5 +1,5 @@
 // Timer.cc for FbTk - Fluxbox Toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Timer.cc for Blackbox - An X11 Window Manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh
index 1024b9d..f87d5df 100644
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@@ -1,5 +1,5 @@
 // Timer.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Timer.hh for Blackbox - An X11 Window Manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index 1e112e7..7c14849 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -1,5 +1,5 @@
 // Transparent.cc for FbTk - Fluxbox Toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/Transparent.hh b/src/FbTk/Transparent.hh
index a111743..9dc1973 100644
--- a/src/FbTk/Transparent.hh
+++ b/src/FbTk/Transparent.hh
@@ -1,5 +1,5 @@
 // Transparent.hh for FbTk - Fluxbox Toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc
index c232fe8..966608a 100644
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -1,5 +1,5 @@
 // XFontImp.cc for FbTk fluxbox toolkit
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XFontImp.hh b/src/FbTk/XFontImp.hh
index c5b7946..06a6279 100644
--- a/src/FbTk/XFontImp.hh
+++ b/src/FbTk/XFontImp.hh
@@ -1,5 +1,5 @@
 // XFontImp.hh for FbTk fluxbox toolkit
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index 4963120..5f6616b 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -1,5 +1,5 @@
 // XLayer.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index c5a69ea..d01094e 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -1,5 +1,5 @@
 // XLayer.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/XLayerItem.cc b/src/FbTk/XLayerItem.cc
index 8d3187e..87c775d 100644
--- a/src/FbTk/XLayerItem.cc
+++ b/src/FbTk/XLayerItem.cc
@@ -1,5 +1,5 @@
 // XLayerItem.cc for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh
index d8ebdc0..3cca8a9 100644
--- a/src/FbTk/XLayerItem.hh
+++ b/src/FbTk/XLayerItem.hh
@@ -1,5 +1,5 @@
 // XLayerItem.hh for FbTk - fluxbox toolkit
-// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //                and Simon Bowden    (rathnor at users.sourceforge.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 6928f26..1d13900 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -1,5 +1,5 @@
 // XftFontImp.cc  Xft font implementation for FbTk
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XftFontImp.hh b/src/FbTk/XftFontImp.hh
index 466f58d..c221d79 100644
--- a/src/FbTk/XftFontImp.hh
+++ b/src/FbTk/XftFontImp.hh
@@ -1,5 +1,5 @@
 // XftFontImp.hh  Xft font implementation for FbTk
-// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 79a50fb..53d94fe 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -1,5 +1,5 @@
 // XmbFontImp.cc for FbTk fluxbox toolkit
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002 - 2005 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XmbFontImp.hh b/src/FbTk/XmbFontImp.hh
index cba6001..cd13b84 100644
--- a/src/FbTk/XmbFontImp.hh
+++ b/src/FbTk/XmbFontImp.hh
@@ -1,5 +1,5 @@
 // XmbFontImp.hh for FbTk fluxbox toolkit
-// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at fluxbox dot org)
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
diff --git a/src/FbTk/XrmDatabaseHelper.hh b/src/FbTk/XrmDatabaseHelper.hh
index e164931..4c8207a 100644
--- a/src/FbTk/XrmDatabaseHelper.hh
+++ b/src/FbTk/XrmDatabaseHelper.hh
@@ -1,5 +1,5 @@
 // XrmDatabaseHelper.hh
-// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen at fluxbox dot org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
-- 
cgit v0.11.2