diff --git a/Modules/VtkShaders/mitkVtkShaderRepository.cpp b/Modules/VtkShaders/mitkVtkShaderRepository.cpp
index a038145f63..72c99e85d2 100644
--- a/Modules/VtkShaders/mitkVtkShaderRepository.cpp
+++ b/Modules/VtkShaders/mitkVtkShaderRepository.cpp
@@ -1,497 +1,499 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #define SR_INFO MITK_INFO("shader.repository")
 #define SR_WARN MITK_WARN("shader.repository")
 #define SR_ERROR MITK_ERROR("shader.repository")
 
 #include "mitkVtkShaderRepository.h"
 #include "mitkVtkShaderProgram.h"
 #include "mitkShaderProperty.h"
 #include "mitkProperties.h"
 #include "mitkDataNode.h"
 
 #include <vtkActor.h>
 #include <vtkProperty.h>
 #include <vtkXMLMaterial.h>
 #include <vtkXMLShader.h>
 #include <vtkXMLDataElement.h>
 #include <vtkXMLMaterialParser.h>
 #include <vtkSmartPointer.h>
 #include <mitkBaseRenderer.h>
 #include <vtkShader2.h>
 #include <vtkShaderProgram2.h>
 #include <vtkShader2Collection.h>
+#include <vtkUniformVariables.h>
 
 #include <itkDirectory.h>
 #include <itksys/SystemTools.hxx>
 
 int mitk::VtkShaderRepository::shaderId = 0;
 const bool mitk::VtkShaderRepository::debug = false;
 
 mitk::VtkShaderRepository::VtkShaderRepository()
 {
   LoadShaders();
 }
 
 mitk::VtkShaderRepository::~VtkShaderRepository()
 {
 }
 
 mitk::IShaderRepository::ShaderProgram::Pointer mitk::VtkShaderRepository::CreateShaderProgram()
 {
   mitk::IShaderRepository::ShaderProgram::Pointer shaderProg = (mitk::VtkShaderProgram::New()).GetPointer();
   return shaderProg;
 }
 
 void mitk::VtkShaderRepository::LoadShaders()
 {
   itk::Directory::Pointer dir = itk::Directory::New();
 
   std::string dirPath = "./vtk_shader";
 
   if( dir->Load( dirPath.c_str() ) )
   {
     int n = dir->GetNumberOfFiles();
     for(int r=0;r<n;r++)
     {
       const char *filename = dir->GetFile( r );
 
       std::string extension = itksys::SystemTools::GetFilenameExtension(filename);
 
       if(extension.compare(".xml")==0)
       {
         Shader::Pointer element=Shader::New();
 
         element->SetName(itksys::SystemTools::GetFilenameWithoutExtension(filename));
         std::string filePath = dirPath + std::string("/") + element->GetName() + std::string(".xml");
 
         SR_INFO(debug) << "found shader '" << element->GetName() << "'";
 
         std::ifstream fileStream(filePath.c_str());
         element->LoadXmlShader(fileStream);
 
         shaders.push_back(element);
       }
     }
   }
 }
 
 mitk::VtkShaderRepository::Shader::Pointer mitk::VtkShaderRepository::GetShaderImpl(const std::string &name) const
 {
   std::list<Shader::Pointer>::const_iterator i = shaders.begin();
 
   while( i != shaders.end() )
   {
     if( (*i)->GetName() == name)
       return (*i);
 
     i++;
   }
 
   return Shader::Pointer();
 }
 
 int mitk::VtkShaderRepository::LoadShader(std::istream& stream, const std::string& filename)
 {
   Shader::Pointer element=Shader::New();
   element->SetName(filename);
   element->SetId(shaderId++);
   element->LoadXmlShader(stream);
   shaders.push_back(element);
   SR_INFO(debug) << "found shader '" << element->GetName() << "'";
   return element->GetId();
 }
 
 bool mitk::VtkShaderRepository::UnloadShader(int id)
 {
   for (std::list<Shader::Pointer>::iterator i = shaders.begin();
        i != shaders.end(); ++i)
   {
     if ((*i)->GetId() == id)
     {
       shaders.erase(i);
       return true;
     }
   }
   return false;
 }
 
 mitk::VtkShaderRepository::Shader::Shader()
 {
 }
 
 mitk::VtkShaderRepository::Shader::~Shader()
 {
 }
 
 void mitk::VtkShaderRepository::Shader::SetVertexShaderCode(const std::string& code)
 {
   this->m_VertexShaderCode = code;
 }
 
 std::string mitk::VtkShaderRepository::Shader::GetVertexShaderCode() const
 {
   return this->m_VertexShaderCode;
 }
 
 void mitk::VtkShaderRepository::Shader::SetFragmentShaderCode(const std::string& code)
 {
   this->m_FragmentShaderCode = code;
 }
 
 std::string mitk::VtkShaderRepository::Shader::GetFragmentShaderCode() const
 {
   return this->m_FragmentShaderCode;
 }
 
 void mitk::VtkShaderRepository::Shader::LoadXmlShader(std::istream& stream)
 {
   std::string content;
   content.reserve(2048);
   char buffer[2048];
   while (stream.read(buffer, sizeof(buffer)))
   {
     content.append(buffer, sizeof(buffer));
   }
   content.append(buffer, static_cast<std::size_t>(stream.gcount()));
 
   if (content.empty()) return;
 
   this->SetMaterialXml(content);
 
   vtkXMLMaterialParser* parser = vtkXMLMaterialParser::New();
   vtkXMLMaterial* material = vtkXMLMaterial::New();
   parser->SetMaterial(material);
   parser->Parse(content.c_str());
   parser->Delete();
   if (material == NULL) return;
 
   // Vertexshader uniforms
   {
     vtkXMLShader *s=material->GetVertexShader();
     if (s)
     {
       SetVertexShaderCode(s->GetCode());
       vtkXMLDataElement *x=s->GetRootElement();
       int n=x->GetNumberOfNestedElements();
       for(int r=0;r<n;r++)
       {
         vtkXMLDataElement *y=x->GetNestedElement(r);
-        if(!strcmp(y->GetName(),"ApplicationUniform"))
+        if(strcmp(y->GetName(),"ApplicationUniform") == 0 ||
+           strcmp(y->GetName(), "Uniform") == 0)
         {
           Uniform::Pointer element=Uniform::New();
           element->LoadFromXML(y);
           uniforms.push_back(element);
         }
       }
     }
   }
 
   // Fragmentshader uniforms
   {
     vtkXMLShader *s=material->GetFragmentShader();
     if (s)
     {
       SetFragmentShaderCode(s->GetCode());
       vtkXMLDataElement *x=s->GetRootElement();
       int n=x->GetNumberOfNestedElements();
       for(int r=0;r<n;r++)
       {
         vtkXMLDataElement *y=x->GetNestedElement(r);
-        if(!strcmp(y->GetName(),"ApplicationUniform"))
+        if(strcmp(y->GetName(),"ApplicationUniform") == 0 ||
+           strcmp(y->GetName(), "Uniform") == 0)
         {
           Uniform::Pointer element=Uniform::New();
           element->LoadFromXML(y);
           uniforms.push_back(element);
         }
       }
     }
   }
   material->Delete();
 
 }
 
 mitk::VtkShaderRepository::Shader::Uniform::Uniform()
 {
 }
 
 mitk::VtkShaderRepository::Shader::Uniform::~Uniform()
 {
 }
 
 void mitk::VtkShaderRepository::Shader::Uniform::LoadFromXML(vtkXMLDataElement *y)
 {
   //MITK_INFO << "found uniform '" << y->GetAttribute("name") << "' type=" << y->GetAttribute("type");// << " default=" << y->GetAttribute("value");
 
   name = y->GetAttribute("name");
 
   const char *sType=y->GetAttribute("type");
 
   if(!strcmp(sType,"float"))
     type=glsl_float;
   else if(!strcmp(sType,"vec2"))
     type=glsl_vec2;
   else if(!strcmp(sType,"vec3"))
     type=glsl_vec3;
   else if(!strcmp(sType,"vec4"))
     type=glsl_vec4;
   else if(!strcmp(sType,"int"))
     type=glsl_int;
   else if(!strcmp(sType,"ivec2"))
     type=glsl_ivec2;
   else if(!strcmp(sType,"ivec3"))
     type=glsl_ivec3;
   else if(!strcmp(sType,"ivec4"))
     type=glsl_ivec4;
   else
   {
     type=glsl_none;
     SR_WARN << "unknown type for uniform '" << name << "'" ;
   }
 
 
   defaultFloat[0]=defaultFloat[1]=defaultFloat[2]=defaultFloat[3]=0;
 
-  /*
   const char *sDefault=y->GetAttribute("value");
 
   switch(type)
   {
     case glsl_float:
       sscanf(sDefault,"%f",&defaultFloat[0]);
       break;
 
     case glsl_vec2:
       sscanf(sDefault,"%f %f",&defaultFloat[0],&defaultFloat[1]);
       break;
 
     case glsl_vec3:
       sscanf(sDefault,"%f %f %f",&defaultFloat[0],&defaultFloat[1],&defaultFloat[2]);
       break;
 
     case glsl_vec4:
       sscanf(sDefault,"%f %f %f %f",&defaultFloat[0],&defaultFloat[1],&defaultFloat[2],&defaultFloat[3]);
       break;
   }
-  */
 }
 
 void mitk::VtkShaderRepository::AddDefaultProperties(mitk::DataNode* node, mitk::BaseRenderer* renderer, bool overwrite) const
 {
   node->AddProperty( "shader", mitk::ShaderProperty::New(), renderer, overwrite );
 
   std::list<Shader::Pointer>::const_iterator i = shaders.begin();
 
   while( i != shaders.end() )
   {
     std::list<Shader::Uniform::Pointer> *l = (*i)->GetUniforms();
 
     std::string shaderName = (*i)->GetName();
 
     std::list<Shader::Uniform::Pointer>::const_iterator j = l->begin();
 
     while( j != l->end() )
     {
       std::string propertyName = "shader." + shaderName + "." + (*j)->name;
 
       switch( (*j)->type )
       {
         case Shader::Uniform::glsl_float:
           node->AddProperty( propertyName.c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[0] ), renderer, overwrite );
           break;
 
         case Shader::Uniform::glsl_vec2:
           node->AddProperty( (propertyName+".x").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[0] ), renderer, overwrite );
           node->AddProperty( (propertyName+".y").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[1] ), renderer, overwrite );
           break;
 
         case Shader::Uniform::glsl_vec3:
           node->AddProperty( (propertyName+".x").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[0] ), renderer, overwrite );
           node->AddProperty( (propertyName+".y").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[1] ), renderer, overwrite );
           node->AddProperty( (propertyName+".z").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[2] ), renderer, overwrite );
           break;
 
        case Shader::Uniform::glsl_vec4:
           node->AddProperty( (propertyName+".x").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[0] ), renderer, overwrite );
           node->AddProperty( (propertyName+".y").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[1] ), renderer, overwrite );
           node->AddProperty( (propertyName+".z").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[2] ), renderer, overwrite );
           node->AddProperty( (propertyName+".w").c_str(), mitk::FloatProperty::New( (*j)->defaultFloat[3] ), renderer, overwrite );
           break;
 
        default:
           break;
 
       }
 
       j++;
 
     }
 
     i++;
   }
 
 
 }
 
 std::list<mitk::IShaderRepository::Shader::Pointer> mitk::VtkShaderRepository::GetShaders() const
 {
   std::list<mitk::IShaderRepository::Shader::Pointer> result;
   for (std::list<Shader::Pointer>::const_iterator i = shaders.begin();
        i != shaders.end(); ++i)
   {
     result.push_back(i->GetPointer());
   }
   return result;
 }
 
 mitk::IShaderRepository::Shader::Pointer mitk::VtkShaderRepository::GetShader(const std::string& name) const
 {
   for (std::list<Shader::Pointer>::const_iterator i = shaders.begin();
        i != shaders.end(); ++i)
   {
     if ((*i)->GetName() == name) return i->GetPointer();
   }
   return IShaderRepository::Shader::Pointer();
 }
 
 mitk::IShaderRepository::Shader::Pointer mitk::VtkShaderRepository::GetShader(int id) const
 {
   for (std::list<Shader::Pointer>::const_iterator i = shaders.begin();
        i != shaders.end(); ++i)
   {
     if ((*i)->GetId() == id) return i->GetPointer();
   }
   return IShaderRepository::Shader::Pointer();
 }
 
 void
 mitk::VtkShaderRepository::UpdateShaderProgram(ShaderProgram* shaderProgram,
                                                DataNode* node, BaseRenderer* renderer) const
 {
   VtkShaderProgram* mitkVtkShaderProgram = dynamic_cast<VtkShaderProgram*>(shaderProgram);
   mitk::ShaderProperty *sep= dynamic_cast<mitk::ShaderProperty*>(node->GetProperty("shader",renderer));
   if(!sep)
   {
     mitkVtkShaderProgram->SetVtkShaderProgram(0);
     return;
   }
 
   Shader::Pointer s = GetShaderImpl(sep->GetValueAsString());
 
   // Need update pipeline mode
   if(sep->GetMTime() > mitkVtkShaderProgram->GetShaderTimestampUpdate().GetMTime())
   {
     if( s.IsNull() )
     {
       mitkVtkShaderProgram->SetVtkShaderProgram(0);
       MITK_INFO << "disabling shader";
       mitkVtkShaderProgram->GetShaderTimestampUpdate().Modified();
       return;
     }
 
     vtkSmartPointer<vtkShaderProgram2> program = vtkSmartPointer<vtkShaderProgram2>::New();
     program->SetContext(renderer->GetRenderWindow());
 
     // The vertext shader
     vtkShader2 *shader = vtkShader2::New();
     shader->SetType(VTK_SHADER_TYPE_VERTEX);
     shader->SetSourceCode(s->GetVertexShaderCode().c_str());
     shader->SetContext(renderer->GetRenderWindow());
     program->GetShaders()->AddItem(shader);
     shader->Delete();
 
     // The fragment shader
     shader = vtkShader2::New();
     shader->SetType(VTK_SHADER_TYPE_FRAGMENT);
     shader->SetSourceCode(s->GetFragmentShaderCode().c_str());
     shader->SetContext(renderer->GetRenderWindow());
     program->GetShaders()->AddItem(shader);
     shader->Delete();
 
     program->Build();
 
     mitkVtkShaderProgram->SetVtkShaderProgram(program);
 
     MITK_INFO << "enabling shader ";
     mitkVtkShaderProgram->GetShaderTimestampUpdate().Modified();
   }
 
   if(s.IsNull())
     return;
 
   // update uniforms
   vtkShaderProgram2 *p = mitkVtkShaderProgram->GetVtkShaderProgram();
 
   if(!p)
     return;
 
   std::list<Shader::Uniform::Pointer>::const_iterator j = s->uniforms.begin();
 
   while( j != s->uniforms.end() )
   {
     std::string propertyName = "shader." + s->GetName() + "." + (*j)->name;
 
     //  MITK_INFO << "querying property: " << propertyName;
 
     //  mitk::BaseProperty *p = node->GetProperty( propertyName.c_str(), renderer );
 
     //  if( p && p->GetMTime() > MTime.GetMTime() )
     {
       float fval[4];
 
       // MITK_INFO << "copying property " << propertyName << " ->->- " << (*j)->name << " type=" << (*j)->type ;
 
 
       switch( (*j)->type )
       {
       case Shader::Uniform::glsl_float:
         node->GetFloatProperty( propertyName.c_str(), fval[0], renderer );
-        p->SetUniform1f( (*j)->name.c_str(), fval );
+        p->GetUniformVariables()->SetUniformf((*j)->name.c_str(), 1, fval);
         break;
 
       case Shader::Uniform::glsl_vec2:
         node->GetFloatProperty( (propertyName+".x").c_str(), fval[0], renderer );
         node->GetFloatProperty( (propertyName+".y").c_str(), fval[1], renderer );
-        p->SetUniform2f( (*j)->name.c_str(), fval );
+        p->GetUniformVariables()->SetUniformf((*j)->name.c_str(), 2, fval);
         break;
 
       case Shader::Uniform::glsl_vec3:
         node->GetFloatProperty( (propertyName+".x").c_str(), fval[0], renderer );
         node->GetFloatProperty( (propertyName+".y").c_str(), fval[1], renderer );
         node->GetFloatProperty( (propertyName+".z").c_str(), fval[2], renderer );
-        p->SetUniform3f( (*j)->name.c_str(), fval );
+        //p->SetUniform3f( (*j)->name.c_str(), fval );
+        p->GetUniformVariables()->SetUniformf((*j)->name.c_str(), 3, fval);
         break;
 
       case Shader::Uniform::glsl_vec4:
         node->GetFloatProperty( (propertyName+".x").c_str(), fval[0], renderer );
         node->GetFloatProperty( (propertyName+".y").c_str(), fval[1], renderer );
         node->GetFloatProperty( (propertyName+".z").c_str(), fval[2], renderer );
         node->GetFloatProperty( (propertyName+".w").c_str(), fval[3], renderer );
-        p->SetUniform4f( (*j)->name.c_str(), fval );
+        p->GetUniformVariables()->SetUniformf((*j)->name.c_str(), 4, fval);
         break;
 
       default:
         break;
 
       }
     }
 
     j++;
   }
 
   return;
 }