diff --git a/doc/fbsetbg.1 b/doc/fbsetbg.1
index f9631781..b9d7a3c9 100644
--- a/doc/fbsetbg.1
+++ b/doc/fbsetbg.1
@@ -1,4 +1,4 @@
-.\" $Id: fbsetbg.1,v 1.3 2004/08/19 04:53:54 rathnor Exp $
+.\" $Id$
 .\"
 .\" Copyright (c) 2004, Han Boetes <han@fluxbox.org>
 .\"
diff --git a/doc/startfluxbox.1 b/doc/startfluxbox.1
index ff69efd2..5697bbe1 100644
--- a/doc/startfluxbox.1
+++ b/doc/startfluxbox.1
@@ -1,4 +1,4 @@
-.\" $Id: startfluxbox.1,v 1.4 2004/08/17 02:52:41 rathnor Exp $
+.\" $Id$
 .\"
 .\" Copyright (c) 2004, Han Boetes <han@fluxbox.org>
 .\"
diff --git a/mkinstalldirs b/mkinstalldirs
index a411b01d..d0fd194f 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1 2001/12/11 20:47:26 fluxgen Exp $
+# $Id$
 
 errstatus=0
 
diff --git a/src/ArrowButton.cc b/src/ArrowButton.cc
index 2c31be0d..c6d01c27 100644
--- a/src/ArrowButton.cc
+++ b/src/ArrowButton.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ArrowButton.cc,v 1.11 2004/10/21 16:49:19 akir Exp $
+// $Id$
 
 #include "ArrowButton.hh"
 #include "ButtonTheme.hh"
diff --git a/src/ArrowButton.hh b/src/ArrowButton.hh
index ccd0346c..ee0a3641 100644
--- a/src/ArrowButton.hh
+++ b/src/ArrowButton.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ArrowButton.hh,v 1.5 2004/08/26 15:09:33 rathnor Exp $
+// $Id$
 
 #ifndef ARROWBUTTON_HH
 #define ARROWBUTTON_HH
diff --git a/src/AtomHandler.hh b/src/AtomHandler.hh
index 0e622a10..1135ffb9 100644
--- a/src/AtomHandler.hh
+++ b/src/AtomHandler.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: AtomHandler.hh,v 1.14 2004/01/19 18:22:37 fluxgen Exp $
+// $Id$
 
 #ifndef ATOMHANDLER_HH
 #define ATOMHANDLER_HH
diff --git a/src/BoolMenuItem.hh b/src/BoolMenuItem.hh
index f5efae9f..7e20c24a 100644
--- a/src/BoolMenuItem.hh
+++ b/src/BoolMenuItem.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: BoolMenuItem.hh,v 1.2 2003/08/27 14:25:32 fluxgen Exp $
+// $Id$
 
 #ifndef BOOLMENUITEM_HH
 #define BOOLMENUITEM_HH
diff --git a/src/BorderTheme.hh b/src/BorderTheme.hh
index 06cd6aea..f9ed59dc 100644
--- a/src/BorderTheme.hh
+++ b/src/BorderTheme.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: BorderTheme.hh,v 1.1 2003/08/13 10:01:38 fluxgen Exp $
+// $Id$
 
 #ifndef BORDERTHEME_HH
 #define BORDERTHEME_HH
diff --git a/src/ButtonTool.cc b/src/ButtonTool.cc
index 6ec9570f..78278214 100644
--- a/src/ButtonTool.cc
+++ b/src/ButtonTool.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ButtonTool.cc,v 1.6 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #include "ButtonTool.hh"
 
diff --git a/src/ButtonTool.hh b/src/ButtonTool.hh
index ccc984c4..1acc33fe 100644
--- a/src/ButtonTool.hh
+++ b/src/ButtonTool.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ButtonTool.hh,v 1.3 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #ifndef BUTTONTOOL_HH
 #define BUTTONTOOL_HH
diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
index c175c64f..57ae06cc 100644
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ClientPattern.cc,v 1.8 2004/08/31 15:26:38 rathnor Exp $
+// $Id$
 
 #include "ClientPattern.hh"
 #include "RegExp.hh"
diff --git a/src/ClientPattern.hh b/src/ClientPattern.hh
index 2357a245..4b2fc39c 100644
--- a/src/ClientPattern.hh
+++ b/src/ClientPattern.hh
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ClientPattern.hh,v 1.3 2004/04/28 13:04:06 rathnor Exp $
+// $Id$
 
 #ifndef CLIENTPATTERN_HH
 #define CLIENTPATTERN_HH
diff --git a/src/ClockTool.cc b/src/ClockTool.cc
index 621351ce..64d70d12 100644
--- a/src/ClockTool.cc
+++ b/src/ClockTool.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ClockTool.cc,v 1.16 2004/10/10 12:00:37 rathnor Exp $
+// $Id$
 
 #include "ClockTool.hh"
 
diff --git a/src/ClockTool.hh b/src/ClockTool.hh
index 23d2b480..bce966cb 100644
--- a/src/ClockTool.hh
+++ b/src/ClockTool.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ClockTool.hh,v 1.6 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #ifndef CLOCKTOOL_HH
 #define CLOCKTOOL_HH
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index 7dee468c..07cd15c2 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CommandDialog.cc,v 1.6 2004/10/21 10:46:21 akir Exp $
+// $Id$
 
 #include "CommandDialog.hh"
 
diff --git a/src/CommandDialog.hh b/src/CommandDialog.hh
index 2d3e9f27..c3d99312 100644
--- a/src/CommandDialog.hh
+++ b/src/CommandDialog.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CommandDialog.hh,v 1.5 2004/10/21 10:46:21 akir Exp $
+// $Id$
 
 #ifndef RUNCOMMANDDIALOG_HH
 #define RUNCOMMANDDIALOG_HH
diff --git a/src/CommandParser.cc b/src/CommandParser.cc
index baa5e7a3..825a6357 100644
--- a/src/CommandParser.cc
+++ b/src/CommandParser.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CommandParser.cc,v 1.4 2003/08/11 13:47:51 fluxgen Exp $
+// $Id$
 
 #include "CommandParser.hh"
 
diff --git a/src/CommandParser.hh b/src/CommandParser.hh
index 038598fd..0f9ff298 100644
--- a/src/CommandParser.hh
+++ b/src/CommandParser.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CommandParser.hh,v 1.3 2004/01/02 13:43:58 fluxgen Exp $
+// $Id$
 
 #ifndef COMMANDPARSER_HH
 #define COMMANDPARSER_HH
diff --git a/src/Container.cc b/src/Container.cc
index d3290529..543f66c5 100644
--- a/src/Container.cc
+++ b/src/Container.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Container.cc,v 1.15 2004/06/16 15:38:19 rathnor Exp $
+// $Id$
 
 #include "Container.hh"
 
diff --git a/src/Container.hh b/src/Container.hh
index 158e0347..3b053850 100644
--- a/src/Container.hh
+++ b/src/Container.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Container.hh,v 1.6 2004/01/21 13:34:40 fluxgen Exp $
+// $Id$
 
 #ifndef CONTAINER_HH
 #define CONTAINER_HH
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 44355aa2..3e118129 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CurrentWindowCmd.cc,v 1.9 2004/02/20 19:40:31 fluxgen Exp $
+// $Id$
 
 #include "CurrentWindowCmd.hh"
 
diff --git a/src/CurrentWindowCmd.hh b/src/CurrentWindowCmd.hh
index 2c22f073..2bc2c819 100644
--- a/src/CurrentWindowCmd.hh
+++ b/src/CurrentWindowCmd.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CurrentWindowCmd.hh,v 1.7 2004/02/20 19:40:31 fluxgen Exp $
+// $Id$
 
 #ifndef CURRENTWINDOWCMD_HH
 #define CURRENTWINDOWCMD_HH
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 11be04c8..b6c5b24a 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Ewmh.cc,v 1.53 2004/10/21 10:57:38 akir Exp $
+// $Id$
 
 #include "Ewmh.hh"
 
diff --git a/src/Ewmh.hh b/src/Ewmh.hh
index d4bd09c7..b3f15933 100644
--- a/src/Ewmh.hh
+++ b/src/Ewmh.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Ewmh.hh,v 1.18 2004/06/20 04:49:32 rathnor Exp $
+// $Id$
 
 #include "AtomHandler.hh"
 
diff --git a/src/FbAtoms.cc b/src/FbAtoms.cc
index 8b2bfb27..eccf30af 100644
--- a/src/FbAtoms.cc
+++ b/src/FbAtoms.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbAtoms.cc,v 1.10 2004/08/31 15:26:38 rathnor Exp $
+// $Id$
 
 #include "FbAtoms.hh"
 #include "App.hh"
diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 3af1f316..ba9330d8 100644
--- a/src/FbAtoms.hh
+++ b/src/FbAtoms.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbAtoms.hh,v 1.11 2003/09/24 14:02:25 rathnor Exp $
+// $Id$
 #ifndef FBATOMS_HH
 #define FBATOMS_HH
 
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 4e6adf94..8ff92abf 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbCommandFactory.cc,v 1.36 2004/10/06 11:40:28 akir Exp $
+// $Id$
 
 #include "FbCommandFactory.hh"
 
diff --git a/src/FbCommandFactory.hh b/src/FbCommandFactory.hh
index 135c87fa..d1fd797c 100644
--- a/src/FbCommandFactory.hh
+++ b/src/FbCommandFactory.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbCommandFactory.hh,v 1.1 2003/06/30 14:49:23 fluxgen Exp $
+// $Id$
 
 #include "CommandParser.hh"
 
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 1d298a42..84ad4564 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbCommands.cc,v 1.30 2004/10/21 13:05:50 akir Exp $
+// $Id$
 
 #include "FbCommands.hh"
 #include "fluxbox.hh"
diff --git a/src/FbCommands.hh b/src/FbCommands.hh
index 18b404ab..917ab300 100644
--- a/src/FbCommands.hh
+++ b/src/FbCommands.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbCommands.hh,v 1.21 2004/10/21 10:23:58 akir Exp $
+// $Id$
 
 // \file contains basic commands to restart, reconfigure, execute command and exit fluxbox
 
diff --git a/src/FbMenu.cc b/src/FbMenu.cc
index 6efb34e0..e1e3c7b8 100644
--- a/src/FbMenu.cc
+++ b/src/FbMenu.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbMenu.cc,v 1.3 2004/04/18 18:53:55 fluxgen Exp $
+// $Id$
 
 
 #include "FbMenu.hh"
diff --git a/src/FbMenu.hh b/src/FbMenu.hh
index ca4b42de..ec1b4017 100644
--- a/src/FbMenu.hh
+++ b/src/FbMenu.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbMenu.hh,v 1.5 2004/06/27 13:43:09 fluxgen Exp $
+// $Id$
 
 #ifndef FBMENU_HH
 #define FBMENU_HH
diff --git a/src/FbMenuParser.cc b/src/FbMenuParser.cc
index 135283ec..022e100a 100644
--- a/src/FbMenuParser.cc
+++ b/src/FbMenuParser.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbMenuParser.cc,v 1.3 2004/10/21 10:49:20 akir Exp $
+// $Id$
 
 #include "FbMenuParser.hh"
 
diff --git a/src/FbMenuParser.hh b/src/FbMenuParser.hh
index a43e3e9c..c50bb7b0 100644
--- a/src/FbMenuParser.hh
+++ b/src/FbMenuParser.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbMenuParser.hh,v 1.2 2004/06/10 11:42:35 fluxgen Exp $
+// $Id$
 
 #ifndef FBMENUPARSER_HH
 #define FBMENUPARSER_HH
diff --git a/src/FbRootWindow.cc b/src/FbRootWindow.cc
index af9034e3..7cec2347 100644
--- a/src/FbRootWindow.cc
+++ b/src/FbRootWindow.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbRootWindow.cc,v 1.4 2004/10/21 10:21:03 akir Exp $
+// $Id$
 
 #include "FbRootWindow.hh"
 #include "App.hh"
diff --git a/src/FbRootWindow.hh b/src/FbRootWindow.hh
index f977d05c..5ef72fe2 100644
--- a/src/FbRootWindow.hh
+++ b/src/FbRootWindow.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbRootWindow.hh,v 1.3 2004/02/10 18:50:07 fluxgen Exp $
+// $Id$
 
 #ifndef FBROOTWINDOW_HH
 #define FBROOTWINDOW_HH
diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index 75bda598..a3783dc8 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Button.cc,v 1.18 2004/02/27 13:24:21 fluxgen Exp $
+// $Id$
 
 #include "Button.hh"
 
diff --git a/src/FbTk/Button.hh b/src/FbTk/Button.hh
index 791de240..e167f1c8 100644
--- a/src/FbTk/Button.hh
+++ b/src/FbTk/Button.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Button.hh,v 1.9 2004/08/26 15:09:33 rathnor Exp $
+// $Id$
 
 #ifndef FBTK_BUTTON_HH
 #define FBTK_BUTTON_HH
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index cd6c2a8c..ef8aef6f 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Color.cc,v 1.11 2004/06/07 11:46:05 rathnor Exp $
+// $Id$
 
 #include "Color.hh"
 
diff --git a/src/FbTk/Color.hh b/src/FbTk/Color.hh
index 52067901..4ee36d4d 100644
--- a/src/FbTk/Color.hh
+++ b/src/FbTk/Color.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Color.hh,v 1.7 2004/02/28 16:55:22 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_COLOR_HH
 #define FBTK_COLOR_HH
diff --git a/src/FbTk/CompareEqual.hh b/src/FbTk/CompareEqual.hh
index 2894eacf..d7ce7f28 100644
--- a/src/FbTk/CompareEqual.hh
+++ b/src/FbTk/CompareEqual.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: CompareEqual.hh,v 1.1 2004/02/27 12:11:05 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_COMPAREEQUAL_HH
 #define FBTK_COMPAREEQUAL_HH
diff --git a/src/FbTk/Compose.hh b/src/FbTk/Compose.hh
index 91d16655..97cf33ea 100644
--- a/src/FbTk/Compose.hh
+++ b/src/FbTk/Compose.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Compose.hh,v 1.2 2003/12/16 17:06:49 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_COMPOSE_HH
 #define FBTK_COMPOSE_HH
diff --git a/src/FbTk/Directory.cc b/src/FbTk/Directory.cc
index 30a2a9f9..0535dc0b 100644
--- a/src/FbTk/Directory.cc
+++ b/src/FbTk/Directory.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Directory.cc,v 1.4 2004/04/26 10:17:09 fluxgen Exp $
+// $Id$
 
 #include "Directory.hh"
 
diff --git a/src/FbTk/Directory.hh b/src/FbTk/Directory.hh
index a553d565..f138ce71 100644
--- a/src/FbTk/Directory.hh
+++ b/src/FbTk/Directory.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Directory.hh,v 1.4 2004/04/19 18:09:14 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_DIRECTORY_HH
 #define FBTK_DIRECTORY_HH
diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh
index c2263beb..ceb8878b 100644
--- a/src/FbTk/EventHandler.hh
+++ b/src/FbTk/EventHandler.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventHandler.hh,v 1.6 2003/12/16 17:06:49 fluxgen Exp $
+// $Id$
 
 /// @file holds EventHandler interface for X events
 
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index 854a5a59..ec163852 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventManager.cc,v 1.14 2004/09/10 07:15:23 akir Exp $
+// $Id$
 
 #include "EventManager.hh"
 #include "FbWindow.hh"
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index 6bd368c5..48a2492d 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: EventManager.hh,v 1.9 2004/05/04 14:33:38 rathnor Exp $
+// $Id$
 
 #include "EventHandler.hh"
 #include <map>
diff --git a/src/FbTk/FbDrawable.cc b/src/FbTk/FbDrawable.cc
index 157f9912..50bb6906 100644
--- a/src/FbTk/FbDrawable.cc
+++ b/src/FbTk/FbDrawable.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbDrawable.cc,v 1.4 2004/09/11 22:58:20 fluxgen Exp $
+// $Id$
 
 #include "FbDrawable.hh"
 
diff --git a/src/FbTk/FbDrawable.hh b/src/FbTk/FbDrawable.hh
index 03dac923..75178eea 100644
--- a/src/FbTk/FbDrawable.hh
+++ b/src/FbTk/FbDrawable.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbDrawable.hh,v 1.7 2004/09/11 22:58:20 fluxgen Exp $
+// $Id$
 #ifndef FBTK_FBDRAWABLE_HH
 #define FBTK_FBDRAWABLE_HH
 
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 918b8853..02466813 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbPixmap.cc,v 1.17 2004/09/24 06:23:17 rathnor Exp $
+// $Id$
 
 #include "FbPixmap.hh"
 #include "App.hh"
