diff --git a/Modules/ToFHardware/mitkKinectController.h b/Modules/ToFHardware/mitkKinectController.h
index 3760b6b1d4..e2de2ec321 100644
--- a/Modules/ToFHardware/mitkKinectController.h
+++ b/Modules/ToFHardware/mitkKinectController.h
@@ -1,104 +1,107 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2010-05-27 16:06:53 +0200 (Do, 27 Mai 2010) $
 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.
 
 =========================================================================*/
 #ifndef __mitkKinectController_h
 #define __mitkKinectController_h
 
 #include "mitkToFHardwareExports.h"
 #include "mitkCommon.h"
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
 
 #include <XnCppWrapper.h>
 
 namespace mitk
 {
   /**
   * @brief Interface to the Kinect camera
   * 
   *
   * @ingroup ToFHardware
   */
   class MITK_TOFHARDWARE_EXPORT KinectController : public itk::Object
   {
   public: 
 
     mitkClassMacro( KinectController , itk::Object );
 
     itkNewMacro( Self );
 
     itkGetConstMacro(CaptureHeight,unsigned int);
     itkGetConstMacro(CaptureWidth,unsigned int);
+    itkGetConstMacro(UseIR,bool);
+
+    itkSetMacro(UseIR,bool);
 
     /*!
     \brief opens a connection to the Kinect camera.
     */
     virtual bool OpenCameraConnection();
     /*!
     \brief closes the connection to the camera
     */
     virtual bool CloseCameraConnection();
     /*!
     \brief updates the camera. The update function of the hardware interface is called only when new data is available
     */
     virtual bool UpdateCamera();
     /*!
     \brief acquire new distance data from the Kinect camera
     \param distances pointer to memory location where distances should be stored
     */
     void GetDistances(float* distances);
     void GetAmplitudes(float* amplitudes);
     void GetIntensities(float* intensities);
     /*!
     \brief acquire new rgb data from the Kinect camera
     \parama rgb pointer to memory location where rgb information should be stored
     */
     void GetRgb(unsigned char* rgb);
     /*!
     \brief convenience method for faster access to distance and rgb data
     \param distances pointer to memory location where distances should be stored
     \param rgb pointer to memory location where rgb information should be stored
     */
     void GetAllData(float* distances, float* amplitudes, unsigned char* rgb);
 
   protected:
 
     KinectController();
 
     ~KinectController();
 
     bool ErrorText(unsigned int error);
 
     xn::Context m_Context; ///< OpenNI context
     xn::DepthGenerator m_DepthGenerator; ///< Depth generator to access depth image of kinect
     xn::ImageGenerator m_ImageGenerator; ///< Image generator to access RGB image of kinect
     xn::IRGenerator m_IRGenerator; ///< IR generator to access IR image of kinect
     //xn::IRGenerator m_IRGenerator;
 
     bool m_ConnectionCheck; ///< check if camera is connected or not
 
     bool m_UseIR; ///< flag indicating whether IR image is used or not
 
     unsigned int m_CaptureWidth; ///< image width
     unsigned int m_CaptureHeight; ///< image height
 
   private:
 
   };
 } //END mitk namespace
 #endif
