diff --git a/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp
index f34909e777..6e1f622a3c 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp
+++ b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.cpp
@@ -1,191 +1,190 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include <berryIPreferencesService.h>
 #include <berryPlatform.h>
 #include <berryServiceRegistry.h>
 #include <mitkExceptionMacro.h>
 #include <QFileDialog>
 #include <QProcess>
 #include <QTextCodec>
 #include <ui_QmitkExternalProgramsPreferencePage.h>
 #include "QmitkExternalProgramsPreferencePage.h"
 
 static berry::IPreferences::Pointer GetPreferences()
 {
   berry::IPreferencesService::Pointer preferencesService =
     berry::Platform::GetServiceRegistry().GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
 
   if (preferencesService.IsNotNull())
   {
     berry::IPreferences::Pointer systemPreferences = preferencesService->GetSystemPreferences();
 
     if (systemPreferences.IsNotNull())
       return systemPreferences->Node("/org.mitk.gui.qt.ext.externalprograms");
   }
 
   mitkThrow();
 }
 
 QmitkExternalProgramsPreferencePage::QmitkExternalProgramsPreferencePage()
   : m_Preferences(GetPreferences()),
     m_Ui(new Ui::QmitkExternalProgramsPreferencePage),
     m_Control(NULL),
     m_FFmpegProcess(NULL),
     m_GnuplotProcess(NULL)
 {
 }
 
 QmitkExternalProgramsPreferencePage::~QmitkExternalProgramsPreferencePage()
 {
 }
 
 void QmitkExternalProgramsPreferencePage::CreateQtControl(QWidget* parent)
 {
   m_Control = new QWidget(parent);
   m_FFmpegProcess = new QProcess(m_Control);
   m_GnuplotProcess = new QProcess(m_Control);
 
   m_Ui->setupUi(m_Control);
 
   connect(m_FFmpegProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(OnFFmpegProcessError(QProcess::ProcessError)));
   connect(m_FFmpegProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(OnFFmpegProcessFinished(int, QProcess::ExitStatus)));
   connect(m_Ui->ffmpegButton, SIGNAL(clicked()), this, SLOT(OnFFmpegButtonClicked()));
 
   connect(m_GnuplotProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(OnGnuplotProcessError(QProcess::ProcessError)));
   connect(m_GnuplotProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(OnGnuplotProcessFinished(int, QProcess::ExitStatus)));
   connect(m_Ui->gnuplotButton, SIGNAL(clicked()), this, SLOT(OnGnuplotButtonClicked()));
 
   this->Update();
 }
 
 void QmitkExternalProgramsPreferencePage::OnFFmpegButtonClicked()
 {
-  QString filter = "FFmpeg executable ";
+  QString filter = "ffmpeg/avconv executable ";
 
 #if defined(WIN32)
-  filter += "(ffmpeg.exe)";
+  filter += "(ffmpeg.exe avconv.exe)";
 #else
-  filter += "(ffmpeg)";
+  filter += "(ffmpeg avconv)";
 #endif
 
-  QString ffmpegPath = QFileDialog::getOpenFileName(m_Control, "FFmpeg", "", filter);
+  QString ffmpegPath = QFileDialog::getOpenFileName(m_Control, "FFmpeg/Libav", "", filter);
 
   if (!ffmpegPath.isEmpty())
   {
     m_FFmpegPath = ffmpegPath;
     m_FFmpegProcess->start(ffmpegPath, QStringList() << "-version", QProcess::ReadOnly);
   }
 }
 
 void QmitkExternalProgramsPreferencePage::OnFFmpegProcessError(QProcess::ProcessError)
 {
   m_FFmpegPath.clear();
   m_Ui->ffmpegLineEdit->clear();
 }
 
 void QmitkExternalProgramsPreferencePage::OnFFmpegProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
   if (exitStatus == QProcess::NormalExit && exitCode == 0)
   {
-    QString version = QTextCodec::codecForName("UTF-8")->toUnicode(m_FFmpegProcess->readAllStandardOutput()).trimmed();
+    QString output = QTextCodec::codecForName("UTF-8")->toUnicode(m_FFmpegProcess->readAllStandardOutput());
 
-    if (version.startsWith("ffmpeg"))
+    if (output.startsWith("ffmpeg") || output.startsWith("avconv"))
     {
-      version = version.section(' ', 0, 2, QString::SectionSkipEmpty);
-      m_Ui->ffmpegLineEdit->setText(QString("%1 (%2)").arg(m_FFmpegPath).arg(version));
+      m_Ui->ffmpegLineEdit->setText(m_FFmpegPath);
       return;
     }
   }
 
   m_FFmpegPath.clear();
   m_Ui->ffmpegLineEdit->clear();
 }
 
 void QmitkExternalProgramsPreferencePage::OnGnuplotButtonClicked()
 {
   QString filter = "gnuplot executable ";
 
 #if defined(WIN32)
   filter += "(gnuplot.exe)";
 #else
   filter += "(gnuplot)";
 #endif
 
   QString gnuplotPath = QFileDialog::getOpenFileName(m_Control, "Gnuplot", "", filter);
 
   if (!gnuplotPath.isEmpty())
   {
     m_GnuplotPath = gnuplotPath;
     m_GnuplotProcess->start(gnuplotPath, QStringList() << "--version", QProcess::ReadOnly);
   }
 }
 
 void QmitkExternalProgramsPreferencePage::OnGnuplotProcessError(QProcess::ProcessError)
 {
   m_GnuplotPath.clear();
   m_Ui->gnuplotLineEdit->clear();
 }
 
 void QmitkExternalProgramsPreferencePage::OnGnuplotProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
   if (exitStatus == QProcess::NormalExit && exitCode == 0)
   {
-    QString version = QTextCodec::codecForName("UTF-8")->toUnicode(m_GnuplotProcess->readAllStandardOutput()).trimmed();
+    QString output = QTextCodec::codecForName("UTF-8")->toUnicode(m_GnuplotProcess->readAllStandardOutput());
 
-    if (version.startsWith("gnuplot"))
+    if (output.startsWith("gnuplot"))
     {
-      m_Ui->gnuplotLineEdit->setText(QString("%1 (%2)").arg(m_GnuplotPath).arg(version));
+      m_Ui->gnuplotLineEdit->setText(m_GnuplotPath);
       return;
     }
   }
 
   m_GnuplotPath.clear();
   m_Ui->gnuplotLineEdit->clear();
 }
 
 QWidget* QmitkExternalProgramsPreferencePage::GetQtControl() const
 {
   return m_Control;
 }
 
 void QmitkExternalProgramsPreferencePage::Init(berry::IWorkbench::Pointer)
 {
 }
 
 void QmitkExternalProgramsPreferencePage::PerformCancel()
 {
 }
 
 bool QmitkExternalProgramsPreferencePage::PerformOk()
 {
   m_Preferences->Put("ffmpeg", m_FFmpegPath.toStdString());
   m_Preferences->Put("gnuplot", m_GnuplotPath.toStdString());
   return true;
 }
 
 void QmitkExternalProgramsPreferencePage::Update()
 {
   m_FFmpegPath = QString::fromStdString(m_Preferences->Get("ffmpeg", ""));
 
   if (!m_FFmpegPath.isEmpty())
     m_FFmpegProcess->start(m_FFmpegPath, QStringList() << "-version", QProcess::ReadOnly);
 
   m_GnuplotPath = QString::fromStdString(m_Preferences->Get("gnuplot", ""));
 
   if (!m_GnuplotPath.isEmpty())
     m_GnuplotProcess->start(m_GnuplotPath, QStringList() << "--version", QProcess::ReadOnly);
 }
