diff --git a/lib/xcollection.cpp b/lib/xcollection.cpp
index 38c2475..87f6c90 100644
--- a/lib/xcollection.cpp
+++ b/lib/xcollection.cpp
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/lib/xcollection.h b/lib/xcollection.h
index 4bd095a..b3b2be1 100644
--- a/lib/xcollection.h
+++ b/lib/xcollection.h
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/lib/xcollection_p.h b/lib/xcollection_p.h
index d575671..62e2345 100644
--- a/lib/xcollection_p.h
+++ b/lib/xcollection_p.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Promoe
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/lib/xconfig.cpp b/lib/xconfig.cpp
index 6ee57cd..0c34874 100644
--- a/lib/xconfig.cpp
+++ b/lib/xconfig.cpp
@@ -1,7 +1,7 @@
 /**
  *	This file is a part of Promoe, an XMMS2 Client
  *
- *	Copyright (C) 2007,2008 Thomas Frauendorfer
+ *	Copyright (C) 2005-2008 XMMS2 Team
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
diff --git a/lib/xconfig.h b/lib/xconfig.h
index 592eed8..04225df 100644
--- a/lib/xconfig.h
+++ b/lib/xconfig.h
@@ -1,7 +1,7 @@
 /**
  *	This file is a part of Promoe, an XMMS2 Client
  *
- *	Copyright (C) 2007,2008 Thomas Frauendorfer
+ *	Copyright (C) 2005-2008 XMMS2 Team
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
diff --git a/lib/xplayback.cpp b/lib/xplayback.cpp
index 8febc94..0344750 100644
--- a/lib/xplayback.cpp
+++ b/lib/xplayback.cpp
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/lib/xplayback.h b/lib/xplayback.h
index 4ddf999..89ec9db 100644
--- a/lib/xplayback.h
+++ b/lib/xplayback.h
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/BrowseDialog.cpp b/src/BrowseDialog.cpp
index d90b457..1bfc087 100644
--- a/src/BrowseDialog.cpp
+++ b/src/BrowseDialog.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/BrowseDialog.h b/src/BrowseDialog.h
index cc4f6a1..37f25ab 100644
--- a/src/BrowseDialog.h
+++ b/src/BrowseDialog.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/BrowseModel.cpp b/src/BrowseModel.cpp
index 59c9491..a7eec4c 100644
--- a/src/BrowseModel.cpp
+++ b/src/BrowseModel.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/BrowseModel.h b/src/BrowseModel.h
index a4a5df0..21e66c5 100644
--- a/src/BrowseModel.h
+++ b/src/BrowseModel.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/Button.cpp b/src/Button.cpp
index 90a05fa..87dc9f7 100644
--- a/src/Button.cpp
+++ b/src/Button.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/Button.h b/src/Button.h
index 4907459..e236cb7 100644
--- a/src/Button.h
+++ b/src/Button.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/Display.cpp b/src/Display.cpp
index bfddaae..ccd63ef 100644
--- a/src/Display.cpp
+++ b/src/Display.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/Display.h b/src/Display.h
index e727932..fbd4b82 100644
--- a/src/Display.h
+++ b/src/Display.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/FileDialog.cpp b/src/FileDialog.cpp
index b2a0200..c2852de 100644
--- a/src/FileDialog.cpp
+++ b/src/FileDialog.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/FileDialog.h b/src/FileDialog.h
index 94d37d3..78e6a0b 100644
--- a/src/FileDialog.h
+++ b/src/FileDialog.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/NumberDisplay.cpp b/src/NumberDisplay.cpp
index 919f527..722022c 100644
--- a/src/NumberDisplay.cpp
+++ b/src/NumberDisplay.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/NumberDisplay.h b/src/NumberDisplay.h
index b17e8c0..c27a336 100644
--- a/src/NumberDisplay.h
+++ b/src/NumberDisplay.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/PixWidget.cpp b/src/PixWidget.cpp
index ba56eca..c0d329c 100644
--- a/src/PixWidget.cpp
+++ b/src/PixWidget.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/PixWidget.h b/src/PixWidget.h
index 79f497b..a7067cb 100644
--- a/src/PixWidget.h
+++ b/src/PixWidget.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/PlayStatus.cpp b/src/PlayStatus.cpp
index c483323..f489109 100644
--- a/src/PlayStatus.cpp
+++ b/src/PlayStatus.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/PlayStatus.h b/src/PlayStatus.h
index 437fbda..6601d69 100644
--- a/src/PlayStatus.h
+++ b/src/PlayStatus.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/PosBar.cpp b/src/PosBar.cpp
index b88515e..de227a6 100644
--- a/src/PosBar.cpp
+++ b/src/PosBar.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/PosBar.h b/src/PosBar.h
index c40c0a9..25ece7a 100644
--- a/src/PosBar.h
+++ b/src/PosBar.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/ServerBrowser.cpp b/src/ServerBrowser.cpp
index 31f5f00..463cacd 100644
--- a/src/ServerBrowser.cpp
+++ b/src/ServerBrowser.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/ServerBrowser.h b/src/ServerBrowser.h
index ce8b8f6..cc89444 100644
--- a/src/ServerBrowser.h
+++ b/src/ServerBrowser.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/Skin.cpp b/src/Skin.cpp
index efea9d4..cd4f2cf 100644
--- a/src/Skin.cpp
+++ b/src/Skin.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/Skin.h b/src/Skin.h
index c580ff7..07b0a5a 100644
--- a/src/Skin.h
+++ b/src/Skin.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/SkinChooser.cpp b/src/SkinChooser.cpp
index a3f7bed..68200ec 100644
--- a/src/SkinChooser.cpp
+++ b/src/SkinChooser.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/SkinChooser.h b/src/SkinChooser.h
index 39a1845..49cf4c4 100644
--- a/src/SkinChooser.h
+++ b/src/SkinChooser.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/SmallNumberDisplay.cpp b/src/SmallNumberDisplay.cpp
index 996ddeb..4507c97 100644
--- a/src/SmallNumberDisplay.cpp
+++ b/src/SmallNumberDisplay.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/SmallNumberDisplay.h b/src/SmallNumberDisplay.h
index aa99995..08b1c41 100644
--- a/src/SmallNumberDisplay.h
+++ b/src/SmallNumberDisplay.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/TextBar.cpp b/src/TextBar.cpp
index 5c0c772..d1fe63e 100644
--- a/src/TextBar.cpp
+++ b/src/TextBar.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/TextBar.h b/src/TextBar.h
index 76f1b4a..08b6471 100644
--- a/src/TextBar.h
+++ b/src/TextBar.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/TimeDisplay.cpp b/src/TimeDisplay.cpp
index cd26a02..f0c0cb7 100644
--- a/src/TimeDisplay.cpp
+++ b/src/TimeDisplay.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/TimeDisplay.h b/src/TimeDisplay.h
index 207e3cc..8548ffe 100644
--- a/src/TimeDisplay.h
+++ b/src/TimeDisplay.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/TitleBar.cpp b/src/TitleBar.cpp
index 4e5bdf4..2bb9d94 100644
--- a/src/TitleBar.cpp
+++ b/src/TitleBar.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/TitleBar.h b/src/TitleBar.h
index 87b21ab..716c6ef 100644
--- a/src/TitleBar.h
+++ b/src/TitleBar.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/VolumeSlider.cpp b/src/VolumeSlider.cpp
index aabe405..45541b6 100644
--- a/src/VolumeSlider.cpp
+++ b/src/VolumeSlider.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/VolumeSlider.h b/src/VolumeSlider.h
index 77a2b8b..5991c77 100644
--- a/src/VolumeSlider.h
+++ b/src/VolumeSlider.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/XMMSHandler.cpp b/src/XMMSHandler.cpp
index 9deb027..c0cb1f8 100644
--- a/src/XMMSHandler.cpp
+++ b/src/XMMSHandler.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 XMMSHandler &XMMSHandler::getInstance ()
 {
-	static XMMSHandler singleton(NULL, "Prome_Main");
+	static XMMSHandler singleton(NULL, "Promoe_Main");
 	return singleton;
 }
 
diff --git a/src/XMMSHandler.h b/src/XMMSHandler.h
index 5406b4d..891a214 100644
--- a/src/XMMSHandler.h
+++ b/src/XMMSHandler.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/basewindow.cpp b/src/basewindow.cpp
index f55f861..a31470e 100644
--- a/src/basewindow.cpp
+++ b/src/basewindow.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of promoe, an XMMS2 Client
+ *  This file is a part of Promoe, an XMMS2 Client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/basewindow.h b/src/basewindow.h
index 58ad211..4f1f8ea 100644
--- a/src/basewindow.h
+++ b/src/basewindow.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of promoe, an XMMS2 Client
+ *  This file is a part of Promoe, an XMMS2 Client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/dialogs/entryinfo.cpp b/src/dialogs/entryinfo.cpp
index 999c65a..f2efc66 100644
--- a/src/dialogs/entryinfo.cpp
+++ b/src/dialogs/entryinfo.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of promoe, an XMMS2 client
+ *  This file is a part of Promoe, an XMMS2 client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/dialogs/entryinfo.h b/src/dialogs/entryinfo.h
index ff240a9..b7da5e8 100644
--- a/src/dialogs/entryinfo.h
+++ b/src/dialogs/entryinfo.h
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/dialogs/playlistchooser.cpp b/src/dialogs/playlistchooser.cpp
index de71891..e73da74 100644
--- a/src/dialogs/playlistchooser.cpp
+++ b/src/dialogs/playlistchooser.cpp
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -14,7 +14,7 @@
  *  GNU General Public License for more details.
  */
 