diff --git a/Modules/ToFHardware/mitkKinectDevice.cpp b/Modules/ToFHardware/mitkKinectDevice.cpp
index 28c75b18cf..9e85f49ec6 100644
--- a/Modules/ToFHardware/mitkKinectDevice.cpp
+++ b/Modules/ToFHardware/mitkKinectDevice.cpp
@@ -1,452 +1,452 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2010-05-27 16:06:53 +0200 (Do, 27 Mai 2010) $
 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 "mitkKinectDevice.h"
 #include "mitkRealTimeClock.h"
 
 #include "itkMultiThreader.h"
 #include <itksys/SystemTools.hxx>
 
 namespace mitk
 {
   KinectDevice::KinectDevice()
   {
     m_Controller = mitk::KinectController::New();
   }
 
   KinectDevice::~KinectDevice()
   {
   }
 
   bool KinectDevice::ConnectCamera()
   {
     bool ok = false;
     if (m_Controller)
     {
       ok = m_Controller->OpenCameraConnection();
       MITK_INFO<<"Device ok? "<<ok;
       if (ok)
       {
         this->m_CaptureWidth = m_Controller->GetCaptureWidth();
         this->m_CaptureHeight = m_Controller->GetCaptureHeight();
         this->m_PixelNumber = this->m_CaptureWidth * this->m_CaptureHeight;
 
         // allocate buffer
         this->m_IntensityArray = new float[this->m_PixelNumber];
         for(int i=0; i<this->m_PixelNumber; i++) {this->m_IntensityArray[i]=0.0;}
         this->m_DistanceArray = new float[this->m_PixelNumber];
         for(int i=0; i<this->m_PixelNumber; i++) {this->m_DistanceArray[i]=0.0;}
         this->m_AmplitudeArray = new float[this->m_PixelNumber];
         for(int i=0; i<this->m_PixelNumber; i++) {this->m_AmplitudeArray[i]=0.0;}
 
         this->m_DistanceDataBuffer = new float*[this->m_MaxBufferSize];
         for(int i=0; i<this->m_MaxBufferSize; i++)
         {
           this->m_DistanceDataBuffer[i] = new float[this->m_PixelNumber];
         }
         this->m_AmplitudeDataBuffer = new float*[this->m_MaxBufferSize];
         for(int i=0; i<this->m_MaxBufferSize; i++)
         {
           this->m_AmplitudeDataBuffer[i] = new float[this->m_PixelNumber];
         }
         this->m_IntensityDataBuffer = new float*[this->m_MaxBufferSize];
         for(int i=0; i<this->m_MaxBufferSize; i++)
         {
           this->m_IntensityDataBuffer[i] = new float[this->m_PixelNumber];
         }
         this->m_RGBDataBuffer = new unsigned char*[this->m_MaxBufferSize];
         for (int i=0; i<this->m_MaxBufferSize; i++)
         {
           this->m_RGBDataBuffer[i] = new unsigned char[this->m_PixelNumber*3];
         }
 
         m_CameraConnected = true;
       }
     }
     return ok;
   }
 
   bool KinectDevice::DisconnectCamera()
   {
     bool ok = false;
     if (m_Controller)
     {
       ok =  m_Controller->CloseCameraConnection();
 
       // clean-up only if camera was connected
       if (m_CameraConnected)
       {
         delete [] m_IntensityArray;
         delete [] m_DistanceArray;
         delete [] m_AmplitudeArray;
 
         for(int i=0; i<this->m_MaxBufferSize; i++)
         {
           delete[] this->m_DistanceDataBuffer[i];
           delete[] this->m_AmplitudeDataBuffer[i];
           delete[] this->m_IntensityDataBuffer[i];
           delete[] this->m_RGBDataBuffer[i];
         }
         delete[] this->m_DistanceDataBuffer;
         delete[] this->m_AmplitudeDataBuffer;
         delete[] this->m_IntensityDataBuffer;
         delete[] this->m_RGBDataBuffer;
 
         m_CameraConnected = false;
       }
 
     }
     return ok;
   }
 
   void KinectDevice::StartCamera()
   {
     if (m_CameraConnected)
     {
       // get the first image
       this->m_Controller->UpdateCamera();
       this->m_ImageMutex->Lock();
       this->m_Controller->GetAllData(this->m_DistanceDataBuffer[this->m_FreePos],this->m_AmplitudeDataBuffer[this->m_FreePos],this->m_RGBDataBuffer[this->m_FreePos]);
       this->m_FreePos = (this->m_FreePos+1) % this->m_BufferSize;
       this->m_CurrentPos = (this->m_CurrentPos+1) % this->m_BufferSize;
       this->m_ImageSequence++;
       this->m_ImageMutex->Unlock();
 
       this->m_CameraActiveMutex->Lock();
       this->m_CameraActive = true;
       this->m_CameraActiveMutex->Unlock();
       this->m_ThreadID = this->m_MultiThreader->SpawnThread(this->Acquire, this);
       // wait a little to make sure that the thread is started
       itksys::SystemTools::Delay(10);
     }
     else
     {
       MITK_INFO<<"Camera not connected";
     }
   }
 
   void KinectDevice::StopCamera()
   {
     m_CameraActiveMutex->Lock();
     m_CameraActive = false;
     m_CameraActiveMutex->Unlock();
     itksys::SystemTools::Delay(100);
     if (m_MultiThreader.IsNotNull())
     {
       m_MultiThreader->TerminateThread(m_ThreadID);
     }
     // wait a little to make sure that the thread is terminated
     itksys::SystemTools::Delay(10);
   }
 
   bool KinectDevice::IsCameraActive()
   {
     m_CameraActiveMutex->Lock();
     bool ok = m_CameraActive;
     m_CameraActiveMutex->Unlock();
     return ok;
   }
 
   void KinectDevice::UpdateCamera()
   {
     if (m_Controller)
     {
       m_Controller->UpdateCamera();
     }
   }
 
   ITK_THREAD_RETURN_TYPE KinectDevice::Acquire(void* pInfoStruct)
   {
     /* extract this pointer from Thread Info structure */
     struct itk::MultiThreader::ThreadInfoStruct * pInfo = (struct itk::MultiThreader::ThreadInfoStruct*)pInfoStruct;
     if (pInfo == NULL)
     {
       return ITK_THREAD_RETURN_VALUE;
     }
     if (pInfo->UserData == NULL)
     {
       return ITK_THREAD_RETURN_VALUE;
     }
     KinectDevice* toFCameraDevice = (KinectDevice*)pInfo->UserData;
     if (toFCameraDevice!=NULL)
     {
       mitk::RealTimeClock::Pointer realTimeClock;
       realTimeClock = mitk::RealTimeClock::New();
       double t1, t2;
       t1 = realTimeClock->GetCurrentStamp();
       int n = 100;
       bool overflow = false;
       bool printStatus = false;
       while (toFCameraDevice->IsCameraActive())
       {
         // update the ToF camera
         toFCameraDevice->UpdateCamera();
         // get the image data from the camera and write it at the next free position in the buffer
         toFCameraDevice->m_ImageMutex->Lock();
         toFCameraDevice->m_Controller->GetAllData(toFCameraDevice->m_DistanceDataBuffer[toFCameraDevice->m_FreePos],toFCameraDevice->m_AmplitudeDataBuffer[toFCameraDevice->m_FreePos],toFCameraDevice->m_RGBDataBuffer[toFCameraDevice->m_FreePos]);
         toFCameraDevice->m_ImageMutex->Unlock();
 
         // call modified to indicate that cameraDevice was modified
         toFCameraDevice->Modified();
 
         /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         TODO Buffer Handling currently only works for buffer size 1
         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
         //toFCameraDevice->m_ImageSequence++;
         toFCameraDevice->m_FreePos = (toFCameraDevice->m_FreePos+1) % toFCameraDevice->m_BufferSize;
         toFCameraDevice->m_CurrentPos = (toFCameraDevice->m_CurrentPos+1) % toFCameraDevice->m_BufferSize;
         toFCameraDevice->m_ImageSequence++;
         if (toFCameraDevice->m_FreePos == toFCameraDevice->m_CurrentPos)
         {
           // buffer overflow
           //MITK_INFO << "Buffer overflow!! ";
           //toFCameraDevice->m_CurrentPos = (toFCameraDevice->m_CurrentPos+1) % toFCameraDevice->m_BufferSize;
           //toFCameraDevice->m_ImageSequence++;
           overflow = true;
         }
         if (toFCameraDevice->m_ImageSequence % n == 0)
         {
           printStatus = true;
         }
         if (overflow)
         {
           //itksys::SystemTools::Delay(10);
           overflow = false;
         }
         /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         END TODO Buffer Handling currently only works for buffer size 1
         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
         // print current framerate
         if (printStatus)
         {
           t2 = realTimeClock->GetCurrentStamp() - t1;
           //MITK_INFO << "t2: " << t2 <<" Time (s) for 1 image: " << (t2/1000) / n << " Framerate (fps): " << n / (t2/1000) << " Sequence: " << toFCameraDevice->m_ImageSequence;
           MITK_INFO << " Framerate (fps): " << n / (t2/1000) << " Sequence: " << toFCameraDevice->m_ImageSequence;
           t1 = realTimeClock->GetCurrentStamp();
           printStatus = false;
         }
       }  // end of while loop
     }
     return ITK_THREAD_RETURN_VALUE;
   }
 
   //    TODO: Buffer size currently set to 1. Once Buffer handling is working correctly, method may be reactivated
   //  void KinectDevice::ResetBuffer(int bufferSize)
   //  {
   //    this->m_BufferSize = bufferSize;
   //    this->m_CurrentPos = -1;
   //    this->m_FreePos = 0;
   //  }
 
   void KinectDevice::GetAmplitudes(float* amplitudeArray, int& imageSequence)
   {
     m_ImageMutex->Lock();
     if (m_CameraActive)
     {
       // 1) copy the image buffer
       // 2) Flip around y- axis (vertical axis)
 
       /*
       this->m_Controller->GetAmplitudes(this->m_SourceDataBuffer[this->m_CurrentPos], this->m_AmplitudeArray);
       for (int i=0; i<this->m_CaptureHeight; i++)
       {
       for (int j=0; j<this->m_CaptureWidth; j++)
       {
       amplitudeArray[i*this->m_CaptureWidth+j] = this->m_AmplitudeArray[(i+1)*this->m_CaptureWidth-1-j];
       }
       }
       */
       for (int i=0; i<this->m_PixelNumber; i++)
       {
         amplitudeArray[i] = this->m_AmplitudeDataBuffer[this->m_CurrentPos][i];
       }
       imageSequence = this->m_ImageSequence;
     }
     else
     {
       MITK_WARN("ToF") << "Warning: Data can only be acquired if camera is active.";
     }
     m_ImageMutex->Unlock();
   }
 
   void KinectDevice::GetIntensities(float* intensityArray, int& imageSequence)
   {
     m_ImageMutex->Lock();
     if (m_CameraActive)
     {
       // 1) copy the image buffer
       // 2) Flip around y- axis (vertical axis)
 
       /*
       this->m_Controller->GetIntensities(this->m_SourceDataBuffer[this->m_CurrentPos], this->m_IntensityArray);
       for (int i=0; i<this->m_CaptureHeight; i++)
       {
       for (int j=0; j<this->m_CaptureWidth; j++)
       {
       intensityArray[i*this->m_CaptureWidth+j] = this->m_IntensityArray[(i+1)*this->m_CaptureWidth-1-j];
       }
       }
       */
       for (int i=0; i<this->m_PixelNumber; i++)
       {
         intensityArray[i] = this->m_IntensityDataBuffer[this->m_CurrentPos][i];
       }
       imageSequence = this->m_ImageSequence;
     }
     else
     {
       MITK_WARN("ToF") << "Warning: Data can only be acquired if camera is active.";
     }
     m_ImageMutex->Unlock();
   }
 
   void KinectDevice::GetDistances(float* distanceArray, int& imageSequence)
   {
     m_ImageMutex->Lock();
     if (m_CameraActive)
     {
       // 1) copy the image buffer
       // 2) convert the distance values from m to mm
       // 3) Flip around y- axis (vertical axis)
 
       /*
       this->m_Controller->GetDistances(this->m_SourceDataBuffer[this->m_CurrentPos], this->m_DistanceArray);
       for (int i=0; i<this->m_CaptureHeight; i++)
       {
       for (int j=0; j<this->m_CaptureWidth; j++)
       {
       distanceArray[i*this->m_CaptureWidth+j] = 1000 * this->m_DistanceArray[(i+1)*this->m_CaptureWidth-1-j];
       }
       }
       */
       for (int i=0; i<this->m_PixelNumber; i++)
       {
         distanceArray[i] = this->m_DistanceDataBuffer[this->m_CurrentPos][i]; // * 1000
       }
       imageSequence = this->m_ImageSequence;
     }
     else
     {
       MITK_WARN("ToF") << "Warning: Data can only be acquired if camera is active.";
     }
     m_ImageMutex->Unlock();
   }
 
   void KinectDevice::GetAllImages(float* distanceArray, float* amplitudeArray, float* intensityArray, char* sourceDataArray,
     int requiredImageSequence, int& capturedImageSequence, unsigned char* rgbDataArray)
   {
     if (m_CameraActive)
     {
       // 1) copy the image buffer
       // 2) convert the distance values from m to mm
       // 3) Flip around y- axis (vertical axis)
 
       // check for empty buffer
       if (this->m_ImageSequence < 0)
       {
         // buffer empty
         MITK_INFO << "Buffer empty!! ";
         capturedImageSequence = this->m_ImageSequence;
         return;
       }
       // determine position of image in buffer
       int pos = 0;
       if ((requiredImageSequence < 0) || (requiredImageSequence > this->m_ImageSequence))
       {
         capturedImageSequence = this->m_ImageSequence;
         pos = this->m_CurrentPos;
         //MITK_INFO << "Required image not found! Required: " << requiredImageSequence << " delivered/current: " << this->m_ImageSequence;
       }
       else if (requiredImageSequence <= this->m_ImageSequence - this->m_BufferSize)
       {
         capturedImageSequence = (this->m_ImageSequence - this->m_BufferSize) + 1;
         pos = (this->m_CurrentPos + 1) % this->m_BufferSize;
         //MITK_INFO << "Out of buffer! Required: " << requiredImageSequence << " delivered: " << capturedImageSequence << " current: " << this->m_ImageSequence;
       }
       else // (requiredImageSequence > this->m_ImageSequence - this->m_BufferSize) && (requiredImageSequence <= this->m_ImageSequence)
 
       {
         capturedImageSequence = requiredImageSequence;
         pos = (this->m_CurrentPos + (10-(this->m_ImageSequence - requiredImageSequence))) % this->m_BufferSize;
       }
 
       // write image data to float arrays
       for (int i=0; i<this->m_PixelNumber; i++)
       {
         distanceArray[i] = this->m_DistanceDataBuffer[pos][i] /* * 1000 */;
         amplitudeArray[i] = this->m_AmplitudeDataBuffer[pos][i];
         intensityArray[i] = this->m_IntensityDataBuffer[pos][i];
         rgbDataArray[i] = this->m_RGBDataBuffer[pos][i];
       }
       for (int j=this->m_PixelNumber; j<this->m_PixelNumber*3; j++)
       {
         rgbDataArray[j] = this->m_RGBDataBuffer[pos][j];
       }
 
 
       /*
       this->m_Controller->GetDistances(this->m_SourceDataBuffer[pos], this->m_DistanceArray);
       this->m_Controller->GetAmplitudes(this->m_SourceDataBuffer[pos], this->m_AmplitudeArray);
       this->m_Controller->GetIntensities(this->m_SourceDataBuffer[pos], this->m_IntensityArray);
 
       int u, v;
       for (int i=0; i<this->m_CaptureHeight; i++)
       {
       for (int j=0; j<this->m_CaptureWidth; j++)
       {
       u = i*this->m_CaptureWidth+j;
       v = (i+1)*this->m_CaptureWidth-1-j;
       distanceArray[u] = 1000 * this->m_DistanceArray[v]; // unit in mm
       //distanceArray[u] = this->m_DistanceArray[v]; // unit in meter
       amplitudeArray[u] = this->m_AmplitudeArray[v];
       intensityArray[u] = this->m_IntensityArray[v];
       }
       }
 
       memcpy(sourceDataArray, this->m_SourceDataBuffer[this->m_CurrentPos], this->m_SourceDataSize);
       */
     }
     else
     {
       MITK_WARN("ToF") << "Warning: Data can only be acquired if camera is active.";
     }
   }
 
   KinectController::Pointer KinectDevice::GetController()
   {
     return this->m_Controller;
   }
 
   void KinectDevice::SetProperty( const char *propertyKey, BaseProperty* propertyValue )
   {
     ToFCameraDevice::SetProperty(propertyKey,propertyValue);
     this->m_PropertyList->SetProperty(propertyKey, propertyValue);
-    //if (strcmp(propertyKey, "ModulationFrequency") == 0)
-    //{
-    //  int modulationFrequency = 0;
-    //  GetIntProperty(propertyValue, modulationFrequency);
-    //  m_Controller->SetModulationFrequency(modulationFrequency);
-    //}
-    //else if (strcmp(propertyKey, "IntegrationTime") == 0)
-    //{
-    //  int integrationTime = 0;
-    //  GetIntProperty(propertyValue, integrationTime);
-    //  m_Controller->SetIntegrationTime(integrationTime);
-    //}
+    if (strcmp(propertyKey, "RGB") == 0)
+    {
+      bool rgb = false;
+      GetBoolProperty(propertyKey, rgb);
+      m_Controller->SetUseIR(!rgb);
+    }
+    else if (strcmp(propertyKey, "IR") == 0)
+    {
+      bool ir = false;
+      GetBoolProperty(propertyKey, ir);
+      m_Controller->SetUseIR(ir);
+    }
   }
 }