diff --git a/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui
index 61f67ee3a0..428b27c526 100644
--- a/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui
+++ b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExternalProgramsPreferencePage.ui
@@ -1,92 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkExternalProgramsPreferencePage</class>
  <widget class="QWidget" name="QmitkExternalProgramsPreferencePage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>External Programs</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="ffmpegLabel">
        <property name="text">
-        <string>FFmpeg executable:</string>
+        <string>FFmpeg/Libav:</string>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
        <property name="buddy">
         <cstring>gnuplotButton</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLineEdit" name="ffmpegLineEdit">
        <property name="readOnly">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="0" column="2">
       <widget class="QToolButton" name="ffmpegButton">
        <property name="text">
         <string>...</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="gnuplotLabel">
        <property name="text">
-        <string>gnuplot executable:</string>
+        <string>gnuplot:</string>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
        <property name="buddy">
         <cstring>gnuplotButton</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QLineEdit" name="gnuplotLineEdit">
        <property name="readOnly">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="QToolButton" name="gnuplotButton">
        <property name="text">
         <string>...</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>248</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkAnimationItemDelegate.cpp b/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkAnimationItemDelegate.cpp
index 1ae598bdcb..323e685798 100644
--- a/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkAnimationItemDelegate.cpp
+++ b/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkAnimationItemDelegate.cpp
@@ -1,101 +1,102 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "QmitkAnimationItem.h"
 #include "QmitkAnimationItemDelegate.h"
 #include <QPainter>
 #include <QStandardItemModel>
 #include <limits>
 
 QmitkAnimationItemDelegate::QmitkAnimationItemDelegate(QObject* parent)
   : QStyledItemDelegate(parent)
 {
 }
 
 QmitkAnimationItemDelegate::~QmitkAnimationItemDelegate()
 {
 }
 
 void QmitkAnimationItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