diff --git a/src/FbTk/FbPixmap.hh b/src/FbTk/FbPixmap.hh
index ee5d6ac4..9e0d4e09 100644
--- a/src/FbTk/FbPixmap.hh
+++ b/src/FbTk/FbPixmap.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbPixmap.hh,v 1.13 2004/09/09 14:29:10 akir Exp $
+// $Id$
 
 #ifndef FBTK_FBPIXMAP_HH
 #define FBTK_FBPIXMAP_HH
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 7e6c863c..e0a0a4a1 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.cc,v 1.43 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #include "FbWindow.hh"
 #include "FbPixmap.hh"
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index d408216c..6e11789e 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWindow.hh,v 1.35 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #ifndef FBTK_FBWINDOW_HH
 #define FBTK_FBWINDOW_HH
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 400e197d..3bacbce9 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Font.cc,v 1.22 2004/10/31 23:04:30 akir Exp $
+//$Id$
 
 
 #include "StringUtil.hh"
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh
index 0a8f1c32..d299848c 100644
--- a/src/FbTk/Font.hh
+++ b/src/FbTk/Font.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Font.hh,v 1.13 2004/09/11 22:58:20 fluxgen Exp $
+//$Id$
 
 #ifndef FBTK_FONT_HH
 #define FBTK_FONT_HH
diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh
index cf28baf0..8691feb8 100644
--- a/src/FbTk/FontImp.hh
+++ b/src/FbTk/FontImp.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FontImp.hh,v 1.4 2004/09/11 22:58:20 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_FONTIMP_HH
 #define FBTK_FONTIMP_HH
diff --git a/src/FbTk/GContext.cc b/src/FbTk/GContext.cc
index 628df07a..5f6f3b9e 100644
--- a/src/FbTk/GContext.cc
+++ b/src/FbTk/GContext.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: GContext.cc,v 1.7 2004/09/11 23:00:44 fluxgen Exp $
+// $Id$
 
 #include "GContext.hh"
 
diff --git a/src/FbTk/GContext.hh b/src/FbTk/GContext.hh
index 280276c8..4d8da3d6 100644
--- a/src/FbTk/GContext.hh
+++ b/src/FbTk/GContext.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: GContext.hh,v 1.13 2004/10/18 20:10:37 akir Exp $
+// $Id$
 
 #ifndef FBTK_GCONTEXT_HH
 #define FBTK_GCONTEXT_HH
diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc
index d388a97d..68ded40f 100644
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: I18n.cc,v 1.4 2004/10/07 09:52:28 akir Exp $
+// $Id$
 
 /* Note:
  * A good reference for the older non-gettext style I18n
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 186809b4..32d6e19b 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: I18n.hh,v 1.2 2004/07/19 13:53:46 fluxgen Exp $
+// $Id$
 
 #ifndef	 I18N_HH
 #define	 I18N_HH
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 4ccda5b3..1026a922 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Image.cc,v 1.4 2004/01/02 22:01:08 fluxgen Exp $
+// $Id$
 
 #include "Image.hh"
 #include "StringUtil.hh"
diff --git a/src/FbTk/Image.hh b/src/FbTk/Image.hh
index 49c93409..6e0bf530 100644
--- a/src/FbTk/Image.hh
+++ b/src/FbTk/Image.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Image.hh,v 1.3 2003/12/16 17:06:51 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_IMAGE_HH
 #define FBTK_IMAGE_HH
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index cd86c94e..88e769ca 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ImageControl.cc,v 1.16 2004/09/10 16:41:30 akir Exp $
+// $Id$
 
 #include "ImageControl.hh"
 
diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh
index cdb28bf7..cec9f05a 100644
--- a/src/FbTk/ImageControl.hh
+++ b/src/FbTk/ImageControl.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ImageControl.hh,v 1.10 2004/01/21 14:16:02 fluxgen Exp $
+// $Id$
 
 #ifndef	 FBTK_IMAGECONTROL_HH
 #define	 FBTK_IMAGECONTROL_HH
diff --git a/src/FbTk/ImageXPM.cc b/src/FbTk/ImageXPM.cc
index b24cfe5f..8a586408 100644
--- a/src/FbTk/ImageXPM.cc
+++ b/src/FbTk/ImageXPM.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ImageXPM.cc,v 1.1 2003/08/22 21:25:14 fluxgen Exp $
+// $Id$
 
 #include "ImageXPM.hh"
 
diff --git a/src/FbTk/ImageXPM.hh b/src/FbTk/ImageXPM.hh
index d6afdf33..6a9cba4f 100644
--- a/src/FbTk/ImageXPM.hh
+++ b/src/FbTk/ImageXPM.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ImageXPM.hh,v 1.1 2003/08/22 21:25:14 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_IMAGEXPM_HH
 #define FBTK_IMAGEXPM_HH
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index d75790a1..d120a126 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: KeyUtil.cc,v 1.9 2004/10/08 11:49:55 akir Exp $
+// $Id$
 
 #include "KeyUtil.hh"
 #include "App.hh"
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh
index d4f2ccd7..eb31e384 100644
--- a/src/FbTk/KeyUtil.hh
+++ b/src/FbTk/KeyUtil.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: KeyUtil.hh,v 1.8 2004/10/08 11:51:16 akir Exp $
+// $Id$
 
 #ifndef FBTK_KEYUTIL_HH
 #define FBTK_KEYUTIL_HH
diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index a057610b..0feac6e2 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Layer.hh,v 1.2 2003/12/16 17:06:51 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_LAYERTEMPLATE_HH
 #define FBTK_LAYERTEMPLATE_HH
diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
index 09dda0d6..c90ce0da 100644
--- a/src/FbTk/LayerItem.hh
+++ b/src/FbTk/LayerItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: LayerItem.hh,v 1.2 2003/12/16 17:06:51 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_LAYERITEM_HH
 #define FBTK_LAYERITEM_HH
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index d6550994..17766cdc 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MacroCommand.cc,v 1.2 2003/09/29 14:00:46 fluxgen Exp $
+// $Id$
 
 #include "MacroCommand.hh"
 
diff --git a/src/FbTk/MacroCommand.hh b/src/FbTk/MacroCommand.hh
index f710e8ac..65a5cb8b 100644
--- a/src/FbTk/MacroCommand.hh
+++ b/src/FbTk/MacroCommand.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MacroCommand.hh,v 1.3 2003/12/16 17:06:51 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_MACROCOMMAND_HH
 #define FBTK_MACROCOMMAND_HH
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index b2c8fc7b..2460951e 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.cc,v 1.86 2004/09/29 09:58:11 akir Exp $
+// $Id$
 
 //use GNU extensions
 #ifndef	 _GNU_SOURCE
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 43ca828d..04b440cf 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Menu.hh,v 1.40 2004/09/11 13:45:16 fluxgen Exp $
+// $Id$
 
 #ifndef	 FBTK_MENU_HH
 #define	 FBTK_MENU_HH
diff --git a/src/FbTk/MenuIcon.cc b/src/FbTk/MenuIcon.cc
index bd9ed79e..516a9811 100644
--- a/src/FbTk/MenuIcon.cc
+++ b/src/FbTk/MenuIcon.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuIcon.cc,v 1.2 2004/09/10 16:37:54 akir Exp $
+// $Id$
 
 #include "MenuIcon.hh"
 
diff --git a/src/FbTk/MenuIcon.hh b/src/FbTk/MenuIcon.hh
index de695b19..4c8ced29 100644
--- a/src/FbTk/MenuIcon.hh
+++ b/src/FbTk/MenuIcon.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuIcon.hh,v 1.1 2004/06/07 22:28:39 fluxgen Exp $
+// $Id$
 
 #ifndef MENUICON_HH
 #define MENUICON_HH
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 8fe5a507..da57257c 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuItem.cc,v 1.10 2004/09/11 23:00:08 fluxgen Exp $
+// $Id$
 
 #include "MenuItem.hh"
 #include "Command.hh"
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index cd48f5b5..3c703771 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuItem.hh,v 1.7 2004/06/10 17:31:39 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_MENUITEM_HH
 #define FBTK_MENUITEM_HH
diff --git a/src/FbTk/MenuSeparator.cc b/src/FbTk/MenuSeparator.cc
index 45562d99..1e6c4c8c 100644
--- a/src/FbTk/MenuSeparator.cc
+++ b/src/FbTk/MenuSeparator.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuSeparator.cc,v 1.1 2004/06/07 21:05:16 fluxgen Exp $
+// $Id$
 
 #include "MenuSeparator.hh"
 
diff --git a/src/FbTk/MenuSeparator.hh b/src/FbTk/MenuSeparator.hh
index 25b62785..c343fea1 100644
--- a/src/FbTk/MenuSeparator.hh
+++ b/src/FbTk/MenuSeparator.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuSeparator.hh,v 1.1 2004/06/07 21:05:16 fluxgen Exp $
+// $Id$
 
 #ifndef MENUSEPARATOR_HH
 #define MENUSEPARATOR_hh
diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc
index 9fc89590..e4f3e3b6 100644
--- a/src/FbTk/MenuTheme.cc
+++ b/src/FbTk/MenuTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.cc,v 1.20 2004/08/31 15:26:39 rathnor Exp $
+// $Id$
 
 #include "MenuTheme.hh"
 
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index 010e6940..53f7e376 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.hh,v 1.16 2004/06/13 10:59:24 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_MENUTHEME_HH
 #define FBTK_MENUTHEME_HH
diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc
index 9875ef7c..179778f9 100644
--- a/src/FbTk/MultLayers.cc
+++ b/src/FbTk/MultLayers.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultLayers.cc,v 1.8 2004/01/08 22:04:04 fluxgen Exp $
+// $Id$
 
 #include "MultLayers.hh"
 #include "XLayer.hh"
diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
index 7cc8b047..0226836a 100644
--- a/src/FbTk/MultLayers.hh
+++ b/src/FbTk/MultLayers.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultLayers.hh,v 1.7 2004/07/15 09:52:57 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_MULTLAYERS_HH
 #define FBTK_MULTLAYERS_HH
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc
index 68094505..beb65c0c 100644
--- a/src/FbTk/MultiButtonMenuItem.cc
+++ b/src/FbTk/MultiButtonMenuItem.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultiButtonMenuItem.cc,v 1.3 2004/06/10 11:41:15 fluxgen Exp $
+// $Id$
 
 #include "MultiButtonMenuItem.hh"
 #include "PixmapWithMask.hh"
diff --git a/src/FbTk/MultiButtonMenuItem.hh b/src/FbTk/MultiButtonMenuItem.hh
index d56bfcf9..ffd3e4bf 100644
--- a/src/FbTk/MultiButtonMenuItem.hh
+++ b/src/FbTk/MultiButtonMenuItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MultiButtonMenuItem.hh,v 1.1 2003/11/27 13:20:57 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_MULTIBUTTONMENUITEM_HH
 #define FBTK_MULTIBUTTONMENUITEM_HH
diff --git a/src/FbTk/Observer.cc b/src/FbTk/Observer.cc
index 6142b07f..0d1da509 100644
--- a/src/FbTk/Observer.cc
+++ b/src/FbTk/Observer.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Observer.cc,v 1.1 2003/02/15 01:21:40 fluxgen Exp $
+// $Id$
 
 #include "Observer.hh"
 #include "Subject.hh"
diff --git a/src/FbTk/Observer.hh b/src/FbTk/Observer.hh
index 54b7a706..0e4ab4c0 100644
--- a/src/FbTk/Observer.hh
+++ b/src/FbTk/Observer.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Observer.hh,v 1.2 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_OBSERVER_HH
 #define FBTK_OBSERVER_HH
diff --git a/src/FbTk/PixmapWithMask.hh b/src/FbTk/PixmapWithMask.hh
index 5925fb77..85bf385a 100644
--- a/src/FbTk/PixmapWithMask.hh
+++ b/src/FbTk/PixmapWithMask.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: PixmapWithMask.hh,v 1.2 2003/08/27 14:21:25 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_PIXMAPWITHMASK_HH
 #define FBTK_PIXMAPWITHMASK_HH
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index 08b534dc..13876a35 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Resource.cc,v 1.7 2004/08/31 15:26:39 rathnor Exp $
+// $Id$
 
 #include "XrmDatabaseHelper.hh"
 #include "Resource.hh"
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh
index 30ce02d4..9798ce04 100644
--- a/src/FbTk/Resource.hh
+++ b/src/FbTk/Resource.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Resource.hh,v 1.8 2004/04/26 22:19:09 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_RESOURCE_HH
 #define FBTK_RESOURCE_HH
diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc
index 6dbbf49b..27452947 100644
--- a/src/FbTk/SignalHandler.cc
+++ b/src/FbTk/SignalHandler.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SignalHandler.cc,v 1.4 2003/05/13 11:41:29 fluxgen Exp $
+// $Id$
 
 #include "SignalHandler.hh"
 
diff --git a/src/FbTk/SignalHandler.hh b/src/FbTk/SignalHandler.hh
index 2de80a95..ab56d151 100644
--- a/src/FbTk/SignalHandler.hh
+++ b/src/FbTk/SignalHandler.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SignalHandler.hh,v 1.6 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_SIGNALHANDLER_HH
 #define FBTK_SIGNALHANDLER_HH
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index d663bddd..7b4131b5 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StringUtil.cc,v 1.13 2004/09/10 16:04:16 akir Exp $
+// $Id$
 
 #include "StringUtil.hh"
 
diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 34863e2f..2e2bed20 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: StringUtil.hh,v 1.10 2004/09/10 16:04:16 akir Exp $
+//$Id$
 
 #ifndef FBTK_STRINGUTIL_HH
 #define FBTK_STRINGUTIL_HH
diff --git a/src/FbTk/Subject.cc b/src/FbTk/Subject.cc
index a575cfda..dca18451 100644
--- a/src/FbTk/Subject.cc
+++ b/src/FbTk/Subject.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Subject.cc,v 1.3 2003/09/08 15:38:46 fluxgen Exp $
+// $Id$
 
 #include "Subject.hh"
 #include "Observer.hh"
diff --git a/src/FbTk/Subject.hh b/src/FbTk/Subject.hh
index 54bf533c..d3580a8e 100644
--- a/src/FbTk/Subject.hh
+++ b/src/FbTk/Subject.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Subject.hh,v 1.5 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_SUBJECT_HH
 #define FBTK_SUBJECT_HH
diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc
index 8dc91d97..1fef7a2f 100644
--- a/src/FbTk/Text.cc
+++ b/src/FbTk/Text.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Text.cc,v 1.3 2004/04/26 15:04:37 rathnor Exp $
+// $Id$
 
 #include "Text.hh"
 
diff --git a/src/FbTk/Text.hh b/src/FbTk/Text.hh
index 0abe4ed1..9a3f1efd 100644
--- a/src/FbTk/Text.hh
+++ b/src/FbTk/Text.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Text.hh,v 1.3 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_TEXT_HH
 #define FBTK_TEXT_HH
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc
index 02f32f01..0454f87e 100644
--- a/src/FbTk/TextBox.cc
+++ b/src/FbTk/TextBox.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextBox.cc,v 1.15 2004/10/08 11:52:33 akir Exp $
+// $Id$
 
 #include "TextBox.hh"
 #include "Font.hh"
diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh
index 10e7f667..62045ee5 100644
--- a/src/FbTk/TextBox.hh
+++ b/src/FbTk/TextBox.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextBox.hh,v 1.1 2003/08/26 23:24:48 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_TEXTBOX_HH
 #define FBTK_TEXTBOX_HH
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 9b4798bb..0373183d 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextButton.cc,v 1.7 2004/10/10 16:04:33 akir Exp $
+// $Id$
 
 #include "TextButton.hh"
 #include "Font.hh"
diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh
index 42c26f5a..14621e32 100644
--- a/src/FbTk/TextButton.hh
+++ b/src/FbTk/TextButton.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextButton.hh,v 1.6 2004/10/10 16:04:33 akir Exp $
+// $Id$
 
 #ifndef FBTK_TEXTBUTTON_HH
 #define FBTK_TEXTBUTTON_HH
diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc
index 812f76a9..1677790f 100644
--- a/src/FbTk/Texture.cc
+++ b/src/FbTk/Texture.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Texture.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $
+// $Id$
 
 #include "App.hh"
 #include "Texture.hh"
diff --git a/src/FbTk/Texture.hh b/src/FbTk/Texture.hh
index 1ee3e796..162cf44c 100644
--- a/src/FbTk/Texture.hh
+++ b/src/FbTk/Texture.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Texture.hh,v 1.7 2004/08/26 16:37:48 rathnor Exp $
+// $Id$
 
 #ifndef FBTK_TEXTURE_HH
 #define FBTK_TEXTURE_HH
diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc
index 072caefc..5e7520b7 100644
--- a/src/FbTk/TextureRender.cc
+++ b/src/FbTk/TextureRender.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextureRender.cc,v 1.15 2004/10/25 22:57:32 akir Exp $
+// $Id$
 
 #include "TextureRender.hh"
 
diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh
index 0139dcb9..490b0147 100644
--- a/src/FbTk/TextureRender.hh
+++ b/src/FbTk/TextureRender.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextureRender.hh,v 1.3 2004/10/06 09:30:54 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_TEXTURRENDER_HH
 #define FBTK_TEXTURRENDER_HH
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index dea7250c..40c68e97 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.cc,v 1.30 2004/10/21 16:45:30 akir Exp $
+// $Id$
 
 #include "Theme.hh"
 
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index ff84051b..7b831221 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.hh,v 1.16 2004/04/26 15:04:37 rathnor Exp $
+// $Id$
 
 /**
  @file holds ThemeItem<T>, Theme and ThemeManager which is the base for any theme
diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc
index 6f792cce..a5883289 100644
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ThemeItems.cc,v 1.1 2004/10/21 16:44:06 akir Exp $
+// $Id$
 
 /// @file implements common theme items
 
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index f8ca2a88..1e112e7c 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Transparent.cc,v 1.9 2004/09/12 14:56:20 rathnor Exp $
+// $Id$
 
 #include "Transparent.hh"
 #include "App.hh"
diff --git a/src/FbTk/Transparent.hh b/src/FbTk/Transparent.hh
index 9aeeead9..a1117437 100644
--- a/src/FbTk/Transparent.hh
+++ b/src/FbTk/Transparent.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Transparent.hh,v 1.4 2004/09/12 14:56:20 rathnor Exp $
+// $Id$
 
 #ifndef FBTK_TRANSPARENT_HH
 #define FBTK_TRANSPARENT_HH
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc
index 0a01eb0f..c232fe8b 100644
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XFontImp.cc,v 1.10 2004/09/11 22:58:20 fluxgen Exp $
+// $Id$
 
 #include "XFontImp.hh"
 #include "App.hh"
diff --git a/src/FbTk/XFontImp.hh b/src/FbTk/XFontImp.hh
index 483ae0b2..c5b79469 100644
--- a/src/FbTk/XFontImp.hh
+++ b/src/FbTk/XFontImp.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XFontImp.hh,v 1.6 2004/09/11 22:58:20 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_XFONTIMP_HH
 #define FBTK_XFONTIMP_HH
diff --git a/src/FbTk/XLayer.cc b/src/FbTk/XLayer.cc
index 8b3ead06..49631202 100644
--- a/src/FbTk/XLayer.cc
+++ b/src/FbTk/XLayer.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayer.cc,v 1.10 2004/09/10 04:03:58 rathnor Exp $
+// $Id$
 
 #include "XLayer.hh"
 #include "XLayerItem.hh"
diff --git a/src/FbTk/XLayer.hh b/src/FbTk/XLayer.hh
index 442f288b..c5a69eae 100644
--- a/src/FbTk/XLayer.hh
+++ b/src/FbTk/XLayer.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayer.hh,v 1.5 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 
 #ifndef FBTK_XLAYER_HH
diff --git a/src/FbTk/XLayerItem.cc b/src/FbTk/XLayerItem.cc
index fdc7fb6f..8d3187e3 100644
--- a/src/FbTk/XLayerItem.cc
+++ b/src/FbTk/XLayerItem.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayerItem.cc,v 1.7 2003/04/15 23:09:25 rathnor Exp $
+// $Id$
 
 #include "XLayerItem.hh"
 #include "XLayer.hh"
diff --git a/src/FbTk/XLayerItem.hh b/src/FbTk/XLayerItem.hh
index 1ea355ab..d8ebdc0d 100644
--- a/src/FbTk/XLayerItem.hh
+++ b/src/FbTk/XLayerItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XLayerItem.hh,v 1.8 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_XLAYERITEM_HH
 #define FBTK_XLAYERITEM_HH
diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc
index 3d79dcce..6928f265 100644
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: XftFontImp.cc,v 1.6 2004/09/11 22:58:20 fluxgen Exp $
+//$Id$
 
 #include "XftFontImp.hh"
 #include "App.hh"
diff --git a/src/FbTk/XftFontImp.hh b/src/FbTk/XftFontImp.hh
index 74b5a5be..c04084df 100644
--- a/src/FbTk/XftFontImp.hh
+++ b/src/FbTk/XftFontImp.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: XftFontImp.hh,v 1.5 2004/09/11 22:58:20 fluxgen Exp $
+//$Id$
 
 #ifndef FBTK_XFTFONTIMP_HH
 #define FBTK_XFTFONTIMP_HH
diff --git a/src/FbTk/XmbFontImp.hh b/src/FbTk/XmbFontImp.hh
index 36be6274..ac9f0ee4 100644
--- a/src/FbTk/XmbFontImp.hh
+++ b/src/FbTk/XmbFontImp.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XmbFontImp.hh,v 1.5 2004/09/11 22:58:20 fluxgen Exp $
+// $Id$
 
 #ifndef FBTK_XMBFONTIMP_HH
 #define FBTK_XMBFONTIMP_HH
diff --git a/src/FbTk/XrmDatabaseHelper.hh b/src/FbTk/XrmDatabaseHelper.hh
index 3273d411..e1649318 100644
--- a/src/FbTk/XrmDatabaseHelper.hh
+++ b/src/FbTk/XrmDatabaseHelper.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XrmDatabaseHelper.hh,v 1.3 2003/12/16 17:06:52 fluxgen Exp $
+// $Id$
 
 
 #ifndef FBTK_XRMDATABASEHELPER_HH
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index f05cdfaf..06c53f60 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrame.cc,v 1.81 2004/10/22 09:43:53 akir Exp $
+// $Id$
 
 #include "FbWinFrame.hh"
 
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index c0919b4b..88fe51ac 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrame.hh,v 1.28 2004/01/02 13:25:55 fluxgen Exp $
+// $Id$
 
 #ifndef FBWINFRAME_HH
 #define FBWINFRAME_HH
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 01611551..0acc9306 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrameTheme.cc,v 1.19 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #include "FbWinFrameTheme.hh"
 #include "App.hh"
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh
index e8397d00..53b159e3 100644
--- a/src/FbWinFrameTheme.hh
+++ b/src/FbWinFrameTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrameTheme.hh,v 1.16 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #ifndef FBWINFRAMETHEME_HH
 #define FBWINFRAMETHEME_HH
diff --git a/src/FocusModelMenuItem.hh b/src/FocusModelMenuItem.hh
index ec638c81..e5dba601 100644
--- a/src/FocusModelMenuItem.hh
+++ b/src/FocusModelMenuItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FocusModelMenuItem.hh,v 1.1 2004/05/02 21:09:04 fluxgen Exp $
+// $Id$
 
 #ifndef FOCUSMODELMENUITEM_HH
 #define FOCUSMODELMENUITEM_HH
diff --git a/src/GenericTool.cc b/src/GenericTool.cc
index 671a4eb2..0cb35ed4 100644
--- a/src/GenericTool.cc
+++ b/src/GenericTool.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: GenericTool.cc,v 1.4 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #include "GenericTool.hh"
 #include "FbTk/FbWindow.hh"
diff --git a/src/GenericTool.hh b/src/GenericTool.hh
index 96331574..91015b32 100644
--- a/src/GenericTool.hh
+++ b/src/GenericTool.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: GenericTool.hh,v 1.3 2004/09/12 14:56:18 rathnor Exp $
+// $Id$
 
 #ifndef GENERICTOOL_HH
 #define GENERICTOOL_HH
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 64a6cacb..d7bfd434 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Gnome.cc,v 1.37 2004/08/11 13:16:10 fluxgen Exp $
+// $Id$
 
 #include "Gnome.hh"
 
diff --git a/src/Gnome.hh b/src/Gnome.hh
index d8ed4125..b1bca4cd 100644
--- a/src/Gnome.hh
+++ b/src/Gnome.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Gnome.hh,v 1.12 2004/06/28 13:33:05 fluxgen Exp $
+// $Id$
 
 #ifndef GNOME_HH
 #define GNOME_HH
diff --git a/src/IconButton.cc b/src/IconButton.cc
index a4293c62..457a921d 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconButton.cc,v 1.23 2004/10/22 00:35:28 akir Exp $
+// $Id$
 
 #include "IconButton.hh"
 #include "IconbarTool.hh"
diff --git a/src/IconButton.hh b/src/IconButton.hh
index 80310b47..82ae68b9 100644
--- a/src/IconButton.hh
+++ b/src/IconButton.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconButton.hh,v 1.5 2004/10/22 00:35:28 akir Exp $
+// $Id$
 
 #ifndef ICONBUTTON_HH
 #define ICONBUTTON_HH
diff --git a/src/IconMenu.cc b/src/IconMenu.cc
index f5ebedd4..bc881143 100644
--- a/src/IconMenu.cc
+++ b/src/IconMenu.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconMenu.cc,v 1.3 2004/06/07 21:42:05 fluxgen Exp $
+// $Id$
 
 #include "IconMenu.hh"
 
diff --git a/src/IconMenu.hh b/src/IconMenu.hh
index a9cb0456..67dd1080 100644
--- a/src/IconMenu.hh
+++ b/src/IconMenu.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconMenu.hh,v 1.1 2004/05/02 20:51:36 fluxgen Exp $
+// $Id$
 
 #ifndef ICONMENU_HH
 #define ICONMENU_HH
diff --git a/src/IconMenuItem.hh b/src/IconMenuItem.hh
index a75847c9..1634cfec 100644
--- a/src/IconMenuItem.hh
+++ b/src/IconMenuItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconMenuItem.hh,v 1.1 2003/07/28 18:28:39 fluxgen Exp $
+// $Id$
 
 #ifndef ICONMENUITEM_HH
 #define ICONMENUITEM_HH
diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc
index ed34b14d..e308d794 100644
--- a/src/IconbarTheme.cc
+++ b/src/IconbarTheme.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconbarTheme.cc,v 1.11 2004/08/25 17:16:40 rathnor Exp $
+// $Id$
 
 #include "IconbarTheme.hh"
 #include "FbTk/App.hh"
diff --git a/src/IconbarTheme.hh b/src/IconbarTheme.hh
index e0c76c6d..87bd22ab 100644
--- a/src/IconbarTheme.hh
+++ b/src/IconbarTheme.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconbarTheme.hh,v 1.6 2004/01/13 14:41:32 rathnor Exp $
+// $Id$
 
 #ifndef ICONBARTHEME_HH
 #define ICONBARTHEME_HH
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index e6cc22b2..6aff9b8b 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconbarTool.cc,v 1.49 2004/10/22 00:35:28 akir Exp $
+// $Id$
 
 #include "IconbarTool.hh"
 
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh
index 278bf21c..8e1bfa86 100644
--- a/src/IconbarTool.hh
+++ b/src/IconbarTool.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconbarTool.hh,v 1.18 2004/10/22 00:35:29 akir Exp $
+// $Id$
 
 #ifndef ICONBARTOOL_HH
 #define ICONBARTOOL_HH
diff --git a/src/IntResMenuItem.cc b/src/IntResMenuItem.cc
index 33fa0b80..9ba55282 100644
--- a/src/IntResMenuItem.cc
+++ b/src/IntResMenuItem.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IntResMenuItem.cc,v 1.5 2004/10/21 10:40:37 akir Exp $
+// $Id$
 
 #include "IntResMenuItem.hh"
 #include "PixmapWithMask.hh"
diff --git a/src/IntResMenuItem.hh b/src/IntResMenuItem.hh
index 6da3db92..502238fb 100644
--- a/src/IntResMenuItem.hh
+++ b/src/IntResMenuItem.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IntResMenuItem.hh,v 1.2 2003/05/18 21:59:14 fluxgen Exp $
+// $Id$
 
 #ifndef INTRESMENUITEM_HH
 #define INTRESMENUITEM_HH
diff --git a/src/Keys.cc b/src/Keys.cc
index 8b9d1ea9..159ff976 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//$Id: Keys.cc,v 1.44 2004/08/31 15:26:38 rathnor Exp $
+//$Id$
 
 
 #include "Keys.hh"
diff --git a/src/Keys.hh b/src/Keys.hh
index 014f5a14..46c2eb7f 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Keys.hh,v 1.31 2003/12/20 17:37:20 fluxgen Exp $
+// $Id$
 
 #ifndef KEYS_HH
 #define KEYS_HH
diff --git a/src/LayerMenu.hh b/src/LayerMenu.hh
index 45c3b2b1..bfb60e60 100644
--- a/src/LayerMenu.hh
+++ b/src/LayerMenu.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: LayerMenu.hh,v 1.9 2004/06/27 13:43:59 fluxgen Exp $
+// $Id$
 
 #ifndef LAYERMENU_HH
 #define LAYERMENU_HH
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 964fc74c..55250cc6 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuCreator.cc,v 1.17 2004/10/04 15:37:58 rathnor Exp $
+// $Id$
 
 #include "MenuCreator.hh"
 
diff --git a/src/MenuTheme.cc b/src/MenuTheme.cc
index fe8cac2e..61bc454c 100644
--- a/src/MenuTheme.cc
+++ b/src/MenuTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.cc,v 1.3 2004/04/26 15:04:37 rathnor Exp $
+// $Id$
 
 #include "MenuTheme.hh"
 #include "StringUtil.hh"
diff --git a/src/MenuTheme.hh b/src/MenuTheme.hh
index 3d522a6d..4837d770 100644
--- a/src/MenuTheme.hh
+++ b/src/MenuTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuTheme.hh,v 1.1 2003/07/10 11:52:47 fluxgen Exp $
+// $Id$
 
 #ifndef MENUTHEME_HH
 #define MENUTHEME_HH
diff --git a/src/Parser.hh b/src/Parser.hh
index ad51502e..9776c33f 100644
--- a/src/Parser.hh
+++ b/src/Parser.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Parser.hh,v 1.1 2004/05/02 20:57:14 fluxgen Exp $
+// $Id$
 
 #ifndef PARSER_HH
 #define PARSER_HH
diff --git a/src/RegExp.cc b/src/RegExp.cc
index 1a47d049..27bbb265 100644
--- a/src/RegExp.cc
+++ b/src/RegExp.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: RegExp.cc,v 1.3 2004/06/07 11:46:04 rathnor Exp $
+// $Id$
 
 #include "RegExp.hh"
 #include "FbTk/I18n.hh"
diff --git a/src/RegExp.hh b/src/RegExp.hh
index 7d424bae..7aaac568 100644
--- a/src/RegExp.hh
+++ b/src/RegExp.hh
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: RegExp.hh,v 1.3 2003/07/10 19:59:21 fluxgen Exp $
+// $Id$
 
 #ifndef REGEXP_HH
 #define REGEXP_HH
diff --git a/src/Remember.cc b/src/Remember.cc
index 6cef4c6c..9a230824 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Remember.cc,v 1.44 2004/11/09 11:28:55 akir Exp $
+// $Id$
 
 #include "Remember.hh"
 #include "ClientPattern.hh"
diff --git a/src/Remember.hh b/src/Remember.hh
index e1a4db5d..0d1cff9c 100644
--- a/src/Remember.hh
+++ b/src/Remember.hh
@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Remember.hh,v 1.16 2004/02/20 09:05:38 fluxgen Exp $
+// $Id$
 
 /* Based on the original "Remember patch" by Xavier Brouckaert */
 
