diff --git a/Plugins/org.mitk.gui.qt.basicimageprocessing/plugin.xml b/Plugins/org.mitk.gui.qt.basicimageprocessing/plugin.xml
index 9984ae7810..ffc671d614 100644
--- a/Plugins/org.mitk.gui.qt.basicimageprocessing/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.basicimageprocessing/plugin.xml
@@ -1,11 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
   
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.basicimageprocessing"
           name="BasicImageProcessing"
           class="QmitkBasicImageProcessing"
-          icon="resources/lena.xpm" />
+          icon="resources/lena.xpm" >
+      <description>Perform basic image operations like add, subtract etc..</description>
+      <keywordReference id="org.mitk.views.basicimageprocessing.ViewKeyword"/>
+    </view>
   </extension>
 
+  <extension point="org.blueberry.ui.keywords">
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Filter Image" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Image Arithmetic" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Denoising" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Gaussian" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Median" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Total Variation" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Morphological" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Opening" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Closing" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Dilatation" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Erosion" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Edge Detection" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Soebel Operator" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Laplacian (2. Derivation)" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Derivation" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Gradient" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Threshold" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Image Inversion" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Downsampling" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Flipping" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Resampling" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Rescaling" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Add" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Subtract" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Divide" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Multiply" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="AND" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="OR" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="XOR" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="boolean operations" />
+    <keyword id="org.mitk.views.basicimageprocessing.ViewKeyword"  label="Boolean Commands" />
+  </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.cmdlinemodules/plugin.xml b/Plugins/org.mitk.gui.qt.cmdlinemodules/plugin.xml
index 429082df03..7cc2548e7f 100644
--- a/Plugins/org.mitk.gui.qt.cmdlinemodules/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.cmdlinemodules/plugin.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.gui.qt.cmdlinemodules"
           name="Command Line Modules"
           class="CommandLineModulesView"
-          icon="resources/icon.xpm" />
+          icon="resources/icon.xpm" >
+      <description>Control the execution of Commandline-Tools</description>
+      <keywordReference id="org.mitk.views.cmdlinemodules.ViewKeyword"/>
+    </view>
   </extension>
 
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.cmdlinemodules.CommandLineModulesPreferencesPage" name="Command Line Modules" class="CommandLineModulesPreferencesPage">
       <keywordreference id="org.mitk.gui.qt.cmdlinemodules.CommandLineModulesPreferencesPageKeywords"></keywordreference>
     </page>
   </extension>
 
+  <extension point="org.blueberry.ui.keywords">
+    <keyword id="org.mitk.views.cmdlinemodules.ViewKeyword"  label="CTK-Apps" />
+    <keyword id="org.mitk.views.cmdlinemodules.ViewKeyword"  label="Apps" />
+    <keyword id="org.mitk.views.cmdlinemodules.ViewKeyword"  label="Commandline" />
+    <keyword id="org.mitk.views.cmdlinemodules.ViewKeyword"  label="CMD" />
+    <keyword id="org.mitk.views.cmdlinemodules.ViewKeyword"  label="Smalltools" />
+  </extension>
+
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml b/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml
index 32c792be7d..542ae7a262 100644
--- a/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.moviemaker"
           name="Movie Maker"
           class="QmitkMovieMaker"
           icon="resources/icon.xpm" >
           <description>Take movies of your data</description>
           <keywordReference id="org.mitk.views.moviemaker.Keyword"/>
         </view>
   </extension>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.screenshotmaker"
           name="Screenshot Maker"
           class="QmitkScreenshotMaker"
           icon="resources/screenshot_maker.png" >
       <description>Take screenshots of your data</description>
       <keywordReference id="org.mitk.views.screenshotmaker.Keyword"/>
     </view>
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
 
   <keyword label="image" id="org.mitk.views.screenshotmaker.Keyword"/>
   <keyword label="picture" id="org.mitk.views.screenshotmaker.Keyword"/>
   <keyword label="screenshot" id="org.mitk.views.screenshotmaker.Keyword"/>
+  <keyword label="capture" id="org.mitk.views.screenshotmaker.Keyword"/>
+  <keyword label="png bmp jpg jepg" id="org.mitk.views.screenshotmaker.Keyword"/>
 
   <keyword label="movie" id="org.mitk.views.moviemaker.Keyword"/>
   <keyword label="clip" id="org.mitk.views.moviemaker.Keyword"/>
+  <keyword label="capture" id="org.mitk.views.moviemaker.Keyword"/>
+  <keyword label="avi" id="org.mitk.views.moviemaker.Keyword"/>
 
  </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.registration/plugin.xml b/Plugins/org.mitk.gui.qt.registration/plugin.xml
