diff --git a/src/gui/ctrl/ui-manager.cpp b/src/gui/ctrl/ui-manager.cpp
index 6f135dd7e..4a3cc5d2d 100644
--- a/src/gui/ctrl/ui-manager.cpp
+++ b/src/gui/ctrl/ui-manager.cpp
@@ -31,7 +31,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/config-keys.hpp"
 #include "gui/ctrl/ui-manager.hpp"
 #include "gui/ctrl/global-ctx.hpp"
@@ -104,9 +104,7 @@ namespace ctrl {
   void
   UiManager::terminateUI()
   {
-      Gtk::Main *main = Gtk::Main::instance();               /////////////////////////////////////TICKET #1032 : use gtk::Application instead of gtk::Main
-      REQUIRE(main);
-      main->quit();
+    gtkMain_.quit();
   }
   
   void
diff --git a/src/gui/ctrl/ui-state.cpp b/src/gui/ctrl/ui-state.cpp
index fa8360a04..e80228c64 100644
--- a/src/gui/ctrl/ui-state.cpp
+++ b/src/gui/ctrl/ui-state.cpp
@@ -27,7 +27,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/ctrl/ui-state.hpp"
 #include "gui/ctrl/state-manager.hpp"
 #include "gui/interact/focus-tracker.hpp"
diff --git a/src/gui/dialog/name-chooser.cpp b/src/gui/dialog/name-chooser.cpp
index c8a48c023..100925cb3 100644
--- a/src/gui/dialog/name-chooser.cpp
+++ b/src/gui/dialog/name-chooser.cpp
@@ -27,7 +27,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/dialog/name-chooser.hpp"
 #include "gui/dialog/dialog.hpp"
 
diff --git a/src/gui/dialog/name-chooser.hpp b/src/gui/dialog/name-chooser.hpp
index efb98e5ee..b70e6e8d0 100644
--- a/src/gui/dialog/name-chooser.hpp
+++ b/src/gui/dialog/name-chooser.hpp
@@ -29,7 +29,7 @@
 #ifndef GUI_DIALOG_NAME_CHOOSER_H
 #define GUI_DIALOG_NAME_CHOOSER_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 
 namespace gui {
diff --git a/src/gui/dialog/preferences-dialog.hpp b/src/gui/dialog/preferences-dialog.hpp
index 71df694d7..0cd64a350 100644
--- a/src/gui/dialog/preferences-dialog.hpp
+++ b/src/gui/dialog/preferences-dialog.hpp
@@ -33,7 +33,7 @@
 #define GUI_DIALOG_PREFERENCES_DIALOG_H
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/dialog/dialog.hpp"
 
 namespace gui {
diff --git a/src/gui/dialog/render.cpp b/src/gui/dialog/render.cpp
index f775057c7..ffe714add 100644
--- a/src/gui/dialog/render.cpp
+++ b/src/gui/dialog/render.cpp
@@ -27,7 +27,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 #include "gui/dialog/render.hpp"
 #include "gui/dialog/dialog.hpp"
diff --git a/src/gui/dialog/render.hpp b/src/gui/dialog/render.hpp
index e35d71851..6d38780ce 100644
--- a/src/gui/dialog/render.hpp
+++ b/src/gui/dialog/render.hpp
@@ -29,7 +29,7 @@
 #ifndef GUI_DIALOG_RENDER_H
 #define GUI_DIALOG_RENDER_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 
 namespace gui {
diff --git a/src/gui/gtk-base.hpp b/src/gui/gtk-base.hpp
index 339880668..7519fe07f 100644
--- a/src/gui/gtk-base.hpp
+++ b/src/gui/gtk-base.hpp
@@ -23,18 +23,34 @@
 
 
 /** @file gtk-base.hpp
- ** A set of basic GTK includes.
+ ** A set of basic GTK includes for the UI.
  ** There are some tricky points to consider when including the
  ** basic GTKmm headers. Especially, GTK tries to shadow the ERROR macro
  ** from Microsoft Windows. Unfortunately this breaks the ERROR macro from NoBug;
- ** thus we need to include NoBug \em after GTK
+ ** thus we need to include NoBug _after_ GTK
  ** 
- ** Besides, this header defines the basic NLS. Most parts of the GUI rely either
- ** directly on this header, or through the inclusion of gtk-lumiera.hpp
+ ** Besides, this header defines the basic NLS. Most parts of the GUI rely on this header.
+ ** 
+ ** 
+ ** ## configuration and resource search
+ ** 
+ ** The GUI backbone retrieves the necessary configuration values from lumiera::Config,
+ ** the config facade in the application core. Currently as of 2/2011 these values are
+ ** loaded from setup.ini, because the full-blown config system is not yet implemented.
+ ** Amongst others, this configuration defines a _search path_ for icons and a
+ ** separate search path for resources. These path specs may use the token `$ORIGIN`
+ ** to refer to the installation directory of the currently executing program.
+ ** This allows for a relocatable Lumiera installation bundle.
  ** 
  ** @warning include here only what is absolutely necessary,
  **          for sake of compilation times and (debug) executable size.
- ** @see GtkLumiera
+ ** 
+ ** @see guistart.cpp the plugin to pull up this GUI
+ ** @see gui::GuiFacade access point for starting the GUI
+ ** @see gui::GuiNotification interface for communication with the gui from the lower layers
+ ** @see lumiera::Config
+ ** @see lumiera::BasicSetup definition of the acceptable configuration values
+ ** @see lumiera::AppState general Lumiera application main
  */
 
 
@@ -64,10 +80,78 @@
 #endif
 
 
+
+
+/* ======= Namespace Definitions ======= */
+
+/** Lumiera GTK UI implementation root. */
 namespace gui {
   
   typedef Glib::ustring uString;
   typedef const uString cuString;
   
+  
+  
+
+  /** Backbone of the Lumiera GTK UI.
+   *  All interface elements and controllers of global relevance
+   *  are connected to a communication structure known as UI-Bus.
+   *  This structure allows to address interface elements by ID
+   *  and to process command invocations with asynchronous feedback
+   *  in a uniform way.
+   */
+  namespace ctrl {}
+  
+  /** UI interaction control.
+   *  Any overarching concerns of interaction patterns,
+   *  selecting the subject, forming and binding of commands,
+   *  management of focus and perspective, keybindings and gestures.
+   */
+  namespace interact {}
+  
+  /** The Lumiera GTK-GUI uses a thin proxy layer data model
+   *  on top of the actual "high-level-model", which lives in the
+   *  Proc-Layer below. GUI operations interact with these proxy model
+   *  entities, which in turn forward the calls to the actual objects
+   *  in the Proc-Layer, through the Command system (which enables UNDO).
+   *  
+   *  @todo: as of 1/2011 this connection between the GUI proxy model and
+   *         the Proc-Layer model needs to be set up. Currently, the GUI model
+   *         entities are just created standalone and thus dysfunctional.
+   *  @todo: as of 11/2015 this connection between UI and Proc-Layer is actually
+   *         in the works, and it is clear by now that we won't use proxy objects,
+   *         but rather a generic bus-like connection and symbolic IDs to designate
+   *         the model elements
+   *  @todo: and as of 2/2017 the new structure is basically set, but we need actually
+   *         to implement a new timeline display in accordance to this reworked design.
+   *         After this is done, most of the model elements in this packare are obsolete.
+   */
+  namespace model {}
+  
+  /** Video output implementation. */
+  namespace output {}
+
+  /** Dialog box classes. */
+  namespace dialog {}
+  
+  /** Docking panel classes. */
+  namespace panel {}
+  
+  /** The asset management, configuration and project settings. */
+  namespace setting {}
+  
+  /** The timeline display and editing operations. */
+  namespace timeline {}
+  
+  /** The global workspace with top-level windows. */
+  namespace workspace {}
+  
+  /** Lumiera custom widgets. */
+  namespace widget {}
+  
+  /** GUI helpers, utility functions and classes. */
+  namespace util {}
+  
+  
 }// namespace gui
-#endif
+#endif /*GUI_GTK_BASE_H*/
diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp
deleted file mode 100644
index de5cd4585..000000000
--- a/src/gui/gtk-lumiera.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-  GtkLumiera  -  The Lumiera GUI Application Object
-
-  Copyright (C)         Lumiera.org
-    2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
-
-  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 the Free Software Foundation; either version 2 of
-  the License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-* *****************************************************/
-
-
-/** @file gtk-lumiera.cpp
- */
-
-
-#include "gui/gtk-base.hpp"
-#include "gui/ctrl/ui-manager.hpp"
-#include "gui/ui-bus.hpp"
-#include "lib/depend.hpp"
-
-#include "include/config-facade.h"
-
-#include <gdlmm.h>
-
-
-namespace gui {
-  
-  namespace error = lumiera::error;
-  
-  
-  using std::string;
-  
-  
-  
-  
-  namespace {
-    
-    /** storage for the Main Application object */
-    lib::Depend<GtkLumiera> theApplicationInstance;
-    
-  }
-  
-  
-  
-  
-  GtkLumiera&
-  GtkLumiera::application()
-  {
-    return theApplicationInstance();
-  }
-  
-  
-  
-  /** @remarks this function blocks until shutdown of the UI */
-  void
-  GtkLumiera::run()
-  {
-    //////////////////////TICKET #959 : establish the new backbone here / replaces Project and Controller
-    UiBus uiBus;
-    
-    ctrl::UiManager uiManager(uiBus);
-    uiManager.createApplicationWindow();
-    uiManager.performMainLoop();
-  }
-  
-  
-}// namespace gui
diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp
index 8d41da614..7762921df 100644
--- a/src/gui/gtk-lumiera.hpp
+++ b/src/gui/gtk-lumiera.hpp
@@ -56,75 +56,8 @@
 #include <boost/noncopyable.hpp>
 
 
-
-
-/* ======= Namespace Definitions ======= */
-
-/** Lumiera GTK UI implementation root. */
 namespace gui {
   
-
-  /** Backbone of the Lumiera GTK UI.
-   *  All interface elements and controllers of global relevance
-   *  are connected to a communication structure known as UI-Bus.
-   *  This structure allows to address interface elements by ID
-   *  and to process command invocations with asynchronous feedback
-   *  in a uniform way.
-   */
-  namespace ctrl {}
-  
-  /** UI interaction control.
-   *  Any overarching concerns of interaction patterns,
-   *  selecting the subject, forming and binding of commands,
-   *  management of focus and perspective, keybindings and gestures.
-   */
-  namespace interact {}
-  
-  /** The Lumiera GTK-GUI uses a thin proxy layer data model
-   *  on top of the actual "high-level-model", which lives in the
-   *  Proc-Layer below. GUI operations interact with these proxy model
-   *  entities, which in turn forward the calls to the actual objects
-   *  in the Proc-Layer, through the Command system (which enables UNDO).
-   *  
-   *  @todo: as of 1/2011 this connection between the GUI proxy model and
-   *         the Proc-Layer model needs to be set up. Currently, the GUI model
-   *         entities are just created standalone and thus dysfunctional.
-   *  @todo: as of 11/2015 this connection between UI and Proc-Layer is actually
-   *         in the works, and it is clear by now that we won't use proxy objects,
-   *         but rather a generic bus-like connection and symbolic IDs to designate
-   *         the model elements
-   *  @todo: and as of 2/2017 the new structure is basically set, but we need actually
-   *         to implement a new timeline display in accordance to this reworked design.
-   *         After this is done, most of the model elements in this packare are obsolete.
-   */
-  namespace model {}
-  
-  /** Video output implementation. */
-  namespace output {}
-
-  /** Dialog box classes. */
-  namespace dialog {}
-  
-  /** Docking panel classes. */
-  namespace panel {}
-  
-  /** The asset management, configuration and project settings. */
-  namespace setting {}
-  
-  /** The timeline display and editing operations. */
-  namespace timeline {}
-  
-  /** The global workspace with top-level windows. */
-  namespace workspace {}
-  
-  /** Lumiera custom widgets. */
-  namespace widget {}
-  
-  /** GUI helpers, utility functions and classes. */
-  namespace util {}
-  
-  
-  
   
   
   
diff --git a/src/gui/interact/focus-tracker.cpp b/src/gui/interact/focus-tracker.cpp
index 9266fe6a5..b387bded3 100644
--- a/src/gui/interact/focus-tracker.cpp
+++ b/src/gui/interact/focus-tracker.cpp
@@ -29,7 +29,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/interact/focus-tracker.hpp"
 #include "gui/interact/navigator.hpp"
 //#include "gui/ctrl/global-ctx.hpp"
diff --git a/src/gui/interact/navigator.cpp b/src/gui/interact/navigator.cpp
index aa42a2858..e8e05a22c 100644
--- a/src/gui/interact/navigator.cpp
+++ b/src/gui/interact/navigator.cpp
@@ -28,7 +28,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/interact/navigator.hpp"
 #include "gui/interact/spot-locator.hpp"
 //#include "gui/ctrl/global-ctx.hpp"
diff --git a/src/gui/interact/spot-locator.cpp b/src/gui/interact/spot-locator.cpp
index b03d60531..6f5097cef 100644
--- a/src/gui/interact/spot-locator.cpp
+++ b/src/gui/interact/spot-locator.cpp
@@ -28,7 +28,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/interact/spot-locator.hpp"
 //#include "gui/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
diff --git a/src/gui/interact/work-site-trail.cpp b/src/gui/interact/work-site-trail.cpp
index 4a9bfb140..6a2fcd442 100644
--- a/src/gui/interact/work-site-trail.cpp
+++ b/src/gui/interact/work-site-trail.cpp
@@ -28,7 +28,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/interact/work-site-trail.hpp"
 //#include "gui/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
diff --git a/src/gui/interact/work-site.cpp b/src/gui/interact/work-site.cpp
index 187026b4a..aadf163b9 100644
--- a/src/gui/interact/work-site.cpp
+++ b/src/gui/interact/work-site.cpp
@@ -29,7 +29,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/interact/work-site.hpp"
 //#include "gui/ctrl/global-ctx.hpp"
 //#include "lib/util.hpp"
diff --git a/src/gui/model/clip.hpp b/src/gui/model/clip.hpp
index 5798761dc..11ec7ce36 100644
--- a/src/gui/model/clip.hpp
+++ b/src/gui/model/clip.hpp
@@ -30,7 +30,7 @@
 #ifndef GUI_MODEL_CLIP_H
 #define GUI_MODEL_CLIP_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"
 
 #include <string>
diff --git a/src/gui/model/track.hpp b/src/gui/model/track.hpp
index b204cb07c..aecb06436 100644
--- a/src/gui/model/track.hpp
+++ b/src/gui/model/track.hpp
@@ -28,7 +28,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 #include <memory>
 #include <list>
diff --git a/src/gui/output/displayer.cpp b/src/gui/output/displayer.cpp
index d773762bb..0eadb3506 100644
--- a/src/gui/output/displayer.cpp
+++ b/src/gui/output/displayer.cpp
@@ -35,7 +35,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/output/displayer.hpp"
 #include "gui/output/xvdisplayer.hpp"
 #include "gui/output/gdkdisplayer.hpp"
diff --git a/src/gui/output/gdkdisplayer.cpp b/src/gui/output/gdkdisplayer.cpp
index f27d6f527..63079e5c5 100644
--- a/src/gui/output/gdkdisplayer.cpp
+++ b/src/gui/output/gdkdisplayer.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/output/gdkdisplayer.hpp"
 
 #if false  ///////////////////////////////////////////////////////////////////////////////////////////////////TICKET #950 : new solution for video display
diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp
index b76dc9755..806b9bc24 100644
--- a/src/gui/output/xvdisplayer.cpp
+++ b/src/gui/output/xvdisplayer.cpp
@@ -33,7 +33,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/output/xvdisplayer.hpp"
 #include "include/logging.h"
 
diff --git a/src/gui/panel/assets-panel.cpp b/src/gui/panel/assets-panel.cpp
index dc363d5d7..f2f4a0be6 100644
--- a/src/gui/panel/assets-panel.cpp
+++ b/src/gui/panel/assets-panel.cpp
@@ -25,7 +25,7 @@
  ** Implementation of a (dockable) panel to organise the assets of a project.
  */
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/panel/assets-panel.hpp"
 
 namespace gui  {
diff --git a/src/gui/panel/panel.cpp b/src/gui/panel/panel.cpp
index 01aa02bba..a663db660 100644
--- a/src/gui/panel/panel.cpp
+++ b/src/gui/panel/panel.cpp
@@ -26,7 +26,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/panel/panel.hpp"
 #include "gui/workspace/panel-manager.hpp"
 #include "gui/workspace/workspace-window.hpp"
diff --git a/src/gui/panel/panel.hpp b/src/gui/panel/panel.hpp
index 83d725ee4..d79c24305 100644
--- a/src/gui/panel/panel.hpp
+++ b/src/gui/panel/panel.hpp
@@ -30,7 +30,7 @@
 #ifndef GUI_PANEL_PANEL_H
 #define GUI_PANEL_PANEL_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/panel-bar.hpp"
 
 #include <gdlmm.h>
diff --git a/src/gui/panel/timeline-panel-obsolete.cpp b/src/gui/panel/timeline-panel-obsolete.cpp
index 795a73b6d..02ab44d98 100644
--- a/src/gui/panel/timeline-panel-obsolete.cpp
+++ b/src/gui/panel/timeline-panel-obsolete.cpp
@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/panel/timeline-panel-obsolete.hpp"
 #include "gui/widget/timeline/timeline-zoom-scale.hpp"
 #include "gui/workspace/workspace-window.hpp"
diff --git a/src/gui/panel/timeline-panel.cpp b/src/gui/panel/timeline-panel.cpp
index e98739d42..698e8b344 100644
--- a/src/gui/panel/timeline-panel.cpp
+++ b/src/gui/panel/timeline-panel.cpp
@@ -31,7 +31,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/panel/timeline-panel.hpp"
 
 //#include "gui/workspace/workspace-window.hpp"
diff --git a/src/gui/panel/viewer-panel.cpp b/src/gui/panel/viewer-panel.cpp
index ca751f560..bbf552e8b 100644
--- a/src/gui/panel/viewer-panel.cpp
+++ b/src/gui/panel/viewer-panel.cpp
@@ -25,7 +25,7 @@
  ** Implementation of a dockable panel to hold the video viewers
  */
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/panel/viewer-panel.hpp"
 
 #include "gui/workspace/workspace-window.hpp"
diff --git a/src/gui/setting/asset-controller.cpp b/src/gui/setting/asset-controller.cpp
index 446675a39..352bd751d 100644
--- a/src/gui/setting/asset-controller.cpp
+++ b/src/gui/setting/asset-controller.cpp
@@ -29,7 +29,6 @@
  */
 
 
-//#include "gui/gtk-lumiera.hpp"
 #include "gui/setting/asset-controller.hpp"
 //#include "gui/ctrl/global-ctx.hpp"
 #include "lib/diff/tree-mutator.hpp"
diff --git a/src/gui/timeline/body-canvas-widget.cpp b/src/gui/timeline/body-canvas-widget.cpp
index 181dce91d..52d4e8383 100644
--- a/src/gui/timeline/body-canvas-widget.cpp
+++ b/src/gui/timeline/body-canvas-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/body-canvas-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/clip-presenter.cpp b/src/gui/timeline/clip-presenter.cpp
index b04817638..8a749412e 100644
--- a/src/gui/timeline/clip-presenter.cpp
+++ b/src/gui/timeline/clip-presenter.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/clip-presenter.hpp"
 #include "gui/timeline/marker-widget.hpp"
 
diff --git a/src/gui/timeline/clip-widget.cpp b/src/gui/timeline/clip-widget.cpp
index 25d34a6bc..5b2316524 100644
--- a/src/gui/timeline/clip-widget.cpp
+++ b/src/gui/timeline/clip-widget.cpp
@@ -34,7 +34,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/clip-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/header-pane-widget.cpp b/src/gui/timeline/header-pane-widget.cpp
index 6358e979a..6590e3e4e 100644
--- a/src/gui/timeline/header-pane-widget.cpp
+++ b/src/gui/timeline/header-pane-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/header-pane-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/layout-manager.cpp b/src/gui/timeline/layout-manager.cpp
index bd6780bca..24d6b9b10 100644
--- a/src/gui/timeline/layout-manager.cpp
+++ b/src/gui/timeline/layout-manager.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/layout-manager.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/marker-widget.cpp b/src/gui/timeline/marker-widget.cpp
index 3fa60f662..52d6760f0 100644
--- a/src/gui/timeline/marker-widget.cpp
+++ b/src/gui/timeline/marker-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/marker-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/navigator-widget.cpp b/src/gui/timeline/navigator-widget.cpp
index 11e4ae16b..8559fbe65 100644
--- a/src/gui/timeline/navigator-widget.cpp
+++ b/src/gui/timeline/navigator-widget.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/navigator-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/patchbay-widget.cpp b/src/gui/timeline/patchbay-widget.cpp
index 046b91631..32496d6b7 100644
--- a/src/gui/timeline/patchbay-widget.cpp
+++ b/src/gui/timeline/patchbay-widget.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/patchbay-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/pipe-widget.cpp b/src/gui/timeline/pipe-widget.cpp
index 2f2fb4a2d..577e29650 100644
--- a/src/gui/timeline/pipe-widget.cpp
+++ b/src/gui/timeline/pipe-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/pipe-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/ruler-widget.cpp b/src/gui/timeline/ruler-widget.cpp
index 14e9f7578..b9f178d1b 100644
--- a/src/gui/timeline/ruler-widget.cpp
+++ b/src/gui/timeline/ruler-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/ruler-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/timeline-controller.cpp b/src/gui/timeline/timeline-controller.cpp
index 9a7c11472..80135b2c1 100644
--- a/src/gui/timeline/timeline-controller.cpp
+++ b/src/gui/timeline/timeline-controller.cpp
@@ -38,7 +38,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/timeline-controller.hpp"
 #include "gui/timeline/track-presenter.hpp"
 #include "gui/timeline/marker-widget.hpp"
diff --git a/src/gui/timeline/timeline-widget-empty.cpp b/src/gui/timeline/timeline-widget-empty.cpp
index aa2a36ede..2874af081 100644
--- a/src/gui/timeline/timeline-widget-empty.cpp
+++ b/src/gui/timeline/timeline-widget-empty.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/timeline-widget-empty.hpp"
 
 //#include "gui/workspace/workspace-window.hpp"
diff --git a/src/gui/timeline/timeline-widget.cpp b/src/gui/timeline/timeline-widget.cpp
index 7059c5c85..52a9bc824 100644
--- a/src/gui/timeline/timeline-widget.cpp
+++ b/src/gui/timeline/timeline-widget.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/timeline-widget.hpp"
 
 //#include "gui/workspace/workspace-window.hpp"
diff --git a/src/gui/timeline/track-body.cpp b/src/gui/timeline/track-body.cpp
index d0445f910..081a85842 100644
--- a/src/gui/timeline/track-body.cpp
+++ b/src/gui/timeline/track-body.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/track-body.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/track-head-widget.cpp b/src/gui/timeline/track-head-widget.cpp
index 0cf93bd9e..3bb54282a 100644
--- a/src/gui/timeline/track-head-widget.cpp
+++ b/src/gui/timeline/track-head-widget.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/track-head-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/timeline/track-presenter.cpp b/src/gui/timeline/track-presenter.cpp
index 69e09cb74..cc6e3e993 100644
--- a/src/gui/timeline/track-presenter.cpp
+++ b/src/gui/timeline/track-presenter.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/track-presenter.hpp"
 #include "gui/timeline/clip-presenter.hpp"
 #include "gui/timeline/marker-widget.hpp"
diff --git a/src/gui/timeline/transition-widget.cpp b/src/gui/timeline/transition-widget.cpp
index 0e4984986..e2cc1350e 100644
--- a/src/gui/timeline/transition-widget.cpp
+++ b/src/gui/timeline/transition-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/timeline/transition-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/ui-bus.hpp b/src/gui/ui-bus.hpp
index e1bdea9f6..f56c7f479 100644
--- a/src/gui/ui-bus.hpp
+++ b/src/gui/ui-bus.hpp
@@ -103,7 +103,7 @@
 #define GUI_UI_BUS_H
 
 
-#include "gui/gtk-lumiera.hpp"  //////////////////////////////////////////////////////TODO remove any GTK dependency if possible
+#include "gui/gtk-base.hpp"  //////////////////////////////////////////////////////TODO remove any GTK dependency if possible
 #include "gui/ctrl/playback-controller.hpp"
 
 #include <boost/noncopyable.hpp>
diff --git a/src/gui/util/rectangle.hpp b/src/gui/util/rectangle.hpp
index 3fd168612..89f91d2a2 100644
--- a/src/gui/util/rectangle.hpp
+++ b/src/gui/util/rectangle.hpp
@@ -29,7 +29,7 @@
 #ifndef GUI_UTIL_RECTANGLE_H
 #define GUI_UTIL_RECTANGLE_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 namespace gui {
 namespace util {
diff --git a/src/gui/widget/bin-widget.cpp b/src/gui/widget/bin-widget.cpp
index 239091fee..7f6f4583e 100644
--- a/src/gui/widget/bin-widget.cpp
+++ b/src/gui/widget/bin-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/bin-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/widget/label-widget.cpp b/src/gui/widget/label-widget.cpp
index 89af91fdc..1882506df 100644
--- a/src/gui/widget/label-widget.cpp
+++ b/src/gui/widget/label-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/label-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/widget/mixer-widget.cpp b/src/gui/widget/mixer-widget.cpp
index 920ce0866..e691045df 100644
--- a/src/gui/widget/mixer-widget.cpp
+++ b/src/gui/widget/mixer-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/mixer-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/widget/player-widget.cpp b/src/gui/widget/player-widget.cpp
index dd6fdb8aa..15edc21be 100644
--- a/src/gui/widget/player-widget.cpp
+++ b/src/gui/widget/player-widget.cpp
@@ -29,7 +29,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/player-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/widget/switchboard-widget.cpp b/src/gui/widget/switchboard-widget.cpp
index cf235cadd..1743cfd6f 100644
--- a/src/gui/widget/switchboard-widget.cpp
+++ b/src/gui/widget/switchboard-widget.cpp
@@ -30,7 +30,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/switchboard-widget.hpp"
 
 //#include "gui/ui-bus.hpp"
diff --git a/src/gui/widget/timeline/timeline-body.hpp b/src/gui/widget/timeline/timeline-body.hpp
index 0766c1a83..198d8fa6f 100644
--- a/src/gui/widget/timeline/timeline-body.hpp
+++ b/src/gui/widget/timeline/timeline-body.hpp
@@ -28,7 +28,7 @@
 #ifndef GUI_WIDGET_TIMELINE_BODY_H
 #define GUI_WIDGET_TIMELINE_BODY_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/timeline/timeline-tool.hpp"
 #include "lib/time/timevalue.hpp"
 
diff --git a/src/gui/widget/timeline/timeline-clip.hpp b/src/gui/widget/timeline/timeline-clip.hpp
index a62639f12..fbca71d9b 100644
--- a/src/gui/widget/timeline/timeline-clip.hpp
+++ b/src/gui/widget/timeline/timeline-clip.hpp
@@ -28,7 +28,7 @@
 #ifndef GUI_WIDGET_TIMELINE_CLIP_H
 #define GUI_WIDGET_TIMELINE_CLIP_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/model/clip.hpp"
 #include "include/logging.h"
 #include "lib/time/timevalue.hpp"
diff --git a/src/gui/widget/timeline/timeline-entity.cpp b/src/gui/widget/timeline/timeline-entity.cpp
index da3d4086f..765e2acc1 100644
--- a/src/gui/widget/timeline/timeline-entity.cpp
+++ b/src/gui/widget/timeline/timeline-entity.cpp
@@ -27,7 +27,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/timeline/timeline-entity.hpp"
 #include "gui/widget/timeline/draw-strategy.hpp"
 
diff --git a/src/gui/widget/timeline/timeline-header-container.hpp b/src/gui/widget/timeline/timeline-header-container.hpp
index 84ee305f6..b052a79ea 100644
--- a/src/gui/widget/timeline/timeline-header-container.hpp
+++ b/src/gui/widget/timeline/timeline-header-container.hpp
@@ -32,7 +32,7 @@
 #ifndef GUI_WIDGET_TIMELINE_HEADER_CONTAINER_H
 #define GUI_WIDGET_TIMELINE_HEADER_CONTAINER_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "timeline-layout-helper.hpp"
 
 namespace gui {
diff --git a/src/gui/widget/timeline/timeline-header-widget.hpp b/src/gui/widget/timeline/timeline-header-widget.hpp
index ed4bbecda..ca9e7cec4 100644
--- a/src/gui/widget/timeline/timeline-header-widget.hpp
+++ b/src/gui/widget/timeline/timeline-header-widget.hpp
@@ -30,7 +30,7 @@
 #ifndef GUI_WIDGET_HEADER_WIDGET_H
 #define GUI_WIDGET_HEADER_WIDGET_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 namespace gui {  
 namespace widget {
diff --git a/src/gui/widget/timeline/timeline-layout-helper.hpp b/src/gui/widget/timeline/timeline-layout-helper.hpp
index 1516f1f9e..a094e1da3 100644
--- a/src/gui/widget/timeline/timeline-layout-helper.hpp
+++ b/src/gui/widget/timeline/timeline-layout-helper.hpp
@@ -29,7 +29,7 @@
 #ifndef GUI_WIDGET_TIMELINE_LAYOUT_HELPER_H
 #define GUI_WIDGET_TIMELINE_LAYOUT_HELPER_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "lib/util-coll.hpp"
 #include "lib/tree.hpp"
 
diff --git a/src/gui/widget/timeline/timeline-ruler.hpp b/src/gui/widget/timeline/timeline-ruler.hpp
index a90ad087b..ec556444c 100644
--- a/src/gui/widget/timeline/timeline-ruler.hpp
+++ b/src/gui/widget/timeline/timeline-ruler.hpp
@@ -30,7 +30,7 @@
 #ifndef GUI_WIDGET_TIMELINE_RULER_H
 #define GUI_WIDGET_TIMELINE_RULER_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"
 #include "gui/widget/timeline/timeline-state.hpp"
 
diff --git a/src/gui/widget/timeline/timeline-tool.hpp b/src/gui/widget/timeline/timeline-tool.hpp
index 988edc0ba..c54a55d69 100644
--- a/src/gui/widget/timeline/timeline-tool.hpp
+++ b/src/gui/widget/timeline/timeline-tool.hpp
@@ -32,7 +32,7 @@
 #ifndef GUI_WIDGET_TIMELINE_TOOL_H
 #define GUI_WIDGET_TIMELINE_TOOL_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 
 #include <memory>
 
diff --git a/src/gui/widget/timeline/timeline-track.hpp b/src/gui/widget/timeline/timeline-track.hpp
index 4edefa174..fc233e4b0 100644
--- a/src/gui/widget/timeline/timeline-track.hpp
+++ b/src/gui/widget/timeline/timeline-track.hpp
@@ -33,7 +33,7 @@
 #define GUI_WIDGET_TIMELINE_TRACK_H
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/model/track.hpp"
 #include "gui/widget/menu-button.hpp"
 #include "gui/widget/mini-button.hpp"
diff --git a/src/gui/widget/timeline/timeline-view-window.hpp b/src/gui/widget/timeline/timeline-view-window.hpp
index 19405279c..049b8dc9e 100644
--- a/src/gui/widget/timeline/timeline-view-window.hpp
+++ b/src/gui/widget/timeline/timeline-view-window.hpp
@@ -31,7 +31,7 @@
 #ifndef GUI_WIDGET_TIMELINE_VIEW_WINDOW_H
 #define GUI_WIDGET_TIMELINE_VIEW_WINDOW_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "lib/time/timevalue.hpp"
 
 namespace gui {
diff --git a/src/gui/widget/timeline/timeline-zoom-scale.hpp b/src/gui/widget/timeline/timeline-zoom-scale.hpp
index f9d6f41e2..01393674b 100644
--- a/src/gui/widget/timeline/timeline-zoom-scale.hpp
+++ b/src/gui/widget/timeline/timeline-zoom-scale.hpp
@@ -31,7 +31,7 @@
 #ifndef GUI_WIDGET_TIMELINE_ZOOM_SCALE_H
 #define GUI_WIDGET_TIMELINE_ZOOM_SCALE_H
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/widget/mini-button.hpp"
 #include "gui/widget/timeline-widget.hpp"
 #include "gui/widget/timeline/timeline-state.hpp"
diff --git a/src/gui/widget/video-display-widget.cpp b/src/gui/widget/video-display-widget.cpp
index 482ca54a9..00664f139 100644
--- a/src/gui/widget/video-display-widget.cpp
+++ b/src/gui/widget/video-display-widget.cpp
@@ -26,7 +26,7 @@
  */
 
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/output/xvdisplayer.hpp"
 #include "gui/output/gdkdisplayer.hpp"
 
diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp
index fa6905c09..dc6a5fb26 100644
--- a/src/gui/workspace/workspace-window.cpp
+++ b/src/gui/workspace/workspace-window.cpp
@@ -25,7 +25,7 @@
  ** Implementation of base functionality for workspace windows.
  */
 
-#include "gui/gtk-lumiera.hpp"
+#include "gui/gtk-base.hpp"
 #include "gui/config-keys.hpp"
 #include "gui/workspace/workspace-window.hpp"
 #include "gui/workspace/panel-manager.hpp"