diff --git a/Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.cpp b/Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.cpp
new file mode 100644
index 0000000000..f36ea96cad
--- /dev/null
+++ b/Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.cpp
@@ -0,0 +1,90 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Module:    $RCSfile$
+Language:  C++
+Date:      $Date: 2009-05-20 13:35:09 +0200 (Mi, 20 Mai 2009) $
+Version:   $Revision: 17332 $
+
+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 <QmitkKinectParameterWidget.h>
+
+const std::string QmitkKinectParameterWidget::VIEW_ID = "org.mitk.views.qmitkkinectparameterwidget";
+
+QmitkKinectParameterWidget::QmitkKinectParameterWidget(QWidget* p, Qt::WindowFlags f): QWidget(p, f)
+{
+  m_ToFImageGrabber = NULL;
+  m_Controls = NULL;
+  CreateQtPartControl(this);
+}
+
+QmitkKinectParameterWidget::~QmitkKinectParameterWidget()
+{
+}
+
+void QmitkKinectParameterWidget::CreateQtPartControl(QWidget *parent)
+{
+  if (!m_Controls)
+  {
+    // create GUI widgets
+    m_Controls = new Ui::QmitkKinectParameterWidgetControls;
+    m_Controls->setupUi(parent);
+
+    this->CreateConnections();
+  }
+}
+
+void QmitkKinectParameterWidget::CreateConnections()
+{
+  if ( m_Controls )
+  {
+    connect( m_Controls->m_RGB, SIGNAL(toggled(bool)), this, SLOT(OnAcquisitionModeChanged()) );
+    connect( m_Controls->m_IR, SIGNAL(toggled(bool)), this, SLOT(OnAcquisitionModeChanged()) );
+  }
+}
+
+mitk::ToFImageGrabber* QmitkKinectParameterWidget::GetToFImageGrabber()
+{
+  return this->m_ToFImageGrabber;
+}
+
+void QmitkKinectParameterWidget::SetToFImageGrabber(mitk::ToFImageGrabber* aToFImageGrabber)
+{
+  this->m_ToFImageGrabber = aToFImageGrabber;
+}
+
+void QmitkKinectParameterWidget::ActivateAllParameters()
+{
+  this->OnAcquisitionModeChanged();
+}
+
+void QmitkKinectParameterWidget::OnAcquisitionModeChanged()
+{
+  if (m_ToFImageGrabber.IsNotNull())
+  {
+    // stop camera if active
+    bool active = m_ToFImageGrabber->IsCameraActive();
+    if (active)
+    {
+      m_ToFImageGrabber->StopCamera();
+      m_ToFImageGrabber->DisconnectCamera();
+    }
+    this->m_ToFImageGrabber->SetBoolProperty("RGB", m_Controls->m_RGB->isChecked());
+    this->m_ToFImageGrabber->SetBoolProperty("IR", m_Controls->m_IR->isChecked());
+    if (active)
+    {
+      m_ToFImageGrabber->ConnectCamera();
+      m_ToFImageGrabber->StartCamera();
+    }
+  }
+}
+
diff --git a/Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.h b/Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.h
new file mode 100644
index 0000000000..d46b43b63b
--- /dev/null
+++ b/Modules/ToFUI/Qmitk/QmitkKinectParameterWidget.h
@@ -0,0 +1,80 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Module:    $RCSfile$
+Language:  C++
+Date:      $Date: 2009-05-20 13:35:09 +0200 (Mi, 20 Mai 2009) $
+Version:   $Revision: 17332 $
+
+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.
+
+=========================================================================*/
+
+#ifndef _QMITKKINECTPARAMETERWIDGET_H_INCLUDED
+#define _QMITKKINECTPARAMETERWIDGET_H_INCLUDED
+
+#include "mitkTOFUIExports.h"
+#include "ui_QmitkKinectParameterWidgetControls.h"
+
+//mitk headers
+#include <mitkToFImageGrabber.h>
+
+#include <QWidget>
+
+/**
+* @brief Widget for configuring the Kinect device
+*
+* @ingroup ToFUI
+*/
+class mitkTOFUI_EXPORT QmitkKinectParameterWidget :public QWidget
+{
+  //this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
+  Q_OBJECT
+
+  public:
+
+    static const std::string VIEW_ID;
+
+    QmitkKinectParameterWidget(QWidget* p = 0, Qt::WindowFlags f = 0);
+    virtual ~QmitkKinectParameterWidget();
+
+    /* @brief This method is part of the widget an needs not to be called seperately. */
+    virtual void CreateQtPartControl(QWidget *parent);
+    /* @brief This method is part of the widget an needs not to be called seperately. (Creation of the connections of main and control widget.)*/
+    virtual void CreateConnections();
+
+    /*!
+    \brief returns the ToFImageGrabber
+    \return ToFImageGrabber currently used by the widget
+    */
+    mitk::ToFImageGrabber* GetToFImageGrabber();
+
+    /*!
+    \brief sets the ToFImageGrabber
+    */
+    void SetToFImageGrabber(mitk::ToFImageGrabber* aToFImageGrabber);
+
+    /*!
+    \brief activate camera settings according to the parameters from GUI
+    */
+    void ActivateAllParameters();
+
+  protected slots:
+    void OnAcquisitionModeChanged();
+
+  protected:
+
+    Ui::QmitkKinectParameterWidgetControls* m_Controls; ///< member holding the UI elements of this widget
+
+    mitk::ToFImageGrabber::Pointer m_ToFImageGrabber; ///< image grabber object to be configured by the widget
+
+  private:
+};
+
+#endif // _QmitkKinectParameterWIDGET_H_INCLUDED
diff --git a/Modules/ToFUI/Qmitk/QmitkKinectParameterWidgetControls.ui b/Modules/ToFUI/Qmitk/QmitkKinectParameterWidgetControls.ui
new file mode 100644
index 0000000000..02ff87e5d0
--- /dev/null
+++ b/Modules/ToFUI/Qmitk/QmitkKinectParameterWidgetControls.ui
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QmitkKinectParameterWidgetControls</class>
+ <widget class="QWidget" name="QmitkKinectParameterWidgetControls">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>425</width>
+    <height>76</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>QmitkToFMESAParameter</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="m_ParameterGroupBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Kinect Camera Parameter</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Acquisition mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="m_RGB">
+        <property name="toolTip">
+         <string>Acquire RGB and range image</string>
+        </property>
+        <property name="text">
+         <string>RGB</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QRadioButton" name="m_IR">
+        <property name="toolTip">
+         <string>Acquire infrared (IR) and range image</string>
+        </property>
+        <property name="text">
+         <string>IR</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
index 6fa13bbc74..138c441a66 100644
--- a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
+++ b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
@@ -1,367 +1,339 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2009-05-20 13:35:09 +0200 (Mi, 20 Mai 2009) $
 Version:   $Revision: 17332 $
 
 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.
 
 =========================================================================*/
 
 //#define _USE_MATH_DEFINES
 #include <QmitkToFConnectionWidget.h>
 
 //QT headers
 #include <qmessagebox.h>
 #include <qfiledialog.h>
 #include <qcombobox.h>
 
 //mitk headers
 #include "mitkToFConfig.h"
 #include <mitkToFImageGrabberCreator.h>
 
 //itk headers
 #include <itksys/SystemTools.hxx>
 
 const std::string QmitkToFConnectionWidget::VIEW_ID = "org.mitk.views.qmitktofconnectionwidget";
 
 QmitkToFConnectionWidget::QmitkToFConnectionWidget(QWidget* parent, Qt::WindowFlags f): QWidget(parent, f)
 {
   this->m_IntegrationTime = 0;
   this->m_ModulationFrequency = 0;
   this->m_ToFImageGrabber = NULL;
 
   m_Controls = NULL;
   CreateQtPartControl(this);
 }
 
 QmitkToFConnectionWidget::~QmitkToFConnectionWidget()
 {
 }
 
 void QmitkToFConnectionWidget::CreateQtPartControl(QWidget *parent)
 {
   if (!m_Controls)
   {
     // create GUI widgets
     m_Controls = new Ui::QmitkToFConnectionWidgetControls;
     m_Controls->setupUi(parent);
     this->CreateConnections();
     // set available cameras to combo box
     QString string(MITK_TOF_CAMERAS);
     string.replace(";"," ");
     QStringList list = string.split(",");
     m_Controls->m_SelectCameraCombobox->addItems(list);
 
     ShowParameterWidget();
   }
 }
 
 void QmitkToFConnectionWidget::CreateConnections()
 {
   if ( m_Controls )
   {
     connect( (QObject*)(m_Controls->m_ConnectCameraButton), SIGNAL(clicked()),(QObject*) this, SLOT(OnConnectCamera()) );
     connect( m_Controls->m_SelectCameraCombobox, SIGNAL(currentIndexChanged(const QString)), this, SLOT(OnSelectCamera(const QString)) );
     connect( m_Controls->m_SelectCameraCombobox, SIGNAL(activated(const QString)), this, SLOT(OnSelectCamera(const QString)) );
     connect( m_Controls->m_SelectCameraCombobox, SIGNAL(activated(const QString)), this, SIGNAL(ToFCameraSelected(const QString)) );
   }
 }
 
 void QmitkToFConnectionWidget::ShowParameterWidget()
 {
   QString selectedCamera = m_Controls->m_SelectCameraCombobox->currentText();
 
-  if ((selectedCamera == "PMD CamCube 2.0/3.0")||(selectedCamera == "PMD CamBoard")||(selectedCamera=="PMD O3D")||
-    (selectedCamera=="PMD CamBoardRaw")||(selectedCamera=="PMD CamCubeRaw") )
-  {
-    ShowPMDParameterWidget();
-  }
-  else if (selectedCamera=="MESA Swissranger 4000")
-  {
-    ShowMESAParameterWidget();
-  }
-  else
-  {
-    this->m_Controls->m_PMDParameterWidget->hide();
-    this->m_Controls->m_MESAParameterWidget->hide();
-  }
-}
-
-void QmitkToFConnectionWidget::ShowPMDParameterWidget()
-{
-  this->m_Controls->m_PMDParameterWidget->show();
-  this->m_Controls->m_MESAParameterWidget->hide();
-}
-
-void QmitkToFConnectionWidget::ShowMESAParameterWidget()
-{
-  this->m_Controls->m_PMDParameterWidget->hide();
-  this->m_Controls->m_MESAParameterWidget->show();
-}
-
-void QmitkToFConnectionWidget::ShowPlayerParameterWidget()
-{
-  this->m_Controls->m_PMDParameterWidget->hide();
-  this->m_Controls->m_MESAParameterWidget->hide();
+  this->OnSelectCamera(selectedCamera);
 }
 
 mitk::ToFImageGrabber* QmitkToFConnectionWidget::GetToFImageGrabber()
 {
   return m_ToFImageGrabber;
 }
 
