diff --git a/data/config/setup.ini b/data/config/setup.ini
index 17befa9a2..868a0333a 100644
--- a/data/config/setup.ini
+++ b/data/config/setup.ini
@@ -1,6 +1,6 @@
 ###########################################################
-# ### Lumiera installation and platform configuration ### 
-# 
+# ### Lumiera installation and platform configuration ###
+#
 # (file located relative to the Lumiera executable)
 #
 
diff --git a/src/common/subsys.hpp b/src/common/subsys.hpp
index 33fe237ce..f1a4ec794 100644
--- a/src/common/subsys.hpp
+++ b/src/common/subsys.hpp
@@ -1,5 +1,5 @@
 /*
-  SUBSYS.hpp  -  interface for describing an application part to be handled by main() 
+  SUBSYS.hpp  -  interface for describing an application part to be handled by main()
 
   Copyright (C)         Lumiera.org
     2008,               Hermann Vosseler <Ichthyostega@web.de>
@@ -26,13 +26,13 @@
  ** need to be started and maintained, observing some interrelations.
  ** While the activation of the key components is controlled by options, maybe
  ** some prerequisite subsystems need to be pulled up, and in case of an regular
- ** or irregular exit of a given subsystem, the whole dependency graph needs 
+ ** or irregular exit of a given subsystem, the whole dependency graph needs
  ** to be brought down in a clean manner. The purpose of lumiera::Subsys is
  ** to maintain these in a self-explanatory script-like fashion within main(),
  ** without forcing the individual subsystems into a fixed implementation scheme.
  ** The only requirement is that for each subsystem there is sort-of an entry
  ** point or facade object, providing a Subsys descriptor instance to be
- ** used within main. 
+ ** used within main.
  **
  ** @see lumiera::AppState
  ** @see lumiera::Option
@@ -88,7 +88,7 @@ namespace lumiera {
       bool isRunning()  noexcept;
       
       
-      /** query application option state to determine 
+      /** query application option state to determine
        *  if this subsystem should be activated.
        * @note even if not started explicitly, it could still
        *       be started as prerequisite of another one */