diff --git a/src/RootCmdMenuItem.cc b/src/RootCmdMenuItem.cc
index d9e0e08f..ef2750a0 100644
--- a/src/RootCmdMenuItem.cc
+++ b/src/RootCmdMenuItem.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: RootCmdMenuItem.cc,v 1.1 2004/08/29 21:11:24 akir Exp $
+// $Id$
 
 #include "RootCmdMenuItem.hh"
 
diff --git a/src/RootCmdMenuItem.hh b/src/RootCmdMenuItem.hh
index c18737a7..3bd9982a 100644
--- a/src/RootCmdMenuItem.hh
+++ b/src/RootCmdMenuItem.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: RootCmdMenuItem.hh,v 1.1 2004/08/29 21:11:24 akir Exp $
+// $Id$
 
 #ifndef ROOTCMDMENUITEM_HH 
 #define ROOTCMDMENUITEM_HH 
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 813d8673..80a7556e 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: RootTheme.cc,v 1.8 2004/03/22 21:01:42 fluxgen Exp $
+// $Id$
 
 #include "RootTheme.hh"
 
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index 83ce2c88..8a0998b0 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: RootTheme.hh,v 1.7 2004/03/22 21:01:42 fluxgen Exp $
+// $Id$
 
 #ifndef ROOTTHEME_HH
 #define ROOTTHEME_HH