+  if (option.state & QStyle::State_Selected)
+    painter->fillRect(option.rect, option.palette.highlight());
+
   const QStandardItemModel* model = dynamic_cast<const QStandardItemModel*>(index.model());
   const QmitkAnimationItem* thisItem = dynamic_cast<QmitkAnimationItem*>(model->item(index.row(), 1));
   QList<const QmitkAnimationItem*> items;
 
   const int rowCount = model->rowCount();
 
   for (int i = 0; i < rowCount; ++i)
     items << dynamic_cast<QmitkAnimationItem*>(model->item(i, 1));
 
   double totalDuration = 0.0;
   double previousStart = 0.0;
   double thisStart = 0.0;
 
   Q_FOREACH(const QmitkAnimationItem* item, items)
   {
     if (item->GetStartWithPrevious())
     {
       totalDuration = std::max(totalDuration, previousStart + item->GetDelay() + item->GetDuration());
     }
     else
     {
       previousStart = totalDuration;
       totalDuration += item->GetDelay() + item->GetDuration();
     }
 
     if (item == thisItem)
       thisStart = previousStart;
   }
 
   QColor color = thisItem->GetStartWithPrevious()
     ? QColor("Khaki")
     : QColor("DarkKhaki");
 
   painter->setBrush(color);
   painter->setPen(Qt::NoPen);
 
   const QRect& rect = option.rect;
   const double widthPerSecond = rect.width() / totalDuration;
 
   painter->drawRect(
     rect.x() + static_cast<int>(widthPerSecond * (thisStart + thisItem->GetDelay())),
     rect.y() + 1,
     static_cast<int>(widthPerSecond * thisItem->GetDuration()),
     rect.height() - 2);
 
   if (thisItem->GetDelay() > std::numeric_limits<double>::min())
   {
     QPen pen(color);
     painter->setPen(pen);
 
     painter->drawLine(
       rect.x() + static_cast<int>(widthPerSecond * thisStart),
       rect.y() + 1,
       rect.x() + static_cast<int>(widthPerSecond * thisStart),
       rect.y() + rect.height() - 2);
 
     pen.setStyle(Qt::DashLine);
     painter->setPen(pen);
 
     painter->drawLine(
       rect.x() + static_cast<int>(widthPerSecond * thisStart),
       rect.y() + rect.height() / 2,
       rect.x() + static_cast<int>(widthPerSecond * (thisStart + thisItem->GetDelay())) - 1,
       rect.y() + rect.height() / 2);
   }
-
-  QStyledItemDelegate::paint(painter, option, index);
 }