diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@
 set(LIBKDEPIM_LIB_VERSION_LIB "5.6.40")
 set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.6.40")
 set(CALENDARSUPPORT_LIB_VERSION_LIB "5.6.40")
-set(EVENTVIEW_LIB_VERSION_LIB "5.6.40")
+set(EVENTVIEW_LIB_VERSION_LIB "5.6.41")
 set(KCONTACTS_LIB_VERSION "5.6.40")
 
 find_package(KF5AkonadiSearch "5.6.40" CONFIG REQUIRED)
diff --git a/src/akonadicollectionview.cpp b/src/akonadicollectionview.cpp
--- a/src/akonadicollectionview.cpp
+++ b/src/akonadicollectionview.cpp
@@ -768,13 +768,11 @@
     const Akonadi::Collection collection = CalendarSupport::collectionFromIndex(index);
     Q_ASSERT(collection.isValid());
 
-    const QString identifier = QString::number(collection.id());
-    const QColor defaultColor = KOPrefs::instance()->resourceColor(identifier);
+    const QColor defaultColor = KOHelper::resourceColor(collection);
     QColor myColor;
     myColor = QColorDialog::getColor(defaultColor);
     if (myColor.isValid() && myColor != defaultColor) {
-        KOPrefs::instance()->setResourceColor(identifier, myColor);
-        KOPrefs::instance()->eventViewsPreferences()->writeConfig();
+        KOHelper::setResourceColor(collection, myColor);
         Q_EMIT colorsChanged();
         updateMenu();
         updateView();
@@ -787,9 +785,7 @@
     Q_ASSERT(index.isValid());
     const Akonadi::Collection collection = CalendarSupport::collectionFromIndex(index);
     Q_ASSERT(collection.isValid());
-    const QString identifier = QString::number(collection.id());
-    KOPrefs::instance()->setResourceColor(identifier, QColor());
-    KOPrefs::instance()->eventViewsPreferences()->writeConfig();
+    KOHelper::setResourceColor(collection, QColor());
     updateMenu();
     updateView();
     Q_EMIT colorsChanged();
@@ -845,8 +841,7 @@
         const Akonadi::Collection collection = CalendarSupport::collectionFromIndex(index);
 
         if (collection.isValid() && !collection.contentMimeTypes().isEmpty()) {
-            const QString identifier = QString::number(collection.id());
-            const QColor defaultColor = KOPrefs::instance()->resourceColor(identifier);
+            const QColor defaultColor = KOHelper::resourceColor(collection);
             enableAction = enableAction && defaultColor.isValid();
             if (collection.remoteId() == QLatin1String("akonadi_birthdays_resource")) {
                 enableAction = false;
diff --git a/src/kohelper.cpp b/src/kohelper.cpp
--- a/src/kohelper.cpp
+++ b/src/kohelper.cpp
@@ -25,8 +25,9 @@
 #include "kohelper.h"
 #include "prefs/koprefs.h"
 
-#include <CalendarSupport/KCalPrefs>
+#include <EventViews/Helper>
 
+#include <CalendarSupport/KCalPrefs>
 #include <KMessageBox>
 
 QColor KOHelper::getTextColor(const QColor &c)
@@ -37,40 +38,23 @@
 
 QColor KOHelper::resourceColor(const Akonadi::Collection &coll)
 {
-    if (!coll.isValid()) {
-        return QColor();
-    }
-
-    const QString id = QString::number(coll.id());
-    return KOPrefs::instance()->resourceColor(id);
+    return EventViews::resourceColor(coll, KOPrefs::instance()->eventViewsPreferences());
 }
 
 QColor KOHelper::resourceColorKnown(const Akonadi::Collection &coll)
 {
-    if (!coll.isValid()) {
-        return QColor();
-    }
-
-    const QString id = QString::number(coll.id());
-    return KOPrefs::instance()->resourceColorKnown(id);
+    return EventViews::resourceColor(coll, KOPrefs::instance()->eventViewsPreferences());
 }
 
 void KOHelper::setResourceColor(const Akonadi::Collection &collection, const QColor &color)
 {
-    if (collection.isValid()) {
-        const QString id = QString::number(collection.id());
-        return KOPrefs::instance()->setResourceColor(id, color);
-    }
+    EventViews::setResourceColor(collection, color, KOPrefs::instance()->eventViewsPreferences());
+    KOPrefs::instance()->eventViewsPreferences()->writeConfig();
 }
 
 QColor KOHelper::resourceColor(const Akonadi::Item &item)
 {
-    if (!item.isValid()) {
-        return QColor();
-    }
-
-    const QString id = QString::number(item.storageCollectionId());
-    return KOPrefs::instance()->resourceColor(id);
+    return EventViews::resourceColor(item, KOPrefs::instance()->eventViewsPreferences());
 }
 
 int KOHelper::yearDiff(const QDate &start, const QDate &end)