index 094f1eab40..3c2bd1c4a0 100644
--- a/Plugins/org.mitk.gui.qt.registration/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.registration/plugin.xml
@@ -1,28 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.deformableregistration"
           name="DeformableRegistration"
           category="Registration"
           class="QmitkDeformableRegistrationView"
-          icon="resources/DeformableRegistration.xpm" />
+          icon="resources/DeformableRegistration.xpm" >
+      <description>Register two images using a deformable registration</description>
+      <keywordReference id="org.mitk.views.xnat.registrationViews.ViewKeyword"/>
+    </view>
   </extension>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.pointbasedregistration"
           name="PointBasedRegistration"
           category="Registration"
           class="QmitkPointBasedRegistrationView"
-          icon="resources/PointBasedRegistration.xpm"/>
+          icon="resources/PointBasedRegistration.xpm" >
+      <description>Register two images using user-defined points registration</description>
+      <keywordReference id="org.mitk.views.xnat.registrationViews.ViewKeyword"/>
+      <keywordReference id="org.mitk.views.xnat.pointbasedregistration.ViewKeyword"/>
+    </view>
   </extension>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.rigidregistration"
           name="RigidRegistration"
           category="Registration"
           class="QmitkRigidRegistrationView"
-          icon="resources/RigidRegistration.xpm" />
+          icon="resources/RigidRegistration.xpm" >
+      <description>Register two images using a rigid registration</description>
+      <keywordReference id="org.mitk.views.xnat.registrationViews.ViewKeyword"/>
+    </view>
   </extension>
 
+  <extension point="org.blueberry.ui.keywords">
+    <keyword id="org.mitk.views.xnat.registrationViews.ViewKeyword"  label="Registration" />
+    <keyword id="org.mitk.views.xnat.registrationViews.ViewKeyword"  label="Match" />
+    <keyword id="org.mitk.views.xnat.registrationViews.ViewKeyword"  label="Overlay" />
+    <keyword id="org.mitk.views.xnat.registrationViews.ViewKeyword"  label="Align" />
+    <keyword id="org.mitk.views.xnat.registrationViews.ViewKeyword"  label="Manual Registration" />
+
+    <keyword id="org.mitk.views.xnat.pointbasedregistration.ViewKeyword"  label="Rigid Registration" />
+    <keyword id="org.mitk.views.xnat.pointbasedregistration.ViewKeyword"  label="Similarity Registration" />
+    <keyword id="org.mitk.views.xnat.pointbasedregistration.ViewKeyword"  label="Affine Registration" />
+    <keyword id="org.mitk.views.xnat.pointbasedregistration.ViewKeyword"  label="Landmark based Registration" />
+  </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.segmentation/plugin.xml b/Plugins/org.mitk.gui.qt.segmentation/plugin.xml
index 75c8681509..8b45cd94a7 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.segmentation/plugin.xml
@@ -1,43 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
     <category
       id="org.mitk.views.general"
       name="MITK General"/>
     <view id="org.mitk.views.segmentation"
       name="Segmentation"
       category="Segmentation"
       icon="resources/segmentation.png"
-      class="QmitkSegmentationView" />
+      class="QmitkSegmentationView" >
+      <description>Allows the segmentation of images using different tools.</description>
+      <keywordReference id="org.mitk.views.segmentation.ViewKeyword"/>
+    </view>
      <view id="org.mitk.views.deformableclippingplane"
        name="Clipping Plane"
        category="Segmentation"
        class="QmitkDeformableClippingPlaneView"
-       icon="resources/deformablePlane.png" />
+       icon="resources/deformablePlane.png" >
+      <description>Allow the clipping of a volume using a deformable plane.</description>
+      <keywordReference id="org.mitk.views.deformableclippingplane.ViewKeyword"/>
+    </view>
     <view
       id="org.mitk.views.segmentationutilities"
       name="Segmentation Utilities"
       category="Segmentation"
       class="QmitkSegmentationUtilitiesView"
-      icon="resources/SegmentationUtilities_48x48.png" />
+      icon="resources/SegmentationUtilities_48x48.png" >
+      <description>Edit segmentations using standard operations. </description>
+      <keywordReference id="org.mitk.views.segmentationutilities.ViewKeyword"/>
+    </view>
   </extension>
 
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.application.SegmentationPreferencePage" name="Segmentation" class="QmitkSegmentationPreferencePage">
       <keywordreference id="org.mitk.gui.qt.application.SegmentationPreferencePageKeywords"></keywordreference>
     </page>
   </extension>
 
    <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.gui.qt.application.SegmentationPreferencePageKeywords" label="data manager"></keyword>
   </extension>
 
   <extension point="org.mitk.gui.qt.datamanager.contextMenuActions">
     <contextMenuAction nodeDescriptorName="ImageMask" label="Create polygon model" icon="" smoothed="false" class="QmitkCreatePolygonModelAction" />
     <contextMenuAction nodeDescriptorName="ImageMask" label="Create smoothed polygon model" icon="" smoothed = "true" class="QmitkCreatePolygonModelAction" />
     <contextMenuAction nodeDescriptorName="ImageMask" label="Autocrop" icon="" class="QmitkAutocropAction" />
   </extension>
 
