diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp
index de37e2f00b..a9a39d92fe 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <QHelpCollectionProject version="1.0">
      <assistant>
-         <title>MITK 3M3 Help</title>
+         <title>MITK Diffusion Help</title>
 		 <applicationIcon>assistant-logo.png</applicationIcon>
          <startPage>qthelp://org.mitk.gui.qt.diffusionimagingapp/bundle/index.html</startPage>
 		 <applicationIcon>assistant-icon.png</applicationIcon>
          <enableFilterFunctionality>false</enableFilterFunctionality>
          <enableDocumentationManager>false</enableDocumentationManager>
          <enableAddressBar visible="false">true</enableAddressBar>
-         <cacheDirectory>Mitk3M3</cacheDirectory>
+         <cacheDirectory>MitkDIApp</cacheDirectory>
          <aboutMenuText>
-             <text>About MITK 3M3 Help</text>
+             <text>About MITK Diffusion Help</text>
          </aboutMenuText>
          <aboutDialog>		 
 		     <icon>about-logo.png</icon>
 		</aboutDialog>
      </assistant>
      <docFiles>
          
      </docFiles>
 </QHelpCollectionProject>
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake
index b4eac9b557..9cb5a6290f 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake
@@ -1,95 +1,96 @@
 SET(SRC_CPP_FILES
   QmitkDiffusionImagingAppApplication.cpp
   QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
 )
 
 SET(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
   QmitkDiffusionImagingAppIntroPart.cpp
   QmitkDiffusionImagingAppPerspective.cpp
   QmitkWelcomePerspective.cpp
   QmitkDIAppConnectomicsPerspective.cpp
   QmitkDIAppDicomImportPerspective.cpp
   QmitkDIAppFiberTractographyPerspective.cpp
   QmitkDIAppIVIMPerspective.cpp
   QmitkDIAppPreprocessingReconstructionPerspective.cpp
   QmitkDIAppQuantificationPerspective.cpp
   QmitkDIAppScreenshotsMoviesPerspective.cpp
   QmitkDIAppTBSSPerspective.cpp
   QmitkDIAppVolumeVisualizationPerspective.cpp
 )
 
 SET(UI_FILES
   src/internal/QmitkWelcomeScreenViewControls.ui
 )
 
 SET(MOC_H_FILES
   src/internal/QmitkDiffusionImagingAppIntroPart.h
   src/internal/mitkPluginActivator.h
   src/QmitkDiffusionImagingAppApplication.h
   src/internal/QmitkDiffusionImagingAppPerspective.h
   src/internal/QmitkWelcomePerspective.h
   src/internal/QmitkDIAppConnectomicsPerspective.h
   src/internal/QmitkDIAppDicomImportPerspective.h
   src/internal/QmitkDIAppFiberTractographyPerspective.h
   src/internal/QmitkDIAppIVIMPerspective.h
   src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h
   src/internal/QmitkDIAppQuantificationPerspective.h
   src/internal/QmitkDIAppScreenshotsMoviesPerspective.h
   src/internal/QmitkDIAppTBSSPerspective.h
   src/internal/QmitkDIAppVolumeVisualizationPerspective.h
 )
 
 SET(CACHED_RESOURCE_FILES
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
   plugin.xml
   resources/icon_dicom.xpm
   resources/diffusionimaging.png
   resources/preprocessing.png
   resources/Measurement_48.png
   resources/volvis.png
   resources/perspectives/diffusionimaging.png
   resources/perspectives/icon_home.png
   resources/perspectives/connectomics.png
   resources/perspectives/dicomimport.png
   resources/perspectives/tractography.png
   resources/perspectives/ivim.png
   resources/perspectives/preprocessingreconstruction.png
   resources/perspectives/quantification.png
   resources/perspectives/screenshotsmovies.png
   resources/perspectives/tbss.png
   resources/perspectives/volumevizualization.png
 )
 
 SET(QRC_FILES
 # uncomment the following line if you want to use Qt resources
   resources/welcome/QmitkWelcomeScreenView.qrc
   resources/org_mitk_gui_qt_diffusionimagingapp.qrc
 )
 
 # SET(CPP_FILES)
 
 foreach(file ${SRC_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
 
 
 #----------- Qt Help Collection Project -------------#
 
 IF (BLUEBERRY_USE_QT_HELP)
   SET(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp")
-  SET(_plugin_qhcp_output "${PLUGIN_OUTPUT_DIR}/resources/MitkDiffusionImagingAppQtHelpCollection_${MBI_WC_REVISION_HASH}.qhc")
+  SET(_plugin_qhcp_output "${CMAKE_CURRENT_BINARY_DIR}/MitkDiffusionImagingAppQtHelpCollection.qhc")
   ADD_CUSTOM_COMMAND(OUTPUT ${_plugin_qhcp_output}
                      COMMAND ${QT_COLLECTIONGENERATOR_EXECUTABLE} ${_plugin_qhcp_input} -o ${_plugin_qhcp_output}
                      DEPENDS ${_plugin_qhcp_input}
                      )
 
-  SET(FILE_DEPENDENCIES ${_plugin_qhcp_output})
+  LIST(APPEND CACHED_RESOURCE_FILES ${_plugin_qhcp_output})
+  #SET(FILE_DEPENDENCIES ${_plugin_qhcp_output})
 ENDIF()
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
index e1807f72b2..0974f82372 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
@@ -1,116 +1,116 @@
 /*=========================================================================
 
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fri, 23 Oct 2009) $
  Version:   $Revision$
 
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
 
 #include "QmitkDiffusionImagingAppWorkbenchAdvisor.h"
 
 #include "internal/mitkPluginActivator.h"
 
 #include <berryPlatform.h>
 #include <berryIPreferencesService.h>
 #include <berryWorkbenchPreferenceConstants.h>
 #include <berryQtAssistantUtil.h>
 #include <QmitkExtWorkbenchWindowAdvisor.h>
 
 #include <QApplication>
 
 const std::string QmitkDiffusionImagingAppWorkbenchAdvisor::WELCOME_PERSPECTIVE_ID = "org.mitk.diffusionimagingapp.perspectives.welcome";
 
 
 void
 QmitkDiffusionImagingAppWorkbenchAdvisor::Initialize(berry::IWorkbenchConfigurer::Pointer configurer)
 {
   berry::QtWorkbenchAdvisor::Initialize(configurer);
 
   configurer->SetSaveAndRestore(true);
 
   // TODO This should go into the products plugin_customization.ini file (when
   // the product and branding support is finished, see bug 2146).
   // This will not work anymore, if bug 2822 is fixed.
   berry::IPreferencesService::Pointer prefService = berry::Platform::GetServiceRegistry().GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   prefService->GetSystemPreferences()->Put(berry::WorkbenchPreferenceConstants::PREFERRED_SASH_LAYOUT, berry::WorkbenchPreferenceConstants::RIGHT);
 
   QString collectionFile = mitkPluginActivator::GetDefault()->GetQtHelpCollectionFile();
   if (!collectionFile.isEmpty())
   {
-//    berry::QtAssistantUtil::SetHelpCollectionFile(collectionFile);
-//    berry::QtAssistantUtil::SetDefaultHelpUrl("qthelp://org.mitk.gui.qt.diffusionimagingapp/bundle/index.html");
+    berry::QtAssistantUtil::SetHelpCollectionFile(collectionFile);
+    berry::QtAssistantUtil::SetDefaultHelpUrl("qthelp://org.mitk.gui.qt.diffusionimagingapp/bundle/index.html");
 
     typedef std::vector<berry::IBundle::Pointer> BundleContainer;
     BundleContainer bundles = berry::Platform::GetBundles();
     berry::QtAssistantUtil::RegisterQCHFiles(bundles);
   }
 
 }
 
 berry::WorkbenchWindowAdvisor*
 QmitkDiffusionImagingAppWorkbenchAdvisor::CreateWorkbenchWindowAdvisor(
         berry::IWorkbenchWindowConfigurer::Pointer configurer)
 {
   std::vector<std::string> perspExcludeList;
   perspExcludeList.push_back( std::string("org.blueberry.uitest.util.EmptyPerspective") );
   perspExcludeList.push_back( std::string("org.blueberry.uitest.util.EmptyPerspective2") );
   perspExcludeList.push_back( std::string("org.mitk.coreapp.defaultperspective") );
   perspExcludeList.push_back( std::string("org.mitk.extapp.defaultperspective") );
   perspExcludeList.push_back( std::string("org.mitk.perspectives.publicdiffusionimaging") );
   perspExcludeList.push_back( std::string("org.mitk.perspectives.diffusionimaginginternal") );
 
   std::vector<std::string> viewExcludeList;
 //  viewExcludeList.push_back( std::string("org.mitk.views.partialvolumeanalysis") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.globalfibertracking") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.tractbasedspatialstatistics") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.fibertracking") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.ivim") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.qballreconstruction") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.diffusiondicomimport") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.diffusionpreprocessing") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.diffusionquantification") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.tensorreconstruction") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.perspectiveswitcher") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.basicimageprocessing") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.fiberbundleoperations") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.measurement") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.moviemaker") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.odfdetails") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.propertylistview") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.screenshotmaker") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.segmentation") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.imagestatistics") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.controlvisualizationpropertiesview") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.volumevisualization") );
 //  viewExcludeList.push_back( std::string("org.mitk.views.simplemeasurement") );
 
   configurer->SetInitialSize(berry::Point(1000,770));
 
   QmitkExtWorkbenchWindowAdvisor* advisor = new QmitkExtWorkbenchWindowAdvisor(this, configurer);
   advisor->ShowViewMenuItem(false);
   advisor->ShowNewWindowMenuItem(false);
   advisor->ShowClosePerspectiveMenuItem(false);
   advisor->SetPerspectiveExcludeList(perspExcludeList);
   advisor->SetViewExcludeList(viewExcludeList);
   advisor->ShowViewToolbar(false);
   advisor->ShowPerspectiveToolbar(true);
   advisor->ShowVersionInfo(false);
   advisor->ShowMitkVersionInfo(false);
   advisor->SetProductName("MITK Diffusion");
   advisor->SetWindowIcon(":/org.mitk.gui.qt.diffusionimagingapp/app-icon.png");
   return advisor;
 }
 
 std::string QmitkDiffusionImagingAppWorkbenchAdvisor::GetInitialWindowPerspectiveId()
 {
   return WELCOME_PERSPECTIVE_ID;
 }