@@ -100,9 +100,9 @@ namespace lumiera {
        *  Failure to start up usually terminates the whole application.
        *  When this subsystem ceases to work, it must ensure to activate
        *  the given callback signal.
-       *  @param options may be influencing the operation mode 
+       *  @param options may be influencing the operation mode
        *  @param SigTerm to be signalled by the subsystem.
-       *  @warning termination must be signalled reliably.  
+       *  @warning termination must be signalled reliably.
        *  @return `true` if actually started. */
       virtual bool start (lumiera::Option& options, SigTerm)  =0;
       
@@ -111,7 +111,7 @@ namespace lumiera {
        *  This trigger may be called repeatedly any time...
        *  When the subsystem actually has terminated,
        *  the SigTerm passed to #start must be invoked.
-       * @note called within a locked context (barrier) 
+       * @note called within a locked context (barrier)
        * @warning must not block nor throw. */
       virtual void triggerShutdown()  noexcept  =0;
       
diff --git a/src/lib/format-obj.cpp b/src/lib/format-obj.cpp
index 44b0405a3..4c40c3069 100644
--- a/src/lib/format-obj.cpp
+++ b/src/lib/format-obj.cpp
@@ -182,7 +182,7 @@ apologies for that."
    *   the cache, so it doesn't make much of a difference if we scan
    *   the same comparatively short string multiple times
    * 
-   * [stdRegEx-threadsafe]: http://stackoverflow.com/questions/15752910/is-stdregex-thread-safe 
+   * [stdRegEx-threadsafe]: http://stackoverflow.com/questions/15752910/is-stdregex-thread-safe
    */
   string
   humanReadableTypeID (Literal rawType)
diff --git a/src/lib/idi/genfunc.cpp b/src/lib/idi/genfunc.cpp
index c06c1c2ff..46a9a561e 100644
--- a/src/lib/idi/genfunc.cpp
+++ b/src/lib/idi/genfunc.cpp
@@ -49,7 +49,7 @@ namespace idi {
     instance_format (string const& prefix, size_t instanceNr)
     {
       return _Fmt("%s.%03d")
-                % prefix % instanceNr; 
+                % prefix % instanceNr;
     }
     
     string
diff --git a/src/lib/util.hpp b/src/lib/util.hpp
index ddccbd360..ff37034bd 100644
--- a/src/lib/util.hpp
+++ b/src/lib/util.hpp
@@ -74,7 +74,7 @@ namespace util {
   
   /** cut a numeric value to be >=0 */
   template <typename NUM>
-  inline NUM 
+  inline NUM
   noneg (NUM val)
   {
     return (0<val? val : 0);
@@ -82,7 +82,7 @@ namespace util {
   
   /** force a numeric to be within bounds, inclusively */
   template <typename NUM, typename NB>
-  inline NUM 
+  inline NUM
   limited (NB lowerBound, NUM val, NB upperBound)
   {
     return min ( max (val, lowerBound)
@@ -90,7 +90,7 @@ namespace util {
   }
   
   /** positive integral number from textual representation
-   * @return always a number, 0 in case of unparseable text,  
+   * @return always a number, 0 in case of unparseable text,
    *         limited to 0 <= num <= LUMIERA_MAX_ORDINAL_NUMBER */
   inline uint
   uNum (const char* pCStr)
@@ -201,7 +201,7 @@ namespace util {
   
   /** shortcut for containment test on a map */
   template <typename MAP>
-  inline bool 
+  inline bool
   contains (MAP& map, typename MAP::key_type const& key)
   {
     return map.find(key) != map.end();
@@ -209,7 +209,7 @@ namespace util {
   
   /** shortcut for set value containment test */
   template <typename T>
-  inline bool 
+  inline bool
   contains (std::set<T> const& set, T const& val)
   {
     return set.end() != set.find (val);
@@ -217,7 +217,7 @@ namespace util {
   
   /** shortcut for string value containment test */
   template <typename T>
-  inline bool 
+  inline bool
   contains (std::string const& str, const T& val)
   {
     return str.find (val) != std::string::npos;
@@ -226,7 +226,7 @@ namespace util {
   /** shortcut for brute-force containment test
    *  in any sequential container */
   template <typename SEQ>
-  inline bool 
+  inline bool
   contains (SEQ const& cont, typename SEQ::const_reference val)
   {
     typename SEQ::const_iterator begin = cont.begin();
@@ -277,7 +277,7 @@ namespace util {
   /** shortcut for removing all copies of an Element
    *  in any sequential collection */
   template <typename SEQ>
-  inline typename SEQ::iterator 
+  inline typename SEQ::iterator
   removeall (SEQ& coll, typename SEQ::value_type const& val)
   {
     typename SEQ::iterator collEnd = coll.end();
@@ -305,7 +305,7 @@ namespace util {
           else
             {
               found = true;
-              if (pos==begin) 
+              if (pos==begin)
                 {
                   set.erase(pos);
                   pos = begin = set.begin();
@@ -354,10 +354,10 @@ namespace util {
   
   
   /** produce an identifier based on the given string.
-   *  remove non-standard-chars, reduce sequences of punctuation 
+   *  remove non-standard-chars, reduce sequences of punctuation
    *  and whitespace to single underscores. The sanitised string
    *  will start with an alphanumeric character.
-   * 
+   *
    * @par Example Conversions
 \verbatim
    "Word"                             --> "Word"
@@ -403,7 +403,7 @@ namespace util {
   /** convenience shortcut: conversion to c-String via string.
    *  usable for printf with objects providing to-string conversion.
    */
-  inline const char* 
+  inline const char*
   cStr (string const& org)
   {
     return org.c_str();
diff --git a/src/stage/guifacade.hpp b/src/stage/guifacade.hpp
index 422c46b61..60f1df982 100644
--- a/src/stage/guifacade.hpp
+++ b/src/stage/guifacade.hpp
@@ -58,7 +58,7 @@ namespace stage {
    * of the GUI available, i.e. stage::GuiNotification
    * 
    * When running Lumiera with a GUI is required (the default case),
-   * it is loaded as dynamic module, thus defining the interface(s) 
+   * it is loaded as dynamic module, thus defining the interface(s)
    * for any further access. After successfully loading and starting
    * the GUI, the actual "business" interfaces of the GUI are opened
    * and wired internally such as to allow transparent access from
diff --git a/src/stage/id-scheme.hpp b/src/stage/id-scheme.hpp
index fe24d3adb..580978482 100644
--- a/src/stage/id-scheme.hpp
+++ b/src/stage/id-scheme.hpp
@@ -52,7 +52,7 @@
  ** 
  ** In the current state (2017/2021) the foundation for such a rule based view allocation was worked out,
  ** but all the possibly quite elaborated details of hooking into the actual widget tree was postponed,
- ** until we have a more mature implementation of actual presentation widgets in place. 
+ ** until we have a more mature implementation of actual presentation widgets in place.
  ** 
  ** @todo as of 2017 .. 2021, this is a half-finished draft and postponed in favour of building the actually visible timeline display first
  ** 
diff --git a/src/steam/common.hpp b/src/steam/common.hpp
index 74ac6fdb8..cd474c660 100644
--- a/src/steam/common.hpp
+++ b/src/steam/common.hpp
@@ -61,7 +61,7 @@
  * the API and backbone of the renderengine. Most render implementation
  * code resides in the vault layer or is loaded from plug-ins though.
  */
-namespace steam { 
+namespace steam {
   
   
   
@@ -82,7 +82,7 @@ namespace steam {
    * The so called "player" combines and orchestrates services from
    * the engine, session and vault to perform playback or rendering
    */
-  namespace play { 
+  namespace play {
     
   }
   
@@ -124,8 +124,8 @@ namespace steam {
      */
     namespace builder { }
   
-  }
   
+  }//(End)namespace mobject
 } //(End)namespace steam
 
 #endif /*STEAM_COMMON_H*/
diff --git a/src/steam/config-resolver.hpp b/src/steam/config-resolver.hpp
index d405808a5..53e5f588b 100644
--- a/src/steam/config-resolver.hpp
+++ b/src/steam/config-resolver.hpp
@@ -36,7 +36,7 @@
  ** 
  ** @see lumiera::Query
  ** @see mobject::session::DefsManager
- ** @see asset::StructFactory 
+ ** @see asset::StructFactory
  ** @see fake-configrules.hpp currently used dummy-implementation
  ** @see 
  **
@@ -66,7 +66,7 @@ namespace steam {
   
   /* ============= global configuration ==================== */
   
-  /** 
+  /**
    *  the list of all concrete types participating in the
    *  rule based config query system
    */
@@ -78,7 +78,7 @@ namespace steam {
                            > ::List
                              InterfaceTypes;
   
-  /** 
+  /**
    * user-visible Interface to the ConfigRules subsystem.
    * Configured as Singleton (with hidden Implementation class)
    */