+  <extension point="org.blueberry.ui.keywords">
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Segmentation" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Otsu" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Correction" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Paint" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Wipe" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Region Growing" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Fill" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Erase" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Live Wire" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Fast Marching" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Threshold" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Watershed" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Picking" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Watershed" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Annotation annote" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Labeling" />
+    <keyword id="org.mitk.views.segmentation.ViewKeyword"  label="Tools" />
+
+    <keyword id="org.mitk.views.deformableclippingplane.ViewKeyword"  label="Plane" />
+    <keyword id="org.mitk.views.deformableclippingplane.ViewKeyword"  label="Volumne calculation" />
+    <keyword id="org.mitk.views.deformableclippingplane.ViewKeyword"  label="Splitting" />
+    <keyword id="org.mitk.views.deformableclippingplane.ViewKeyword"  label="Deformation" />
+    <keyword id="org.mitk.views.deformableclippingplane.ViewKeyword"  label="Volume analysis" />
+
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Segmentation" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Difference" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Intersection" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Union" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Image Masking" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Surface Masking" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Dilatation" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Erosion" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Closing" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Opening" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Fill Holes" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Morphological Operations" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Boolean Operations" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Surface to Image" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Surface creation" />
+    <keyword id="org.mitk.views.segmentationutilities.ViewKeyword"  label="Surface operations" />
+  </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
index 5ae4185899..4ab6b1c346 100755
--- a/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <category
       id="org.mitk.views.general"
       name="MITK General"/>
     <view
       id="org.mitk.views.volumevisualization"
       name="Volume Visualization"
       class="QmitkVolumeVisualizationView"
-      icon="resources/icon.xpm" />
+      icon="resources/icon.xpm" >
+      <description>Configure the 3D-Visualization of images.</description>
+      <keywordReference id="org.mitk.views.volumevisualization.ViewKeyword"/>
+    </view>
+  </extension>
+
+  <extension point="org.blueberry.ui.keywords">
+    <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Visualisation" />
+    <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="3D" />
+    <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Rendering" />
+    <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Volumevisualisation" />
+    <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Look-up-table" />
+    <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Color Colour" />
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.xnat/plugin.xml b/Plugins/org.mitk.gui.qt.xnat/plugin.xml
index af8a0fb47a..52064ddba4 100644
--- a/Plugins/org.mitk.gui.qt.xnat/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.xnat/plugin.xml
@@ -1,28 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
 
   <extension point="org.blueberry.ui.editors">
     <editor id="org.mitk.editors.xnat.browser"
       name="XNAT Editor"
       class="QmitkXnatEditor"
-      icon="resources/icon.xpm"/>
+      icon="resources/icon.xpm">
+      <description>Search, browse and view the data in a XNAT-Installation</description>
+      <keywordReference id="org.mitk.views.xnat.browser.ViewKeyword"/>
+    </editor>
   </extension>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.xnat.treebrowser"
       name="XNAT Tree Browser"
       class="QmitkXnatTreeBrowserView"
-      icon="resources/xnat_treebrowser_icon.xpm"/>
+      icon="resources/xnat_treebrowser_icon.xpm">
+      <description>Search, browse and view the data in a XNAT-Installation</description>
+      <keywordReference id="org.mitk.views.xnat.treebrowser.ViewKeyword"/>
+    </view>
   </extension>
 
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.application.XnatConnectionPreferencePage" name="Xnat Connection" class="QmitkXnatConnectionPreferencePage">
       <keywordreference id="org.mitk.gui.qt.application.XnatConnectionPreferencePageKeywords"></keywordreference>
     </page>
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.gui.qt.application.XnatConnectionPreferencePageKeywords" label="xnat session connection login"></keyword>
   </extension>
 
+  <extension point="org.blueberry.ui.keywords">
+    <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="DICOM" />
+    <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="WPACS" />
+    <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Data Source" />
+    <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Import" />
+    <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Data Handling" />
+    <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Data Loading" />
+
+    <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="DICOM" />
+    <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="WPACS" />
+    <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Data Source" />
+    <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Import" />
+    <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Data Handling" />
+    <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Data Loading" />
+  </extension>
 </plugin>