diff -Nru albert-0.11.3/debian/changelog albert-0.12.0/debian/changelog
--- albert-0.11.3/debian/changelog	2017-05-17 10:49:22.000000000 +0000
+++ albert-0.12.0/debian/changelog	2017-06-13 10:40:30.000000000 +0000
@@ -1,3 +1,9 @@
+albert (0.12.0-1~webupd8~zesty0) zesty; urgency=medium
+
+  * New upstream release
+
+ -- Alin Andrei <andrew@webupd8.org>  Tue, 13 Jun 2017 13:40:29 +0200
+
 albert (0.11.3-1~webupd8~zesty0) zesty; urgency=medium
 
   * New upstream release
diff -Nru albert-0.11.3/src/lib/albert/src/albert/albert.cpp albert-0.12.0/src/lib/albert/src/albert/albert.cpp
--- albert-0.11.3/src/lib/albert/src/albert/albert.cpp	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/lib/albert/src/albert/albert.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -69,7 +69,7 @@
         app = new QApplication(argc, argv);
         app->setApplicationName("albert");
         app->setApplicationDisplayName("Albert");
-        app->setApplicationVersion("v0.11.2");
+        app->setApplicationVersion("v0.12.0");
         app->setQuitOnLastWindowClosed(false);
         QString icon = XdgIconLookup::iconPath("albert");
         if ( icon.isEmpty() ) icon = ":app_icon";
@@ -170,11 +170,11 @@
                 // Show newsbox in case of major version change
                 if ( app->applicationVersion().section('.', 1, 1) != lastUsedVersion.section('.', 1, 1) ){
                     // Do whatever is neccessary on first run
-                    QMessageBox(QMessageBox::Information, "First run",
+                    QMessageBox(QMessageBox::Information, "Major version changed",
                                 QString("You are now using Albert %1. Albert is still in the alpha "
                                         "stage. This means things may change unexpectedly. Check "
                                         "the <a href=\"https://albertlauncher.github.io/news/\">"
-                                        "news</a> to see what changed.")
+                                        "news</a> to read about the things that changed.")
                                 .arg(app->applicationVersion())
                                 ).exec();
                 }
@@ -300,10 +300,8 @@
         bool alfred_note_shown = settings.value("alfred_note_shown", false).toBool();
         if ( !alfred_note_shown ) {
             QMessageBox(QMessageBox::Information, "Note",
-                        "This is free and open source software. We are "
-                        "not affiliated with Alfred or Running with "
-                        "Crayons Ltd. Please do not bother them with "
-                        "support questions. They cannot help you.").exec();
+                        "This is standalone free and open source software. This project is not "
+                        "related or affiliated to any other projects or corporations.").exec();
             settings.setValue("alfred_note_shown", true);
         }
 
diff -Nru albert-0.11.3/src/plugins/files/src/main.cpp albert-0.12.0/src/plugins/files/src/main.cpp
--- albert-0.11.3/src/plugins/files/src/main.cpp	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/files/src/main.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -21,7 +21,7 @@
 #include <QMessageBox>
 #include <QObject>
 #include <QPointer>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QtConcurrent>
@@ -30,6 +30,7 @@
 #include <memory>
 #include <functional>
 #include <vector>
+#include <set>
 #include "configwidget.h"
 #include "file.h"
 #include "main.h"
@@ -44,7 +45,7 @@
 using namespace Core;
 
 
-namespace  {
+namespace {
 
 const char* CFG_PATHS           = "paths";
 const char* CFG_FILTERS         = "filters";
@@ -66,6 +67,17 @@
     bool followSymlinks;
 };
 
+enum class PatternType {
+    Include,
+    Exclude
+};
+
+struct IgnoreEntry {
+    IgnoreEntry(QRegularExpression regex, PatternType type) : regex(regex), type(type) {}
+    QRegularExpression regex;
+    PatternType type;
+};
+
 }
 
 
@@ -120,10 +132,10 @@
         indexIntervalTimer.start();
 
     // Run the indexer thread
+    qDebug() << "Start indexing files.";
     futureWatcher.setFuture(QtConcurrent::run(this, &FilesPrivate::indexFiles, indexSettings));
 
     // Notification
-    qDebug() << "Start indexing files.";
     emit q->statusInfo("Indexing files ...");
 }
 