-// FIXME: because somewhere something with the includes is wrons, this line
+// FIXME: because somewhere something with the includes is wrong, this line
 // is needed
 #include "XMMSHandler.h"
 
diff --git a/src/dialogs/playlistchooser.h b/src/dialogs/playlistchooser.h
index 2a9230c..1be3f6a 100644
--- a/src/dialogs/playlistchooser.h
+++ b/src/dialogs/playlistchooser.h
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/dialogs/urlopen.cpp b/src/dialogs/urlopen.cpp
index 2952411..33d0731 100644
--- a/src/dialogs/urlopen.cpp
+++ b/src/dialogs/urlopen.cpp
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/dialogs/urlopen.h b/src/dialogs/urlopen.h
index 78e6267..74dfc4d 100644
--- a/src/dialogs/urlopen.h
+++ b/src/dialogs/urlopen.h
@@ -1,7 +1,7 @@
 /**
  *  This file is a part of Promoe, an XMMS2 client
  *
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/src/equalizer/equalizerwidget.cpp b/src/equalizer/equalizerwidget.cpp
index 5b92b3f..322a08a 100644
--- a/src/equalizer/equalizerwidget.cpp
+++ b/src/equalizer/equalizerwidget.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/equalizer/equalizerwidget.h b/src/equalizer/equalizerwidget.h
index 003427d..98d11b3 100644
--- a/src/equalizer/equalizerwidget.h
+++ b/src/equalizer/equalizerwidget.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/equalizer/equalizerwindow.cpp b/src/equalizer/equalizerwindow.cpp
index af3a034..f0fff2a 100644
--- a/src/equalizer/equalizerwindow.cpp
+++ b/src/equalizer/equalizerwindow.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/equalizer/equalizerwindow.h b/src/equalizer/equalizerwindow.h
index 9edac1e..3541c4e 100644
--- a/src/equalizer/equalizerwindow.h
+++ b/src/equalizer/equalizerwindow.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/main.cpp b/src/main.cpp
index 34b4d11..ab24f41 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/clutterbar.cpp b/src/mainwindow/clutterbar.cpp
index e92fcde..00cea9c 100644
--- a/src/mainwindow/clutterbar.cpp
+++ b/src/mainwindow/clutterbar.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/clutterbar.h b/src/mainwindow/clutterbar.h
index b3c8352..f327512 100644
--- a/src/mainwindow/clutterbar.h
+++ b/src/mainwindow/clutterbar.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/maindisplay.cpp b/src/mainwindow/maindisplay.cpp
index 9905dae..af2479e 100644
--- a/src/mainwindow/maindisplay.cpp
+++ b/src/mainwindow/maindisplay.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/maindisplay.h b/src/mainwindow/maindisplay.h
index ee1f2d6..8002daa 100644
--- a/src/mainwindow/maindisplay.h
+++ b/src/mainwindow/maindisplay.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp
index 26be404..edf9f83 100644
--- a/src/mainwindow/mainwindow.cpp
+++ b/src/mainwindow/mainwindow.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h
index 63ab8ec..736e71c 100644
--- a/src/mainwindow/mainwindow.h
+++ b/src/mainwindow/mainwindow.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/shadeddisplay.cpp b/src/mainwindow/shadeddisplay.cpp
index 2dd48c8..2fca8b8 100644
--- a/src/mainwindow/shadeddisplay.cpp
+++ b/src/mainwindow/shadeddisplay.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/shadeddisplay.h b/src/mainwindow/shadeddisplay.h
index 1039775..72d1229 100644
--- a/src/mainwindow/shadeddisplay.h
+++ b/src/mainwindow/shadeddisplay.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/stereomono.cpp b/src/mainwindow/stereomono.cpp
index e632c30..8389d15 100644
--- a/src/mainwindow/stereomono.cpp
+++ b/src/mainwindow/stereomono.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/mainwindow/stereomono.h b/src/mainwindow/stereomono.h
index 5e051d9..3aed2b5 100644
--- a/src/mainwindow/stereomono.h
+++ b/src/mainwindow/stereomono.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistmenu.cpp b/src/playlist/playlistmenu.cpp
index da192e7..985e128 100644
--- a/src/playlist/playlistmenu.cpp
+++ b/src/playlist/playlistmenu.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistmenu.h b/src/playlist/playlistmenu.h
index 6c11e71..463c898 100644
--- a/src/playlist/playlistmenu.h
+++ b/src/playlist/playlistmenu.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistshade.cpp b/src/playlist/playlistshade.cpp
index 12559a0..7a7b784 100644
--- a/src/playlist/playlistshade.cpp
+++ b/src/playlist/playlistshade.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistshade.h b/src/playlist/playlistshade.h
index 6dedede..6b3c3f1 100644
--- a/src/playlist/playlistshade.h
+++ b/src/playlist/playlistshade.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 60ed06a..6aab894 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -1,8 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
- *  Copyright (C) 2007,2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h
index fcfd2ed..7114ed8 100644
--- a/src/playlist/playlistview.h
+++ b/src/playlist/playlistview.h
@@ -1,8 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
- *  Copyright (C) 2007,2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistwidget.cpp b/src/playlist/playlistwidget.cpp
index 3301c1e..972b620 100644
--- a/src/playlist/playlistwidget.cpp
+++ b/src/playlist/playlistwidget.cpp
@@ -1,8 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
- *  Copyright (C) 2007 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistwidget.h b/src/playlist/playlistwidget.h
index f945a25..14f804d 100644
--- a/src/playlist/playlistwidget.h
+++ b/src/playlist/playlistwidget.h
@@ -1,8 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
- *  Copyright (C) 2007 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistwindow.cpp b/src/playlist/playlistwindow.cpp
index 6b364f9..6c2f013 100644
--- a/src/playlist/playlistwindow.cpp
+++ b/src/playlist/playlistwindow.cpp
@@ -1,8 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/playlist/playlistwindow.h b/src/playlist/playlistwindow.h
index 65b616d..5240d3a 100644
--- a/src/playlist/playlistwindow.h
+++ b/src/playlist/playlistwindow.h
@@ -1,8 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
- *  Copyright (C) 2008 Thomas Frauendorfer
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 4388560..4af8402 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 7f0acdc..506081a 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -1,7 +1,7 @@
 /**
- *  This file is a part of Prome, an XMMS2 Client.
+ *  This file is a part of Promoe, an XMMS2 Client.
  *
- *  Copyright (C) 2005-2007 XMMS2 Team
+ *  Copyright (C) 2005-2008 XMMS2 Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by