diff --git a/src/Screen.hh b/src/Screen.hh
index e861386f..ad18f635 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.hh,v 1.149 2004/10/18 01:24:23 akir Exp $
+// $Id$
 
 #ifndef	 SCREEN_HH
 #define	 SCREEN_HH
diff --git a/src/SendToMenu.cc b/src/SendToMenu.cc
index 825ed365..c071495b 100644
--- a/src/SendToMenu.cc
+++ b/src/SendToMenu.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SendToMenu.cc,v 1.7 2003/12/18 18:03:21 fluxgen Exp $
+// $Id$
 
 #include "SendToMenu.hh"
 
diff --git a/src/SendToMenu.hh b/src/SendToMenu.hh
index 1aaf4134..073ff8d8 100644
--- a/src/SendToMenu.hh
+++ b/src/SendToMenu.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SendToMenu.hh,v 1.3 2003/12/17 00:43:51 fluxgen Exp $
+// $Id$
 
 #ifndef SENDTOMENU_HH
 #define SENDTOMENU_HH
diff --git a/src/Shape.cc b/src/Shape.cc
index 22156f4b..57c66075 100644
--- a/src/Shape.cc
+++ b/src/Shape.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Shape.cc,v 1.13 2004/08/31 15:26:38 rathnor Exp $
+// $Id$
 
 #include "Shape.hh"
 