@@ -175,7 +187,8 @@
         filters |= QDir::Hidden;
 
     // Anonymous function that implemnents the index recursion
-    std::function<void(const QFileInfo&)> indexRecursion = [&](const QFileInfo& fileInfo){
+    std::function<void(const QFileInfo&, vector<IgnoreEntry>)> indexRecursion =
+            [&](const QFileInfo& fileInfo, const vector<IgnoreEntry> &ignoreEntries){
 
         if (abort) return;
 
@@ -199,51 +212,82 @@
             // Remember that this dir has been indexed to avoid loops
             indexedDirs.insert(canonicalPath);
 
-            // Ignore ignorefile by default
-            std::vector<QRegExp> ignores;
-            ignores.push_back(QRegExp(IGNOREFILE, Qt::CaseSensitive, QRegExp::Wildcard));
-
             // Read the ignore file, see http://doc.qt.io/qt-5/qregexp.html#wildcard-matching
+            vector<IgnoreEntry> localIgnoreEntries = ignoreEntries;
             QFile file(QDir(canonicalPath).filePath(IGNOREFILE));
-            if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
                 QTextStream in(&file);
-                while (!in.atEnd())
-                    ignores.push_back(QRegExp(in.readLine().trimmed(), Qt::CaseSensitive, QRegExp::Wildcard));
+                while ( !in.atEnd() ) {
+                    QString pattern = QDir::cleanPath(in.readLine());
+
+                    if ( pattern.isEmpty() || pattern.startsWith("#") )
+                        continue;
+
+                    // Replace ** and * by their regex analogons
+                    pattern.replace(QRegularExpression("(?<!\\*)\\*(?!\\*)"), "[^\\/]*");
+                    pattern.replace(QRegularExpression("\\*{2,}"), ".*");
+
+                    // Determine pattern type
+                    PatternType patternType = PatternType::Exclude;
+                    if ( pattern.startsWith('!') ) {
+                        patternType = PatternType::Include;
+                        pattern = pattern.mid(1, -1);
+                    }
+
+                    // Respect files beginning with excalmation mark
+                    if ( pattern.startsWith("\\!") )
+                        pattern = pattern.mid(1, -1);
+
+                    if ( pattern.startsWith("/") ) {
+                        pattern = QString("^%1$").arg(QDir(fileInfo.filePath()).filePath(pattern.mid(1, -1)));
+                        localIgnoreEntries.emplace_back(QRegularExpression(pattern), patternType);
+                    } else {
+                        pattern = QString("%1$").arg(pattern);
+                        localIgnoreEntries.emplace_back(QRegularExpression(pattern), patternType);
+                    }
+                }
                 file.close();
             }
 
             // Index all children in the dir
             QDirIterator dirIterator(canonicalPath, filters, QDirIterator::NoIteratorFlags);
-            while (dirIterator.hasNext()) {
+            while ( dirIterator.hasNext() ) {
                 dirIterator.next();
-                const QString & fileName = dirIterator.fileName();
                 const QFileInfo & fileInfo = dirIterator.fileInfo();
 
-                // Skip if this file matches one of the ignore patterns
-                if ( std::any_of(ignores.begin(), ignores.end(),
-                                 [&fileName](const QRegExp& ignore){ return ignore.exactMatch(fileName); } ) )
+                // Skip if this file depending on ignore patterns
+                PatternType patternType = PatternType::Include;
+                for ( const IgnoreEntry &ignoreEntry : localIgnoreEntries )
+                    if ( ignoreEntry.regex.match(fileInfo.filePath()).hasMatch() )
+                        patternType = ignoreEntry.type;
+                if ( patternType == PatternType::Exclude )
                     continue;
 
-                // Skip if this file is a symlink and we shoud skip symlinks
-                if (fileInfo.isSymLink() && !indexSettings.followSymlinks)
+                // Skip if this file is a symlink and we should skip symlinks
+                if ( fileInfo.isSymLink() && !indexSettings.followSymlinks )
                     continue;
 
                 // Index this file
-                indexRecursion(fileInfo);
+                indexRecursion(fileInfo, localIgnoreEntries);
             }
         }
     };
 
     // Start the indexing
