diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h
index 67e763cba..9c2cd4520 100644
--- a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h
+++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.12 $
+    Version  : $Revision: 1.13 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -94,7 +94,7 @@ using namespace LiveSupport::Core;
  *  </code></pre>
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.12 $
+ *  @version $Revision: 1.13 $
  *  @see WidgetFactory
  *  @see WidgetFactory#getWhiteWindowCorners
  */
@@ -142,6 +142,11 @@ class WhiteWindow : public Gtk::Window
          */
         Gtk::Alignment                * cornerButtonAlignment;
 
+        /**
+         *  True if the window has been minimized.
+         */
+        bool                            isMaximized;
+
         /**
          *  The close button.
          */
@@ -186,11 +191,6 @@ class WhiteWindow : public Gtk::Window
         bool
         onTitleClicked(GdkEventButton     * event)          throw ();
 
-        /**
-         *  True if the window has been minimized.
-         */
-        bool                            isMaximized;
-
         /**
          *  Signal handler for the minimize button clicked.
          */
diff --git a/livesupport/modules/widgets/src/WhiteWindow.cxx b/livesupport/modules/widgets/src/WhiteWindow.cxx
index f0d446279..8b4c4126d 100644
--- a/livesupport/modules/widgets/src/WhiteWindow.cxx
+++ b/livesupport/modules/widgets/src/WhiteWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.15 $
+    Version  : $Revision: 1.16 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/WhiteWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -64,6 +64,7 @@ WhiteWindow :: WhiteWindow(WidgetFactory::ImageType     title,
                   isMaximized(false)
 {
     // do the image title-specific stuff
+    titleLabel = 0;
     Ptr<WidgetFactory>::Ref wf          = WidgetFactory::getInstance();
     Gtk::Image*             titleImage  = Gtk::manage(wf->createImage(title));
     titleEventBox                       = Gtk::manage(new Gtk::EventBox());
@@ -85,9 +86,10 @@ WhiteWindow :: WhiteWindow(Glib::ustring                title,
                   isMaximized(false)
 {
     // do the text title-specific stuff
-    titleLabel      = Gtk::manage(new Gtk::Label(title));
+    titleLabel      = Gtk::manage(new Gtk::Label);
     titleLabel->modify_font(Pango::FontDescription(
                                         "Bitstream Vera Sans 10"));
+    set_title(title);
     titleEventBox   = Gtk::manage(new Gtk::EventBox());
     titleEventBox->add(*titleLabel);
 
diff --git a/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx b/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx
index 76211e1c2..438628e87 100644
--- a/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.16 $
+    Version  : $Revision: 1.17 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/LiveModeWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -71,6 +71,13 @@ LiveModeWindow :: LiveModeWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
             LocalizedObject(bundle),
             gLiveSupport(gLiveSupport)
 {
+    try {
+        set_title(*getResourceUstring("windowTitle"));
+    } catch (std::invalid_argument &e) {
+        std::cerr << e.what() << std::endl;
+        std::exit(1);
+    }
+
     Ptr<WidgetFactory>::Ref     wf = WidgetFactory::getInstance();
     
     // Create the tree model:
diff --git a/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx b/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx
index 56eb132bf..44fd146da 100644
--- a/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.8 $
+    Version  : $Revision: 1.9 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -70,6 +70,7 @@ SchedulerWindow :: SchedulerWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
             gLiveSupport(gLiveSupport)
 {
     try {
+        set_title(*getResourceUstring("windowTitle"));
         closeButton = Gtk::manage(new Gtk::Button(
                                     *getResourceUstring("closeButtonLabel")));
     } catch (std::invalid_argument &e) {
diff --git a/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx b/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx
index 154338ad2..1b9a13782 100644
--- a/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.21 $
+    Version  : $Revision: 1.22 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/ScratchpadWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -74,6 +74,7 @@ ScratchpadWindow :: ScratchpadWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
     Ptr<WidgetFactory>::Ref     widgetFactory = WidgetFactory::getInstance();
 
     try {
+        set_title(*getResourceUstring("windowTitle"));
         addToPlaylistButton = Gtk::manage(widgetFactory->createButton(
                             *getResourceUstring("addToPlaylistButtonLabel")));
         clearListButton = Gtk::manage(widgetFactory->createButton(
diff --git a/livesupport/products/gLiveSupport/src/SearchWindow.cxx b/livesupport/products/gLiveSupport/src/SearchWindow.cxx
index 2fde8b00e..9336e7fe3 100644
--- a/livesupport/products/gLiveSupport/src/SearchWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/SearchWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.17 $
+    Version  : $Revision: 1.18 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SearchWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -80,6 +80,7 @@ SearchWindow :: SearchWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
 
     Notebook *      views = Gtk::manage(new Notebook);
     try {
+        set_title(*getResourceUstring("windowTitle"));
         views->appendPage(*simpleSearchView,   *getResourceUstring(
                                                         "simpleSearchTab"));
         views->appendPage(*advancedSearchView, *getResourceUstring(
diff --git a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
index f39681c05..337382d3c 100644
--- a/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.11 $
+    Version  : $Revision: 1.12 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SimplePlaylistManagementWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -72,6 +72,7 @@ SimplePlaylistManagementWindow :: SimplePlaylistManagementWindow (
     Ptr<WidgetFactory>::Ref     wf = WidgetFactory::getInstance();
     
     try {
+        set_title(*getResourceUstring("windowTitle"));
         nameLabel = Gtk::manage(new Gtk::Label(
                                     *getResourceUstring("nameLabel")));
         saveButton = Gtk::manage(wf->createButton(