diff --git a/src/Shape.hh b/src/Shape.hh
index 53faaaa9..3062e394 100644
--- a/src/Shape.hh
+++ b/src/Shape.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Shape.hh,v 1.4 2004/01/11 15:02:11 fluxgen Exp $
+// $Id$
 
 #ifndef SHAPE_HH
 #define SHAPE_HH
diff --git a/src/Slit.cc b/src/Slit.cc
index 4413c48a..41340750 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Slit.cc,v 1.102 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #include "Slit.hh"
 
diff --git a/src/Slit.hh b/src/Slit.hh
index 6f5b4284..3fe56c51 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
 	
-/// $Id: Slit.hh,v 1.43 2004/09/12 14:56:19 rathnor Exp $
+/// $Id$
 
 #ifndef	 SLIT_HH
 #define	 SLIT_HH
diff --git a/src/SlitClient.cc b/src/SlitClient.cc
index 04fa867f..61d0efda 100644
--- a/src/SlitClient.cc
+++ b/src/SlitClient.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SlitClient.cc,v 1.3 2004/01/31 11:39:32 rathnor Exp $
+// $Id$
 
 #include "SlitClient.hh"
 
diff --git a/src/SlitClient.hh b/src/SlitClient.hh
index f88c0620..53d9de94 100644
--- a/src/SlitClient.hh
+++ b/src/SlitClient.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SlitClient.hh,v 1.2 2003/11/01 00:12:53 rathnor Exp $
+// $Id$
 
 #ifndef SLITCLIENT_HH
 #define SLITCLIENT_HH
diff --git a/src/SlitTheme.cc b/src/SlitTheme.cc
index 8414bd97..fce1889a 100644
--- a/src/SlitTheme.cc
+++ b/src/SlitTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SlitTheme.cc,v 1.3 2004/04/26 15:04:37 rathnor Exp $
+// $Id$
 
 #include "SlitTheme.hh"
 
diff --git a/src/SlitTheme.hh b/src/SlitTheme.hh
index 3c8e8fcb..65135b59 100644
--- a/src/SlitTheme.hh
+++ b/src/SlitTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SlitTheme.hh,v 1.6 2004/10/21 16:49:19 akir Exp $
+// $Id$
 
 #ifndef SLITTHEME_HH
 #define SLITTHEME_HH
diff --git a/src/Strut.hh b/src/Strut.hh
index bb4595c2..d06bede0 100644
--- a/src/Strut.hh
+++ b/src/Strut.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Strut.hh,v 1.4 2004/09/11 13:36:03 fluxgen Exp $
+// $Id$
 
 #ifndef STRUT_HH
 #define STRUT_HH
diff --git a/src/StyleMenuItem.cc b/src/StyleMenuItem.cc
index 7e256e19..9892d080 100644
--- a/src/StyleMenuItem.cc
+++ b/src/StyleMenuItem.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StyleMenuItem.cc,v 1.2 2004/05/03 21:37:38 fluxgen Exp $
+// $Id$
 
 #include "StyleMenuItem.hh"
 
diff --git a/src/StyleMenuItem.hh b/src/StyleMenuItem.hh
index 8210594e..24e58732 100644
--- a/src/StyleMenuItem.hh
+++ b/src/StyleMenuItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: StyleMenuItem.hh,v 1.1 2004/05/02 20:54:16 fluxgen Exp $
+// $Id$
 
 #ifndef STYLEMENUITEM_HH
 #define STYLEMENUITEM_HH
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 5f9ba8f3..ab64f207 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SystemTray.cc,v 1.16 2004/10/21 10:38:25 akir Exp $
+// $Id$
 
 #include "SystemTray.hh"
 
diff --git a/src/SystemTray.hh b/src/SystemTray.hh
index 91a017d3..cceb434e 100644
--- a/src/SystemTray.hh
+++ b/src/SystemTray.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: SystemTray.hh,v 1.7 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #ifndef SYSTEMTRAY_HH
 #define SYSTEMTRAY_HH
diff --git a/src/TextTheme.cc b/src/TextTheme.cc
index f23e030e..a6b5ba7c 100644
--- a/src/TextTheme.cc
+++ b/src/TextTheme.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextTheme.cc,v 1.7 2004/08/29 08:33:12 rathnor Exp $
+// $Id$
 
 #include "TextTheme.hh"
 
diff --git a/src/TextTheme.hh b/src/TextTheme.hh
index d24b2015..2918e194 100644
--- a/src/TextTheme.hh
+++ b/src/TextTheme.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextTheme.hh,v 1.3 2003/08/27 18:05:12 fluxgen Exp $
+// $Id$
 
 #ifndef TEXTTHEME_HH
 #define TEXTTHEME_HH
diff --git a/src/ToggleMenu.hh b/src/ToggleMenu.hh
index 56988ee9..d8fde6a6 100644
--- a/src/ToggleMenu.hh
+++ b/src/ToggleMenu.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToggleMenu.hh,v 1.1 2004/06/27 13:41:45 fluxgen Exp $
+// $Id$
 
 #ifndef TOGGLEMENU_HH
 #define TOGGLEMENU_HH
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc
index 160e1b37..c56645ae 100644
--- a/src/ToolFactory.cc
+++ b/src/ToolFactory.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolFactory.cc,v 1.9 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #include "ToolFactory.hh"
 
diff --git a/src/ToolFactory.hh b/src/ToolFactory.hh
index 805b75cd..01a3d74c 100644
--- a/src/ToolFactory.hh
+++ b/src/ToolFactory.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolFactory.hh,v 1.1 2003/10/13 23:37:41 fluxgen Exp $
+// $Id$
 
 #ifndef TOOLFACTORY_HH
 #define TOOLFACTORY_HH
diff --git a/src/ToolTheme.cc b/src/ToolTheme.cc
index c13ec96c..3ed89f72 100644
--- a/src/ToolTheme.cc
+++ b/src/ToolTheme.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolTheme.cc,v 1.8 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #include "ToolTheme.hh"
 
diff --git a/src/ToolTheme.hh b/src/ToolTheme.hh
index ef4bbdf3..53e09f7a 100644
--- a/src/ToolTheme.hh
+++ b/src/ToolTheme.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolTheme.hh,v 1.6 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #ifndef TOOLTHEME_HH
 #define TOOLTHEME_HH
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index ca7d0a77..164a9873 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.156 2004/10/21 10:36:57 akir Exp $
+// $Id$
 
 #include "Toolbar.hh"
 
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 6e49e104..47717a68 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.hh,v 1.54 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #ifndef	 TOOLBAR_HH
 #define	 TOOLBAR_HH
diff --git a/src/ToolbarItem.cc b/src/ToolbarItem.cc
index 2cedc0ec..5a7f66e8 100644
--- a/src/ToolbarItem.cc
+++ b/src/ToolbarItem.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarItem.cc,v 1.1 2003/08/11 15:44:12 fluxgen Exp $
+// $Id$
 
 #include "ToolbarItem.hh"
 
diff --git a/src/ToolbarItem.hh b/src/ToolbarItem.hh
index 90fe6f37..3b5e6929 100644
--- a/src/ToolbarItem.hh
+++ b/src/ToolbarItem.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarItem.hh,v 1.7 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #ifndef TOOLBARITEM_HH
 #define TOOLBARITEM_HH
diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc
index f9d00ee8..33b8db6d 100644
--- a/src/ToolbarTheme.cc
+++ b/src/ToolbarTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarTheme.cc,v 1.17 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #include "ToolbarTheme.hh"
 
diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh
index ef486f1b..288e8607 100644
--- a/src/ToolbarTheme.hh
+++ b/src/ToolbarTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarTheme.hh,v 1.12 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #ifndef TOOLBARTHEME_HH
 #define TOOLBARTHEME_HH
diff --git a/src/WinButton.cc b/src/WinButton.cc
index 14a202c3..a3a85b08 100644
--- a/src/WinButton.cc
+++ b/src/WinButton.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-/// $Id: WinButton.cc,v 1.20 2004/05/14 13:44:31 rathnor Exp $
+/// $Id$
 
 #include "WinButton.hh"
 #include "App.hh"
diff --git a/src/WinButton.hh b/src/WinButton.hh
index bd673fe7..33873958 100644
--- a/src/WinButton.hh
+++ b/src/WinButton.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-/// $Id: WinButton.hh,v 1.5 2004/01/10 00:37:35 rathnor Exp $
+/// $Id$
 
 #include "Button.hh"
 #include "Observer.hh"
diff --git a/src/WinButtonTheme.cc b/src/WinButtonTheme.cc
index 85b273e3..0bded5e8 100644
--- a/src/WinButtonTheme.cc
+++ b/src/WinButtonTheme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinButtonTheme.cc,v 1.7 2003/08/25 16:51:16 fluxgen Exp $
+// $Id$
 
 #include "WinButtonTheme.hh"
 
