diff --git a/Core/Core.cc b/Core/Core.cc
index 52df2a97cf433d9e3936928fcca303a148b81d45..a1959b2099e3a70ae18c1872f7d2836eda1bf914 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -667,6 +667,13 @@ void Core::fullscreen() {
 
 //-----------------------------------------------------------------------------
 
+void Core::fullscreen( bool _state ) {
+  if ( OpenFlipper::Options::gui() )
+    coreWidget_->setFullscreen(_state);
+}
+
+//-----------------------------------------------------------------------------
+
 void Core::logger() {
   if ( OpenFlipper::Options::gui() )
     coreWidget_->toggleLogger();
diff --git a/Core/Core.hh b/Core/Core.hh
index 63e04269276dfd1dee71e27c5f91291b015d9f01..86b94894d986a8b40e9d3d4796e228ebbb8fc648 100644
--- a/Core/Core.hh
+++ b/Core/Core.hh
@@ -282,6 +282,9 @@ public slots:
     /// toggle fullscreen mode
     void fullscreen();
 
+    /// set fullscreen mode
+    void fullscreen( bool _state );
+
     /// Hide or show logging window
     void logger();
 
@@ -300,7 +303,7 @@ public slots:
     /// set the baseFilename for snapshots (a counter is automatically increased when
     /// snapshot() is called)
     void snapshotBaseFileName(const QString& _fname);
-  
+
     /** Trigger a snapshot and increase the snapshot counter.
       Save snapshot to file determined by snapshotBaseFileName() and
       the current snapshot counter. The \a back buffer will be saved.
@@ -360,7 +363,7 @@ private:
       * @param _id id of the object
       */
     bool saveObject( int _id, QString _filename );
-    
+
     /** Show dialog for saving an object to a new location
       * @param _id id of the object
       * @param _filename current filename of the object
@@ -620,7 +623,7 @@ private:
   private:
 
     QList< SlotInfo > coreSlots_;
-    
+
     void setDescriptions();
 
   /** @} */
diff --git a/gui.kdevelop b/gui.kdevelop
index e8d4e44dafc18266d022535c1d3c1764ff6b3976..925730aec23bce9dc1847ecf92cdbe04411e9f9b 100644
--- a/gui.kdevelop
+++ b/gui.kdevelop
@@ -87,7 +87,7 @@
       </environments>
     </other>
     <general>
-      <activedir>ACG</activedir>
+      <activedir>Plugin-TemplateModeling</activedir>
     </general>
   </kdevcustomproject>
   <kdevdebugger>
diff --git a/gui.kdevses b/gui.kdevses
index 7c9eb897338f3beed4a9f4f41aaf602cfb1f62d6..dce74a474b173c2d6ef45db045568ab1548ab03b 100644
--- a/gui.kdevses
+++ b/gui.kdevses
@@ -1,16 +1,19 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="3" >
-  <Doc0 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.cc" >
-   <View0 Encoding="" Type="Source" />
+ <DocsAndViews NumberOfDocuments="4" >
+  <Doc0 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Init.cc" >
+   <View0 Encoding="" line="1130" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateBlendingComputation.cc" >
-   <View0 Encoding="" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.hh" >
+   <View0 Encoding="" line="157" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Init.cc" >
-   <View0 Encoding="" line="1041" Type="Source" />
+  <Doc2 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/Matching.cc" >
+   <View0 Encoding="" line="58" Type="Source" />
   </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:///data/home1/moebius/projects/OpenFlipper/Plugin-TemplateModeling/TemplateModelingPlugin.cc" >
+   <View0 Encoding="" line="410" Type="Source" />
+  </Doc3>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
diff --git a/widgets/coreWidget/CoreWidget.cc b/widgets/coreWidget/CoreWidget.cc
index f6d08cab6d86ba70b27509419d9fea0299ae0a7a..f29e0ad937e7a67debf22a60e801e05f68245589 100644
--- a/widgets/coreWidget/CoreWidget.cc
+++ b/widgets/coreWidget/CoreWidget.cc
@@ -294,6 +294,24 @@ CoreWidget::toggleFullscreen() {
 
 //-----------------------------------------------------------------------------
 
+/** Enable or disable Fullscreen Mode
+  */
+void
+CoreWidget::setFullscreen(bool _state ) {
+  if ( _state )
+    setWindowState( windowState() | Qt::WindowFullScreen);
+  else {
+    if ( windowState() & Qt::WindowFullScreen )
+      setWindowState( windowState() ^  Qt::WindowFullScreen);
+  }
+
+  OpenFlipper::Options::fullScreen( bool( windowState() & Qt::WindowFullScreen) );
+
+  show();
+}
+
+//-----------------------------------------------------------------------------
+
 /** Hide or show logger
   */
 void
diff --git a/widgets/coreWidget/CoreWidget.hh b/widgets/coreWidget/CoreWidget.hh
index 966f9a78aee74c7c350723f0ba87eba21f05f832..6eaf2870167ad5d8c502b42d848738d542421b78 100644
--- a/widgets/coreWidget/CoreWidget.hh
+++ b/widgets/coreWidget/CoreWidget.hh
@@ -205,6 +205,9 @@ public:
     /// Set application to Fullscreen and back
     void toggleFullscreen();
 
+    /// Enable or disable fullscreen mode
+    void setFullscreen(bool _state );
+
     /// Hide or show logging area
     void toggleLogger();