diff --git a/lib/qml/ResultDelegate.qml b/lib/qml/ResultDelegate.qml
index cb9f811..7dd3879 100644
--- a/lib/qml/ResultDelegate.qml
+++ b/lib/qml/ResultDelegate.qml
@@ -1,284 +1,282 @@
 /*
  * This file is part of the KDE Milou Project
  * Copyright (C) 2013-2014 Vishesh Handa <me@vhanda.in>
  * Copyright (C) 2015-2016 Kai Uwe Broulik <kde@privat.broulik.de>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
 MouseArea {
     id: resultDelegate
 
     property variant theModel: model
 
     readonly property bool isCurrent: ListView.isCurrentItem // cannot properly Connect {} to this
     readonly property bool sectionHasChanged: typeof reversed !== "undefined" && (
                                                   (reversed && ListView.section != ListView.nextSection)
                                                     || (!reversed && ListView.section != ListView.previousSection)
                                                   )
 
     property int activeAction: -1
 
     property string typeText: sectionHasChanged ? ListView.section : ""
     property var additionalActions: typeof actions !== "undefined" ? actions : []
     property int categoryWidth: units.gridUnit * 10
 
     Accessible.role: Accessible.ListItem
     Accessible.name: displayLabel.text
     Accessible.description: {
         var section = ListView.section;
         if (!section) {
             return "";
         }
         var subtext = subtextLabel.text;
         if (subtext.length > 0) {
             return i18nd("milou", "%1, in category %2", subtext, section);
         } else {
             return i18nd("milou", "in category %1", section);
         }
     }
 
     property bool __pressed: false
     property int __pressX: -1
     property int __pressY: -1
 
     onIsCurrentChanged: {
         if (!isCurrent) {
             activeAction = -1
         }
     }
 
     function activateNextAction() {
         if (activeAction === actionsRepeater.count - 1) { // last action, do nothing
             return false
         }
         ++activeAction
         return true
     }
 
     function activatePreviousAction() {
         if (activeAction < 0) { // no action, do nothing
             return false
         }
         --activeAction
         return true
     }
 
     function activateLastAction() {
         activeAction = actionsRepeater.count - 1
     }
 
     width: listItem.implicitWidth
     height: listItem.implicitHeight
 
     acceptedButtons: Qt.LeftButton
     hoverEnabled: true
     onPressed: {
         __pressed = true;
         __pressX = mouse.x;
         __pressY = mouse.y;
     }
 
     onReleased: {
         if (__pressed) {
             listView.currentIndex = model.index
             listView.runCurrentIndex()
         }
 
         __pressed = false;
         __pressX = -1;
         __pressY = -1;
     }
 
     onPositionChanged: {
         if (__pressX != -1 && typeof dragHelper !== "undefined" && dragHelper.isDrag(__pressX, __pressY, mouse.x, mouse.y)) {
             var resultsModel = ListView.view.model;
             var mimeData = resultsModel.getMimeData(resultsModel.index(index, 0));
             if (mimeData) {
                 dragHelper.startDrag(resultDelegate, mimeData, model.decoration);
                 __pressed = false;
                 __pressX = -1;
                 __pressY = -1;
             }
         }
 
         if (!listView.moved && listView.mouseMovedGlobally()) {
             listView.moved = true
             listView.currentIndex = index
         }
     }
 
     onContainsMouseChanged: {
         if (!containsMouse) {
             __pressed = false;
             __pressX = -1;
             __pressY = -1;
         } else {
             if (listView.moved) {
                 listView.currentIndex = index
             } else if (listView.mouseMovedGlobally()) {
                 listView.moved = true
                 listView.currentIndex = index
             }
         }
     }
 
     PlasmaComponents.Label {
         id: typeText
         text: resultDelegate.typeText
-        color: theme.textColor
         opacity: 0.5
 
         horizontalAlignment: Text.AlignRight
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
         textFormat: Text.PlainText
 
         width: resultDelegate.categoryWidth - units.largeSpacing
         anchors {
             left: parent.left
             verticalCenter: listItem.verticalCenter
         }
     }
 
     PlasmaComponents.ListItem {
         id: listItem
 
         readonly property int indexModifier: reversed ? 0 : 1
 
         // fake pressed look
         checked: resultDelegate.pressed
         separatorVisible: resultDelegate.sectionHasChanged
                        && !resultDelegate.isCurrent
                        && (index === 0 || resultDelegate.ListView.view.currentIndex !== (index - indexModifier))
 
         Item {
             id: labelWrapper
             anchors {
                 left: parent.left
                 right: parent.right
                 leftMargin: resultDelegate.categoryWidth
             }
             height: Math.max(typePixmap.height, displayLabel.height, subtextLabel.height)
 
             RowLayout {
                 anchors {
                     left: parent.left
                     right: actionsRow.left
                     rightMargin: units.smallSpacing
                 }
 
                 PlasmaCore.IconItem {
                     id: typePixmap
                     Layout.preferredWidth: units.iconSizes.small
                     Layout.preferredHeight: units.iconSizes.small
                     Layout.fillHeight: true
                     source: model.decoration
                     usesPlasmaTheme: false
                     animated: false
                 }
 
                 PlasmaComponents.Label {
                     id: displayLabel
                     text: String(typeof modelData !== "undefined" ? modelData : model.display)
 
                     height: undefined
 
                     elide: Text.ElideMiddle
                     wrapMode: Text.NoWrap
                     maximumLineCount: 1
                     verticalAlignment: Text.AlignVCenter
                     textFormat: Text.PlainText
 
                     Layout.maximumWidth: labelWrapper.width - typePixmap.width - actionsRow.width
                 }
 
                 PlasmaComponents.Label {
                     id: subtextLabel
 
                     // SourcesModel returns number of duplicates in this property
                     // ResultsModel just has it as a boolean as you would expect from the name of the property
                     text: model.isDuplicate === true || model.isDuplicate > 1 || resultDelegate.isCurrent ? String(model.subtext || "") : ""
 
-                    color: theme.textColor
                     // HACK If displayLabel is too long it will shift this label outside boundaries
                     // but still render the text leading to it overlapping the action buttons looking horrible
                     opacity: width > 0 ? 0.3 : 0
 
                     height: undefined
 
                     elide: Text.ElideMiddle
                     wrapMode: Text.NoWrap
                     maximumLineCount: 1
                     verticalAlignment: Text.AlignVCenter
                     textFormat: Text.PlainText
 
                     Layout.fillWidth: true
                 }
             }
 
             Row {
                 id: actionsRow
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
                 visible: resultDelegate.isCurrent
 
                 Repeater {
                     id: actionsRepeater
                     model: resultDelegate.additionalActions
 
                     PlasmaComponents.ToolButton {
                         width: height
                         height: listItem.height
                         visible: modelData.visible || true
                         enabled: modelData.enabled || true
                         tooltip: {
                             var text = modelData.text || ""
                             if (index === 0) { // Shift+Return will invoke first action
                                 text = i18ndc("milou", "placeholder is action e.g. run in terminal, in parenthesis is shortcut", "%1 (Shift+Return)", text)
                             }
                             return text
                         }
                         Accessible.role: Accessible.Button
                         Accessible.name: modelData.text
                         checkable: checked
                         checked: resultDelegate.activeAction === index
                         focus: resultDelegate.activeAction === index
 
                         PlasmaCore.IconItem {
                             anchors.centerIn: parent
                             width: units.iconSizes.small
                             height: units.iconSizes.small
                             // ToolButton cannot cope with QIcon
                             source: modelData.icon || ""
                             active: parent.hovered || parent.checked
                         }
 
                         onClicked: resultDelegate.ListView.view.runAction(index)
                     }
                 }
             }
         }
     }
 }
diff --git a/lib/qml/ResultsListViewDelegate.qml b/lib/qml/ResultsListViewDelegate.qml
index f80c9d4..db0bc71 100644
--- a/lib/qml/ResultsListViewDelegate.qml
+++ b/lib/qml/ResultsListViewDelegate.qml
@@ -1,94 +1,93 @@
 /*
  * This file is part of the KDE Milou Project
  * Copyright (C) 2013-2014 Vishesh Handa <me@vhanda.in>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) version 3, or any
  * later version accepted by the membership of KDE e.V. (or its
  * successor approved by the membership of KDE e.V.), which shall
  * act as a proxy defined in Section 6 of version 3 of the license.
  *
  * This library 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 import QtQuick 2.1
 import QtQuick.Layouts 1.1
 
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0 as QtExtra
 import "globals.js" as Globals
 
 MouseArea {
     id: resultDelegate
     property variant theModel: model
 
     width: listItem.implicitWidth
     height: listItem.implicitHeight
 
     hoverEnabled: true
     onEntered: {
         listView.currentIndex = index
     }
 
     PlasmaComponents.ListItem {
         id: listItem
         enabled: true
 
         onClicked: {
             listView.currentIndex = model.index
             listView.runCurrentIndex()
         }
 
         RowLayout {
             spacing: 7
 
             QtExtra.QIconItem {
                 id: typePixmap
                 width: Globals.IconSize
                 height: Globals.IconSize
 
                 icon: model.decoration
                 smooth: true
             }
 
             ColumnLayout {
                 Layout.fillWidth: true
 
                 PlasmaComponents.Label {
                     id: displayLabel
                     text: String(model.display)
 
                     height: typePixmap.height
 
                     elide: Text.ElideMiddle
                     maximumLineCount: 1
 
                     Layout.maximumWidth: parent.width - displayLabel.x
                 }
 
                 PlasmaComponents.Label {
                     id: subtextLabel
                     text: String(model.subtext)
 
-                    color: theme.textColor
                     opacity: 0.3
 
                     height: typePixmap.height
 
                     elide: Text.ElideRight
                     maximumLineCount: 1
                     Layout.fillWidth: true
                 }
             }
         }
     }
 }