-    for (const QString &rootDir : indexSettings.rootDirs) {
-        indexRecursion(QFileInfo(rootDir));
-        if (abort) return vector<shared_ptr<Files::File>>();
+    for ( const QString &rootDir : indexSettings.rootDirs ) {
+        // Index rootdir, ignore ignorefile by default
+        vector<IgnoreEntry> ignores = {IgnoreEntry(
+                                       QRegularExpression(QString("%1$").arg(IGNOREFILE)),
+                                       PatternType::Exclude)};
+        indexRecursion(QFileInfo(rootDir), ignores);
+        if ( abort )
+            return vector<shared_ptr<Files::File>>();
     }
 
     // Serialize data
     QFile file(QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).
                    filePath(QString("%1.txt").arg(q->Core::Extension::id)));
-    if (file.open(QIODevice::WriteOnly|QIODevice::Text)) {
+    if ( file.open(QIODevice::WriteOnly|QIODevice::Text) ) {
         qDebug() << qPrintable(QString("Serializing files to '%1'").arg(file.fileName()));
         QTextStream out(&file);
         for (const shared_ptr<File> &item : newIndex)
diff -Nru albert-0.11.3/src/plugins/terminal/src/main.cpp albert-0.12.0/src/plugins/terminal/src/main.cpp
--- albert-0.11.3/src/plugins/terminal/src/main.cpp	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/terminal/src/main.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -100,18 +100,18 @@
     item->setSubtext(QString("Run '%1' in terminal").arg(commandline));
     item->setCompletionString(query->searchTerm());
     item->setIconPath(d->iconPath);
+
     std::vector<shared_ptr<Action>> actions;
-    actions.push_back(std::make_shared<StandardAction>(
-                          "Execute in the terminal", [=](){
+    actions.push_back(std::make_shared<StandardAction>("Execute in the shell",
+                                                       [shell, commandline](){
+        QProcess::startDetached(shell, {"-c", commandline});
+    }));
+     actions.push_back(std::make_shared<StandardAction>("Execute in the terminal", [=](){
         QStringList tokens = Util::ShellLexer::split(terminalCommand);
         tokens << shell << "-ic" << QString("%1; exec %2").arg(commandline, shell);
         QProcess::startDetached(tokens.takeFirst(), tokens);
     }));
-    actions.push_back(std::make_shared<StandardAction>(
-                          "Execute in the shell without terminal",
-                          [shell, commandline](){
-        QProcess::startDetached(shell, {"-c", commandline});
-    }));
+
     item->setActions(std::move(actions));
 
     // Add results to query
diff -Nru albert-0.11.3/src/plugins/websearch/CMakeLists.txt albert-0.12.0/src/plugins/websearch/CMakeLists.txt
--- albert-0.11.3/src/plugins/websearch/CMakeLists.txt	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/CMakeLists.txt	2017-06-09 16:29:43.000000000 +0000
@@ -9,7 +9,8 @@
 )
 
 qt5_wrap_ui(UI
-    configwidget.ui
+    forms/configwidget.ui
+    forms/searchengineeditor.ui
 )
 
 qt5_add_resources(QRC
@@ -20,7 +21,7 @@
 add_library(${PROJECT_NAME} SHARED ${SRC} ${UI} ${QRC})
 
 # Set INCLUDE_DIRS and INTERFACE_INCLUDE_DIRS
-target_include_directories(${PROJECT_NAME} PRIVATE src/)
+target_include_directories(${PROJECT_NAME} PRIVATE src/ forms/)
 
 # Link target to libraries
 target_link_libraries(${PROJECT_NAME}
diff -Nru albert-0.11.3/src/plugins/websearch/configwidget.ui albert-0.12.0/src/plugins/websearch/configwidget.ui
--- albert-0.11.3/src/plugins/websearch/configwidget.ui	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/configwidget.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Websearch::ConfigWidget</class>
- <widget class="QWidget" name="Websearch::ConfigWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>293</width>
-    <height>161</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTableView" name="tableView_searches">
-     <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarAsNeeded</enum>
-     </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustToContents</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
-     <property name="showGrid">
-      <bool>false</bool>
-     </property>
-     <property name="wordWrap">
-      <bool>false</bool>
-     </property>
-     <attribute name="horizontalHeaderHighlightSections">
-      <bool>false</bool>
-     </attribute>
-     <attribute name="horizontalHeaderStretchLastSection">
-      <bool>true</bool>
-     </attribute>
-     <attribute name="verticalHeaderVisible">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="1">
-      <widget class="QPushButton" name="pushButton_new">
-       <property name="text">
-        <string>New</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="4">
-      <widget class="QPushButton" name="pushButton_setIcon">
-       <property name="text">
-        <string>Set icon</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QPushButton" name="pushButton_moveUp">
-       <property name="text">
-        <string>Move up</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QPushButton" name="pushButton_remove">
-       <property name="text">
-        <string>Remove</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="4">
-      <widget class="QPushButton" name="pushButton_restoreDefaults">
-       <property name="text">
-        <string>Restore</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="QPushButton" name="pushButton_moveDown">
-       <property name="text">
-        <string>Move down</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff -Nru albert-0.11.3/src/plugins/websearch/forms/configwidget.ui albert-0.12.0/src/plugins/websearch/forms/configwidget.ui
--- albert-0.11.3/src/plugins/websearch/forms/configwidget.ui	1970-01-01 00:00:00.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/forms/configwidget.ui	2017-06-09 16:29:43.000000000 +0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Websearch::ConfigWidget</class>
+ <widget class="QWidget" name="Websearch::ConfigWidget">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTableView" name="tableView_searches">
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAsNeeded</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustToContents</enum>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::InternalMove</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="showGrid">
+      <bool>false</bool>
+     </property>
+     <property name="wordWrap">
+      <bool>false</bool>
+     </property>
+     <attribute name="horizontalHeaderHighlightSections">
+      <bool>false</bool>
+     </attribute>
+     <attribute name="horizontalHeaderStretchLastSection">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="verticalHeaderVisible">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_new">
+       <property name="icon">
+        <iconset theme="add">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_remove">
+       <property name="icon">
+        <iconset theme="remove">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_restoreDefaults">
+       <property name="text">
+        <string>Restore</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -Nru albert-0.11.3/src/plugins/websearch/forms/searchengineeditor.ui albert-0.12.0/src/plugins/websearch/forms/searchengineeditor.ui
--- albert-0.11.3/src/plugins/websearch/forms/searchengineeditor.ui	1970-01-01 00:00:00.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/forms/searchengineeditor.ui	2017-06-09 16:29:43.000000000 +0000
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Websearch::SearchEngineEditor</class>
+ <widget class="QDialog" name="Websearch::SearchEngineEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>420</width>
+    <height>320</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Edit search engine</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolButton_icon">
+       <property name="toolTip">
+        <string>Click to set an icon for the search engine.</string>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>96</width>
+         <height>96</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </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>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="nameLabel">
+       <property name="text">
+        <string>Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="lineEdit_name">
+       <property name="toolTip">
+        <string>Name of the search engine.</string>
+       </property>
+       <property name="placeholderText">
+        <string>Name of the search engine</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="triggerLabel">
+       <property name="text">
+        <string>Trigger:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="lineEdit_trigger">
+       <property name="toolTip">
+        <string>The query prefix that triggers this engine. Note that it may make sense to append a space to the trigger prefix.</string>
+       </property>
+       <property name="placeholderText">
+        <string>The query prefix that triggers this engine</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_url">
+       <property name="text">
+        <string>URL:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="lineEdit_url">
+       <property name="toolTip">
+        <string>The URL containing a %s that will be replaced by the query.</string>
+       </property>
+       <property name="placeholderText">
+        <string>The URL containing a %s that will be replaced by the query</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>lineEdit_name</tabstop>
+  <tabstop>lineEdit_trigger</tabstop>
+  <tabstop>lineEdit_url</tabstop>
+  <tabstop>toolButton_icon</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Websearch::SearchEngineEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>275</x>
+     <y>310</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Websearch::SearchEngineEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>343</x>
+     <y>310</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff -Nru albert-0.11.3/src/plugins/websearch/src/configwidget.cpp albert-0.12.0/src/plugins/websearch/src/configwidget.cpp
--- albert-0.11.3/src/plugins/websearch/src/configwidget.cpp	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/configwidget.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -19,6 +19,7 @@
 #include <QStandardPaths>
 #include "configwidget.h"
 #include "enginesmodel.h"
+#include "searchengineeditor.h"
 #include "main.h"
 
 /** ***************************************************************************/
@@ -40,17 +41,11 @@
     connect(ui.pushButton_remove, &QPushButton::clicked,
             this, &ConfigWidget::onButton_remove);
 
-    connect(ui.pushButton_setIcon, &QPushButton::clicked,
-            this, &ConfigWidget::onButton_setIcon);
-
-    connect(ui.pushButton_moveUp, &QPushButton::clicked,
-            this, &ConfigWidget::onButton_moveUp);
-
-    connect(ui.pushButton_moveDown, &QPushButton::clicked,
-            this, &ConfigWidget::onButton_moveDown);
-
     connect(ui.pushButton_restoreDefaults, &QPushButton::clicked,
             this, &ConfigWidget::onButton_restoreDefaults);
+
+    connect(ui.tableView_searches, &QTableView::activated,
+            this, &ConfigWidget::onActivated);
 }
 
 
@@ -62,15 +57,50 @@
 
 
 /** ***************************************************************************/
+void Websearch::ConfigWidget::onActivated(QModelIndex index) {
+    int row = index.row();
+    SearchEngineEditor searchEngineEditor(extension_->engines()[static_cast<ulong>(row)], this);
+
+    if (searchEngineEditor.exec()){
+        // Set the new engine
+        const SearchEngine & searchEngine = searchEngineEditor.searchEngine();
+        enginesModel_->setData(enginesModel_->index(row, 0), searchEngine.name, Qt::DisplayRole);
+        enginesModel_->setData(enginesModel_->index(row, 0), searchEngine.iconPath, Qt::DecorationRole);
+        enginesModel_->setData(enginesModel_->index(row, 1), searchEngine.trigger, Qt::DisplayRole);
+        enginesModel_->setData(enginesModel_->index(row, 2), searchEngine.url, Qt::DisplayRole);
+    }
+    ui.tableView_searches->reset();
+}
+
+
+
+/** ***************************************************************************/
 void Websearch::ConfigWidget::onButton_new() {
-    int row = (ui.tableView_searches->currentIndex().isValid())
-            ? ui.tableView_searches->currentIndex().row()
-            : ui.tableView_searches->model()->rowCount();
-    ui.tableView_searches->model()->insertRow(row);
-
-    QModelIndex index = ui.tableView_searches->model()->index(row, 0, QModelIndex());
-    ui.tableView_searches->setCurrentIndex(index);
-    ui.tableView_searches->edit(index);
+
+    // Open search engine editor
+    SearchEngine searchEngine;
+    searchEngine.iconPath = ":default";
+    SearchEngineEditor searchEngineEditor(searchEngine, this);
+
+    if (searchEngineEditor.exec()){
+
+        // Insert new row in model
+        int row = (ui.tableView_searches->currentIndex().isValid())
+                ? ui.tableView_searches->currentIndex().row()
+                : ui.tableView_searches->model()->rowCount();
+        enginesModel_->insertRow(row);
+
+        // Set the new engine
+        searchEngine = searchEngineEditor.searchEngine();
+        enginesModel_->setData(enginesModel_->index(row, 0), searchEngine.name, Qt::DisplayRole);
+        enginesModel_->setData(enginesModel_->index(row, 0), searchEngine.iconPath, Qt::DecorationRole);
+        enginesModel_->setData(enginesModel_->index(row, 1), searchEngine.trigger, Qt::DisplayRole);
+        enginesModel_->setData(enginesModel_->index(row, 2), searchEngine.url, Qt::DisplayRole);
+
+        // Set current
+        QModelIndex index = ui.tableView_searches->model()->index(row, 0, QModelIndex());
+        ui.tableView_searches->setCurrentIndex(index);
+    }
 }
 
 
@@ -92,46 +122,6 @@
 }
 
 
-
-/** ***************************************************************************/
-void Websearch::ConfigWidget::onButton_moveUp() {
-    ui.tableView_searches->model()->moveRows(
-                QModelIndex(), ui.tableView_searches->currentIndex().row(),
-                1,
-                QModelIndex(), ui.tableView_searches->currentIndex().row() - 1);
-}
-
-
-
-/** ***************************************************************************/
-void Websearch::ConfigWidget::onButton_moveDown() {
-    ui.tableView_searches->model()->moveRows(
-                QModelIndex(), ui.tableView_searches->currentIndex().row(),
-                1,
-                QModelIndex(), ui.tableView_searches->currentIndex().row() + 2);
-}
-
-
-
-/** ***************************************************************************/
-void Websearch::ConfigWidget::onButton_setIcon() {
-    int row = ui.tableView_searches->currentIndex().row();
-    if (row < 0 || ui.tableView_searches->model()->rowCount() <= row)
-        return;
-
-    QString fileName =
-            QFileDialog::getOpenFileName(
-                this,
-                tr("Choose icon"),
-                QStandardPaths::writableLocation(QStandardPaths::HomeLocation),
-                tr("Images (*.png *.svg)"));
-    if(fileName.isEmpty())
-        return;
-
-    ui.tableView_searches->model()->setData(ui.tableView_searches->currentIndex(), fileName, Qt::DecorationRole);
-}
-
-
 
 /** ***************************************************************************/
 void Websearch::ConfigWidget::onButton_restoreDefaults() {
diff -Nru albert-0.11.3/src/plugins/websearch/src/configwidget.h albert-0.12.0/src/plugins/websearch/src/configwidget.h
--- albert-0.11.3/src/plugins/websearch/src/configwidget.h	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/configwidget.h	2017-06-09 16:29:43.000000000 +0000
@@ -35,11 +35,9 @@
 
 private:
 
+    void onActivated(QModelIndex index);
     void onButton_new();
     void onButton_remove();
-    void onButton_moveUp();
-    void onButton_moveDown();
-    void onButton_setIcon();
     void onButton_restoreDefaults();
 
     Extension *extension_;
diff -Nru albert-0.11.3/src/plugins/websearch/src/enginesmodel.cpp albert-0.12.0/src/plugins/websearch/src/enginesmodel.cpp
--- albert-0.11.3/src/plugins/websearch/src/enginesmodel.cpp	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/enginesmodel.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -19,6 +19,8 @@
 #include <QDebug>
 #include <QFileInfo>
 #include <QIcon>
+#include <QUuid>
+#include <QMimeData>
 #include <QStandardPaths>
 #include "enginesmodel.h"
 #include "main.h"
@@ -147,7 +149,7 @@
         return false;
 
     switch (role) {
-    case Qt::EditRole: {
+    case Qt::DisplayRole: {
         if ( !value.canConvert(QMetaType::QString) )
             return false;
         QString s = value.toString();
@@ -177,23 +179,38 @@
     }
     case Qt::DecorationRole: {
         QFileInfo fileInfo(value.toString());
-        QString newFilePath;
-        uint i = 0;
+
+        if ( !fileInfo.exists() )
+            return false;
 
         // Remove icon from cache
         iconCache.erase(extension_->engines()[static_cast<ulong>(index.row())].iconPath);
 
-        // Build the new generic path and copy the file into cache dir
-        do {
-            newFilePath = QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation))
-                            .filePath(QString("%1-%2.%3")
-                                        .arg(extension_->engines()[static_cast<ulong>(index.row())].name)
-                                        .arg(i++)
-                                        .arg(fileInfo.suffix()));
-        } while (!QFile::copy(fileInfo.filePath(), newFilePath));
+        // Create extension dir if necessary
+        QDir dataDir = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
+        if ( !dataDir.exists(extension_->Core::Extension::id) ) {
+            if ( !dataDir.mkdir(extension_->Core::Extension::id) ) {
+                qWarning() << "Could not create extension data dir.";
+                return false;
+            }
+        }
+
+        dataDir.cd(extension_->Core::Extension::id);
+
+        // Build the new random path
+        QString newFilePath = dataDir.filePath(QString("%1.%2")
+                                               .arg(QUuid::createUuid().toString())
+                                               .arg(fileInfo.suffix()));
+
+        // Copy the file into data dir
+        if ( !QFile::copy(fileInfo.filePath(), newFilePath) ) {
+            qWarning() << "Could not copy icon to cache.";
+            return false;
+        }
 
-        // Set the copied file as icon
+        // Remove old icon and set the copied file as icon
         std::vector<SearchEngine> newEngines = extension_->engines();
+        QFile::remove(newEngines[static_cast<ulong>(index.row())].iconPath);
         newEngines[static_cast<ulong>(index.row())].iconPath = newFilePath;
         extension_->setEngines(newEngines);
 
@@ -213,9 +230,9 @@
 /** ***************************************************************************/
 Qt::ItemFlags Websearch::EnginesModel::flags(const QModelIndex &index) const {
     if (index.isValid())
-        return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
+        return QAbstractTableModel::flags(index) | Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled;
     else
-        return Qt::NoItemFlags;
+        return QAbstractTableModel::flags(index) | Qt::ItemIsDropEnabled;
 }
 
 
@@ -257,7 +274,8 @@
 
 
 /** ***************************************************************************/
-bool Websearch::EnginesModel::moveRows(const QModelIndex &src, int srcRow, int cnt, const QModelIndex &dst, int dstRow) {
+bool Websearch::EnginesModel::moveRows(const QModelIndex &srcParent, int srcRow, int cnt,
+                                       const QModelIndex &dstParent, int dstRow) {
     if ( srcRow < 0 || cnt < 1 || dstRow < 0 ||
          static_cast<int>(extension_->engines().size()) < srcRow + cnt - 1 ||
          static_cast<int>(extension_->engines().size()) < dstRow ||
@@ -265,7 +283,7 @@
         return false;
 
     std::vector<SearchEngine> newEngines = extension_->engines();
-    beginMoveRows(src, srcRow, srcRow + cnt - 1, dst, dstRow);
+    beginMoveRows(srcParent, srcRow, srcRow + cnt - 1, dstParent, dstRow);
     newEngines.insert(newEngines.begin() + dstRow,
                       extension_->engines().begin() + srcRow,
                       extension_->engines().begin() + srcRow + cnt);
@@ -289,3 +307,26 @@
     endResetModel();
 }
 
+
+
+/** ***************************************************************************/
+Qt::DropActions Websearch::EnginesModel::supportedDropActions() const {
+    return Qt::MoveAction;
+}
+
+
+
+/** ***************************************************************************/
+bool Websearch::EnginesModel::dropMimeData(const QMimeData *data,
+                                           Qt::DropAction /*action*/,
+                                           int dstRow,
+                                           int /*column*/,
+                                           const QModelIndex &/*parent*/) {
+    QByteArray encoded = data->data("application/x-qabstractitemmodeldatalist");
+    QDataStream stream(&encoded, QIODevice::ReadOnly);
+    int srcRow = 0;
+    if (!stream.atEnd())
+        stream >> srcRow;
+    moveRows(QModelIndex(), srcRow, 1, QModelIndex(), dstRow);
+    return false;
+}
diff -Nru albert-0.11.3/src/plugins/websearch/src/enginesmodel.h albert-0.12.0/src/plugins/websearch/src/enginesmodel.h
--- albert-0.11.3/src/plugins/websearch/src/enginesmodel.h	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/enginesmodel.h	2017-06-09 16:29:43.000000000 +0000
@@ -38,6 +38,8 @@
     bool insertRows (int position, int rows, const QModelIndex & parent = QModelIndex()) override;
     bool removeRows (int position, int rows, const QModelIndex & parent = QModelIndex()) override;
     bool moveRows(const QModelIndex &sourceRow, int srcRow, int cnt, const QModelIndex & dst, int destinationChild) override;
+    Qt::DropActions supportedDropActions() const override;
+    bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
 
     void restoreDefaults();
 
diff -Nru albert-0.11.3/src/plugins/websearch/src/main.cpp albert-0.12.0/src/plugins/websearch/src/main.cpp
--- albert-0.11.3/src/plugins/websearch/src/main.cpp	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/main.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -252,7 +252,7 @@
     {"Amazon",        "ama ", ":amazon",    "http://www.amazon.com/s/?field-keywords=%s"},
     {"Ebay",          "eb ",  ":ebay",      "http://www.ebay.com/sch/i.html?_nkw=%s"},
     {"GitHub",        "gh ",  ":github",    "https://github.com/search?utf8=✓&q=%s"},
-    {"Wikipedia",     "wp ",  ":wikipedia", "https://wikipedia.org/w/index.php?search=%s"},
+    {"Wikipedia",     "wiki ",":wikipedia", "https://en.wikipedia.org/w/index.php?search=%s"},
     {"Wolfram Alpha", "=",    ":wolfram",   "https://www.wolframalpha.com/input/?i=%s"}
 };
 
diff -Nru albert-0.11.3/src/plugins/websearch/src/searchengineeditor.cpp albert-0.12.0/src/plugins/websearch/src/searchengineeditor.cpp
--- albert-0.11.3/src/plugins/websearch/src/searchengineeditor.cpp	1970-01-01 00:00:00.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/searchengineeditor.cpp	2017-06-09 16:29:43.000000000 +0000
@@ -0,0 +1,61 @@
+// albert - a simple application launcher for linux
+// Copyright (C) 2014-2017 Manuel Schneider
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include <QFileDialog>
+#include <QStandardPaths>
+#include "searchengineeditor.h"
+
+
+
+/** ***************************************************************************/
+Websearch::SearchEngineEditor::SearchEngineEditor(const SearchEngine &searchEngine, QWidget *parent)
+    : QDialog(parent), searchEngine_(searchEngine) {
+
+    ui.setupUi(this);
+    setWindowModality(Qt::WindowModal);
+
+    ui.lineEdit_name->setText(searchEngine.name);
+    ui.lineEdit_trigger->setText(searchEngine.trigger);
+    ui.lineEdit_url->setText(searchEngine.url);
+    ui.toolButton_icon->setIcon(QIcon(searchEngine.iconPath));
+
+    connect(ui.lineEdit_name, &QLineEdit::textChanged,
+            [this](const QString & text){ searchEngine_.name = text; });
+
+    connect(ui.lineEdit_trigger, &QLineEdit::textChanged,
+            [this](const QString & text){ searchEngine_.trigger = text; });
+
+    connect(ui.lineEdit_url, &QLineEdit::textChanged,
+            [this](const QString & text){ searchEngine_.url = text; });
+
+    connect(ui.toolButton_icon, &QToolButton::clicked,
+            [this](){
+
+        QString fileName =
+                QFileDialog::getOpenFileName(
+                    this,
+                    tr("Choose icon"),
+                    QStandardPaths::writableLocation(QStandardPaths::HomeLocation),
+                    tr("Images (*.png *.svg)"));
+
+        if(fileName.isEmpty())
+            return;
+
+        searchEngine_.iconPath = fileName;
+        ui.toolButton_icon->setIcon(QIcon(fileName));
+    });
+
+}
diff -Nru albert-0.11.3/src/plugins/websearch/src/searchengineeditor.h albert-0.12.0/src/plugins/websearch/src/searchengineeditor.h
--- albert-0.11.3/src/plugins/websearch/src/searchengineeditor.h	1970-01-01 00:00:00.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/searchengineeditor.h	2017-06-09 16:29:43.000000000 +0000
@@ -0,0 +1,40 @@
+// albert - a simple application launcher for linux
+// Copyright (C) 2014-2017 Manuel Schneider
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#pragma once
+#include <QDialog>
+#include "ui_searchengineeditor.h"
+#include "searchengine.h"
+
+namespace Websearch {
+
+class SearchEngineEditor : public QDialog
+{
+    Q_OBJECT
+
+public:
+
+    explicit SearchEngineEditor(const SearchEngine &searchEngine, QWidget *parent = 0);
+    const SearchEngine &searchEngine() { return searchEngine_; }
+
+private:
+
+    SearchEngine searchEngine_;
+    Ui::SearchEngineEditor ui;
+
+};
+
+}
diff -Nru albert-0.11.3/src/plugins/websearch/src/searchengine.h albert-0.12.0/src/plugins/websearch/src/searchengine.h
--- albert-0.11.3/src/plugins/websearch/src/searchengine.h	2017-05-28 21:57:15.000000000 +0000
+++ albert-0.12.0/src/plugins/websearch/src/searchengine.h	2017-06-09 16:29:43.000000000 +0000
@@ -19,7 +19,8 @@
 
 namespace Websearch {
 
-struct SearchEngine {
+class SearchEngine {
+public:
     QString name;
     QString trigger;
     QString iconPath;