diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 15bc465..0bcdd64 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -1,202 +1,202 @@
 /*
  *  Contact overlay buttons
  *
  *  Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *  Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
  *
  *  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 2 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, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "contact-overlays.h"
 
 #include <KLocale>
 #include <KIconLoader>
 #include <KDebug>
 
-#include <KTp/Models/contacts-model.h>
+#include <KTp/types.h>
 
 const int spacing = IconSize(KIconLoader::Dialog) / 8;
 
 class GuiItemContactViewHoverButton : public ContactViewHoverButton
 {
 public:
 
     GuiItemContactViewHoverButton(QAbstractItemView *parentView, const KGuiItem &gui);
     virtual QSize sizeHint() const;
 
 protected:
 
     virtual QPixmap icon();
     virtual void updateToolTip();
 
 private:
 
     KGuiItem m_guiItem;
 };
 
 GuiItemContactViewHoverButton::GuiItemContactViewHoverButton(QAbstractItemView *parentView, const KGuiItem &gui)
     : ContactViewHoverButton(parentView), m_guiItem(gui)
 {
 }
 
 QSize GuiItemContactViewHoverButton::sizeHint() const
 {
     return QSize(IconSize(KIconLoader::Small), IconSize(KIconLoader::Small));
 }
 
 QPixmap GuiItemContactViewHoverButton::icon()
 {
     return KIconLoader::global()->loadIcon(m_guiItem.iconName(),
                                            KIconLoader::NoGroup,
                                            IconSize(KIconLoader::Small));
 }
 
 void GuiItemContactViewHoverButton::updateToolTip()
 {
     setToolTip(m_guiItem.toolTip());
 }
 
 // -------------------------------------------------------------------------
 
 StartChannelContactOverlay::StartChannelContactOverlay(QObject *parent, const KGuiItem &gui,
                                                        int capabilityRole, int xpos)
     : ContactDelegateOverlay(parent),
       m_gui(gui),
       m_capabilityRole(capabilityRole),
       m_xpos(xpos)
 {
 }
 
 void StartChannelContactOverlay::setActive(bool active)
 {
     ContactDelegateOverlay::setActive(active);
 
     if (active) {
         connect(button(), SIGNAL(clicked(bool)),
                 this, SLOT(slotClicked(bool)));
     } else {
         // button is deleted
     }
 }
 
 ContactViewHoverButton* StartChannelContactOverlay::createButton()
 {
     return new GuiItemContactViewHoverButton(view(), m_gui);
 }
 
 void StartChannelContactOverlay::updateButton(const QModelIndex &index)
 {
     const QRect rect = m_view->visualRect(index);
     const QSize size = button()->size();
 
     const int gap = spacing / 2;
     const int x   = rect.left() + m_xpos; // rect.right() - gap - 96 - size.width();
     const int y   = rect.bottom() - gap - size.height();
     button()->move(QPoint(x, y));
 }
 
 void StartChannelContactOverlay::slotClicked(bool checked)
 {
     Q_UNUSED(checked);
     QModelIndex index = button()->index();
 
     if (index.isValid()) {
         Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
         Tp::ContactPtr contact = index.data(KTp::ContactRole).value<Tp::ContactPtr>();
         if (account && contact) {
             emit activated(account, contact);
         }
     }
 }
 
 bool StartChannelContactOverlay::checkIndex(const QModelIndex& index) const
 {
     return index.data(m_capabilityRole).toBool() && index.data(ContactsModel::TypeRole).toInt() == ContactsModel::ContactRowType;
 }
 
 // ------------------------------------------------------------------------
 
 TextChannelContactOverlay::TextChannelContactOverlay(QObject *parent)
     : StartChannelContactOverlay(
         parent,
         KGuiItem(i18n("Start Chat"), "text-x-generic",
                  i18n("Start Chat"), i18n("Start a text chat")),
-        ContactsModel::TextChatCapabilityRole,
+        KTp::ContactCanTextChatRole,
         IconSize(KIconLoader::Dialog) + spacing * 2)
 {
 }
 
 // ------------------------------------------------------------------------
 
 AudioChannelContactOverlay::AudioChannelContactOverlay(QObject *parent)
     : StartChannelContactOverlay(
         parent,
         KGuiItem(i18n("Start Audio Call"), "audio-headset",
                  i18n("Start Audio Call"), i18n("Start an audio call")),
-        ContactsModel::AudioCallCapabilityRole,
+        KTp::ContactCanAudioCallRole,
         IconSize(KIconLoader::Dialog) + spacing * 3 + IconSize(KIconLoader::Small))
 
 {
 }
 
 // -------------------------------------------------------------------------
 
 VideoChannelContactOverlay::VideoChannelContactOverlay(QObject *parent)
     : StartChannelContactOverlay(
         parent,
         KGuiItem(i18n("Start Video Call"), "camera-web",
                  i18n("Start Video Call"), i18n("Start a video call")),
-        ContactsModel::VideoCallCapabilityRole,
+        KTp::ContactCanVideoCallRole,
         IconSize(KIconLoader::Dialog) + spacing * 4 + IconSize(KIconLoader::Small) * 2)
 {
 }
 
 // -------------------------------------------------------------------------
 
 FileTransferContactOverlay::FileTransferContactOverlay(QObject *parent)
     : StartChannelContactOverlay(
         parent,
         KGuiItem(i18n("Send File..."), "mail-attachment",
                  i18n("Send File..."), i18n("Send a file")),
-        ContactsModel::FileTransferCapabilityRole,
+        KTp::ContactCanFileTransferRole,
         IconSize(KIconLoader::Dialog) + spacing * 5 + IconSize(KIconLoader::Small) * 3)
 {
 }
 
 // -------------------------------------------------------------------------
 
 DesktopSharingContactOverlay::DesktopSharingContactOverlay(QObject *parent)
     : StartChannelContactOverlay(
         parent,
         KGuiItem(i18n("Share My Desktop"), "krfb",
                  i18n("Share My Desktop"), i18n("Share desktop using RFB")),
-        ContactsModel::DesktopSharingCapabilityRole,
+        -1, //FIXME: the share desktop is now part of ContactTubesRole, not returning bool anymore, needs porting
         IconSize(KIconLoader::Dialog) + spacing * 6 + IconSize(KIconLoader::Small) * 4)
 {
 }
 
 //-------------------------------------------------------------------------
 
 LogViewerOverlay::LogViewerOverlay(QObject* parent)
     : StartChannelContactOverlay(
         parent,
         KGuiItem(i18n("Open Log Viewer"), "documentation",
                  i18n("Open Log Viewer"), i18n("Show conversation logs")),
         Qt::DisplayRole, /* Always display the logviewer action */
         IconSize(KIconLoader::Dialog) + spacing * 7 + IconSize(KIconLoader::Small) * 5)
 {
 }
 
 #include "contact-overlays.moc"