-void QmitkToFConnectionWidget::OnSelectCamera(const QString selectedText)
+void QmitkToFConnectionWidget::OnSelectCamera(const QString selectedCamera)
 {
-  if (selectedText == "PMD CamCube 2.0/3.0" || selectedText == "PMD CamCubeRaw 2.0/3.0" ) // PMD camcube 2
-  {
-    ShowPMDParameterWidget();
-  }
-  else if (selectedText == "PMD CamBoard" || selectedText == "PMD CamBoardRaw" ) // pmd camboard
-  {
-    ShowPMDParameterWidget();
-  }
-  else if (selectedText == "PMD O3D") // pmd O3d
-  {
-    ShowPMDParameterWidget();
-  }
-  else if (selectedText == "MESA Swissranger 4000") // MESA 4000
+  if ((selectedCamera == "PMD CamCube 2.0/3.0")||(selectedCamera == "PMD CamBoard")||(selectedCamera=="PMD O3D")||
+    (selectedCamera=="PMD CamBoardRaw")||(selectedCamera=="PMD CamCubeRaw 2.0/3.0") )
   {
-    ShowMESAParameterWidget();
+    this->m_Controls->m_PMDParameterWidget->show();
+    this->m_Controls->m_MESAParameterWidget->hide();
+    this->m_Controls->m_KinectParameterWidget->hide();
   }
-  else if (selectedText == "PMD Player") // pmd file player
+  else if (selectedCamera=="MESA Swissranger 4000")
   {
-    ShowPlayerParameterWidget();
+    this->m_Controls->m_PMDParameterWidget->hide();
+    this->m_Controls->m_MESAParameterWidget->show();
+    this->m_Controls->m_KinectParameterWidget->hide();
   }
-  else if (selectedText == "PMD Raw Data Player") // pmd raw data player
+  else if (selectedCamera=="Microsoft Kinect")
   {
-    ShowPlayerParameterWidget();
+    this->m_Controls->m_PMDParameterWidget->hide();
+    this->m_Controls->m_MESAParameterWidget->hide();
+    this->m_Controls->m_KinectParameterWidget->show();
   }
-  else if (selectedText == "MITK Player") // mitk player
+  else
   {
-    ShowPlayerParameterWidget();
+    this->m_Controls->m_PMDParameterWidget->hide();
+    this->m_Controls->m_MESAParameterWidget->hide();
+    this->m_Controls->m_KinectParameterWidget->hide();
   }
 }
 
 void QmitkToFConnectionWidget::OnConnectCamera()
 {
   bool playerMode = false;
 
   if (m_Controls->m_ConnectCameraButton->text()=="Connect")
   {   
     //reset the status of the GUI buttons
     m_Controls->m_ConnectCameraButton->setEnabled(false);
     m_Controls->m_SelectCameraCombobox->setEnabled(false);
     //repaint the widget
     this->repaint();
 
     QString tmpFileName("");
     QString fileFilter("");
 
     //select the camera to connect with
     QString selectedCamera = m_Controls->m_SelectCameraCombobox->currentText();
     if (selectedCamera == "PMD CamCube 2.0/3.0")
     { //PMD CamCube
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDCamCubeImageGrabber();
     }
     else if (selectedCamera == "PMD CamCubeRaw 2.0/3.0")
     { //PMD CamCube
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDRawDataCamCubeImageGrabber();
     }
     else if (selectedCamera == "PMD CamBoard")
     { //PMD CamBoard
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDCamBoardImageGrabber();
     }
     else if (selectedCamera == "PMD CamBoardRaw")
     { //PMD CamBoard
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDRawDataCamBoardImageGrabber();
     }
     else if (selectedCamera == "PMD O3D")
     {//PMD O3
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDO3ImageGrabber();
     }
     else if (selectedCamera == "MESA Swissranger 4000")
     {//MESA SR4000
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetMESASR4000ImageGrabber();
     }
     else if (selectedCamera == "Microsoft Kinect")
     {//KINECT
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetKinectImageGrabber();
     }
     else if (selectedCamera == "PMD Player")
     {//PMD player
       playerMode = true;
       fileFilter.append("PMD Files (*.pmd)");
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDPlayerImageGrabber();
     }
     else if (selectedCamera == "PMD Raw Data Player")
     {//PMD MITK player
       playerMode = true;
       fileFilter.append("NRRD Images (*.nrrd);;PIC Images - deprecated (*.pic)");
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDMITKPlayerImageGrabber();
     }
     else if (selectedCamera == "MITK Player")
     {//MITK player
       playerMode = true;
       fileFilter.append("NRRD Images (*.nrrd);;PIC Images - deprecated (*.pic)");
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetMITKPlayerImageGrabber();
     }
 
     // if a player was selected ...
     if (playerMode)
     { //... open a QFileDialog to chose the corresponding file from the disc
       tmpFileName = QFileDialog::getOpenFileName(NULL, "Play Image From...", "", fileFilter);
       if (tmpFileName.isEmpty())
       {
         m_Controls->m_ConnectCameraButton->setChecked(false);
         m_Controls->m_ConnectCameraButton->setEnabled(true);
         m_Controls->m_SelectCameraCombobox->setEnabled(true);
         this->OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
         QMessageBox::information( this, "Template functionality", "Please select a valid image before starting some action.");
         return;
       }
       if(selectedCamera == "PMD Player")
       { //set the PMD file name
         this->m_ToFImageGrabber->SetStringProperty("PMDFileName", tmpFileName.toStdString().c_str() );
       }
       if (selectedCamera == "PMD Raw Data Player" || selectedCamera == "MITK Player")
       {
         std::string msg = "";
         try
         {
           //get 3 corresponding file names
           std::string dir = itksys::SystemTools::GetFilenamePath( tmpFileName.toStdString() );
           std::string baseFilename = itksys::SystemTools::GetFilenameWithoutLastExtension( tmpFileName.toStdString() );
           std::string extension = itksys::SystemTools::GetFilenameLastExtension( tmpFileName.toStdString() );
 
           if (extension != ".pic" && extension != ".nrrd")
           {
             msg = msg + "Invalid file format, please select a \".nrrd\"-file";
             throw std::logic_error(msg.c_str());
           }
           int found = baseFilename.rfind("_DistanceImage");
           if (found == std::string::npos)
           {
             found = baseFilename.rfind("_AmplitudeImage");
           }
           if (found == std::string::npos)
           {
             found = baseFilename.rfind("_IntensityImage");
           }
           if (found == std::string::npos)
           {
             found = baseFilename.rfind("_RGBImage");
           }
           if (found == std::string::npos)
           {
             msg = msg + "Input file name must end with \"_DistanceImage\", \"_AmplitudeImage\", \"_IntensityImage\" or \"_RGBImage\"!";
             throw std::logic_error(msg.c_str());
           }
           std::string baseFilenamePrefix = baseFilename.substr(0,found);
 
           std::string distanceImageFileName = dir + "/" + baseFilenamePrefix + "_DistanceImage" + extension;
           std::string amplitudeImageFileName = dir + "/" + baseFilenamePrefix + "_AmplitudeImage" + extension;
           std::string intensityImageFileName = dir + "/" + baseFilenamePrefix + "_IntensityImage" + extension;
           std::string rgbImageFileName = dir + "/" + baseFilenamePrefix + "_RGBImage" + extension;
 
           if (!itksys::SystemTools::FileExists(distanceImageFileName.c_str(), true))
           {
             this->m_ToFImageGrabber->SetStringProperty("DistanceImageFileName", "");
           }
           else
           {
             this->m_ToFImageGrabber->SetStringProperty("DistanceImageFileName", distanceImageFileName.c_str());
           }
           if (!itksys::SystemTools::FileExists(amplitudeImageFileName.c_str(), true))
           {
             this->m_ToFImageGrabber->SetStringProperty("AmplitudeImageFileName", "");
           }
           else
           {
             this->m_ToFImageGrabber->SetStringProperty("AmplitudeImageFileName", amplitudeImageFileName.c_str());
           }
           if (!itksys::SystemTools::FileExists(intensityImageFileName.c_str(), true))
           {
             this->m_ToFImageGrabber->SetStringProperty("IntensityImageFileName", "");
           }
           else
           {
             this->m_ToFImageGrabber->SetStringProperty("IntensityImageFileName", intensityImageFileName.c_str());
           }
           if (!itksys::SystemTools::FileExists(rgbImageFileName.c_str(), true))
           {
             this->m_ToFImageGrabber->SetStringProperty("RGBImageFileName", "");
           }
           else
           {
             this->m_ToFImageGrabber->SetStringProperty("RGBImageFileName", rgbImageFileName.c_str());
           }
         }
         catch (std::exception &e)
         {
           MITK_ERROR << e.what();
           QMessageBox::critical( this, "Error", e.what() );
           m_Controls->m_ConnectCameraButton->setChecked(false);
           m_Controls->m_ConnectCameraButton->setEnabled(true);
           m_Controls->m_SelectCameraCombobox->setEnabled(true);
           this->OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
           return;
         }
       }
 
     }
-    //if a connection could be established
-    if (this->m_ToFImageGrabber->ConnectCamera())
-    {
-      this->m_Controls->m_PMDParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
-      this->m_Controls->m_MESAParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
 
-      if ((selectedCamera == "PMD CamCube 2.0/3.0")||(selectedCamera == "PMD CamBoard")||(selectedCamera=="PMD O3D")||
+    this->m_Controls->m_PMDParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
+    this->m_Controls->m_MESAParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
+    this->m_Controls->m_KinectParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
+
+    if ((selectedCamera == "PMD CamCube 2.0/3.0")||(selectedCamera == "PMD CamBoard")||(selectedCamera=="PMD O3D")||
         (selectedCamera=="PMD CamBoardRaw")||(selectedCamera=="PMD CamCubeRaw 2.0/3.0"))
-      {
-        this->m_Controls->m_PMDParameterWidget->ActivateAllParameters();
-      }
-      else if (selectedCamera=="MESA Swissranger 4000")
-      {
-        this->m_Controls->m_MESAParameterWidget->ActivateAllParameters();
-      }
-      m_Controls->m_ConnectCameraButton->setText("Disconnect");
+    {
+      this->m_Controls->m_PMDParameterWidget->ActivateAllParameters();
+    }
+    else if (selectedCamera=="MESA Swissranger 4000")
+    {
+      this->m_Controls->m_MESAParameterWidget->ActivateAllParameters();
+    }
+    else if (selectedCamera=="Microsoft Kinect")
+    {
+      this->m_Controls->m_KinectParameterWidget->ActivateAllParameters();
+    }
+    m_Controls->m_ConnectCameraButton->setText("Disconnect");
 
+    //if a connection could be established
+    if (this->m_ToFImageGrabber->ConnectCamera())
+    {
       // send connect signal to the caller functionality
       emit ToFCameraConnected();
     }
     else
     {
       QMessageBox::critical( this, "Error", "Connection failed. Check if you have installed the latest driver for your system." );
       m_Controls->m_ConnectCameraButton->setChecked(false);
       m_Controls->m_ConnectCameraButton->setEnabled(true);
       m_Controls->m_SelectCameraCombobox->setEnabled(true);
       this->OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
       return;
 
     }
     m_Controls->m_ConnectCameraButton->setEnabled(true);
 
   }
   else if (m_Controls->m_ConnectCameraButton->text()=="Disconnect")
   {
     this->m_ToFImageGrabber->StopCamera();
     this->m_ToFImageGrabber->DisconnectCamera();
     m_Controls->m_ConnectCameraButton->setText("Connect");
     m_Controls->m_SelectCameraCombobox->setEnabled(true);
     this->OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
 
     this->m_ToFImageGrabber = NULL;
     // send disconnect signal to the caller functionality
     emit ToFCameraDisconnected();
 
   }
 }
diff --git a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h
index ae46b113c1..3903418618 100644
--- a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h
+++ b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h
@@ -1,111 +1,106 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2009-05-20 13:35:09 +0200 (Mi, 20 Mai 2009) $
 Version:   $Revision: 17332 $
 
 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.
 
 =========================================================================*/
 
 #ifndef _QMITKTOFCONNECTIONWIDGET_H_INCLUDED
 #define _QMITKTOFCONNECTIONWIDGET_H_INCLUDED
 
 #include "mitkTOFUIExports.h"
 #include "ui_QmitkToFConnectionWidgetControls.h"
 
 //QT headers
 #include <QWidget>
 
 //mitk headers
 #include "mitkToFImageGrabber.h"
 
 /**
 * @brief Widget allowing to connect to different ToF / range cameras (located in module ToFProcessing)
 *
 * The widget basically allows to connect/disconnect to different ToF cameras
 *
 * @ingroup ToFUI
 */
 class mitkTOFUI_EXPORT QmitkToFConnectionWidget :public QWidget
 {
 
   //this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
   Q_OBJECT
 
   public:
 
     static const std::string VIEW_ID;
 
     QmitkToFConnectionWidget(QWidget* p = 0, Qt::WindowFlags f1 = 0);
     virtual ~QmitkToFConnectionWidget();
 
     /* @brief This method is part of the widget an needs not to be called seperately. */
     virtual void CreateQtPartControl(QWidget *parent);
     /* @brief This method is part of the widget an needs not to be called seperately. (Creation of the connections of main and control widget.)*/
     virtual void CreateConnections();
 
     /*!
     \brief returns the ToFImageGrabber which was provided by the ToFImageGrabberCreator after selecting a camera / player
     \return ToFImageGrabber currently used by the widget
     */
     mitk::ToFImageGrabber* GetToFImageGrabber();
   
   signals:
 
     /*!
     \brief This signal is sent if the user has connected the TOF camera.
      *        The ToFImageGrabber is now availiable if the method GetToFImageGrabber() is called.
     */
     void ToFCameraConnected();
     /*!
     \brief This signal is sent if the user has disconnect the TOF camera.
      */
     void ToFCameraDisconnected();
     /*!
     \brief signal that is emitted when a ToF camera is selected in the combo box
     */
     void ToFCameraSelected(const QString selectedText);
 
   protected slots:
   
     /*!
     \brief slot called when the "Connect Camera" button was pressed
     * According to the selection in the camera combo box, the ToFImageGrabberCreator provides
     * the desired instance of the ToFImageGrabber
     */
     void OnConnectCamera();
     /*!
     \brief slot updating the GUI elements after the selection of the camera combo box has changed
     */
-    void OnSelectCamera(const QString selectedText);
+    void OnSelectCamera(const QString selectedCamera);
 
   protected:
 
     Ui::QmitkToFConnectionWidgetControls* m_Controls; ///< member holding the UI elements of this widget
 
     mitk::ToFImageGrabber* m_ToFImageGrabber; ///< member holding the current ToFImageGrabber
 
     int m_IntegrationTime; ///< member for the current integration time of the ToF device
     int m_ModulationFrequency; ///< member for the current modulation frequency of the ToF device
 
   private:
 
     void ShowParameterWidget();
 
-    void ShowPMDParameterWidget();
-
-    void ShowMESAParameterWidget();
-
-    void ShowPlayerParameterWidget();
 };
 
 #endif // _QMITKTOFCONNECTIONWIDGET_H_INCLUDED
diff --git a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui
index d43807972c..6110dd201b 100644
--- a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui
+++ b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui
@@ -1,133 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkToFConnectionWidgetControls</class>
  <widget class="QWidget" name="QmitkToFConnectionWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>405</width>
-    <height>124</height>
+    <height>139</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkToFConnection</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="font">
       <font>
        <pointsize>11</pointsize>
       </font>
      </property>
      <property name="text">
       <string>ToF camera connection</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QComboBox" name="m_SelectCameraCombobox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
        <height>50</height>
       </size>
      </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
       </font>
      </property>
      <property name="currentIndex">
       <number>-1</number>
      </property>
      <property name="maxVisibleItems">
       <number>7</number>
      </property>
      <property name="insertPolicy">
       <enum>QComboBox::InsertAtBottom</enum>
      </property>
      <property name="sizeAdjustPolicy">
       <enum>QComboBox::AdjustToContents</enum>
      </property>
      <property name="frame">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QPushButton" name="m_ConnectCameraButton">
      <property name="minimumSize">
       <size>
        <width>0</width>
        <height>50</height>
       </size>
      </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
       </font>
      </property>
      <property name="toolTip">
       <string>Connect to camera</string>
      </property>
      <property name="text">
       <string>Connect</string>
      </property>
      <property name="icon">
       <iconset resource="../resources/QmitkToFUtilWidget.qrc">
        <normaloff>:/images/powerRed.png</normaloff>
        <normalon>:/images/powerGreen.png</normalon>:/images/powerRed.png</iconset>
      </property>
      <property name="iconSize">
       <size>
        <width>30</width>
        <height>30</height>
       </size>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QmitkToFPMDParameterWidget" name="m_PMDParameterWidget" native="true"/>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QmitkToFMESAParameterWidget" name="m_MESAParameterWidget" native="true"/>
    </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QmitkKinectParameterWidget" name="m_KinectParameterWidget" native="true"/>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkToFPMDParameterWidget</class>
    <extends>QWidget</extends>
    <header>QmitkToFPMDParameterWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkToFMESAParameterWidget</class>
    <extends>QWidget</extends>
    <header>QmitkToFMESAParameterWidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QmitkKinectParameterWidget</class>
+   <extends>QWidget</extends>
+   <header>QmitkKinectParameterWidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../resources/QmitkToFUtilWidget.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Modules/ToFUI/files.cmake b/Modules/ToFUI/files.cmake
index af636a4574..08cbe73cf2 100644
--- a/Modules/ToFUI/files.cmake
+++ b/Modules/ToFUI/files.cmake
@@ -1,34 +1,37 @@
 
 SET(CPP_FILES
+  Qmitk/QmitkKinectParameterWidget.cpp
   Qmitk/QmitkToFConnectionWidget.cpp
   Qmitk/QmitkToFPointSetWidget.cpp
   Qmitk/QmitkToFRecorderWidget.cpp
   Qmitk/QmitkToFVisualisationSettingsWidget.cpp
   Qmitk/QmitkToFCompositeFilterWidget.cpp
   Qmitk/QmitkToFPMDParameterWidget.cpp
   Qmitk/QmitkToFMESAParameterWidget.cpp
 )
 SET(UI_FILES
+  Qmitk/QmitkKinectParameterWidgetControls.ui
   Qmitk/QmitkToFConnectionWidgetControls.ui
   Qmitk/QmitkToFPointSetWidgetControls.ui
   Qmitk/QmitkToFRecorderWidgetControls.ui
   Qmitk/QmitkToFVisualisationSettingsWidgetControls.ui
   Qmitk/QmitkToFCompositeFilterWidgetControls.ui
   Qmitk/QmitkToFPMDParameterWidgetControls.ui
   Qmitk/QmitkToFMESAParameterWidgetControls.ui
 )
 
 SET(MOC_H_FILES
+  Qmitk/QmitkKinectParameterWidget.h
   Qmitk/QmitkToFConnectionWidget.h
   Qmitk/QmitkToFPointSetWidget.h
   Qmitk/QmitkToFRecorderWidget.h
   Qmitk/QmitkToFVisualisationSettingsWidget.h
   Qmitk/QmitkToFCompositeFilterWidget.h
   Qmitk/QmitkToFPMDParameterWidget.h
   Qmitk/QmitkToFMESAParameterWidget.h
 )
 
 # uncomment the following line if you want to use Qt resources
 SET(QRC_FILES
   resources/QmitkToFUtilWidget.qrc
 )