diff --git a/src/WinButtonTheme.hh b/src/WinButtonTheme.hh
index 0e959ca7..4cf19279 100644
--- a/src/WinButtonTheme.hh
+++ b/src/WinButtonTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinButtonTheme.hh,v 1.4 2003/08/22 21:35:40 fluxgen Exp $
+// $Id$
 
 #ifndef WINBUTTONTHEME_HH
 #define WINBUTTONTHEME_HH
diff --git a/src/WinClient.cc b/src/WinClient.cc
index fc8a018d..0370a1c3 100644
--- a/src/WinClient.cc
+++ b/src/WinClient.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinClient.cc,v 1.42 2004/08/31 15:26:38 rathnor Exp $
+// $Id$
 
 #include "WinClient.hh"
 
diff --git a/src/WinClient.hh b/src/WinClient.hh
index 3f2dc950..c747b51f 100644
--- a/src/WinClient.hh
+++ b/src/WinClient.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WinClient.hh,v 1.18 2004/08/10 13:36:07 fluxgen Exp $
+// $Id$
 
 #ifndef WINCLIENT_HH
 #define WINCLIENT_HH
diff --git a/src/Window.cc b/src/Window.cc
index 8265f919..4b5e52e0 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.306 2004/11/07 09:30:59 akir Exp $
+// $Id$
 
 #include "Window.hh"
 
diff --git a/src/Window.hh b/src/Window.hh
index 1b45d826..236f620d 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.hh,v 1.118 2004/08/10 19:18:47 fluxgen Exp $
+// $Id$
 
 #ifndef	 WINDOW_HH
 #define	 WINDOW_HH
diff --git a/src/Workspace.cc b/src/Workspace.cc
index cafdb0c0..b377880f 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Workspace.cc,v 1.99 2004/08/31 15:26:39 rathnor Exp $
+// $Id$
 
 #include "Workspace.hh"
 
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 454cb494..44c55f12 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceCmd.cc,v 1.13 2004/08/31 15:26:39 rathnor Exp $
+// $Id$
 
 #include "WorkspaceCmd.hh"
 
diff --git a/src/WorkspaceCmd.hh b/src/WorkspaceCmd.hh
index 9a9c9601..5a16c40a 100644
--- a/src/WorkspaceCmd.hh
+++ b/src/WorkspaceCmd.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceCmd.hh,v 1.3 2004/04/28 14:59:12 rathnor Exp $
+// $Id$
 
 #ifndef WORKSPACECMD_HH
 #define WORKSPACECMD_HH
diff --git a/src/WorkspaceMenu.cc b/src/WorkspaceMenu.cc
index 2719f971..f505cea9 100644
--- a/src/WorkspaceMenu.cc
+++ b/src/WorkspaceMenu.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceMenu.cc,v 1.5 2004/09/06 21:12:10 akir Exp $
+// $Id$
 
 #include "WorkspaceMenu.hh"
 
diff --git a/src/WorkspaceMenu.hh b/src/WorkspaceMenu.hh
index 77f1006c..1f04b4c2 100644
--- a/src/WorkspaceMenu.hh
+++ b/src/WorkspaceMenu.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceMenu.hh,v 1.1 2004/05/02 20:51:36 fluxgen Exp $
+// $Id$
 
 #ifndef WORKSPACEMENU_HH
 #define WORKSPACEMENU_HH
diff --git a/src/WorkspaceNameTheme.hh b/src/WorkspaceNameTheme.hh
index ee4f12d7..10beadda 100644
--- a/src/WorkspaceNameTheme.hh
+++ b/src/WorkspaceNameTheme.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceNameTheme.hh,v 1.2 2004/04/26 15:04:37 rathnor Exp $
+// $Id$
 
 #ifndef WORKSPACENAMETHEME_HH
 #define WORKSPACENAMETHEME_HH
diff --git a/src/WorkspaceNameTool.cc b/src/WorkspaceNameTool.cc
index 1dc339f6..a3e92a30 100644
--- a/src/WorkspaceNameTool.cc
+++ b/src/WorkspaceNameTool.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceNameTool.cc,v 1.11 2004/09/12 14:56:19 rathnor Exp $
+// $Id$
 
 #include "WorkspaceNameTool.hh"
 
diff --git a/src/WorkspaceNameTool.hh b/src/WorkspaceNameTool.hh
index e86045fd..906f65a2 100644
--- a/src/WorkspaceNameTool.hh
+++ b/src/WorkspaceNameTool.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceNameTool.hh,v 1.7 2004/10/21 11:08:04 akir Exp $
+// $Id$
 
 #ifndef WORKSPACENAMETOOL_HH
 #define WORKSPACENAMETOOL_HH
diff --git a/src/Xinerama.hh b/src/Xinerama.hh
index 2b324d41..545555d8 100644
--- a/src/Xinerama.hh
+++ b/src/Xinerama.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Xinerama.hh,v 1.8 2004/02/10 18:52:10 fluxgen Exp $
+// $Id$
 
 #ifndef XINERAMA_HH
 #define XINERAMA_HH
diff --git a/src/Xutil.cc b/src/Xutil.cc
index 514198c4..f8eb282c 100644
--- a/src/Xutil.cc
+++ b/src/Xutil.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Xutil.cc,v 1.5 2004/06/07 11:46:04 rathnor Exp $
+// $Id$
 
 #include "Xutil.hh"
 
diff --git a/src/Xutil.hh b/src/Xutil.hh
index 43796db8..206961f1 100644
--- a/src/Xutil.hh
+++ b/src/Xutil.hh
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Xutil.hh,v 1.3 2004/01/30 11:06:25 rathnor Exp $
+// $Id$
 
 #ifndef XUTIL_HH
 #define XUTIL_HH
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 61a83b2a..fb846e06 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.262 2004/10/21 10:18:40 akir Exp $
+// $Id$
 
 #include "fluxbox.hh"
 
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 1b53cef1..6ed79022 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.hh,v 1.95 2004/10/21 10:16:55 akir Exp $
+// $Id$
 
 #ifndef	 FLUXBOX_HH
 #define	 FLUXBOX_HH
diff --git a/src/main.cc b/src/main.cc
index 137d1ded..31a0c2f2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: main.cc,v 1.33 2004/10/18 01:26:54 akir Exp $
+// $Id$
 
 #include "fluxbox.hh"
 #include "version.h"
diff --git a/src/tests/template.cc b/src/tests/template.cc
index 3eab430b..1175e8fd 100644
--- a/src/tests/template.cc
+++ b/src/tests/template.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: template.cc,v 1.1 2004/03/01 10:49:43 fluxgen Exp $
+// $Id$
 
 /*
  * Use this file as a template for new test applications
diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index e8dcfa95..1091b5d2 100644
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -18,7 +18,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 
-// $Id: bsetroot.cc,v 1.23 2004/10/06 06:51:21 fluxgen Exp $
+// $Id$
 
 #include "bsetroot.hh"
 
diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index 6683fbb8..fb6412a0 100644
--- a/util/bsetroot.hh
+++ b/util/bsetroot.hh
@@ -18,7 +18,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 
-// $Id: bsetroot.hh,v 1.6 2003/05/10 15:44:15 fluxgen Exp $
+// $Id$
 
 #ifndef BSETROOT_HH
 #define BSETROOT_HH
diff --git a/util/fbrun/FbRun.hh b/util/fbrun/FbRun.hh
index f287a5b2..3d3eea09 100644
--- a/util/fbrun/FbRun.hh
+++ b/util/fbrun/FbRun.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbRun.hh,v 1.15 2004/04/18 14:16:09 fluxgen Exp $
+// $Id$
 
 #ifndef FBRUN_HH
 #define FBRUN_HH
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index c00944ba..f032486b 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: main.cc,v 1.14 2004/09/12 10:01:46 akir Exp $
+// $Id$
 
 #include "FbRun.hh"
 #include "App.hh"
diff --git a/util/fbsetbg b/util/fbsetbg
index cf6bea03..04431eda 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -23,7 +23,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# $Id: fbsetbg,v 1.31 2004/06/17 16:12:20 rathnor Exp $
+# $Id$
 
 # Portability notes:
 # To guarantee this script works on all platforms that support fluxbox
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index 558297f5..bbe7bf69 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: startfluxbox.in,v 1.3 2003/12/06 16:29:21 fluxgen Exp $
+# $Id$
 if [ -x ~/.fluxbox/startup ]; then
     exec ~/.fluxbox/startup
 elif [ -r ~/.fluxbox/startup ]; then