diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a88630c..1a19d4bc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,363 +1,334 @@
 IF(POLICY CMP0017)
    CMAKE_POLICY(SET CMP0017 NEW)
 ENDIF(POLICY CMP0017)
 
 IF(POLICY CMP0022)
    CMAKE_POLICY(SET CMP0022 NEW)
 ENDIF(POLICY CMP0022)
 
 IF(POLICY CMP0063)
    CMAKE_POLICY(SET CMP0063 NEW)
 ENDIF(POLICY CMP0063)
 
 SET(QT_MIN_VERSION  "5.2.0")
 
 ADD_DEFINITIONS(
    ${KF5_DEFINITIONS}
    ${QT_DEFINITIONS}
    -fexceptions
    -Wno-error
    -Wno-reorder
    -Wno-error=deprecated-declarations
 )
 
 # It doesn't work in sandboxes
 IF (NOT ENABLE_SINGLE_INSTANCE)
    ADD_DEFINITIONS(-DDISABLE_KDBUS_SERVICE=1)
 ENDIF()
 
 # Enable some useful warnings
 ADD_DEFINITIONS(
    -Wall
    -Wextra
    -Wmissing-declarations
    -Wmissing-noreturn
    -Wpointer-arith
    -Wcast-align
    -Wwrite-strings
    -Wformat-nonliteral
    -Wformat-security
    -Wswitch-enum
    -Winit-self
    -Wmissing-include-dirs
    -Wundef
    -Wmissing-format-attribute
    -Wno-reorder
    -Wunused
    -Wuninitialized
    -Woverloaded-virtual
    -Wunused-value
    -pedantic
    -Wnonnull
    -Wsequence-point
    #-Wsystem-headers
    -Wsizeof-pointer-memaccess
    #-Wuseless-cast
    -Wvarargs
 )
 
 #Add more warnings for compilers that support it. I used this command:
 #curl https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Warning-Options.html | \
 #grep -E "^[\t ]+<br><dt><code>-W[a-zA-Z=-]*" -o | grep -E "\-W[a-zA-Z=-]*" -o >
 #cat /tmp/48 /tmp/49 | sort | uniq -u
 # IF (CMAKE_COMPILER_IS_GNUCC)
 
 IF (CMAKE_COMPILER_IS_GNUCC)
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9)
       ADD_DEFINITIONS(
          -Wunused-but-set-parameter
          -Wconditionally-supported
          -Wno-cpp
 #          -Wdouble-promotion
          -Wdate-time
          -Wdelete-incomplete
 #          -Wfloat-conversion
       )
    ENDIF()
 
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9)
       ADD_DEFINITIONS(
          -Wno-pragmas
       )
    ENDIF()
 
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0)
       ADD_DEFINITIONS(
          -Wsuggest-override
          -Wsuggest-final-types
          -Wsuggest-final-methods
          -Wbool-compare
          -Wformat-signedness
          -Wlogical-not-parentheses
          -Wnormalized
          -Wshift-count-negative
          -Wshift-count-overflow
          -Wsized-deallocation
          -Wsizeof-array-argument
       )
    ENDIF()
 
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 6.0)
       ADD_DEFINITIONS(
          -Wnull-dereference
          -Wtautological-compare
          -Wduplicated-cond
          -Wmisleading-indentation
       )
    ENDIF()
 
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.0)
       ADD_DEFINITIONS(
          -Wimplicit-fallthrough
          -Wduplicated-branches
          -Wswitch-unreachable
          -Wformat-overflow
          -Wformat-truncation
          -Wnonnull
       )
    ENDIF()
 
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 8.0)
       ADD_DEFINITIONS(
         -Wmultistatement-macros
         -Wstringop-truncation
         -Wif-not-aligned
         -Wmissing-attributes
       )
    ENDIF()
 ENDIF()
 
 IF (CMAKE_COMPILER_IS_GNUCC)
    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE CMAKE_CXX_COMPILER_VERSION)
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6.9 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6)
       #GCC 4.6 version of those warnings does detect valid C++0x/C++11 as invalid.
       ADD_DEFINITIONS(
          -Wno-error=pragmas
          -Wno-pragmas
          -Wno-error
       )
    ENDIF()
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.7 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.7)
       ADD_DEFINITIONS(
          -Wmaybe-uninitialized
          -Wunused-local-typedefs
          -pedantic
       )
    ENDIF()
    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.8)
 #       ADD_DEFINITIONS("-Wzero-as-null-pointer-constant")
 #       ADD_DEFINITIONS( -DENABLE_IGNORE_NULL=true )
    ENDIF()
 ELSE()
    ADD_DEFINITIONS(-Wno-unknown-pragmas -Wno-unknown-warning-option)
 ENDIF()
 
 ADD_DEFINITIONS("-std=c++0x")
 
 #Make sure it can access DBUS autogenerated files
 INCLUDE_DIRECTORIES(SYSTEM
    ${KF5_INCLUDES}
    ${Qt5Widgets_INCLUDES}
    ${Qt5PrintSupport_INCLUDES}
    ${Qt5Core_INCLUDES}
    ${CMAKE_BINARY_DIR}
    ${ringqt_INCLUDE_DIR}
    ${LIB_TIP_INCLUDE}
    ${LIB_CONFIG_INCLUDE}
    ${LIB_CONFIG_WIDGETS}
 )
 
 # Shared C++ QML components
 ADD_SUBDIRECTORY( qmlwidgets )
 
-# Pack the icons shared by various components
-ADD_SUBDIRECTORY( sharedassets )
-
 #Build KDE specific files
-ADD_SUBDIRECTORY( klib )
+ADD_SUBDIRECTORY( jamikdeintegration )
 
 # Build the QML based first run Wizard
 ADD_SUBDIRECTORY( wizard )
 
 # Build the QML based interactive video canvas
 ADD_SUBDIRECTORY( callview )
 
 # Build the advanced phone dialer
 ADD_SUBDIRECTORY( dialview )
 
 # Build the views and widgets related to the social timeline feature
 ADD_SUBDIRECTORY( timeline )
 
 # Build the contact and profile photo editor dialog
 ADD_SUBDIRECTORY( photoselector )
 
 # Build the elements used to notify the users of events
 ADD_SUBDIRECTORY( canvasindicators )
 
 # Build the contact manager subsystem
 ADD_SUBDIRECTORY( contactview )
 
 # Build the account manager subsystem
 ADD_SUBDIRECTORY( accountview )
 
 # Build the main desktop component
 ADD_SUBDIRECTORY( desktopview )
 
+# ADD_DEPENDENCIES(desktopview DEPENDS jamikdeintegration)
+
 IF(${CMAKE_BUILD_TYPE} MATCHES Release)
    MESSAGE("NO DEBUG OUTPUT")
    ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT)
 ELSE()
 
 ENDIF(${CMAKE_BUILD_TYPE} MATCHES Release)
 
-# Delegates
-SET(
-   ring_kde_PROXIES
-   delegates/kdepixmapmanipulation.cpp
-   proxies/simplerotateproxy.cpp
-   proxies/deduplicateproxy.cpp
-   proxies/filtertoplevelproxy.cpp
-   proxies/roletransformationproxy.cpp
-   proxies/flagsfilterproxy.cpp
-   proxies/pollingproxy.cpp
-)
-
 SET(
    ring_kde_SRCS
    main.cpp
    cmd.cpp
-   notification.cpp
    ringapplication.cpp
    errormessage.cpp
-   actioncollection.cpp
-   implementation.cpp
-   model/extendedprotocolmodel.cpp
-   ${ring_kde_PROXIES}
-   widgets/systray.cpp
 )
 
-
-IF (Qt5TextToSpeech_FOUND)
-
-SET(
-   ring_kde_SRCS
-   ${ring_kde_SRCS}
-   accessibility.cpp
-)
-ENDIF()
-
 # generate rules for building source files from the resources
 SET(QtApp_RCCS
    qrc/resources.qrc
 #    conf/confresources.qrc
    ../data/appicon.qrc
 )
 QT5_ADD_RESOURCES(QtApp_RCC_SRCS ${QtApp_RCCS})
 
 # add_subdirectory( test   ) #Enable again some day, it cause compile problems for some users
 
 IF(NOT (${ENABLE_VIDEO} MATCHES false))
    SET(ENABLE_VIDEO 1 CACHE BOOLEAN "Enable video")
    ADD_DEFINITIONS( -DENABLE_VIDEO=true )
    SET (
       config_ui_files
       ${config_ui_files}
       conf/dlgvideobase.ui
    )
 ENDIF(NOT (${ENABLE_VIDEO} MATCHES false))
 
 IF(${DISABLE_UNIQUE_APPLICATION} MATCHES true)
    MESSAGE("KUniqueApplication disabled")
    SET(DISABLE_UNIQUE_APPLICATION 1 CACHE BOOLEAN "Disable KUniqueApplication")
    ADD_DEFINITIONS( -DDISABLE_UNIQUE_APPLICATION=true )
 ENDIF(${DISABLE_UNIQUE_APPLICATION} MATCHES true)
 
 ki18n_wrap_ui(ring_kde_SRCS ${config_ui_files} )
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   ADD_EXECUTABLE(ring-kde MACOSX_BUNDLE ${ring_kde_SRCS} ${QtApp_RCC_SRCS})
 
   set_source_files_properties( ../data/ring-kdeui.rc PROPERTIES MACOSX_PACKAGE_LOCATION Resources )
   file( COPY ../data/ring-kdeui.rc DESTINATION "ring-kde.app/Contents/Resources/" )
 ELSE()
   ADD_EXECUTABLE(ring-kde ${ring_kde_SRCS} ${QtApp_RCC_SRCS})
 ENDIF()
 
 IF(NOT ${ENABLE_STATIC} MATCHES false)
   FIND_PACKAGE(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED DBus)
   INCLUDE_DIRECTORIES(SYSTEM ${Qt5DBus_INCLUDE_DIRS} )
   LINK_DIRECTORIES(${Qt5DBus_LIBRARY_DIRS} )
   ADD_DEFINITIONS(${Qt5DBus_CFLAGS})
 
   IF(NOT DEFINED OS_ANDROID)
     TARGET_LINK_LIBRARIES(ring-kde
       -lpthread
     )
   ENDIF()
 
   TARGET_LINK_LIBRARIES(ring-kde
     ${ringqt_LIBRARY_STATIC}
   )
 
   IF(NOT ${ENABLE_LIBWRAP})
     TARGET_LINK_LIBRARIES(ring-kde
         ${Qt5DBus_LIBRARIES}
     )
   ENDIF()
 
 ELSE()
    TARGET_LINK_LIBRARIES(ring-kde ${ringqt_LIBRARY_DYNAMIC})
 ENDIF()
 
 QT5_ADD_DBUS_ADAPTOR(ring_kde_SRCS ../data/org.kde.kuiserver.xml cmd.h Cmd )
 
 TARGET_LINK_LIBRARIES(ring-kde
-  libkring
-  libwizard
+  jamiwizard
   libcallview
   dialview
   libtimeline
   libphotoselector
   libcanvasindicator
   desktopview
   contactview
-  accountview
+  jamiaccountview
   libqmlwidgets
   kquickitemviews
+  jamikdeintegration
 
   # RingQt
   ringqtquick
 
   # Qt5
   Qt5::Widgets
   Qt5::Core
   Qt5::Gui
   Qt5::Svg
   Qt5::PrintSupport
 
   # KF5
   KF5::I18n
   KF5::WidgetsAddons
   KF5::ConfigCore
   KF5::ConfigGui
   KF5::DBusAddons
   KF5::XmlGui
   KF5::Notifications
   KF5::IconThemes
   KF5::Crash
   KF5::NotifyConfig
   KF5::GlobalAccel
   KF5::Declarative
   KF5::Kirigami2
 )
 
 IF (Qt5TextToSpeech_FOUND)
    TARGET_LINK_LIBRARIES(ring-kde
       Qt5::TextToSpeech
    )
 ENDIF()
 
 ########### install files ###############
 
 INSTALL( TARGETS ring-kde                     DESTINATION ${BIN_INSTALL_DIR}           )
 INSTALL( FILES wizard/assets/beta_logo.svg    DESTINATION ${DATA_INSTALL_DIR}/ring-kde )
diff --git a/src/accountview/CMakeLists.txt b/src/accountview/CMakeLists.txt
index 4dedc6ee..ef90d01a 100644
--- a/src/accountview/CMakeLists.txt
+++ b/src/accountview/CMakeLists.txt
@@ -1,30 +1,119 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+cmake_minimum_required(VERSION 3.0)
 
-ADD_DEFINITIONS("-std=c++11")
+project(jamiaccountview)
 
-PROJECT(accountview)
+if(POLICY CMP0063)
+   CMAKE_POLICY(SET CMP0063 NEW)
+endif(POLICY CMP0063)
 
-SET(CMAKE_AUTOMOC ON)
-SET(CMAKE_AUTORCC ON)
-SET(CMAKE_AUTOUIC ON)
+find_package(ECM 1.1.0 REQUIRED NO_MODULE)
+list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}")
 
-SET(GENERIC_LIB_VERSION "1.0.0")
+include(ECMInstallIcons)
+include(ECMOptionalAddSubdirectory)
+include(CMakePackageConfigHelpers)
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+
+SET(CMAKE_C_VISIBILITY_PRESET hidden)
+SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
+SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+# When used with `add_subdirectory`, assume it is a static Qt plugin
+get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY)
+if(USES_ADD_SUBDIRECTORY)
+   set(BUILD_SHARED_LIBS OFF)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 14)
+
+if(NOT BUILD_SHARED_LIBS)
+    set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in
+    add_definitions(-DQT_PLUGIN)
+    add_definitions(-DQT_STATICPLUGIN=1)
+    add_definitions(-DJAMIACCOUNTVIEW_USE_STATIC_PLUGIN=1)
+endif()
+
+find_package(Qt5 CONFIG REQUIRED
+    Core Gui Quick QuickControls2
+)
+
+set(GENERIC_LIB_VERSION "1.0.0")
 
 #File to compile
-SET( accountview_LIB_SRCS
-   accountviewplugin.cpp
+set( jamiaccountview_LIB_SRCS
+    accountviewplugin.cpp
 )
 
-QT5_ADD_RESOURCES(accountview_LIB_SRCS
-    accountview.qrc
+qt5_add_resources(jamiaccountview_LIB_SRCS
+   accountview.qrc
 )
 
-ADD_LIBRARY( accountview STATIC ${accountview_LIB_SRCS} )
+set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamiaccountview)
+
+add_library(jamiaccountview ${jamiaccountview_LIB_SRCS} )
+
+target_link_libraries( jamiaccountview
+    # Project
+    ringqt
+    ringqtquick
 
-target_link_libraries( accountview
+    # Qt
     Qt5::Core
     Qt5::Gui
     Qt5::Quick
     Qt5::QuickControls2
-    KF5::ConfigWidgets
+)
+
+# Configure the target config
+set(jamiaccountview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiAccountViewConfig.cmake")
+
+if(USES_ADD_SUBDIRECTORY)
+   set(JamiAccountView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
+
+configure_package_config_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiAccountViewConfig.cmake.in" ${jamiaccountview_CONFIG_PATH}
+   INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAccountView/
+   PATH_VARS INCLUDE_INSTALL_DIR
+)
+
+install( FILES ${jamiaccountview_CONFIG_PATH}
+    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAccountView/
+    COMPONENT Devel
+)
+
+# Create the target
+target_include_directories(jamiaccountview
+    PUBLIC
+        $<INSTALL_INTERFACE:include/JamiAccountView>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/
+)
+
+set_target_properties(jamiaccountview PROPERTIES
+    PUBLIC_HEADER
+    "${jamiaccountview_EXPORT_HDRS}"
+)
+
+export(TARGETS jamiaccountview
+    FILE "${PROJECT_BINARY_DIR}/cmake/JamiAccountViewTargets.cmake"
+)
+
+install(TARGETS jamiaccountview
+    EXPORT JamiAccountViewTargets
+    LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamiaccountview
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    COMPONENT Devel
+)
+
+install(EXPORT JamiAccountViewTargets
+    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAccountView
+    COMPONENT Devel
 )
diff --git a/src/accountview/accountviewplugin.cpp b/src/accountview/accountviewplugin.cpp
index e16dad5f..5f2358a8 100644
--- a/src/accountview/accountviewplugin.cpp
+++ b/src/accountview/accountviewplugin.cpp
@@ -1,26 +1,27 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "accountviewplugin.h"
 
 #include <QtCore/QDebug>
 
 #include <qrc_accountview.cpp>
 
-void AccountView::registerTypes(const char *)
+void JamiAccountView::registerTypes(const char *)
 {
+
 }
diff --git a/src/accountview/accountviewplugin.h b/src/accountview/accountviewplugin.h
index d635dd91..0e44da8d 100644
--- a/src/accountview/accountviewplugin.h
+++ b/src/accountview/accountviewplugin.h
@@ -1,30 +1,29 @@
 /***************************************************************************
  *   Copyright (C) 2018 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 <QtCore/QObject>
+#include <QQmlExtensionPlugin>
 
-//![plugin]
-class AccountView final : public QObject
+class Q_DECL_EXPORT JamiAccountView final : public QQmlExtensionPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.kde.ringkde.jamiaccountview" FILE "jamiaccountview.json")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char* uri) override;
 };
-//![plugin]
diff --git a/src/accountview/cmake/JamiAccountViewConfig.cmake.in b/src/accountview/cmake/JamiAccountViewConfig.cmake.in
new file mode 100644
index 00000000..581e940a
--- /dev/null
+++ b/src/accountview/cmake/JamiAccountViewConfig.cmake.in
@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+#Allow users to when to use Q_IMPORT_PLUGIN in main.cpp
+if(@ENABLE_STATIC_PLUGIN@ MATCHES 1)
+    add_definitions(-DJAMIWIZARD_USE_STATIC_PLUGIN=1)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/JamiAccountViewTargets.cmake")
diff --git a/src/accountview/jamiaccountview.json b/src/accountview/jamiaccountview.json
new file mode 100644
index 00000000..b20c6efa
--- /dev/null
+++ b/src/accountview/jamiaccountview.json
@@ -0,0 +1,4 @@
+{
+    "Keys": [ "org.kde.ringkde.jamiaccountview" ],
+    "uri": ["org.kde.ringkde.jamiaccountview"]
+}
diff --git a/src/accountview/qml/accountlist.qml b/src/accountview/qml/accountlist.qml
index 9d3badbe..15e1da38 100644
--- a/src/accountview/qml/accountlist.qml
+++ b/src/accountview/qml/accountlist.qml
@@ -1,297 +1,297 @@
 /***************************************************************************
  *   Copyright (C) 2018 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 import QtQuick 2.7
 import QtQuick.Layouts 1.0
 import RingQmlWidgets 1.0
 import Ring 1.0
 import QtQuick.Controls 2.2
 import ContactView 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 ListView {
     id: accountList
     interactive: false
     height: totalHeight
     implicitHeight: totalHeight
-    model: RingQtQuick.session.accountModel
+    model: RingSession.accountModel
 
     property real totalHeight: footerItem + contentHeight + headerItem + 10
 
     property real footerItem: 0
     property real headerItem: 0
 
     property bool enableAdd: true
 
     Component {
         id: accountErrorComponent
         RowLayout {
             anchors.fill: parent
 
             Image {
                 Layout.fillHeight: true
                 fillMode: Image.PreserveAspectFit
                 width: parent.width
                 sourceSize.width: 22
                 sourceSize.height: 22
                 horizontalAlignment: Image.AlignHCenter
                 source: "image://SymbolicColorizer/:/sharedassets/outline/warning.svg"
             }
             Label {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 text: error
                 color: activePalette.text
                 wrapMode: Text.WordWrap
                 width: parent.width
             }
         }
     }
 
     Component {
         id: defaultAccountComponent
         RowLayout {
             CheckBox {
                 Layout.fillHeight: true
                 Layout.preferredWidth: Kirigami.Units.fontMetrics.height * 2
                 Layout.minimumWidth: Kirigami.Units.fontMetrics.height * 2
                 checked: obj.enabled
                 onClicked: {
                     obj.enabled = checked
                     obj.performAction(RingQtQuick.Account.SAVE)
                 }
             }
 
             Rectangle {
                 height: Kirigami.Units.fontMetrics.height * 0.66
                 width: Kirigami.Units.fontMetrics.height * 0.66
                 radius: 99
                 color: obj.registrationState == RingQtQuick.Account.READY ?
                     Kirigami.Theme.positiveTextColor : (
                         obj.registrationState == RingQtQuick.Account.TRYING ?
                             Kirigami.Theme.neutralTextColor : Kirigami.Theme.negativeTextColor
                     )
             }
 
             Label {
                 Layout.fillHeight: true
                 Layout.fillWidth: true
                 text: obj.alias
             }
 
             Item {
                 Layout.fillHeight: true
                 KQuickItemViews.DecorationAdapter {
                     pixmap: secIcon
                     anchors.verticalCenter: parent.verticalCenter
                     height: (Kirigami.Units.fontMetrics.height * 2) - 6
                     width:  (Kirigami.Units.fontMetrics.height * 2) - 6
                 }
             }
 
             // Do not cover the handle
             Item {
                 width: (Kirigami.Units.fontMetrics.height * 2)
             }
         }
     }
 
     Component {
         id: errorComponent
         RowLayout {
             anchors.fill: parent
 
             CheckBox {
                 Layout.fillHeight: true
                 Layout.preferredWidth: Kirigami.Units.fontMetrics.height * 2
                 Layout.minimumWidth: Kirigami.Units.fontMetrics.height * 2
                 checked: obj.enabled
                 onClicked: {
                     obj.enabled = checked
                     obj.performAction(RingQtQuick.Account.SAVE)
                 }
             }
 
             Rectangle {
                 height: Kirigami.Units.fontMetrics.height * 0.66
                 width: Kirigami.Units.fontMetrics.height * 0.66
                 radius: 99
                 color: obj.registrationState == RingQtQuick.Account.READY ?
                     Kirigami.Theme.positiveTextColor : (
                         obj.registrationState == RingQtQuick.Account.TRYING ?
                         Kirigami.Theme.neutralTextColor : Kirigami.Theme.negativeTextColor
                     )
             }
 
             ColumnLayout {
                 Layout.fillHeight: true
                 Layout.fillWidth: true
 
                 Loader {
                     property string error: obj.lastErrorMessage
                     property int code: obj.lastErrorCode
                     id: accountError
                     Layout.minimumHeight: active ? Kirigami.Units.fontMetrics.height * 1.5 : 0
                     Layout.fillWidth: true
                     active: true
 
                     sourceComponent: accountErrorComponent
                 }
 
                 Label {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
                     text: obj.alias
                 }
             }
 
             KQuickItemViews.DecorationAdapter {
                 pixmap: secIcon
                 anchors.verticalCenter: parent.verticalCenter
                 height: (Kirigami.Units.fontMetrics.height * 2) - 6
                 width:  (Kirigami.Units.fontMetrics.height * 2) - 6
             }
 
             // Do not cover the handle
             Item {
                 width: (Kirigami.Units.fontMetrics.height * 2)
             }
         }
     }
 
     Loader {
         id: accountDeleter
         property string name: ""
         property var account: ""
         active: false
         sourceComponent: Dialog {
             height: 150
             parent: applicationWindow().contentItem
             x: applicationWindow().contentItem.width / 2 - width/2
             y: applicationWindow().contentItem.height / 2 - height/2
             standardButtons: Dialog.Ok | Dialog.Cancel
             closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
             modal: true
             title: i18n("Delete an account")
 
             Label {
                 text: i18n("<center>Are you sure you want to delete the account called ")
                     + name + i18n(". <br><br> This cannot be undone and you will lose the account <b>permanently</b></center>")
             }
 
             onAccepted: {
                 accountDeleter.active = false
                 RingSession.accountModel.remove(account)
                 RingSession.accountModel.save()
                 accountDeleter.account = null
             }
 
             onRejected: {
                 accountDeleter.active = false
                 accountDeleter.account = null
             }
         }
     }
 
     delegate: Kirigami.SwipeListItem {
         property bool hasProblems: object.enabled && registrationState != RingQtQuick.Account.READY
 
         height: Kirigami.Units.fontMetrics.height * (hasProblems ? 3.5 : 2)
         width: accountList.width
 
         actions: [
             Kirigami.Action {
                 iconName: "message-news"
                 text: i18n("Status logs")
                 onTriggered: {
                     object.performAction(RingQtQuick.Account.RELOAD)
                 }
             },
             Kirigami.Action {
                 iconName: "document-share"
                 text: i18n("Share")
                 onTriggered: {
                     //TODO
                 }
             },
             Kirigami.Action {
                 iconName: "edit-delete"
                 text: i18n("Delete")
                 onTriggered: {
                     accountDeleter.name = alias
                     accountDeleter.account = object
                     accountDeleter.active = true
                     accountDeleter.item.open()
                     //applicationWindow().globalDrawer.drawerOpen = false //FIXME
                 }
             },
             Kirigami.Action {
                 iconName: "view-refresh"
                 text: i18n("Reload")
                 onTriggered: {
                     object.performAction(RingQtQuick.Account.RELOAD)
                 }
             }
         ]
 
         Loader {
             anchors.fill: parent
             property QtObject obj: object
             property var secIcon: securityLevelIcon
             sourceComponent: hasProblems ?
                 errorComponent : defaultAccountComponent
         }
     }
 
     header: Kirigami.Heading {
         level: 2
         text: i18n("Accounts")
 
         Component.onCompleted: {
             headerItem = Math.max(height, implicitHeight)
         }
 
         onHeightChanged: {
             headerItem = Math.max(height, implicitHeight)
         }
     }
 
     footer: OutlineButton {
         id: mainArea
         height: enableAdd ? fontMetrics.height * 3.5 : 0
         expandedHeight: fontMetrics.height * 3.5
         sideMargin: 2
         width: parent.width
         label: i18n("Add an account")
         topPadding: 2
         visible: enableAdd
         onClicked: {
             applicationWindow().globalDrawer.drawerOpen = false
             ActionCollection.showWizard.trigger()
         }
 
         Component.onCompleted: {
             footerItem = Math.max(height, implicitHeight)
         }
 
         onHeightChanged: {
             footerItem = Math.max(height, implicitHeight)
         }
     }
 }
diff --git a/src/cmd.cpp b/src/cmd.cpp
index 3775301f..d430ffcf 100644
--- a/src/cmd.cpp
+++ b/src/cmd.cpp
@@ -1,221 +1,221 @@
 /***************************************************************************
  *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "cmd.h"
 
 //Qt
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QCommandLineOption>
 
 //KDE
 #include <KAboutData>
 #include <klocalizedstring.h>
 
 //Ring
 #include <call.h>
 #include <callmodel.h>
 #include <session.h>
 #include <media/text.h>
 #include "ringapplication.h"
-#include "klib/kcfg_settings.h"
+#include "kcfg_settings.h"
 
 //Static definition
 Cmd* Cmd::m_spSelf = nullptr;
 
 ///(Private) constructor
 Cmd::Cmd(QObject* parent) : QObject(parent)
 {
 }
 
 ///Signleton
 Cmd* Cmd::instance() {
    if (!m_spSelf) {
       m_spSelf = new Cmd();
    }
    return m_spSelf;
 }
 
 ///Setup command line options before passing them to the KUniqueApplication
 bool Cmd::parseCmd(int argc, char **argv, KAboutData& about)
 {
    Q_UNUSED(argc)
    Q_UNUSED(argv)
 
    QCoreApplication* app = QCoreApplication::instance();
 
    QCommandLineOption call      (QStringList { "place-call" }, i18n("Place a call to a given number"                                              ), QStringLiteral("number" ), QLatin1String(""));
    QCommandLineOption text      (QStringList { "send-text"  }, i18n("Send a text to &lt;number&gt;, use --message to set the content, then hangup"), QStringLiteral("number" ), QLatin1String(""));
    QCommandLineOption message   (QStringList { "message"    }, i18n("Used in combination with --send-text"                                        ), QStringLiteral("content"), QLatin1String(""));
    QCommandLineOption icon      (QStringList { "iconify"    }, i18n("Start in the system tray"                                                    )                                             );
    QCommandLineOption showPhone (QStringList { "phone"      }, i18n("Start with the phone interface"                                              )                                             );
    QCommandLineOption showTimeL (QStringList { "timeline"   }, i18n("Start with the timeline interface"                                           )                                             );
 
    QCommandLineParser parser;
    parser.addOptions({call,text,message,icon,showPhone,showTimeL});
 
    about.setupCommandLine(&parser);
 
    parser.process(*app);
 
    about.processCommandLine(&parser);
 
    const auto versionOption = parser.addVersionOption();
    const auto helpOption    = parser.addHelpOption   ();
 
    if (parser.isSet(versionOption) || parser.isSet(helpOption))
       return false;
 
    RingApplication::instance()->init();
 
    if (parser.isSet(call))
       placeCall(parser.value(call));
 
    if (parser.isSet(icon))
       iconify();
    if (parser.isSet(showPhone))
       phoneInterface();
    if (parser.isSet(showTimeL))
       timelineInterface();
 
    if (parser.isSet(text) && parser.isSet(message))
       sendText(parser.value(text),parser.value(message));
 
    return true;
 }
 
 ///Place a call (from the command line)
 void Cmd::placeCall(const QString& number)
 {
    if (number.isEmpty()) {
       qWarning() << "Example: --place-call 123@example.com";
       return;
    }
 
    //Wait until the initialization is done
    QTimer::singleShot(0,[number] {
       Call* call = Session::instance()->callModel()->dialingCall();
       call->reset();
       call->appendText(number);
       call->performAction(Call::Action::ACCEPT);
    });
 }
 
 ///Send a text ans hang up (from the command line)
 void Cmd::sendText(const QString& number, const QString& text)
 {
    Q_UNUSED(number)
    Q_UNUSED(text)
    QTimer::singleShot(0,[number,text] {
       Call* call = Session::instance()->callModel()->dialingCall();
       call->reset();
       call->appendText(number);
       call->setProperty("message",text);
       QObject::connect(call,&Call::lifeCycleStateChanged,[text,call](const Call::LifeCycleState st) {
          if (st == Call::LifeCycleState::PROGRESS) {
             call->addOutgoingMedia<Media::Text>()->send({{"text/plain",call->property("message").toString()}});
             call->performAction(Call::Action::REFUSE); //HangUp
          }
       });
       call->performAction(Call::Action::ACCEPT);
    });
 }
 
 void Cmd::iconify()
 {
    if (RingApplication::instance()) {
       RingApplication::instance()->setIconify(true);
    }
 }
 
 void Cmd::phoneInterface()
 {
    //FIXME
 }
 
 void Cmd::timelineInterface()
 {
    //FIXME
 }
 
 void Cmd::slotActivateActionRequested (const QString&, const QVariant&)
 {
 }
 
 /**
  * This function is called when a new client try to open. It will stop but this
  * process need to take care of its arguments.
  */
 void Cmd::slotActivateRequested (const QStringList& args, const QString& cwd)
 {
    Q_UNUSED(cwd)
 
    enum class Current {
       NONE      , /* No args */
       PLACE_CALL, /* One arg */
       SEND_TEXT , /* One arg */
       MESSAGE   , /* One arg */
       MINIMIZED   /* No args */
    };
 
    Current current = Current::NONE;
    bool sendMessage = false;
    QStringList messages;
    QString sendTextTo;
 
    for(const QString& arg : args) {
       if (current != Current::NONE) {
          switch(current) {
             case Current::NONE      :
             case Current::MINIMIZED :
                //Iconify do nothing when the executable is already started
                break;
             case Current::SEND_TEXT :
                sendTextTo = arg;
                break;
             case Current::PLACE_CALL:
                placeCall(arg);
                break;
             case Current::MESSAGE   :
                messages << arg;
                break;
          }
       }
       else {
          if (arg == QLatin1String("--place-call"))
             current = Current::PLACE_CALL;
          else if (arg == QLatin1String("--send-text"))
             sendMessage = true;
          else if (arg == QLatin1String("--message"))
             current = Current::MESSAGE;
          else if (arg == QLatin1String("--iconify"))
          {}//TODO
       }
    }
 
    if (sendMessage && sendTextTo.size() && messages.size()) {
       foreach (const QString& msg, messages)
          sendText(sendTextTo, msg);
    }
 }
 
 void Cmd::slotOpenRequested (const QList<QUrl>&)
 {
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/conf/dlggeneral.cpp b/src/conf/dlggeneral.cpp
deleted file mode 100644
index 6a09cf6f..00000000
--- a/src/conf/dlggeneral.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2009-2015 by Savoir-Faire Linux                          *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
- *            Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "dlggeneral.h"
-
-//Qt
-#include <QtWidgets/QToolButton>
-#include <QtWidgets/QAction>
-#include <QtGui/QIcon>
-
-//KDE
-#include <kmessagebox.h>
-#include <klocalizedstring.h>
-
-//Ring
-#include "klib/kcfg_settings.h"
-#include "callhistorymodel.h"
-#include "session.h"
-
-///Constructor
-DlgGeneral::DlgGeneral(KConfigDialog *parent)
- : QWidget(parent),m_HasChanged(false)
-{
-//    setupUi(this);
-//    connect(toolButton_historyClear, &QAbstractButton::clicked, this, &DlgGeneral::slotClearCallHistoryAsked);
-//    const bool isLimited = Session::instance()->historyModel()->isHistoryLimited();
-//    m_pKeepHistory->setChecked(!isLimited);
-//    m_pHistoryMax ->setEnabled(isLimited );
-//
-//    m_pHistoryMax->setValue(Session::instance()->historyModel()->historyLimit());
-//    m_HasChanged = false;
-}
-
-///Destructor
-DlgGeneral::~DlgGeneral()
-{
-}
-
-///Have this dialog changed
-bool DlgGeneral::hasChanged()
-{
-   return m_HasChanged;
-}
-
-///Tag this dialog as changed
-void DlgGeneral::slotChanged()
-{
-   m_HasChanged = true;
-   emit updateButtons();
-}
-
-///Update all widgets
-void DlgGeneral::updateWidgets()
-{
-}
-
-///Save current settings
-void DlgGeneral::updateSettings()
-{
-//    Session::instance()->historyModel()->setHistoryLimited(!m_pKeepHistory->isChecked());
-//
-//    if (!m_pKeepHistory->isChecked())
-//       Session::instance()->historyModel()->setHistoryLimit(m_pHistoryMax->value());
-//
-//    m_HasChanged = false;
-}
-
-void DlgGeneral::slotClearCallHistoryAsked()
-{
-//    Session::instance()->historyModel()->clearAllCollections();
-}
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/conf/dlggeneral.h b/src/conf/dlggeneral.h
deleted file mode 100644
index d5c34b01..00000000
--- a/src/conf/dlggeneral.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2009-2015 by Savoir-Faire Linux                          *
- *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
- *            Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-
-#ifndef DLGGENERAL_H
-#define DLGGENERAL_H
-
-#include <QWidget>
-#include <kconfigdialog.h>
-
-// #include "ui_dlggeneralbase.h"
-
-/**
-	@author Jérémy Quentin <jeremy.quentin@gmail.com>
-*/
-class DlgGeneral final : public QWidget
-{
-Q_OBJECT
-public:
-   //Constructor
-   explicit DlgGeneral(KConfigDialog *parent = nullptr);
-
-   //Destructor
-   virtual ~DlgGeneral();
-
-   bool hasChanged();
-   bool m_HasChanged;
-
-public Q_SLOTS:
-   //Mutator
-   void updateWidgets();
-   void updateSettings();
-   void slotClearCallHistoryAsked();
-
-public Q_SLOTS:
-   void slotChanged();
-
-Q_SIGNALS:
-   ///Emitted when the buttons need to be updated
-   void updateButtons();
-   void clearCallHistoryAsked();
-
-};
-
-#endif
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/conf/dlggeneralbase.ui b/src/conf/dlggeneralbase.ui
deleted file mode 100644
index cf4bed85..00000000
--- a/src/conf/dlggeneralbase.ui
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgGeneralBase</class>
- <widget class="QWidget" name="DlgGeneralBase">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>525</width>
-    <height>404</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">General settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>This module is deprecated and only exists to import history from SFLPhone 1.2 and Ring-KDE 2.x</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="m_pHistoryGB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Ca&amp;ll History</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QPushButton" name="toolButton_historyClear">
-          <property name="text">
-           <string>Clear History</string>
-          </property>
-          <property name="icon">
-           <iconset theme="edit-clear-history">
-            <normaloff>.</normaloff>.</iconset>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <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 row="1" column="0">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QCheckBox" name="m_pKeepHistory">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Keep history forever</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="label_2">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Automatically remove calls after</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QSpinBox" name="m_pHistoryMax">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::PlusMinus</enum>
-        </property>
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="maximum">
-         <number>10000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <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 row="1" column="3">
-       <widget class="QLabel" name="label">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>days</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Display</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="kcfg_mergeSameDayPeer">
-        <property name="text">
-         <string>Merge calls with the same day and peer</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_displayHistoryStatus">
-        <property name="text">
-         <string>Display incoming, outgoing and missed for history items</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_highlightMissedOutgoingCalls">
-        <property name="text">
-         <string>Highlight missed outgoing calls</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_highlightMissedIncomingCalls">
-        <property name="text">
-         <string>Highlight missed incoming calls</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>Those settings only take effect after restarting Ring-KDE</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_configGeneral_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>504</width>
-       <height>171</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../qrc/resources.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>m_pKeepHistory</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_pHistoryMax</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>152</x>
-     <y>43</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>301</x>
-     <y>95</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_pHistoryMax</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>DlgGeneralBase</receiver>
-   <slot>slotChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>301</x>
-     <y>95</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>474</x>
-     <y>69</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_pKeepHistory</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>DlgGeneralBase</receiver>
-   <slot>slotChanged()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>95</x>
-     <y>43</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>492</x>
-     <y>28</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>slotChanged()</slot>
- </slots>
-</ui>
diff --git a/src/delegates/kdepixmapmanipulation.cpp b/src/delegates/kdepixmapmanipulation.cpp
deleted file mode 100644
index ee68a59c..00000000
--- a/src/delegates/kdepixmapmanipulation.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2013-2014 by Savoir-Faire Linux                          *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "kdepixmapmanipulation.h"
-
-//Qt
-#include <QtCore/QSize>
-#include <QtCore/QBuffer>
-#include <QtGui/QColor>
-#include <QtGui/QPainter>
-#include <QtGui/QBitmap>
-#include <QtWidgets/QApplication>
-#include <QtGui/QImage>
-#include <QtGui/QPalette>
-#include <QtGui/QIcon>
-
-//KDE
-#include <KColorScheme>
-#include <klocalizedstring.h>
-
-
-//Ring
-#include <person.h>
-#include <contactmethod.h>
-#include <presencestatusmodel.h>
-#include <securityevaluationmodel.h>
-#include <collectioninterface.h>
-#include <useractionmodel.h>
-#include <session.h>
-#include <video/sourcemodel.h>
-#include <QStandardPaths>
-#include "icons/icons.h"
-#include "qmlwidgets/cmiconengine.h"
-#include "qmlwidgets/personiconengine.h"
-#include <qrc_assets.cpp>
-#include "../callview/imageprovider.h"
-
-
-static const char* callStateIcons[] = {
-   RingIcons::DIALING       , /* NEW            */
-   RingIcons::INCOMING      , /* INCOMING       */
-   RingIcons::RINGING       , /* RINGING        */
-   RingIcons::CURRENT       , /* CURRENT        */
-   RingIcons::DIALING       , /* DIALING        */
-   RingIcons::HOLD          , /* HOLD           */
-   RingIcons::FAILURE       , /* FAILURE        */
-   RingIcons::BUSY          , /* BUSY           */
-   RingIcons::TRANSFER      , /* TRANSFERRED    */
-   RingIcons::TRANSF_HOLD   , /* TRANSF_HOLD    */
-   ""                       , /* OVER           */
-   RingIcons::FAILURE       , /* ERROR          */
-   RingIcons::CONFERENCE    , /* CONFERENCE     */
-   RingIcons::HOLD          , /* CONFERENCE_HOLD*/
-   RingIcons::INITIALIZATION, /* INITIALIZATION */
-   RingIcons::FAILURE       , /* ABORTED        */
-   RingIcons::CONNECTED     , /* CONNECTED      */
-};
-
-KDEPixmapManipulation::KDEPixmapManipulation() : QObject(), Interfaces::PixmapManipulatorI()
-{
-
-}
-
-QVariant KDEPixmapManipulation::contactPhoto(Person* c, const QSize& size, bool displayPresence)
-{
-   Q_UNUSED(displayPresence)
-   Q_UNUSED(size)
-
-   // Keep the engine cached
-   if (c->property("icon").canConvert<QIcon>())
-      return c->property("icon");
-
-   auto icn = QIcon(new PersonIconEngine(c));
-   c->setProperty("icon", icn);
-
-   return icn;
-}
-
-QVariant KDEPixmapManipulation::callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence)
-{
-   // Use the photo when available
-   if (n->contact())
-      return contactPhoto(n->contact(), size, displayPresence);
-
-   // Keep the engine cached
-   if (n->property("icon2").canConvert<QIcon>())
-      return n->property("icon2");
-
-   auto cm = const_cast<ContactMethod*>(n);
-
-   QIcon icn(new CMIconEngine(cm));
-   cm->setProperty("icon2", icn);
-
-   return icn;
-}
-
-QVariant KDEPixmapManipulation::callPhoto(Call* c, const QSize& size, bool displayPresence)
-{
-   if (c->peerContactMethod()->contact()) {
-      return contactPhoto(c->peerContactMethod()->contact(),size,displayPresence);
-   }
-   else
-      return QIcon(callStateIcons[(int)c->state()]);
-}
-
-QVariant KDEPixmapManipulation::numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence, bool isPresent)
-{
-   Q_UNUSED(size);
-   if (displayPresence) {
-      QPixmap pxm;
-      if(p.isValid())
-         pxm = qvariant_cast<QPixmap>(p);
-      else
-         pxm = QPixmap(QStringLiteral(":/mini/icons/miniicons/call.png"));
-      QPainter painter(&pxm);
-      painter.setOpacity(0.3);
-      painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
-      painter.fillRect(pxm.rect(),isPresent?Qt::green:Qt::red);
-      return pxm;
-   }
-   if (p.isValid())
-      return qvariant_cast<QPixmap>(p);
-   return QPixmap(QStringLiteral(":/mini/icons/miniicons/call.png"));
-}
-
-QVariant KDEPixmapManipulation::securityIssueIcon(const QModelIndex& index)
-{
-   SecurityEvaluationModel::Severity sev = qvariant_cast<SecurityEvaluationModel::Severity>(index.data((int)SecurityEvaluationModel::Role::Severity));
-   switch(sev) {
-      case SecurityEvaluationModel::Severity::INFORMATION:
-         return QIcon::fromTheme(QStringLiteral("dialog-information"));
-      case SecurityEvaluationModel::Severity::WARNING:
-         return QIcon::fromTheme(QStringLiteral("dialog-warning"));
-      case SecurityEvaluationModel::Severity::ISSUE:
-      case SecurityEvaluationModel::Severity::FATAL_WARNING:
-         return QIcon::fromTheme(QStringLiteral("view-barcode"));
-      case SecurityEvaluationModel::Severity::ERROR:
-         return QIcon::fromTheme(QStringLiteral("dialog-error"));
-      case SecurityEvaluationModel::Severity::UNSUPPORTED:
-      case SecurityEvaluationModel::Severity::COUNT__:
-         break;
-   }
-   return QVariant();
-}
-
-QByteArray KDEPixmapManipulation::toByteArray(const QVariant& pxm, const QString& type)
-{
-   //Preparation of our QPixmap
-   QByteArray bArray;
-   QBuffer buffer(&bArray);
-   buffer.open(QIODevice::WriteOnly);
-
-   //PNG ?
-   (qvariant_cast<QPixmap>(pxm)).save(&buffer, type.toLatin1());
-   buffer.close();
-
-   return bArray;
-}
-
-QVariant KDEPixmapManipulation::personPhoto(const QByteArray& data, const QString& type)
-{
-   if (data.isEmpty()) {
-      return {};
-   }
-
-   QImage image;
-   //For now, ENCODING is only base64 and image type PNG or JPG
-   const bool ret = image.loadFromData(QByteArray::fromBase64(data),type.toLower().toLatin1());
-
-   if (!ret) {
-      qDebug() << "vCard image loading failed";
-      return {};
-   } //TODO check is width || height == 0
-
-   return QPixmap::fromImage(image);
-}
-
-QVariant KDEPixmapManipulation::userActionIcon(const UserActionElement& state) const
-{
-
-   switch(state.action) {
-      case UserActionModel::Action::ACCEPT          :
-         return QIcon(":/sharedassets/phone_light/accept.svg"   );
-      case UserActionModel::Action::HOLD            :
-         return QIcon(":/sharedassets/phone_light/hold.svg"     );
-      case UserActionModel::Action::MUTE_AUDIO      :
-         return QIcon(":/sharedassets/phone_light/mic_off.svg"  );
-      case UserActionModel::Action::MUTE_VIDEO      :
-         return QIcon(":/sharedassets/phone_light/mic_off.svg"  );
-      case UserActionModel::Action::SERVER_TRANSFER :
-         return QIcon(":/sharedassets/phone_light/transfert.svg" );
-      case UserActionModel::Action::RECORD          :
-         return QIcon(":/sharedassets/phone_light/record_call.svg"   );
-      case UserActionModel::Action::HANGUP          :
-         return QIcon(":/sharedassets/phone_light/refuse.svg"   );
-      case UserActionModel::Action::JOIN            :
-         return QIcon();
-      case UserActionModel::Action::ADD_NEW         :
-         return QIcon(":/sharedassets/phone_light/accept.svg"   );
-      case UserActionModel::Action::ADD_CONTACT:
-      case UserActionModel::Action::ADD_TO_CONTACT:
-      case UserActionModel::Action::ADD_CONTACT_METHOD:
-         return QIcon::fromTheme(QStringLiteral("contact-new"));
-      case UserActionModel::Action::DELETE_CONTACT:
-         return QIcon::fromTheme(QStringLiteral("list-remove-user"), QIcon::fromTheme(QStringLiteral("edit-delete")));
-      case UserActionModel::Action::EMAIL_CONTACT:
-         return QIcon::fromTheme(QStringLiteral("mail-message-new"));
-      case UserActionModel::Action::BOOKMARK:
-         return QIcon::fromTheme(QStringLiteral("bookmarks"));
-      case UserActionModel::Action::VIEW_CHAT_HISTORY:
-         return QIcon::fromTheme(QStringLiteral("view-history"));
-      case UserActionModel::Action::REMOVE_HISTORY :
-         return QIcon::fromTheme(QStringLiteral("list-remove"));
-      case UserActionModel::Action::CALL_CONTACT:
-         return QIcon::fromTheme(QStringLiteral("call-start"));
-      case UserActionModel::Action::EDIT_CONTACT:
-         return QIcon::fromTheme(QStringLiteral("contact-new"));
-      case UserActionModel::Action::COPY_CONTACT:
-         return QIcon::fromTheme(QStringLiteral("edit-copy"));
-      case UserActionModel::Action::TOGGLE_VIDEO:
-      case UserActionModel::Action::MARK_AS_CONSUMED:
-      case UserActionModel::Action::COUNT__:
-         break;
-   };
-
-   return QVariant();
-}
-
-QVariant KDEPixmapManipulation::collectionIcon(const CollectionInterface* interface, Interfaces::PixmapManipulatorI::CollectionIconHint hint) const
-{
-   Q_UNUSED(interface)
-
-   switch(hint) {
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::CONTACT:
-         return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::HISTORY:
-         return QIcon::fromTheme(QStringLiteral("view-history"));
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::BOOKMARK:
-         return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::CERTIFICATE:
-         return QIcon::fromTheme(QStringLiteral("certificate-server"));
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::RECORDING:
-         return QIcon(":/sharedassets/phone_dark/mailbox.svg");
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::RINGTONE:
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::NONE:
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::PROFILE:
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::PHONE_NUMBER:
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::ACCOUNT:
-      case Interfaces::PixmapManipulatorI::CollectionIconHint::MACRO:
-         break;
-   };
-
-   return QVariant();
-}
-
-const char* KDEPixmapManipulation::icnPath[2][2] = {
-   {
-   /* INCOMING  */ RingIcons::HISTORY_INCOMING  ,
-   /* OUTGOING  */ RingIcons::HISTORY_OUTGOING  ,
-   },
-   {
-   /* MISSED_IN */ RingIcons::HISTORY_MISSED    ,
-   /* MISSED_OUT*/ RingIcons::HISTORY_MISSED_OUT,
-   }
-};
-
-QVariant KDEPixmapManipulation::securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const
-{
-   switch (level) {
-      case SecurityEvaluationModel::SecurityLevel::COUNT__:
-      case SecurityEvaluationModel::SecurityLevel::NONE      :
-         return QIcon(":/sharedassets/security/lock_off.svg");
-      case SecurityEvaluationModel::SecurityLevel::WEAK      :
-      case SecurityEvaluationModel::SecurityLevel::MEDIUM    :
-         return QIcon(":/sharedassets/security/lock_unconfirmed.svg");
-      case SecurityEvaluationModel::SecurityLevel::ACCEPTABLE:
-      case SecurityEvaluationModel::SecurityLevel::STRONG    :
-      case SecurityEvaluationModel::SecurityLevel::COMPLETE  :
-         return QIcon(":/sharedassets/security/lock_confirmed.svg");
-   }
-
-   return QVariant();
-}
-
-QVariant KDEPixmapManipulation::historySortingCategoryIcon(const CallHistoryModel::SortedProxy::Categories cat) const
-{
-   switch(cat) {
-      case CallHistoryModel::SortedProxy::Categories::DATE      :
-         break;
-      case CallHistoryModel::SortedProxy::Categories::NAME      :
-         return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
-      case CallHistoryModel::SortedProxy::Categories::POPULARITY:
-         return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
-      case CallHistoryModel::SortedProxy::Categories::LENGTH    :
-      case CallHistoryModel::SortedProxy::Categories::SPENT_TIME:
-      case CallHistoryModel::SortedProxy::Categories::COUNT__   :
-         break;
-   }
-   return QVariant();
-}
-
-QVariant KDEPixmapManipulation::contactSortingCategoryIcon(const ContactModel::SortedProxy::Categories cat) const
-{
-   switch(cat) {
-      case ContactModel::SortedProxy::Categories::NAME        :
-         return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
-      case ContactModel::SortedProxy::Categories::RECENTLYUSED:
-         return QIcon::fromTheme(QStringLiteral("view-history"));
-      case ContactModel::SortedProxy::Categories::ORGANIZATION:
-      case ContactModel::SortedProxy::Categories::GROUP       :
-      case ContactModel::SortedProxy::Categories::DEPARTMENT  :
-      case ContactModel::SortedProxy::Categories::COUNT__     :
-         break;
-   }
-   return QVariant();
-}
-
-QVariant KDEPixmapManipulation::videoDeviceIcon(const QModelIndex& idx) const
-{
-   switch (idx.row()) {
-      case Video::SourceModel::ExtendedDeviceList::NONE:
-         return QIcon::fromTheme(QStringLiteral("camera-off"));
-      case Video::SourceModel::ExtendedDeviceList::SCREEN:
-         return QIcon::fromTheme(QStringLiteral("video-display"));
-      case Video::SourceModel::ExtendedDeviceList::FILE:
-         return QIcon::fromTheme(QStringLiteral("video-mp4"));
-      default:
-         return QIcon::fromTheme(QStringLiteral("camera-on"));
-   }
-
-   return {};
-}
-
-QString KDEPixmapManipulation::takeSnapshot(Call* call)
-{
-   return ImageProvider::takeSnapshot(call);
-}
-
-QVariant KDEPixmapManipulation::decorationRole(const QModelIndex& index)
-{
-   if (!index.isValid())
-      return QVariant();
-
-   const QVariant tv = index.data(static_cast<int>(Ring::Role::ObjectType));
-
-   if (!tv.canConvert<Ring::ObjectType>())
-      return QVariant();
-
-   const Ring::ObjectType type = qvariant_cast<Ring::ObjectType>(tv);
-
-   switch (type) {
-      case Ring::ObjectType::Person         : {
-
-         Person* p = qvariant_cast<Person*>(
-            index.data(static_cast<int>(Ring::Role::Object))
-         );
-
-         return contactPhoto(p, QSize(22,22), true);
-         }
-      case Ring::ObjectType::ContactMethod  : {
-
-         const ContactMethod* cm = qvariant_cast<ContactMethod*>(
-            index.data(static_cast<int>(Ring::Role::Object))
-         );
-
-         return callPhoto(cm, QSize(22,22), true);
-         }
-      case Ring::ObjectType::Call           : {
-
-         const Call* c = qvariant_cast<Call*>(
-            index.data(static_cast<int>(Ring::Role::Object))
-         );
-
-         return callPhoto(c->peerContactMethod(), QSize(22,22), true);
-         }
-      case Ring::ObjectType::Media          : //TODO
-      case Ring::ObjectType::Certificate    :
-      case Ring::ObjectType::ContactRequest :
-      case Ring::ObjectType::Event :
-      case Ring::ObjectType::Individual :
-      case Ring::ObjectType::COUNT__        :
-         break;
-   }
-
-   return QVariant();
-}
-
-QVariant KDEPixmapManipulation::decorationRole(const Call* c)
-{
-   return callPhoto(c->peerContactMethod(), QSize(22,22), true);
-}
-
-QVariant KDEPixmapManipulation::decorationRole(const ContactMethod* cm)
-{
-   if (!cm)
-      return {};
-
-   return callPhoto((ContactMethod*)cm, QSize(22,22), true);
-}
-
-QVariant KDEPixmapManipulation::decorationRole(const Person* p)
-{
-   if (!p)
-      return {};
-
-   return contactPhoto((Person*)p, QSize(22,22), true);
-}
-
-QVariant KDEPixmapManipulation::decorationRole(const Account* a)
-{
-    Q_UNUSED(a)
-    return {};
-}
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/delegates/kdepixmapmanipulation.h b/src/delegates/kdepixmapmanipulation.h
deleted file mode 100644
index fdab34ed..00000000
--- a/src/delegates/kdepixmapmanipulation.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2013-2014 by Savoir-Faire Linux                          *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef KDEPIXMAPMANIPULATION_H
-#define KDEPIXMAPMANIPULATION_H
-
-#include <interfaces/pixmapmanipulatori.h>
-#include <call.h>
-// #include "matrixutils.h"
-
-class Person;
-
-
-class KDEPixmapManipulation final : public QObject ,public Interfaces::PixmapManipulatorI {
-   Q_OBJECT
-public:
-   KDEPixmapManipulation();
-   QVariant contactPhoto(Person* c, const QSize& size, bool displayPresence = true) override;
-
-   virtual QVariant callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence = true) override;
-
-   virtual QVariant callPhoto(Call* c, const QSize& size, bool displayPresence = true) override;
-
-   virtual QByteArray toByteArray(const QVariant& pxm, const QString& type = QStringLiteral("PNG")) override;
-
-   virtual QVariant personPhoto(const QByteArray& data, const QString& type = QStringLiteral("PNG")) override;
-
-   QVariant numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence = false, bool isPresent = false) override;
-
-   virtual QVariant securityIssueIcon(const QModelIndex& index) override;
-
-   virtual QVariant userActionIcon(const UserActionElement& state) const override;
-
-   virtual QVariant collectionIcon(const CollectionInterface* interface, Interfaces::PixmapManipulatorI::CollectionIconHint hint = Interfaces::PixmapManipulatorI::CollectionIconHint::NONE) const override;
-
-   virtual QVariant securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const override;
-
-   virtual QVariant historySortingCategoryIcon(const CallHistoryModel::SortedProxy::Categories cat) const override;
-
-   virtual QVariant contactSortingCategoryIcon(const ContactModel::SortedProxy::Categories cat) const override;
-
-   virtual QVariant videoDeviceIcon(const QModelIndex& idx) const override;
-
-   virtual QString  takeSnapshot(Call* call) override;
-
-   virtual QVariant decorationRole(const QModelIndex& index) override;
-
-   virtual QVariant decorationRole(const Call*              c    ) override;
-
-   virtual QVariant decorationRole(const ContactMethod*     cm   ) override;
-
-   virtual QVariant decorationRole(const Person*            p    ) override;
-
-   virtual QVariant decorationRole(const Account*           a    ) override;
-
-   static const char* icnPath[2][2];
-};
-
-#endif // KDEPIXMAPMANIPULATION_H
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/desktopview/CMakeLists.txt b/src/desktopview/CMakeLists.txt
index 18295440..c7dbbea6 100644
--- a/src/desktopview/CMakeLists.txt
+++ b/src/desktopview/CMakeLists.txt
@@ -1,38 +1,39 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
 
 ADD_DEFINITIONS("-std=c++11")
 
 PROJECT(desktopview)
 
 FIND_PACKAGE(ECM 1.1.0 REQUIRED NO_MODULE)
 
 SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTORCC ON)
 SET(CMAKE_AUTOUIC ON)
 
 SET(GENERIC_LIB_VERSION "1.0.0")
 
+# find_package(JamiKDEIntegration REQUIRED)
+
 SET(desktopview_LIB_SRCS
-    ${desktopview_LIB_SRCS}
     desktopviewplugin.cpp
     dockmodel.cpp
     tipmodel.cpp
 )
 
 QT5_ADD_RESOURCES(desktopview_LIB_SRCS
    desktopview.qrc
 )
 
 ADD_LIBRARY( desktopview STATIC ${desktopview_LIB_SRCS} )
 
 target_link_libraries( desktopview
-    libkring
+    jamikdeintegration
 
     Qt5::Core
     Qt5::Gui
     Qt5::Quick
     Qt5::QuickControls2
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::ConfigWidgets
 )
diff --git a/src/desktopview/dockmodel.cpp b/src/desktopview/dockmodel.cpp
index 22dd6431..2395961e 100644
--- a/src/desktopview/dockmodel.cpp
+++ b/src/desktopview/dockmodel.cpp
@@ -1,140 +1,142 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "dockmodel.h"
 
 #include <QtWidgets/QAction>
 
 #include <callmodel.h>
 #include <session.h>
 
-#include "../actioncollection.h"
+#include "../jamikdeintegration/src/actioncollection.h" //FIXME
 
 class DockModelPrivate final : public QObject
 {
     Q_OBJECT
 public:
     QVector<QAction*> m_lEntries;
 
     DockModel* q_ptr;
 public Q_SLOTS:
     void reload();
 };
 
 DockModel::DockModel(QObject* parent) : QAbstractListModel(parent), d_ptr(new DockModelPrivate)
 {
     d_ptr->q_ptr = this;
 
     for (auto tuple : {
         std::make_tuple(ActionCollection::instance()->showBookmarkDockAction(), "/toolbar/bookmark.svg", "bookmark"),
         std::make_tuple(ActionCollection::instance()->showContactDockAction (), "/toolbar/contact.svg" , "contact" ),
         std::make_tuple(ActionCollection::instance()->showTimelineDockAction(), "/toolbar/timeline.svg", "timeline"),
         std::make_tuple(ActionCollection::instance()->showHistoryDockAction (), "/toolbar/history.svg" , "history" ),
         std::make_tuple(ActionCollection::instance()->showDialDockAction    (), "/toolbar/call.svg"    , "call"    ),
     }) {
+        qDebug() << std::get<0>(tuple) << std::get<1>(tuple);
+        Q_ASSERT(std::get<0>(tuple));
         connect(std::get<0>(tuple), &QAction::toggled, d_ptr, &DockModelPrivate::reload);
         std::get<0>(tuple)->setProperty("iconpath"  , std::get<1>(tuple));
         std::get<0>(tuple)->setProperty("identifier", std::get<2>(tuple));
     }
 
     connect(Session::instance()->callModel(), &CallModel::callStateChanged,
         d_ptr, &DockModelPrivate::reload);
 
     connect(Session::instance()->callModel(), &CallModel::layoutChanged,
         d_ptr, &DockModelPrivate::reload);
 
     d_ptr->reload();
 }
 
 DockModel::~DockModel()
 {
     delete d_ptr;
 }
 
 QVariant DockModel::data( const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return {};
 
     auto a = d_ptr->m_lEntries[index.row()];
 
     switch(role) {
         case Qt::DisplayRole:
             return a->text();
         case Qt::DecorationRole:
             return a->property("iconpath");
         case Roles::Identifier:
             return a->property("identifier");
         case Roles::Action:
             return QVariant::fromValue(a);
         case Roles::ActiveCount:
             if (a == ActionCollection::instance()->showDialDockAction())
                 return Session::instance()->callModel()->size()
                     - (Session::instance()->callModel()->hasDialingCall() ? 1 : 0);
             return 0;
     }
 
     return {};
 }
 
 int DockModel::rowCount( const QModelIndex& parent) const
 {
     return parent.isValid() ? 0 : d_ptr->m_lEntries.size();
 }
 
 QHash<int,QByteArray> DockModel::roleNames() const
 {
     static QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
     static std::atomic_flag initRoles = ATOMIC_FLAG_INIT;
 
     if (!initRoles.test_and_set()) {
         roles[Roles::ActiveCount] = QByteArray( "activeCount" );
         roles[Roles::Identifier ] = QByteArray( "identifier"  );
         roles[Roles::Action     ] = QByteArray( "action"      );
         roles[Roles::Enabled    ] = QByteArray( "enabled2"    );
     }
 
    return roles;
 }
 
 void DockModelPrivate::reload()
 {
     QVector<QAction*> l;
 
     for (QAction* a : {
         ActionCollection::instance()->showBookmarkDockAction(),
         ActionCollection::instance()->showContactDockAction (),
         ActionCollection::instance()->showTimelineDockAction(),
         ActionCollection::instance()->showHistoryDockAction (),
         ActionCollection::instance()->showDialDockAction    (),
     }) {
         if (a->isChecked())
             l << a;
     }
 
     if (m_lEntries != l) {
         q_ptr->beginResetModel();
         m_lEntries = l;
         q_ptr->endResetModel();
     }
     else
         emit q_ptr->dataChanged(
             q_ptr->index(0, 0), q_ptr->index(m_lEntries.size()-1,0)
         );
 }
 
 #include <dockmodel.moc>
diff --git a/src/desktopview/qml/desktopwindow.qml b/src/desktopview/qml/desktopwindow.qml
index 0a7761cd..4ac77ffa 100644
--- a/src/desktopview/qml/desktopwindow.qml
+++ b/src/desktopview/qml/desktopwindow.qml
@@ -1,505 +1,515 @@
 /***************************************************************************
  *   Copyright (C) 2017-2018 by Bluesystems                                *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 import QtQuick 2.7
 import Ring 1.0
 import RingQmlWidgets 1.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0 as Controls
 import org.kde.kirigami 2.2 as Kirigami
 import ContactView 1.0
 import DesktopView 1.0
+import org.kde.ringkde.jamikdeintegration 1.0 as JamiKDEIntegration
+import org.kde.ringkde.jamiwizard 1.0 as JamiWizard
+// import org.kde.ringkde.jamiaccountview 1.0 as JamiAccountView
 
 Kirigami.ApplicationWindow {
     id: root
 
     width: 1024
     height: 768
 
     property bool wizardVisible: false
-    property bool accountMode: false
 
     TipModel {
         id: displayTips
     }
 
-    function showWizard() {
-        wizardVisible = true
-        globalDrawer.drawerOpen = false
-        wizardLoader.visible    = true
-        wizardLoader.active     = true
+    /*
+     * This is an abstraction mechanism to avoid coupling QML code with the
+     * remaining KDE (Desktop) integration code written in C++
+     */
+    JamiKDEIntegration.WindowEvent {
+        id: events
+
+        onRequestsConfigureAccounts: {
+            var component = Qt.createComponent("AccountDialog.qml")
+            if (component.status == Component.Ready) {
+                var window = component.createObject(applicationWindow().contentItem)
+                window.open()
+            }
+            else
+                console.log("ERROR", component.status, component.errorString())
+
+        }
+
+        onRequestsHideWindow: {
+            hide()
+        }
+
+        onRequestsWizard: {
+            wizardVisible = true
+            globalDrawer.drawerOpen = false
+            wizardLoader.visible    = true
+            wizardLoader.active     = true
+        }
     }
 
     function showContactRequests() {
         var component = Qt.createComponent("PendingRequests.qml")
         if (component.status == Component.Ready) {
             var window = component.createObject(applicationWindow().contentItem)
             window.open()
         }
         else
             console.log("ERROR", component.status, component.errorString())
     }
 
     function addNewContact() {
         var component = Qt.createComponent("NewContactDialog.qml")
         if (component.status == Component.Ready) {
             var window = component.createObject(applicationWindow().contentItem)
             window.open()
         }
         else
             console.log("ERROR", component.status, component.errorString())
     }
 
     SystemPalette {
         id: activePalette
         colorGroup: SystemPalette.Active
     }
 
     SystemPalette {
         id: inactivePalette
         colorGroup: SystemPalette.Disabled
     }
 
     property var _regularActions: undefined
     property var _mobileActions: undefined
 
     // It's the only way to make it stateful
     function regularActions() {
         if (_regularActions != undefined)
             return _regularActions
 
         _regularActions = []
 
         var view = [
             "ActionCollection.showTimelineDockAction",
             "ActionCollection.showDialDockAction",
             "ActionCollection.showContactDockAction",
             "ActionCollection.showHistoryDockAction",
             "ActionCollection.showBookmarkDockAction",
             "ActionCollection.displayDialpadAction"
         ]
 
         var actions = [
             "ActionCollection.showWizard",
             "ActionCollection.configureAccount",
-            "ActionCollection.configureRing",
             "ActionCollection.configureShortcut",
             "ActionCollection.configureNotification",
             "ActionCollection.quitAction"
         ]
 
         var viewCode = "import RingQmlWidgets 1.0\n QmlAction {text: \"View\" \n"
         for (var i = 0; i < view.length; i++)
             viewCode = viewCode + "QmlAction { action:"+view[i]+"} \n"
         viewCode += "}"
 
         _regularActions.push(Qt.createQmlObject(viewCode, root, "dynamicSnippet1"))
 
         for (var i = 0; i < actions.length; i++) {
             _regularActions.push(Qt.createQmlObject("import RingQmlWidgets 1.0; QmlAction {
                 action: "+actions[i]+"
             }", root, "dynamicSnippet2"))
         }
 
         return _regularActions
     }
 
     function mobileActions() {
         if (_mobileActions != undefined)
             return _mobileActions
 
         _mobileActions = []
 
         var actions = [
             "ActionCollection.showWizard",
-            "ActionCollection.configureRing",
+            "ActionCollection.configureAccount",
             "ActionCollection.configureShortcut",
             "ActionCollection.configureNotification",
             "ActionCollection.quitAction"
         ]
 
         var viewCode = "import RingQmlWidgets 1.0\n QmlAction {text: \""+i18n("Settings")+"\" \n"
         for (var i = 0; i < actions.length; i++)
             viewCode = viewCode + "QmlAction { action:"+actions[i]+"} \n"
         viewCode += "}"
 
         _mobileActions.push(Qt.createQmlObject(viewCode, root, "dynamicSnippet1"))
 
         return _mobileActions
     }
 
     //TODO use kirigami
     Rectangle {
         id: newHolder
         property bool show: false
         property alias container: mobileHolderContent
         width: 0
         height: parent.height
         color: activePalette.base
         z: 10000
         visible: false
         state: ""
         clip: true
 
         Behavior on width {
             NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
         }
 
         ColumnLayout {
             anchors.fill: parent
             Item {
                 height: 30
 
                 Layout.fillWidth: true
                 Layout.minimumHeight: 30
 
                 Text {
                     text: i18n("Hide")
                     color: activePalette.text
                     anchors.centerIn: parent
                 }
 
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
                         newHolder.show = false
                     }
                 }
 
 
             }
             Item {
                 id: mobileHolderContent
                 Layout.fillWidth: true
                 Layout.fillHeight: true
             }
         }
 
         states: [
             State {
                 name: ""
                 when: stateGroup.state != "mobile"
                 PropertyChanges {
                     target: newHolder
                     visible: false
                     width: 0
                 }
             },
             State {
                 name: "active"
                 when: stateGroup.state == "mobile" && !newHolder.show
                 PropertyChanges {
                     target: newHolder
                     visible: true
                 }
             },
             State {
                 name: "visible"
                 extend: "active"
                 when: stateGroup.state == "mobile" && newHolder.show
                 PropertyChanges {
                     target: newHolder
                     width: 300
                     x: 0
                 }
             }
         ]
     }
 
     globalDrawer: Kirigami.GlobalDrawer {
         id: globalDrawer
         title: "Ring KDE client"
         titleIcon: "ring-kde"
         bannerImageSource: ""
         actions: regularActions()
 
         Component {
             id: timelineAndAccounts
             ColumnLayout {
                 width: globalDrawer.width
                 anchors.fill: drawerContainer
 
                 PeersTimeline {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
                     width: globalDrawer.width
 
                     state: "mobile"
                     onIndividualSelected: {
                         mainPage.setIndividual(ind)
                     }
                 }
                 AccountList {
                     height: contentHeight
                     Layout.fillWidth: true
                     enableAdd: false
                 }
             }
         }
 
         // Yes, this is a Kirigami bug, the Item should *not* be needed, but
         // `content` cannot be resized after being created
         content: Item {
             id: drawerContainer
 
             Component {
                 id: accountsOnly
                 ColumnLayout {
                     anchors.fill: drawerContainer
 
                     Item {
                         width: globalDrawer.width
 
                         // Layouts in Layouts **** up QML, so make sure the result
                         // is what's expected by removing all ambiguities. Otherwise
                         // it's randomly corrupted
                         Layout.preferredHeight: drawerContainer.height
                             - accounts.contentHeight
                         Layout.maximumHeight: drawerContainer.height
                             - accounts.contentHeight
                         Layout.minimumHeight: drawerContainer.height
                             - accounts.contentHeight
                         height: drawerContainer.height
                             - accounts.contentHeight
                         implicitHeight: drawerContainer.height
                             - accounts.contentHeight
 
                         Layout.fillHeight: true
                         Layout.fillWidth: true
                     }
 
                     AccountList {
                         id: accounts
                         height: contentHeight
                         Layout.minimumHeight: contentHeight
                         Layout.preferredHeight: contentHeight
                         Layout.maximumHeight: contentHeight
                         Layout.fillWidth: true
                         Layout.fillHeight: false
                         enableAdd: true
                     }
                 }
             }
 
             // The drawer is a QtQuick.Layout, it uses implicitHeight even if
             // Layout.fillHeight is set to device the "winner" that will take
             // the space. Make sure this is the loader.
             implicitHeight: 99999
             Layout.fillHeight: true
             Layout.fillWidth: true
             width: globalDrawer.width
 
             Loader {
                 id: accountsLoader
                 anchors.fill: parent
                 width: globalDrawer.width
                 Layout.preferredWidth: globalDrawer.width
                 active: globalDrawer.drawerOpen || globalDrawer.peeking
                 sourceComponent: accountsOnly
             }
         }
         handleVisible: true
         drawerOpen: false
     }
 
     FontMetrics {
         id: fontMetrics
     }
 
     Loader {
         id: wizardLoader
         active: false
         anchors.fill: parent
         z: 999999
         visible: false
-        sourceComponent: Wizard {
+        sourceComponent: JamiWizard.Wizard {
             anchors.fill: parent
             z: 999999
             onVisibleChanged: {
                 if (!visible) {
                     wizardLoader.visible = false
                     wizardLoader.active = false
                 }
                 wizardVisible = visible
             }
         }
     }
 
     QActionBinder {
         id: binder
         actionCollection: ActionCollection.kactionCollection
     }
 
     Item {
         id: desktopOverlay //TODO Qt5.10, use QQC2.Overlay
         anchors.fill: parent
         visible: false
         z: 1
     }
 
     RowLayout {
         anchors.fill: parent
         spacing: 0
 
         Loader {
             id: dockBar
             Layout.fillHeight: true
             Layout.maximumWidth: item ? item.width : 0
             Layout.minimumWidth: item ? item.width : 0
             Layout.preferredWidth: item ? item.width : 0
             visible: stateGroup.state != "mobile"
             active: true
             sourceComponent: DockBar {
                 height: parent.height
                 newHolder: newHolder
                 onTimelineSelected: {
                     if (!mainPage.individual)
                         return
 
                     item.setCurrentIndex(mainPage.suggestedTimelineIndex)
                 }
             }
         }
 
         ColumnLayout {
             Layout.fillHeight: true
             Layout.fillWidth: true
 
             ContactHeader {
                 id: contactHeader
                 backgroundColor: activePalette.alternateBase
                 isMobile: stateGroup.state == "mobile"
                 textColor: activePalette.text
                 Layout.maximumHeight: height
                 Layout.minimumHeight: height
 
                 onCachedPhotoChanged: {
 //                     if (contactInfo != undefined)
 //                         contactInfo.cachedPhoto = contactHeader.cachedPhoto
                 }
 
                 onSelectChat: {
                     mainPage.setCurrentPage(MainPage.TIMELINE)
                     timelinePage.currentInstance.focusEdit()
                 }
 
                 onSelectVideo: {
                     mainPage.setCurrentPage(MainPage.MEDIA)
                 }
             }
 
             MainPage {
                 id: mainPage
                 header: contactHeader
                 Layout.fillHeight: true
                 Layout.fillWidth: true
 
                 onSuggestSelection: {
                     var d = dockBar
                     if (d.item) {
                         console.log("Setting timeline index:", modelIndex, individual)
                         d.item.setCurrentIndex(
                             modelIndex
                         )
                     }
                 }
             }
         }
 
     }
 
-    onAccountModeChanged: {
-        if (accountMode == true) {
-            var component = Qt.createComponent("AccountDialog.qml")
-            if (component.status == Component.Ready) {
-                var window = component.createObject(applicationWindow().contentItem)
-                window.open()
-            }
-            else
-                console.log("ERROR", component.status, component.errorString())
-        }
-
-        accountMode = false
-    }
-
     onClosing: {
         close.accepted = false
         hide()
     }
 
     StateGroup {
         id: stateGroup
 
         states: [
             State {
                 name: ""
                 PropertyChanges {
                     target: dockBar
                     active: true
                 }
                 PropertyChanges {
                     target: contactHeader
                     isCompact: false
                 }
                 PropertyChanges {
                     target: accountsLoader
                     sourceComponent: accountsOnly
                 }
                 PropertyChanges {
                     target: globalDrawer
                     title: "Ring KDE client"
                     titleIcon: "ring-kde"
                     bannerImageSource: ""
                     actions: regularActions()
                 }
             },
             State {
                 name: "compact"
                 when: root.height < 700 && root.width >= 500
                 PropertyChanges {
                     target: contactHeader
                     isCompact: true
                 }
             },
             State {
                 name: "mobile"
                 extend: "compact"
                 when: root.width < 500
                 PropertyChanges {
                     target: dockBar
                     active: false
                 }
                 PropertyChanges {
                     target: accountsLoader
                     sourceComponent: timelineAndAccounts
                 }
                 PropertyChanges {
                     target: globalDrawer
 //FIXME buggy
 //                     title: ""
 //                     titleIcon: ""
 //                     bannerImageSource: ""
                     actions: mobileActions()
                 }
                 PropertyChanges {
                     target: mainPage
                     mobile: true
                 }
             }
         ]
     }
 }
diff --git a/src/desktopview/tipmodel.cpp b/src/desktopview/tipmodel.cpp
index 17f2e1f4..fa62b687 100644
--- a/src/desktopview/tipmodel.cpp
+++ b/src/desktopview/tipmodel.cpp
@@ -1,42 +1,42 @@
 /***************************************************************************
  *   Copyright (C) 2018 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "tipmodel.h"
 
-#include "../klib/kcfg_settings.h"
+#include "kcfg_settings.h"
 
 bool TipModel::showSearchTip() const
 {
     return ConfigurationSkeleton::displaySearchTip();
 }
 
 void TipModel::setShowSearchTip(bool v)
 {
     ConfigurationSkeleton::setDisplaySearchTip(v);
     emit changed();
 }
 
 bool TipModel::showFirstTip() const
 {
     return ConfigurationSkeleton::displayFirstTip();
 }
 
 void TipModel::setShowFirstTip(bool v)
 {
     ConfigurationSkeleton::setDisplayFirstTip(v);
     emit changed();
 }
diff --git a/src/icons/icons.h b/src/icons/icons.h
index a0c7d3b4..7166f9fd 100644
--- a/src/icons/icons.h
+++ b/src/icons/icons.h
@@ -1,48 +1,24 @@
 /****************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                          *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
  *            Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
  *                                                                          *
  *   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) any later version.     *
  *                                                                          *
  *   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 General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 #ifndef ICONS_H
 #define ICONS_H
 
-namespace RingIcons {
-   constexpr static const char* INCOMING                 = ":/sharedassets/phone_dark/ringing.svg"         ;
-   constexpr static const char* RINGING                  = ":/sharedassets/phone_dark/ringing.svg"         ;
-   constexpr static const char* CURRENT                  = ":/sharedassets/phone_dark/current.svg"         ;
-   constexpr static const char* DIALING                  = ":/sharedassets/phone_dark/dial.svg"            ;
-   constexpr static const char* HOLD                     = ":/sharedassets/phone_dark/hold.svg"            ;
-   constexpr static const char* FAILURE                  = ":/sharedassets/phone_dark/failed.svg"          ;
-   constexpr static const char* BUSY                     = ":/sharedassets/phone_dark/busy.svg"            ;
-   constexpr static const char* TRANSFER                 = ":/sharedassets/phone_dark/transfert.svg"       ;
-   constexpr static const char* TRANSF_HOLD              = ":/sharedassets/phone_dark/transfert.svg"       ;
-   constexpr static const char* CONFERENCE               = ":/images/icons/user-group-properties.svg"      ;
-   constexpr static const char* CALL                     = ":/sharedassets/phone_dark/current.svg"         ;
-   constexpr static const char* HANGUP                   = ":/sharedassets/phone_dark/hang_up.svg"         ;
-   constexpr static const char* UNHOLD                   = ":/sharedassets/phone_dark/unhold.svg"          ;
-   constexpr static const char* ACCEPT                   = ":/sharedassets/phone_dark/accept.svg"          ;
-   constexpr static const char* REFUSE                   = ":/sharedassets/phone_dark/failed.svg"          ;
-   constexpr static const char* INITIALIZATION           = ":/sharedassets/phone_dark/initialization.svg"  ;
-   constexpr static const char* CONNECTED                = ":/sharedassets/phone_dark/connected.svg"       ;
-   constexpr static const char* DISPLAY_VOLUME_CONSTROLS = ":/images/icons/icon_volume_off.svg"            ;
-   constexpr static const char* DISPLAY_DIALPAD          = ":/images/icons/icon_dialpad.svg"               ;
-   constexpr static const char* HISTORY_INCOMING         = ":/sharedassets/phone_dark/incoming.svg"        ;
-   constexpr static const char* HISTORY_OUTGOING         = ":/sharedassets/phone_dark/outgoing.svg"        ;
-   constexpr static const char* HISTORY_MISSED           = ":/sharedassets/phone_dark/missed_incoming.svg" ;
-   constexpr static const char* HISTORY_MISSED_OUT       = ":/sharedassets/security/missed_outgoing.svg"            ;
-}
+
 
 #endif
diff --git a/src/implementation.cpp b/src/implementation.cpp
deleted file mode 100644
index 7c6eeb38..00000000
--- a/src/implementation.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "implementation.h"
-
-//Qt
-#include <QtGui/QColor>
-#include <QtGui/QGuiApplication>
-#include <QtCore/QMimeData>
-#include <QtCore/QPointer>
-#include <QtCore/QUrl>
-#include <QtGui/QClipboard>
-#include <QtGui/QIcon>
-#include <QQuickView>
-#include <QQuickItem>
-#include <QQmlApplicationEngine>
-#include <QtWidgets/QFileDialog>
-
-//KDE
-#include <klocalizedstring.h>
-#include <KMessageBox>
-
-//Ring
-#include <person.h>
-#include <session.h>
-#include <contactmethod.h>
-#include <presencestatusmodel.h>
-#include <individualdirectory.h>
-#include <individual.h>
-#include <media/textrecording.h>
-#include <securityevaluationmodel.h>
-#include "klib/kcfg_settings.h"
-#include <collectioninterface.h>
-#include "icons/icons.h"
-#include <ringapplication.h>
-
-ColorDelegate::ColorDelegate() : m_Pal(QGuiApplication::palette()) {
-   m_Green = QColor(m_Pal.color(QPalette::Base));
-   if (m_Green.green()+20 >= 255) {
-      m_Green.setRed ( ((int)m_Green.red()  -20));
-      m_Green.setBlue( ((int)m_Green.blue() -20));
-   }
-   else
-      m_Green.setGreen(((int)m_Green.green()+20));
-
-   m_Red = QColor(m_Pal.color(QPalette::Base));
-   if (m_Red.red()+20 >= 255) {
-      m_Red.setGreen(  ((int)m_Red.green()  -20));
-      m_Red.setBlue(   ((int)m_Red.blue()   -20));
-   }
-   else
-      m_Red.setRed(    ((int)m_Red.red()     +20));
-
-   m_Yellow = QColor(m_Pal.color(QPalette::Base));
-   if (m_Yellow.red()+20 >= 255 || m_Green.green()+20 >= 255) {
-      m_Yellow.setBlue(((int)m_Yellow.blue() -20));
-   }
-   else {
-      m_Yellow.setGreen(((int)m_Yellow.green()+20));
-      m_Yellow.setRed( ((int)m_Yellow.red()   +20));
-   }
-}
-
-QVariant ColorDelegate::color(const Account* a)
-{
-   switch(a->registrationState()) {
-      case Account::RegistrationState::READY:
-         return m_Green;
-      case Account::RegistrationState::UNREGISTERED:
-         return m_Pal.color(QPalette::Base);
-      case Account::RegistrationState::TRYING:
-      case Account::RegistrationState::INITIALIZING:
-         return m_Yellow;
-      case Account::RegistrationState::ERROR:
-         return m_Red;
-      case Account::RegistrationState::COUNT__:
-         break;
-   };
-   return QVariant();
-}
-
-QVariant ColorDelegate::icon(const Account* a) {
-   if (a->editState() == Account::EditState::MODIFIED_COMPLETE)
-      return QIcon::fromTheme(QStringLiteral("document-save"));
-   if (a->editState() == Account::EditState::MODIFIED_INCOMPLETE)
-      return QIcon::fromTheme(QStringLiteral("dialog-warning"));
-   else if (a->editState() == Account::EditState::OUTDATED) {
-      return QIcon::fromTheme(QStringLiteral("view-refresh"));
-   }
-   return QVariant();
-}
-
-QVariant KDEShortcutDelegate::createAction(Macro* macro)
-{
-   Q_UNUSED(macro)
-   return {};
-}
-
-void KDEActionExtender::editPerson(Person* p)
-{
-   QPointer<QQuickView> d = new QQuickView( RingApplication::engine(), nullptr );
-
-   d->setSource(QUrl(QStringLiteral("qrc:/ContactDialog.qml")));
-   d->setResizeMode(QQuickView::SizeRootObjectToView);
-   auto item = d->rootObject();
-   item->setProperty("currentPerson", QVariant::fromValue(p));
-   item->setProperty("showStat"   , false     );
-   item->setProperty("showImage"  , true      );
-   item->setProperty("forcedState", "profile" );
-
-   d->resize(800, 600);
-   d->show();
-}
-
-void KDEActionExtender::viewChatHistory(ContactMethod* cm)
-{
-   if (!cm)
-      return;
-
-   // Get a real contact method when necessary
-   if (cm->type() == ContactMethod::Type::TEMPORARY) {
-      cm = Session::instance()->individualDirectory()->getExistingNumberIf(
-         cm->uri(),
-         [](const ContactMethod* cm) -> bool {
-            return cm->textRecording() && !cm->textRecording()->isEmpty();
-      });
-   }
-
-   if (!cm)
-      return;
-
-   //FIXME open the timeline
-}
-
-void KDEActionExtender::viewChatHistory(Person* p)
-{
-   if (!p)
-      return;
-
-   foreach(ContactMethod* cm, p->individual()->phoneNumbers())
-      viewChatHistory(cm);
-}
-
-void KDEActionExtender::copyInformation(QMimeData* data)
-{
-   QClipboard* clipboard = QGuiApplication::clipboard();
-   clipboard->setMimeData(data);
-}
-
-bool KDEActionExtender::warnDeletePerson(Person* p)
-{
-   const int ret = KMessageBox::questionYesNo(nullptr,
-      i18n("Are you sure you want to permanently delete %1?",
-      p->formattedName()), i18n("Delete contact")
-   );
-
-   return ret == KMessageBox::Yes;
-}
-
-bool KDEActionExtender::warnDeleteCall(Call* c)
-{
-   Q_UNUSED(c)
-   const int ret = KMessageBox::questionYesNo(nullptr,
-      i18n("Are you sure you wish to remove this call?"), i18n("Delete call")
-   );
-
-   return ret == KMessageBox::Yes;
-}
-
-Person* KDEActionExtender::selectPerson(FlagPack<SelectPersonHint> hints, const QVariant& hintVar) const
-{
-   Q_UNUSED(hints)
-   Q_UNUSED(hintVar)
-   return nullptr;
-}
-
-ContactMethod* KDEActionExtender::selectContactMethod(FlagPack<ActionExtenderI::SelectContactMethodHint> hints, const QVariant& hintVar) const
-{
-   Q_UNUSED(hints)
-   Q_UNUSED(hintVar)
-
-   return nullptr;
-}
-
-QUrl KDEDesktopFileProvider::getAnyFile(const QStringList& extensions) const
-{
-    Q_UNUSED(extensions)
-    return QFileDialog::getOpenFileName(
-        nullptr,
-        QStringLiteral("Open File"),
-        QDir::currentPath(),
-        QStringLiteral("Media Files (*.png *.jpg *.gif *.mp4 *.mkv *.webm *.txt *.avi *.mpg)")
-    );
-}
-
-QList<QUrl> KDEDesktopFileProvider::recentFiles() const
-{
-    const QStringList files = ConfigurationSkeleton::recentStreamedFiles();
-    QList<QUrl> ret;
-
-    for (const auto& f : qAsConst(files))
-        ret << f;
-
-    return ret;
-}
-
-void KDEDesktopFileProvider::addRecentFile(const QUrl& path) const
-{
-    QStringList files = ConfigurationSkeleton::recentStreamedFiles();
-    files << path.path();
-
-    ConfigurationSkeleton::setRecentStreamedFiles(files);
-
-}
-
-// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/implementation.h b/src/implementation.h
deleted file mode 100644
index ebd714d6..00000000
--- a/src/implementation.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
- **************************************************************************/
-#ifndef IMPLEMENTATION_H
-#define IMPLEMENTATION_H
-
-// Qt
-#include <QtGui/QPalette>
-#include <QtGui/QColor>
-#include <QtCore/QMutex>
-
-// Ring
-#include <interfaces/accountlistcolorizeri.h>
-#include <call.h>
-#include <account.h>
-
-#include <interfaces/shortcutcreatori.h>
-#include <interfaces/actionextenderi.h>
-#include <interfaces/fileprovideri.h>
-
-class Macro;
-
-//Implement all client dependant libringqt abstract interfaces
-
-class ColorDelegate final : public QObject, public Interfaces::AccountListColorizerI
-{
-   Q_OBJECT
-public:
-   explicit ColorDelegate();
-
-   ColorDelegate(const ColorDelegate&) = delete;
-   ColorDelegate& operator=(const ColorDelegate&) = delete;
-
-   virtual Q_INVOKABLE QVariant color(const Account* a) override;
-
-   virtual Q_INVOKABLE QVariant icon(const Account* a) override;
-private:
-   QPalette m_Pal;
-   QColor   m_Green;
-   QColor   m_Yellow;
-   QColor   m_Red;
-};
-
-class KDEShortcutDelegate final : public Interfaces::ShortcutCreatorI
-{
-public:
-   virtual ~KDEShortcutDelegate(){}
-   virtual QVariant createAction(Macro* macro) override;
-};
-
-class LIB_EXPORT KDEActionExtender final : public Interfaces::ActionExtenderI
-{
-public:
-   explicit KDEActionExtender() = default;
-   KDEActionExtender(const KDEActionExtender&) = delete;
-   KDEActionExtender& operator=(const KDEActionExtender&) = delete;
-
-   virtual void editPerson(Person* p) override;
-   virtual void viewChatHistory(ContactMethod* cm) override;
-   virtual void viewChatHistory(Person* p) override;
-   virtual void copyInformation(QMimeData* data) override;
-   virtual bool warnDeletePerson(Person* p) override;
-   virtual bool warnDeleteCall(Call* c) override;
-   virtual Person* selectPerson(FlagPack<SelectPersonHint> hints, const QVariant& hintVar) const override;
-   virtual ContactMethod* selectContactMethod(FlagPack<ActionExtenderI::SelectContactMethodHint>, const QVariant& hintVar) const override;
-};
-
-class KDEDesktopFileProvider : public Interfaces::FileProviderI
-{
-public:
-    explicit KDEDesktopFileProvider() = default;
-
-    virtual QUrl getAnyFile(const QStringList& extensions) const override;
-
-    virtual QList<QUrl> recentFiles() const override;
-
-    virtual void addRecentFile(const QUrl& path) const override;
-
-};
-
-#endif
-
-// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/jamikdeintegration/CMakeLists.txt b/src/jamikdeintegration/CMakeLists.txt
new file mode 100644
index 00000000..72150141
--- /dev/null
+++ b/src/jamikdeintegration/CMakeLists.txt
@@ -0,0 +1,189 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(jamikdeintegration)
+
+if(POLICY CMP0063)
+   CMAKE_POLICY(SET CMP0063 NEW)
+endif(POLICY CMP0063)
+
+find_package(ECM 1.1.0 REQUIRED NO_MODULE)
+list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}")
+
+find_package(KF5 QUIET COMPONENTS
+    Akonadi
+    AkonadiContact
+    Contacts
+)
+
+include(ECMInstallIcons)
+include(ECMOptionalAddSubdirectory)
+include(CMakePackageConfigHelpers)
+
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+
+SET(CMAKE_C_VISIBILITY_PRESET hidden)
+SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
+SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+
+# When used with `add_subdirectory`, assume it is a static Qt plugin
+get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY)
+if(USES_ADD_SUBDIRECTORY)
+   set(BUILD_SHARED_LIBS OFF)
+endif()
+
+if(NOT BUILD_SHARED_LIBS)
+    set(ENABLE__STATIC_PLUGIN 1)
+else()
+    set(ENABLE__STATIC_PLUGIN 0)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 14)
+
+if(ENABLE__STATIC_PLUGIN)
+    add_definitions(-DQT_PLUGIN)
+    add_definitions(-DQT_STATICPLUGIN=1)
+    add_definitions(-DJAMIKDEINTEGRATION_USE_STATIC_PLUGIN=1)
+endif(ENABLE__STATIC_PLUGIN)
+
+find_package(Qt5 CONFIG REQUIRED
+    Core Gui Quick Widgets QuickControls2
+)
+
+set(GENERIC_LIB_VERSION "1.0.0")
+
+# Pack the icons shared by various components
+ADD_SUBDIRECTORY( sharedassets )
+
+#File to compile
+set( jamikdeintegration_LIB_SRCS
+    src/colorinterface.cpp
+    src/shortcutinterface.cpp
+    src/actioninterface.cpp
+    src/fileproverderinterface.cpp
+    src/pixmapinterface.cpp
+    src/serializationinterface.cpp
+    src/actioncollection.cpp
+    src/notification.cpp
+    src/systray.cpp
+    src/windowevent.cpp
+    src/cmiconengine.cpp
+    src/personiconengine.cpp
+    src/plugin.cpp
+)
+
+if(Qt5TextToSpeech_FOUND)
+    set(
+        jamikdeintegration_LIB_SRCS
+        ${jamikdeintegration_LIB_SRCS}
+        accessibility.cpp
+    )
+endif()
+
+if(KF5_AKONADI_FOUND AND  KF5_AKONADICONTACT_FOUND AND  KF5_CONTACTS_FOUND)
+    set(AKONADI_FOUND 1)
+endif()
+
+if( ${AKONADI_FOUND} )
+    set(jamikdeintegration_LIB_SRCS
+        ${jamikdeintegration_LIB_SRCS}
+        akonadibackend.cpp
+    )
+endif()
+
+kconfig_add_kcfg_files (jamikdeintegration_LIB_SRCS kcfg_settings.kcfgc)
+
+set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamikdeintegration)
+
+add_library(jamikdeintegration ${jamikdeintegration_LIB_SRCS} )
+
+target_link_libraries( jamikdeintegration
+    # Project
+    ringqt
+    ringqtquick
+
+    # Qt
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Quick
+    Qt5::Widgets
+    Qt5::QuickControls2
+
+    # KF5
+    KF5::Notifications
+    KF5::I18n
+    KF5::ConfigCore
+    KF5::ConfigGui
+    KF5::ConfigWidgets # KColorScheme
+    KF5::XmlGui # KSortcutdialog # (DESKTOP)
+    KF5::NotifyConfig # the notification dialog # (DESKTOP)
+    KF5::GlobalAccel # (DESKTOP)
+)
+
+if ( ${AKONADI_FOUND} )
+    target_link_libraries( jamikdeintegration
+        KF5::AkonadiCore
+        KF5::AkonadiContact
+        KF5::Contacts
+    )
+endif()
+
+set(jamikdeintegration_EXPORT_HDRS
+    src/actioncollection.h
+    src/windowevent.h
+)
+
+# Configure the target config
+set(jamikdeintegration_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiKDEIntegrationConfig.cmake")
+
+if(USES_ADD_SUBDIRECTORY)
+   set(JamiKDEIntegration_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
+
+configure_package_config_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiKDEIntegrationConfig.cmake.in" ${jamikdeintegration_CONFIG_PATH}
+   INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiKDEIntegration/
+   PATH_VARS INCLUDE_INSTALL_DIR
+)
+
+install( FILES ${jamikdeintegration_CONFIG_PATH}
+    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiKDEIntegration/
+    COMPONENT Devel
+)
+
+# Create the target
+target_include_directories(jamikdeintegration
+    PUBLIC
+#         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+        $<INSTALL_INTERFACE:include/JamiKDEIntegration>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/
+)
+
+set_target_properties(jamikdeintegration PROPERTIES
+    PUBLIC_HEADER
+    "${jamikdeintegration_EXPORT_HDRS}"
+)
+
+export(TARGETS jamikdeintegration
+    FILE "${PROJECT_BINARY_DIR}/cmake/JamiKDEIntegrationTargets.cmake"
+)
+
+install(TARGETS jamikdeintegration
+    EXPORT JamiKDEIntegrationTargets
+    LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamikdeintegration
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    COMPONENT Devel
+)
+
+install(EXPORT JamiKDEIntegrationTargets
+    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiKDEIntegration
+    COMPONENT Devel
+)
+
+install(FILES ring-kde.kcfg DESTINATION ${KCFG_INSTALL_DIR})
diff --git a/src/jamikdeintegration/cmake/JamiKDEIntegrationConfig.cmake.in b/src/jamikdeintegration/cmake/JamiKDEIntegrationConfig.cmake.in
new file mode 100644
index 00000000..64750e94
--- /dev/null
+++ b/src/jamikdeintegration/cmake/JamiKDEIntegrationConfig.cmake.in
@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+#Allow users to when to use Q_IMPORT_PLUGIN in main.cpp
+if(@ENABLE__STATIC_PLUGIN@ MATCHES 1)
+    add_definitions(-DJAMIKDEINTEGRATION_USE_STATIC_PLUGIN=1)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/JamiKDEIntegrationTargets.cmake")
diff --git a/src/klib/kcfg_settings.kcfgc b/src/jamikdeintegration/kcfg_settings.kcfgc
similarity index 100%
rename from src/klib/kcfg_settings.kcfgc
rename to src/jamikdeintegration/kcfg_settings.kcfgc
diff --git a/src/klib/ring-kde.kcfg b/src/jamikdeintegration/ring-kde.kcfg
similarity index 100%
rename from src/klib/ring-kde.kcfg
rename to src/jamikdeintegration/ring-kde.kcfg
diff --git a/src/sharedassets/CMakeLists.txt b/src/jamikdeintegration/sharedassets/CMakeLists.txt
similarity index 100%
rename from src/sharedassets/CMakeLists.txt
rename to src/jamikdeintegration/sharedassets/CMakeLists.txt
diff --git a/src/sharedassets/assets.qrc b/src/jamikdeintegration/sharedassets/assets.qrc
similarity index 100%
rename from src/sharedassets/assets.qrc
rename to src/jamikdeintegration/sharedassets/assets.qrc
diff --git a/src/sharedassets/outline/call.svg b/src/jamikdeintegration/sharedassets/outline/call.svg
similarity index 100%
rename from src/sharedassets/outline/call.svg
rename to src/jamikdeintegration/sharedassets/outline/call.svg
diff --git a/src/sharedassets/outline/camera.svg b/src/jamikdeintegration/sharedassets/outline/camera.svg
similarity index 100%
rename from src/sharedassets/outline/camera.svg
rename to src/jamikdeintegration/sharedassets/outline/camera.svg
diff --git a/src/sharedassets/outline/chat.svg b/src/jamikdeintegration/sharedassets/outline/chat.svg
similarity index 100%
rename from src/sharedassets/outline/chat.svg
rename to src/jamikdeintegration/sharedassets/outline/chat.svg
diff --git a/src/sharedassets/outline/close.svg b/src/jamikdeintegration/sharedassets/outline/close.svg
similarity index 100%
rename from src/sharedassets/outline/close.svg
rename to src/jamikdeintegration/sharedassets/outline/close.svg
diff --git a/src/sharedassets/outline/qrcode.svg b/src/jamikdeintegration/sharedassets/outline/qrcode.svg
similarity index 100%
rename from src/sharedassets/outline/qrcode.svg
rename to src/jamikdeintegration/sharedassets/outline/qrcode.svg
diff --git a/src/sharedassets/outline/screen.svg b/src/jamikdeintegration/sharedassets/outline/screen.svg
similarity index 100%
rename from src/sharedassets/outline/screen.svg
rename to src/jamikdeintegration/sharedassets/outline/screen.svg
diff --git a/src/sharedassets/outline/warning.svg b/src/jamikdeintegration/sharedassets/outline/warning.svg
similarity index 100%
rename from src/sharedassets/outline/warning.svg
rename to src/jamikdeintegration/sharedassets/outline/warning.svg
diff --git a/src/sharedassets/outline/web.svg b/src/jamikdeintegration/sharedassets/outline/web.svg
similarity index 100%
rename from src/sharedassets/outline/web.svg
rename to src/jamikdeintegration/sharedassets/outline/web.svg
diff --git a/src/sharedassets/phone_dark/accept.svg b/src/jamikdeintegration/sharedassets/phone_dark/accept.svg
similarity index 100%
rename from src/sharedassets/phone_dark/accept.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/accept.svg
diff --git a/src/sharedassets/phone_dark/accept_video.svg b/src/jamikdeintegration/sharedassets/phone_dark/accept_video.svg
similarity index 100%
rename from src/sharedassets/phone_dark/accept_video.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/accept_video.svg
diff --git a/src/sharedassets/phone_dark/busy.svg b/src/jamikdeintegration/sharedassets/phone_dark/busy.svg
similarity index 100%
rename from src/sharedassets/phone_dark/busy.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/busy.svg
diff --git a/src/sharedassets/phone_dark/connected.svg b/src/jamikdeintegration/sharedassets/phone_dark/connected.svg
similarity index 100%
rename from src/sharedassets/phone_dark/connected.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/connected.svg
diff --git a/src/sharedassets/phone_dark/current.svg b/src/jamikdeintegration/sharedassets/phone_dark/current.svg
similarity index 100%
rename from src/sharedassets/phone_dark/current.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/current.svg
diff --git a/src/sharedassets/phone_dark/dial.svg b/src/jamikdeintegration/sharedassets/phone_dark/dial.svg
similarity index 100%
rename from src/sharedassets/phone_dark/dial.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/dial.svg
diff --git a/src/sharedassets/phone_dark/failed.svg b/src/jamikdeintegration/sharedassets/phone_dark/failed.svg
similarity index 100%
rename from src/sharedassets/phone_dark/failed.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/failed.svg
diff --git a/src/sharedassets/phone_dark/hang_up.svg b/src/jamikdeintegration/sharedassets/phone_dark/hang_up.svg
similarity index 100%
rename from src/sharedassets/phone_dark/hang_up.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/hang_up.svg
diff --git a/src/sharedassets/phone_dark/hold.svg b/src/jamikdeintegration/sharedassets/phone_dark/hold.svg
similarity index 100%
rename from src/sharedassets/phone_dark/hold.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/hold.svg
diff --git a/src/sharedassets/phone_dark/incoming.svg b/src/jamikdeintegration/sharedassets/phone_dark/incoming.svg
similarity index 100%
rename from src/sharedassets/phone_dark/incoming.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/incoming.svg
diff --git a/src/sharedassets/phone_dark/initialization.svg b/src/jamikdeintegration/sharedassets/phone_dark/initialization.svg
similarity index 100%
rename from src/sharedassets/phone_dark/initialization.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/initialization.svg
diff --git a/src/sharedassets/phone_dark/mailbox.svg b/src/jamikdeintegration/sharedassets/phone_dark/mailbox.svg
similarity index 100%
rename from src/sharedassets/phone_dark/mailbox.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/mailbox.svg
diff --git a/src/sharedassets/phone_dark/missed_incoming.svg b/src/jamikdeintegration/sharedassets/phone_dark/missed_incoming.svg
similarity index 100%
rename from src/sharedassets/phone_dark/missed_incoming.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/missed_incoming.svg
diff --git a/src/sharedassets/phone_dark/missed_outgoing.svg b/src/jamikdeintegration/sharedassets/phone_dark/missed_outgoing.svg
similarity index 100%
rename from src/sharedassets/phone_dark/missed_outgoing.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/missed_outgoing.svg
diff --git a/src/sharedassets/phone_dark/mute_video.svg b/src/jamikdeintegration/sharedassets/phone_dark/mute_video.svg
similarity index 100%
rename from src/sharedassets/phone_dark/mute_video.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/mute_video.svg
diff --git a/src/sharedassets/phone_dark/outgoing.svg b/src/jamikdeintegration/sharedassets/phone_dark/outgoing.svg
similarity index 100%
rename from src/sharedassets/phone_dark/outgoing.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/outgoing.svg
diff --git a/src/sharedassets/phone_dark/ringing.svg b/src/jamikdeintegration/sharedassets/phone_dark/ringing.svg
similarity index 100%
rename from src/sharedassets/phone_dark/ringing.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/ringing.svg
diff --git a/src/sharedassets/phone_dark/transfert.svg b/src/jamikdeintegration/sharedassets/phone_dark/transfert.svg
similarity index 100%
rename from src/sharedassets/phone_dark/transfert.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/transfert.svg
diff --git a/src/sharedassets/phone_dark/unhold.svg b/src/jamikdeintegration/sharedassets/phone_dark/unhold.svg
similarity index 100%
rename from src/sharedassets/phone_dark/unhold.svg
rename to src/jamikdeintegration/sharedassets/phone_dark/unhold.svg
diff --git a/src/sharedassets/phone_light/accept.svg b/src/jamikdeintegration/sharedassets/phone_light/accept.svg
similarity index 100%
rename from src/sharedassets/phone_light/accept.svg
rename to src/jamikdeintegration/sharedassets/phone_light/accept.svg
diff --git a/src/sharedassets/phone_light/call.svg b/src/jamikdeintegration/sharedassets/phone_light/call.svg
similarity index 100%
rename from src/sharedassets/phone_light/call.svg
rename to src/jamikdeintegration/sharedassets/phone_light/call.svg
diff --git a/src/sharedassets/phone_light/hold.svg b/src/jamikdeintegration/sharedassets/phone_light/hold.svg
similarity index 100%
rename from src/sharedassets/phone_light/hold.svg
rename to src/jamikdeintegration/sharedassets/phone_light/hold.svg
diff --git a/src/sharedassets/phone_light/mic_off.svg b/src/jamikdeintegration/sharedassets/phone_light/mic_off.svg
similarity index 100%
rename from src/sharedassets/phone_light/mic_off.svg
rename to src/jamikdeintegration/sharedassets/phone_light/mic_off.svg
diff --git a/src/sharedassets/phone_light/mic_on.svg b/src/jamikdeintegration/sharedassets/phone_light/mic_on.svg
similarity index 100%
rename from src/sharedassets/phone_light/mic_on.svg
rename to src/jamikdeintegration/sharedassets/phone_light/mic_on.svg
diff --git a/src/sharedassets/phone_light/record_call.svg b/src/jamikdeintegration/sharedassets/phone_light/record_call.svg
similarity index 100%
rename from src/sharedassets/phone_light/record_call.svg
rename to src/jamikdeintegration/sharedassets/phone_light/record_call.svg
diff --git a/src/sharedassets/phone_light/refuse.svg b/src/jamikdeintegration/sharedassets/phone_light/refuse.svg
similarity index 100%
rename from src/sharedassets/phone_light/refuse.svg
rename to src/jamikdeintegration/sharedassets/phone_light/refuse.svg
diff --git a/src/sharedassets/phone_light/transfert.svg b/src/jamikdeintegration/sharedassets/phone_light/transfert.svg
similarity index 100%
rename from src/sharedassets/phone_light/transfert.svg
rename to src/jamikdeintegration/sharedassets/phone_light/transfert.svg
diff --git a/src/sharedassets/phone_light/unhold.svg b/src/jamikdeintegration/sharedassets/phone_light/unhold.svg
similarity index 100%
rename from src/sharedassets/phone_light/unhold.svg
rename to src/jamikdeintegration/sharedassets/phone_light/unhold.svg
diff --git a/src/sharedassets/security/lock_certified.svg b/src/jamikdeintegration/sharedassets/security/lock_certified.svg
similarity index 100%
rename from src/sharedassets/security/lock_certified.svg
rename to src/jamikdeintegration/sharedassets/security/lock_certified.svg
diff --git a/src/sharedassets/security/lock_confirmed.svg b/src/jamikdeintegration/sharedassets/security/lock_confirmed.svg
similarity index 100%
rename from src/sharedassets/security/lock_confirmed.svg
rename to src/jamikdeintegration/sharedassets/security/lock_confirmed.svg
diff --git a/src/sharedassets/security/lock_error.svg b/src/jamikdeintegration/sharedassets/security/lock_error.svg
similarity index 100%
rename from src/sharedassets/security/lock_error.svg
rename to src/jamikdeintegration/sharedassets/security/lock_error.svg
diff --git a/src/sharedassets/security/lock_off.svg b/src/jamikdeintegration/sharedassets/security/lock_off.svg
similarity index 100%
rename from src/sharedassets/security/lock_off.svg
rename to src/jamikdeintegration/sharedassets/security/lock_off.svg
diff --git a/src/sharedassets/security/lock_unconfirmed.svg b/src/jamikdeintegration/sharedassets/security/lock_unconfirmed.svg
similarity index 100%
rename from src/sharedassets/security/lock_unconfirmed.svg
rename to src/jamikdeintegration/sharedassets/security/lock_unconfirmed.svg
diff --git a/src/accessibility.cpp b/src/jamikdeintegration/src/accessibility.cpp
similarity index 100%
rename from src/accessibility.cpp
rename to src/jamikdeintegration/src/accessibility.cpp
diff --git a/src/accessibility.h b/src/jamikdeintegration/src/accessibility.h
similarity index 100%
rename from src/accessibility.h
rename to src/jamikdeintegration/src/accessibility.h
diff --git a/src/actioncollection.cpp b/src/jamikdeintegration/src/actioncollection.cpp
similarity index 96%
rename from src/actioncollection.cpp
rename to src/jamikdeintegration/src/actioncollection.cpp
index a516d452..1cb0bc79 100644
--- a/src/actioncollection.cpp
+++ b/src/jamikdeintegration/src/actioncollection.cpp
@@ -1,500 +1,496 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "actioncollection.h"
 
 //Qt
 #include <QtWidgets/QAction>
 #include <QtCore/QPointer>
 #include <QtCore/QTimer>
 #include <QtGui/QKeySequence>
 #include <QQuickWindow>
 
 //KDE
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KShortcutsDialog>
 #include <KActionCollection>
 #include <KSharedConfig>
 #include <KNotifyConfigWidget>
 #include <KGlobalAccel>
 #include <KXmlGuiWindow>
 
 //Ring
 #include "globalinstances.h"
-#include "ringapplication.h"
-#include "icons/icons.h"
-#include "klib/kcfg_settings.h"
+#include "windowevent.h"
+#include "kcfg_settings.h"
 #include <call.h>
 #include <callmodel.h>
 #include <session.h>
-#include <implementation.h>
 #include <useractionmodel.h>
 #include <audio/settings.h>
 #include <persondirectory.h>
-#include <delegates/kdepixmapmanipulation.h>
+#include "shortcutinterface.h"
+#include <interfaces/pixmapmanipulatori.h>
+#include <interfaces/actionextenderi.h>
 
 #ifdef HAVE_SPEECH
  #include "accessibility.h"
 #endif
 
 #define INIT_ACTION(name, icon, text) name = new QAction(icon, text, this);name->setObjectName(QStringLiteral(#name));
 
 ActionCollection* ActionCollection::instance()
 {
    static auto i = new ActionCollection();
    return i;
 }
 
 // Return the default icon
 static QIcon getIcon(const UserActionModel::Action a)
 {
    return qvariant_cast<QIcon>(GlobalInstances::pixmapManipulator().userActionIcon({a, {}, Qt::Unchecked}));
 }
 
 // Return the translated default name
 static QString getName(const UserActionModel::Action a)
 {
    Q_UNUSED(a)
    return QStringLiteral("FOO");
 }
 
 ActionCollection::ActionCollection(QObject* parent) : QObject(parent)
 {
    // It is important to init the actions correctly for the menu and KDE global shortcuts
    INIT_ACTION(action_close         , QIcon::fromTheme("window-close"), i18n( "Close"   ));
 
    INIT_ACTION(action_accept        , QIcon(QStringLiteral(":/sharedassets/phone_light/accept.svg"   )), i18n( "Accept"   ));
    INIT_ACTION(action_hold          , QIcon(QStringLiteral(":/sharedassets/phone_light/hold.svg"     )), i18n( "Hold"     ));
    INIT_ACTION(action_transfer      , QIcon(QStringLiteral(":/sharedassets/phone_light/transfert.svg")), i18n( "Transfer" ));
    INIT_ACTION(action_record        , QIcon(QStringLiteral(":/sharedassets/phone_light/record_call.svg" )), i18n( "Record"   ));
    INIT_ACTION(action_hangup        , QIcon(QStringLiteral(":/sharedassets/phone_light/refuse.svg"  )), i18n( "Hang up"  ));
 
    INIT_ACTION(action_mute_video         , getIcon(UserActionModel::Action::MUTE_VIDEO         ) , getName(UserActionModel::Action::MUTE_VIDEO         ));
    INIT_ACTION(action_join               , getIcon(UserActionModel::Action::JOIN               ) , getName(UserActionModel::Action::JOIN               ));
    INIT_ACTION(action_toggle_video       , getIcon(UserActionModel::Action::TOGGLE_VIDEO       ) , getName(UserActionModel::Action::TOGGLE_VIDEO       ));
    INIT_ACTION(action_add_contact        , getIcon(UserActionModel::Action::ADD_CONTACT        ) , getName(UserActionModel::Action::ADD_CONTACT        ));
    INIT_ACTION(action_add_to_contact     , getIcon(UserActionModel::Action::ADD_TO_CONTACT     ) , getName(UserActionModel::Action::ADD_TO_CONTACT     ));
    INIT_ACTION(action_delete_contact     , getIcon(UserActionModel::Action::DELETE_CONTACT     ) , getName(UserActionModel::Action::DELETE_CONTACT     ));
    INIT_ACTION(action_email_contact      , getIcon(UserActionModel::Action::EMAIL_CONTACT      ) , getName(UserActionModel::Action::EMAIL_CONTACT      ));
    INIT_ACTION(action_copy_contact       , getIcon(UserActionModel::Action::COPY_CONTACT       ) , getName(UserActionModel::Action::COPY_CONTACT       ));
    INIT_ACTION(action_bookmark           , getIcon(UserActionModel::Action::BOOKMARK           ) , getName(UserActionModel::Action::BOOKMARK           ));
    INIT_ACTION(action_view_chat_history  , getIcon(UserActionModel::Action::VIEW_CHAT_HISTORY  ) , getName(UserActionModel::Action::VIEW_CHAT_HISTORY  ));
    INIT_ACTION(action_add_contact_method , getIcon(UserActionModel::Action::ADD_CONTACT_METHOD ) , getName(UserActionModel::Action::ADD_CONTACT_METHOD ));
    INIT_ACTION(action_call_contact       , getIcon(UserActionModel::Action::CALL_CONTACT       ) , getName(UserActionModel::Action::CALL_CONTACT       ));
    INIT_ACTION(action_edit_contact       , getIcon(UserActionModel::Action::EDIT_CONTACT       ) , getName(UserActionModel::Action::EDIT_CONTACT       ));
    INIT_ACTION(action_new_call           , getIcon(UserActionModel::Action::ADD_NEW            ) , getName(UserActionModel::Action::ADD_NEW            ));
    INIT_ACTION(action_remove_history     , getIcon(UserActionModel::Action::REMOVE_HISTORY     ) , getName(UserActionModel::Action::REMOVE_HISTORY     ));
 
    INIT_ACTION(action_mute_capture  , QIcon::fromTheme(QStringLiteral("player-volume-muted")), i18nc("Mute the current audio capture device" , "Mute"     ));
    INIT_ACTION(action_mute_playback , QIcon::fromTheme(QStringLiteral("player-volume-muted")), i18nc("Mute the current audio playback device", "Mute Playback"     ));
 
-#ifdef ENABLE_VIDEO
    INIT_ACTION(action_video_rotate_left     , QIcon::fromTheme(QStringLiteral("object-rotate-left"    )), i18n( "Rotate left"       ));
    INIT_ACTION(action_video_rotate_right    , QIcon::fromTheme(QStringLiteral("object-rotate-right"   )), i18n( "Rotate right"      ));
    INIT_ACTION(action_video_flip_horizontal , QIcon::fromTheme(QStringLiteral("object-flip-horizontal")), i18n( "Flip"              ));
    INIT_ACTION(action_video_flip_vertical   , QIcon::fromTheme(QStringLiteral("object-flip-vertical"  )), i18n( "Flip"              ));
    INIT_ACTION(action_video_mute            , QIcon::fromTheme(QStringLiteral("camera-web"            )), i18n( "Mute"              ));
    INIT_ACTION(action_video_preview         , QIcon::fromTheme(QStringLiteral("view-preview"          )), i18n( "Preview"           ));
    INIT_ACTION(action_video_scale           , QIcon::fromTheme(QStringLiteral("transform-scale"       )), i18n( "Keep aspect ratio" ));
    INIT_ACTION(action_video_fullscreen      , QIcon::fromTheme(QStringLiteral("view-fullscreen"       )), i18n( "Fullscreen"        ));
-#endif
 }
 
 ActionCollection::~ActionCollection()
 {}
 
 QObject* ActionCollection::fakeMainWindow() const
 {
    static auto mw = new KXmlGuiWindow();
 
    static bool init = false;
    if (!init) {
       // Use a QTimer since it can enter in a recursion if there is a shortcut
       // collision creating a warning popup parented on the main window.
       #ifdef Q_OS_MAC
          QDir dir(QApplication::applicationDirPath());
          dir.cdUp();
          dir.cd("Resources/");
          QTimer::singleShot(0, [dir]() {mw->createGUI(dir.path()+"/ring-kdeui.rc");});
       #else
          QTimer::singleShot(0, []() {mw->createGUI();});
       #endif
       init = true;
    }
 
    return mw;
 }
 
 QObject* ActionCollection::kactionCollection() const
 {
    return qobject_cast<KXmlGuiWindow*>(fakeMainWindow())->actionCollection();
 }
 
 void ActionCollection::setupAction()
 {
    auto mw  = qobject_cast<KXmlGuiWindow*>(fakeMainWindow());
    auto col = mw->actionCollection();
 
    // Import standard actions
-   action_quit = KStandardAction::quit       ( RingApplication::instance(), SLOT(quit())   , this);
+   action_quit = KStandardAction::quit       ( WindowEvent::instance(), SLOT(quit())   , this);
 
-   action_quit ->setObjectName( QStringLiteral("action_quit")          );
-   action_close->setObjectName( QStringLiteral("action_close")          );
+   action_quit ->setObjectName( QStringLiteral("action_quit" ) );
+   action_close->setObjectName( QStringLiteral("action_close") );
 
    action_quit->setText(i18n("Quit"));
 
-   INIT_ACTION(action_displayDialpad        , QIcon(RingIcons::DISPLAY_DIALPAD), i18n("Display dialpad"         ));
+   INIT_ACTION(action_displayDialpad        , {}                               , i18n("Display dialpad"         ));
    INIT_ACTION(action_displayVolumeControls , {}                               , i18n("Display volume controls" ));
    INIT_ACTION(action_displayAccountCbb     , {}                               , i18n("Display account selector"));
    INIT_ACTION(action_raise_client          , {}                               , i18n("Raise Ring-KDE window"   ));
    INIT_ACTION(action_focus_history         , {}                               , i18n("Search history"          ));
    INIT_ACTION(action_focus_call            , {}                               , i18n("Search call"             ));
    INIT_ACTION(action_focus_contact         , {}                               , i18n("Search contact"          ));
    INIT_ACTION(action_focus_bookmark        , {}                               , i18n("Search bookmark"         ));
 
    INIT_ACTION(action_show_wizard           , QIcon::fromTheme(QStringLiteral("tools-wizard"                    )), i18n("New account wizard"      ));
    INIT_ACTION(action_show_menu             , QIcon::fromTheme(QStringLiteral("application-menu"                )), i18n("Show the menu"           ));
    INIT_ACTION(action_new_contact           , QIcon::fromTheme(QStringLiteral("contact-new"                     )), i18n("New contact"             ));
    INIT_ACTION(action_pastenumber           , QIcon::fromTheme(QStringLiteral("edit-paste"                      )), i18n("Paste"                   ));
    INIT_ACTION(action_showContactDock       , QIcon::fromTheme(QStringLiteral("edit-find-user"                  )), i18n("Display Person"          ));
    INIT_ACTION(action_showHistoryDock       , QIcon::fromTheme(QStringLiteral("view-history"                    )), i18n("Display history"         ));
    INIT_ACTION(action_showBookmarkDock      , QIcon::fromTheme(QStringLiteral("bookmark-new-list"               )), i18n("Display bookmark"        ));
    INIT_ACTION(action_showTimelineDock      , QIcon::fromTheme(QStringLiteral("bookmark-new-list"               )), i18n("Display timeline"        ));
    INIT_ACTION(action_showDialDock          , QIcon::fromTheme(QStringLiteral("bookmark-new-list"               )), i18n("Display call manager"    ));
    INIT_ACTION(action_addPerson             , QIcon::fromTheme(QStringLiteral("contact-new"                     )), i18n("Add new contact"         ));
    INIT_ACTION(action_configureShortcut     , QIcon::fromTheme(QStringLiteral("configure-shortcuts"             )), i18n("Configure Shortcuts"     ));
    INIT_ACTION(action_configureNotifications, QIcon::fromTheme(QStringLiteral("preferences-desktop-notification")), i18n("Configure Notifications" ));
    INIT_ACTION(action_configureAccount      , QIcon::fromTheme(QStringLiteral("configure"                       )), i18n("Configure Accounts"      ));
 
 #define COL(a,b) col->setDefaultShortcut(a,b)
    // Assign default shortcuts
    COL(action_accept      , Qt::CTRL + Qt::Key_A );
    COL(action_new_call    , Qt::CTRL + Qt::Key_N );
    COL(action_hold        , Qt::CTRL + Qt::Key_H );
    COL(action_transfer    , Qt::CTRL + Qt::Key_T );
    COL(action_record      , Qt::CTRL + Qt::Key_R );
    COL(action_pastenumber , Qt::CTRL + Qt::Key_V );
    COL(action_show_menu   , Qt::CTRL + Qt::Key_M );
 #undef COL
 
 
    // Declare checkable actions
    for (QAction* a : {
       action_video_preview        , action_video_scale          , action_video_fullscreen  ,
       action_video_mute           , action_displayDialpad       , action_displayAccountCbb ,
       action_mute_playback        , action_displayVolumeControls, action_showContactDock   ,
       action_showHistoryDock      , action_showBookmarkDock     , action_mute_capture      ,
       action_show_menu            , action_showTimelineDock     , action_showDialDock      ,
    }) {
       a->setCheckable( true );
    }
 
    // Load the saved check state from KConfig
    action_video_scale           ->setChecked( ConfigurationSkeleton::keepVideoAspectRatio() );
    action_video_preview         ->setChecked( ConfigurationSkeleton::displayVideoPreview () );
    action_displayDialpad        ->setChecked( ConfigurationSkeleton::displayDialpad      () );
    action_displayAccountCbb     ->setChecked( ConfigurationSkeleton::displayAccountBox   () );
    action_displayVolumeControls ->setChecked( ConfigurationSkeleton::displayVolume       () );
    action_showContactDock       ->setChecked( ConfigurationSkeleton::displayContactDock  () );
    action_showHistoryDock       ->setChecked( ConfigurationSkeleton::displayHistoryDock  () );
    action_showBookmarkDock      ->setChecked( ConfigurationSkeleton::displayBookmarkDock () );
    action_showTimelineDock      ->setChecked( ConfigurationSkeleton::displayRecentDock   () );
    action_showDialDock          ->setChecked( ConfigurationSkeleton::displayDialDock     () );
    action_show_menu             ->setChecked( ConfigurationSkeleton::displayMenu         () );
 
 #define BIND_KCFG(action, setter) connect(action, &QAction::triggered,[](bool v) {\
    ConfigurationSkeleton:: setter(v);\
 });
 
    BIND_KCFG(action_showHistoryDock , setDisplayHistoryDock )
    BIND_KCFG(action_showContactDock , setDisplayContactDock )
    BIND_KCFG(action_showBookmarkDock, setDisplayBookmarkDock)
    BIND_KCFG(action_showDialDock    , setDisplayDialDock    )
    BIND_KCFG(action_showTimelineDock, setDisplayRecentDock  )
 
 #undef BIND_KCFG
 
    //Bind actions to the useractionmodel
    UserActionModel* uam = Session::instance()->callModel()->userActionModel();
    QHash<int, QAction*> actionHash;
    actionHash[ (int)UserActionModel::Action::ACCEPT              ] = action_accept             ;
    actionHash[ (int)UserActionModel::Action::ADD_NEW             ] = action_new_call           ;
    actionHash[ (int)UserActionModel::Action::HOLD                ] = action_hold               ;
    actionHash[ (int)UserActionModel::Action::MUTE_AUDIO          ] = action_mute_capture       ;
    actionHash[ (int)UserActionModel::Action::SERVER_TRANSFER     ] = action_transfer           ;
    actionHash[ (int)UserActionModel::Action::RECORD              ] = action_record             ;
    actionHash[ (int)UserActionModel::Action::HANGUP              ] = action_hangup             ;
    actionHash[ (int)UserActionModel::Action::MUTE_VIDEO          ] = action_mute_video         ;
    actionHash[ (int)UserActionModel::Action::JOIN                ] = action_join               ;
    actionHash[ (int)UserActionModel::Action::TOGGLE_VIDEO        ] = action_toggle_video       ;
    actionHash[ (int)UserActionModel::Action::ADD_CONTACT         ] = action_add_contact        ;
    actionHash[ (int)UserActionModel::Action::ADD_TO_CONTACT      ] = action_add_to_contact     ;
    actionHash[ (int)UserActionModel::Action::DELETE_CONTACT      ] = action_delete_contact     ;
    actionHash[ (int)UserActionModel::Action::EMAIL_CONTACT       ] = action_email_contact      ;
    actionHash[ (int)UserActionModel::Action::COPY_CONTACT        ] = action_copy_contact       ;
    actionHash[ (int)UserActionModel::Action::BOOKMARK            ] = action_bookmark           ;
    actionHash[ (int)UserActionModel::Action::VIEW_CHAT_HISTORY   ] = action_view_chat_history  ;
    actionHash[ (int)UserActionModel::Action::ADD_CONTACT_METHOD  ] = action_add_contact_method ;
    actionHash[ (int)UserActionModel::Action::CALL_CONTACT        ] = action_call_contact       ;
    actionHash[ (int)UserActionModel::Action::EDIT_CONTACT        ] = action_edit_contact       ;
    actionHash[ (int)UserActionModel::Action::REMOVE_HISTORY      ] = action_remove_history     ;
 
    for (QHash<int,QAction*>::const_iterator i = actionHash.constBegin(); i != actionHash.constEnd(); ++i) {
       QAction* ea = i.value();
       UserActionModel::Action a = static_cast<UserActionModel::Action>(i.key());
       connect(ea, &QAction::triggered, this, [uam,a](bool) {uam << a;});
    }
 
    // Refresh the action state and text
    static auto l = [actionHash,uam](const QModelIndex& tl, const QModelIndex& br) {
       const int first(tl.row()),last(br.row());
       for(int i = first; i <= last;i++) {
          const auto idx = uam->index(i,0);
          const UserActionModel::Action action = qvariant_cast<UserActionModel::Action>(idx.data(UserActionModel::Role::ACTION));
          QAction* a = actionHash[(int)action];
          if (a) {
             a->setText   ( idx.data(Qt::DisplayRole).toString()                 );
 
             if (action != UserActionModel::Action::ADD_NEW) //HACK
                a->setEnabled( idx.flags() & Qt::ItemIsEnabled                   );
 
             a->setChecked( idx.data(Qt::CheckStateRole) == Qt::Checked          );
          }
       }
    };
 
    connect(uam, &UserActionModel::dataChanged, l);
 
    // Load the initial text
    l(uam->index(0,0), uam->index(uam->rowCount() -1));
 
    const auto as = &Audio::Settings::instance();
 
    // Connect actions
    connect(action_mute_capture           , &QAction::toggled   , as                 , &Audio::Settings::muteCapture             );
    connect(action_mute_playback          , &QAction::toggled   , as                 , &Audio::Settings::mutePlayback            );
-   connect(action_show_wizard            , &QAction::triggered , RingApplication::instance(), &RingApplication::showWizard      );
-   connect(action_configureAccount       , &QAction::triggered , RingApplication::instance(), &RingApplication::configureAccounts);
+   connect(action_show_wizard            , &QAction::triggered , WindowEvent::instance(), &WindowEvent::showWizard      );
+   connect(action_configureAccount       , &QAction::triggered , WindowEvent::instance(), &WindowEvent::configureAccounts);
    connect(action_show_menu              , &QAction::toggled   , this               , &ActionCollection::slotShowMenubar        );
    connect(action_close                  , &QAction::triggered , this               , &ActionCollection::slotClose              );
    connect(action_new_contact            , &QAction::triggered , this               , &ActionCollection::slotNewContact         );
    connect(action_configureShortcut      , &QAction::triggered , this               , &ActionCollection::showShortCutEditor     );
    connect(action_configureNotifications , &QAction::triggered , this               , &ActionCollection::showNotificationEditor );
    connect(action_addPerson              , &QAction::triggered , this               , &ActionCollection::slotAddPerson          );
    connect(action_raise_client           , &QAction::triggered , this               , &ActionCollection::slotRaiseClient        );
 
    connect(as, &Audio::Settings::captureVolumeChanged  , this                , &ActionCollection::updateRecordButton );
    connect(as, &Audio::Settings::playbackVolumeChanged , this                , &ActionCollection::updateVolumeButton );
    connect(as, &Audio::Settings::captureMuted          , action_mute_capture , &QAction::setChecked                  );
    connect(as, &Audio::Settings::playbackMuted         , action_mute_playback, &QAction::setChecked                  );
 
    // Add the actions to the collection
    for (QAction* a : {
       action_accept            , action_new_call          , action_hold              ,
       action_transfer          , action_record            , action_new_contact       ,
       action_quit              , action_displayDialpad    , action_showDialDock      ,
       action_displayAccountCbb , action_close             ,
       action_configureShortcut , action_pastenumber       , action_showContactDock   ,
       action_showHistoryDock   , action_showBookmarkDock  ,
       action_addPerson         , action_mute_capture      , action_mute_playback     ,
       action_mute_video        , action_join              , action_toggle_video      ,
       action_add_contact       , action_add_to_contact    , action_delete_contact    ,
       action_email_contact     , action_copy_contact      , action_bookmark          ,
       action_view_chat_history , action_add_contact_method, action_call_contact      ,
       action_edit_contact      , action_focus_history     , action_remove_history    ,
       action_raise_client      , action_focus_contact     , action_focus_call        ,
       action_focus_bookmark    , action_show_wizard       ,
       action_show_menu         , action_showTimelineDock  , action_configureAccount  ,
       action_configureNotifications, action_displayVolumeControls ,
    }) {
       col->addAction(a->objectName(), a);
    }
 
    // Enable global shortcuts for relevant "current call" actions
    for (QAction* a : {
       action_accept       , action_new_call    , action_hold         ,
       action_mute_capture , action_transfer    , action_record       ,
       action_hangup       , action_raise_client, action_focus_history,
       action_focus_contact, action_focus_call  , action_focus_bookmark
    }) {
       KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>{});
    }
 
-   GlobalInstances::setInterface<KDEShortcutDelegate>();
+   GlobalInstances::setInterface<ShortcutInterface>();
 
 #ifdef HAVE_SPEECH
    QList<QAction *> acList = *Accessibility::instance();
 
    foreach(QAction * ac,acList) {
       col->addAction(ac->objectName() , ac);
    }
 #endif
 
    QTimer::singleShot(0, [this]() {
       updateRecordButton();
       updateVolumeButton();
    });
 }
 
 ///Display the shortcuts dialog
 void ActionCollection::showShortCutEditor()
 {
    KShortcutsDialog::configure(
       qobject_cast<KXmlGuiWindow*>(
          ActionCollection::instance()->fakeMainWindow()
       )->actionCollection()
    );
 }
 
 ///Display the notification manager
 void ActionCollection::showNotificationEditor()
 {
    KNotifyConfigWidget::configure(nullptr, QStringLiteral("ring-kde"));
 }
 
 void ActionCollection::slotAddPerson()
 {
    Person* aPerson = new Person();
    Session::instance()->personDirectory()->addNewPerson(aPerson);
 }
 
 ///Change icon of the record button
 void ActionCollection::updateRecordButton()
 {
    double recVol = Audio::Settings::instance().captureVolume();
    static const QIcon icons[4] = {
       QIcon(QStringLiteral(":/images/icons/mic.svg"   )),
       QIcon(QStringLiteral(":/images/icons/mic_25.svg")),
       QIcon(QStringLiteral(":/images/icons/mic_50.svg")),
       QIcon(QStringLiteral(":/images/icons/mic_75.svg"))
    };
 
    const int idx = (recVol/26 < 0 || recVol/26 >= 4)?0:recVol/26;
    ActionCollection::instance()->muteCaptureAction()->setIcon(icons[idx]);
 }
 
 ///Update the colunm button icon
 void ActionCollection::updateVolumeButton()
 {
    double sndVol = Audio::Settings::instance().playbackVolume();
    static const QIcon icons[4] = {
       QIcon(QStringLiteral(":/images/icons/speaker.svg"   )),
       QIcon(QStringLiteral(":/images/icons/speaker_25.svg")),
       QIcon(QStringLiteral(":/images/icons/speaker_50.svg")),
       QIcon(QStringLiteral(":/images/icons/speaker_75.svg"))
    };
 
    const int idx = (sndVol/26 < 0 || sndVol/26 >= 4)?0:sndVol/26;
    ActionCollection::instance()->mutePlaybackAction()->setIcon(icons[idx]);
 }
 
 void ActionCollection::slotNewContact()
 {
    // Find a suitable collection
    auto cols = Session::instance()->personDirectory()->enabledCollections(
       CollectionInterface::SupportedFeatures::ADD |
       CollectionInterface::SupportedFeatures::EDIT
    );
 
    if (cols.isEmpty()) {
       qWarning() << "Failed to add a contact: no suitable backend found";
       return;
    }
 
    const auto col = cols.first();
 
    auto p = new Person();
    p->setCollection(col); //TODO have a selection widget again
 
    GlobalInstances::actionExtender().editPerson(p);
 
    // The editor won't save if the name isn't set, so it can be used to check
    // if cancel was clicked.
    col->editor<Person>()->addExisting(p);
 }
 
 void ActionCollection::slotClose()
 {
-   RingApplication::instance()->desktopWindow()->hide();
+   WindowEvent::instance()->hideWindow();
 }
 
 void ActionCollection::slotShowMenubar(bool s)
 {
    Q_UNUSED(s)
 //    RingApplication::instance()->timelineWindow()->showMenu(s);
 }
 
 ///Raise the main window to the foreground
 void ActionCollection::slotRaiseClient(bool focus)
 {
    if (focus) {
       // Add a new call if there is none
       if (!Session::instance()->callModel()->rowCount())
          Session::instance()->callModel()->userActionModel() << UserActionModel::Action::ADD_NEW;
    }
 }
 
 #define GETTER(name, action) QAction* ActionCollection::name(){return action;}
 
 GETTER(holdAction                   , action_hold                  )
 GETTER(recordAction                 , action_record                )
 GETTER(muteCaptureAction            , action_mute_capture          )
 GETTER(mutePlaybackAction           , action_mute_playback         )
 GETTER(hangupAction                 , action_hangup                )
 GETTER(transferAction               , action_transfer              )
 GETTER(acceptAction                 , action_accept                )
 GETTER(newCallAction                , action_new_call              )
 GETTER(displayVolumeControlsAction  , action_displayVolumeControls )
 GETTER(displayDialpadAction         , action_displayDialpad        )
 GETTER(displayAccountCbbAction      , action_displayAccountCbb     )
 GETTER(showContactDockAction        , action_showContactDock       )
 GETTER(showHistoryDockAction        , action_showHistoryDock       )
 GETTER(showBookmarkDockAction       , action_showBookmarkDock      )
 GETTER(showTimelineDockAction       , action_showTimelineDock      )
 GETTER(showDialDockAction           , action_showDialDock          )
 GETTER(quitAction                   , action_quit                  )
 GETTER(closeAction                  , action_close                 )
 GETTER(addPerson                    , action_addPerson             )
 GETTER(focusHistory                 , action_focus_history         )
 GETTER(focusContact                 , action_focus_contact         )
 GETTER(focusCall                    , action_focus_call            )
 GETTER(focusBookmark                , action_focus_bookmark        )
 GETTER(showWizard                   , action_show_wizard           )
 GETTER(showMenu                     , action_show_menu             )
 GETTER(newContact                   , action_new_contact           )
 GETTER(configureShortcut            , action_configureShortcut     )
 GETTER(configureNotification        , action_configureNotifications)
 GETTER(configureAccount             , action_configureAccount)
 
 //Video actions
-#ifdef ENABLE_VIDEO
 GETTER(videoRotateLeftAction        , action_video_rotate_left     )
 GETTER(videoRotateRightAction       , action_video_rotate_right    )
 GETTER(videoFlipHorizontalAction    , action_video_flip_horizontal )
 GETTER(videoFlipVerticalAction      , action_video_flip_vertical   )
 GETTER(videoMuteAction              , action_video_mute            )
 GETTER(videoPreviewAction           , action_video_preview         )
 GETTER(videoScaleAction             , action_video_scale           )
 GETTER(videoFullscreenAction        , action_video_fullscreen      )
-#endif
 
 #undef GETTER
 
 #undef INIT_ACTION
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/actioncollection.h b/src/jamikdeintegration/src/actioncollection.h
similarity index 98%
rename from src/actioncollection.h
rename to src/jamikdeintegration/src/actioncollection.h
index be4178e2..84457b80 100644
--- a/src/actioncollection.h
+++ b/src/jamikdeintegration/src/actioncollection.h
@@ -1,218 +1,212 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 #ifndef ACTIONCOLLECTION_H
 #define ACTIONCOLLECTION_H
 
 #include <QtCore/QObject>
 
 //Qt
 class QActionGroup;
 
 //KDE
 class QAction;
 
 // Ring
 class KXmlGuiWindow;
 class PhoneWindow;
 class KActionCollection;
 
 ///Group action declaration under the same umbrella
-class ActionCollection : public QObject
+class Q_DECL_EXPORT ActionCollection : public QObject
 {
    Q_OBJECT
 public:
 
    //Constructor
    explicit ActionCollection(QObject* parent = nullptr);
    virtual ~ActionCollection();
    static ActionCollection* instance();
    void setupAction();
 
    Q_PROPERTY(QAction* holdAction                  READ holdAction                  CONSTANT)
    Q_PROPERTY(QAction* recordAction                READ recordAction                CONSTANT)
    Q_PROPERTY(QAction* muteCaptureAction           READ muteCaptureAction           CONSTANT)
    Q_PROPERTY(QAction* mutePlaybackAction          READ mutePlaybackAction          CONSTANT)
    Q_PROPERTY(QAction* hangupAction                READ hangupAction                CONSTANT)
    Q_PROPERTY(QAction* transferAction              READ transferAction              CONSTANT)
    Q_PROPERTY(QAction* acceptAction                READ acceptAction                CONSTANT)
    Q_PROPERTY(QAction* newCallAction               READ newCallAction               CONSTANT)
    Q_PROPERTY(QAction* displayVolumeControlsAction READ displayVolumeControlsAction CONSTANT)
    Q_PROPERTY(QAction* displayDialpadAction        READ displayDialpadAction        CONSTANT)
    Q_PROPERTY(QAction* displayAccountCbbAction     READ displayAccountCbbAction     CONSTANT)
    Q_PROPERTY(QAction* showContactDockAction       READ showContactDockAction       CONSTANT)
    Q_PROPERTY(QAction* showHistoryDockAction       READ showHistoryDockAction       CONSTANT)
    Q_PROPERTY(QAction* showTimelineDockAction      READ showTimelineDockAction      CONSTANT)
    Q_PROPERTY(QAction* showDialDockAction          READ showDialDockAction          CONSTANT)
    Q_PROPERTY(QAction* showBookmarkDockAction      READ showBookmarkDockAction      CONSTANT)
    Q_PROPERTY(QAction* quitAction                  READ quitAction                  CONSTANT)
    Q_PROPERTY(QAction* closeAction                 READ closeAction                 CONSTANT)
    Q_PROPERTY(QAction* addPerson                   READ addPerson                   CONSTANT)
    Q_PROPERTY(QAction* focusHistory                READ focusHistory                CONSTANT)
    Q_PROPERTY(QAction* focusContact                READ focusContact                CONSTANT)
    Q_PROPERTY(QAction* focusCall                   READ focusCall                   CONSTANT)
    Q_PROPERTY(QAction* focusBookmark               READ focusBookmark               CONSTANT)
    Q_PROPERTY(QAction* showWizard                  READ showWizard                  CONSTANT)
    Q_PROPERTY(QAction* showMenu                    READ showMenu                    CONSTANT)
    Q_PROPERTY(QAction* newContact                  READ newContact                  CONSTANT)
    Q_PROPERTY(QAction* configureShortcut           READ configureShortcut           CONSTANT)
    Q_PROPERTY(QAction* configureNotification       READ configureNotification       CONSTANT)
    Q_PROPERTY(QAction* configureAccount            READ configureAccount            CONSTANT)
-   #ifdef ENABLE_VIDEO
    Q_PROPERTY(QAction* videoRotateLeftAction     READ videoRotateLeftAction     CONSTANT)
    Q_PROPERTY(QAction* videoRotateRightAction    READ videoRotateRightAction    CONSTANT)
    Q_PROPERTY(QAction* videoFlipHorizontalAction READ videoFlipHorizontalAction CONSTANT)
    Q_PROPERTY(QAction* videoFlipVerticalAction   READ videoFlipVerticalAction   CONSTANT)
    Q_PROPERTY(QAction* videoMuteAction           READ videoMuteAction           CONSTANT)
    Q_PROPERTY(QAction* videoPreviewAction        READ videoPreviewAction        CONSTANT)
    Q_PROPERTY(QAction* vimw2deoScaleAction          READ videoScaleAction          CONSTANT)
    Q_PROPERTY(QAction* videoFullscreenAction     READ videoFullscreenAction     CONSTANT)
-   #endif
 
    Q_PROPERTY(QObject* fakeMainWindow READ fakeMainWindow CONSTANT)
    Q_PROPERTY(QObject* kactionCollection READ kactionCollection CONSTANT)
 
    //Actions
    QAction* holdAction                  ();
    QAction* recordAction                ();
    QAction* muteCaptureAction           ();
    QAction* mutePlaybackAction          ();
    QAction* hangupAction                ();
    QAction* transferAction              ();
    QAction* acceptAction                ();
    QAction* newCallAction               ();
    QAction* displayVolumeControlsAction ();
    QAction* displayDialpadAction        ();
    QAction* displayAccountCbbAction     ();
    QAction* showContactDockAction       ();
    QAction* showHistoryDockAction       ();
    QAction* showBookmarkDockAction      ();
    QAction* showTimelineDockAction      ();
    QAction* showDialDockAction          ();
    QAction* quitAction                  ();
    QAction* closeAction                 ();
    QAction* addPerson                   ();
    QAction* focusHistory                ();
    QAction* focusContact                ();
    QAction* focusCall                   ();
    QAction* focusBookmark               ();
    QAction* showWizard                  ();
    QAction* showMenu                    ();
    QAction* newContact                  ();
    QAction* configureShortcut           ();
    QAction* configureNotification       ();
    QAction* configureAccount            ();
 
    //Video actions
-   #ifdef ENABLE_VIDEO
    QAction* videoRotateLeftAction     ();
    QAction* videoRotateRightAction    ();
    QAction* videoFlipHorizontalAction ();
    QAction* videoFlipVerticalAction   ();
    QAction* videoMuteAction           ();
    QAction* videoPreviewAction        ();
    QAction* videoScaleAction          ();
    QAction* videoFullscreenAction     ();
-   #endif
 
 private:
 
    //Selection dependant
    QAction* action_accept             {nullptr};
    QAction* action_new_call           {nullptr};
    QAction* action_hold               {nullptr};
    QAction* action_transfer           {nullptr};
    QAction* action_record             {nullptr};
    QAction* action_mute_capture       {nullptr};
    QAction* action_mute_playback      {nullptr};
    QAction* action_hangup             {nullptr};
    QAction* action_mute_video         {nullptr};
    QAction* action_join               {nullptr};
    QAction* action_toggle_video       {nullptr};
    QAction* action_add_contact        {nullptr};
    QAction* action_add_to_contact     {nullptr};
    QAction* action_delete_contact     {nullptr};
    QAction* action_email_contact      {nullptr};
    QAction* action_copy_contact       {nullptr};
    QAction* action_bookmark           {nullptr};
    QAction* action_view_chat_history  {nullptr};
    QAction* action_add_contact_method {nullptr};
    QAction* action_call_contact       {nullptr};
    QAction* action_edit_contact       {nullptr};
    QAction* action_remove_history     {nullptr};
 
    //Video actions
-   #ifdef ENABLE_VIDEO
    QAction* action_video_rotate_left     {nullptr};
    QAction* action_video_rotate_right    {nullptr};
    QAction* action_video_flip_horizontal {nullptr};
    QAction* action_video_flip_vertical   {nullptr};
    QAction* action_video_mute            {nullptr};
    QAction* action_video_preview         {nullptr};
    QAction* action_video_scale           {nullptr};
    QAction* action_video_fullscreen      {nullptr};
-   #endif
 
    //Other actions
    QAction * action_new_contact            {nullptr};
    QAction * action_quit                   {nullptr};
    QAction * action_close                  {nullptr};
    QAction * action_displayVolumeControls  {nullptr};
    QAction * action_displayDialpad         {nullptr};
    QAction * action_displayAccountCbb      {nullptr};
    QAction * action_configureShortcut      {nullptr};
    QAction * action_configureNotifications {nullptr};
    QAction * action_configureAccount       {nullptr};
    QAction * action_pastenumber            {nullptr};
    QAction * action_showContactDock        {nullptr};
    QAction * action_showHistoryDock        {nullptr};
    QAction * action_showBookmarkDock       {nullptr};
    QAction * action_showTimelineDock       {nullptr};
    QAction * action_showDialDock           {nullptr};
    QAction * action_addPerson              {nullptr};
    QAction * action_raise_client           {nullptr};
    QAction * action_focus_history          {nullptr};
    QAction * action_focus_contact          {nullptr};
    QAction * action_focus_call             {nullptr};
    QAction * action_focus_bookmark         {nullptr};
    QAction * action_show_wizard            {nullptr};
    QAction * action_show_directory         {nullptr};
    QAction * action_show_menu              {nullptr};
 
    QObject* fakeMainWindow() const;
    QObject* kactionCollection() const;
 
 public Q_SLOTS:
    void slotRaiseClient           ( bool focus = false );
 
 private Q_SLOTS:
    void showShortCutEditor    ();
    void showNotificationEditor();
    void slotAddPerson         ();
    void updateRecordButton    ();
    void updateVolumeButton    ();
    void slotNewContact        ();
    void slotClose             ();
    void slotShowMenubar       (bool s);
 
 Q_SIGNALS:
    void windowStateChanged();
 };
 
 #endif
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/jamikdeintegration/src/actioninterface.cpp b/src/jamikdeintegration/src/actioninterface.cpp
new file mode 100644
index 00000000..0db016ec
--- /dev/null
+++ b/src/jamikdeintegration/src/actioninterface.cpp
@@ -0,0 +1,128 @@
+/***************************************************************************
+ *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "actioninterface.h"
+
+// Qt
+#include <QtCore/QMimeData>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QClipboard>
+#include <QtCore/QPointer>
+#include <QtCore/QUrl>
+#include <QQuickView>
+#include <QQuickItem>
+
+// KDE
+#include <KMessageBox>
+#include <KLocalizedString>
+
+// LibRingQt
+#include "contactmethod.h"
+#include "individualdirectory.h"
+#include "media/textrecording.h"
+#include "person.h"
+#include "individual.h"
+#include "session.h"
+
+// Ring-KDE
+#include "plugin.h"
+
+void ActionInterface::editPerson(Person* p)
+{
+   QPointer<QQuickView> d = new QQuickView( JamiKDEIntegration::engine(), nullptr );
+
+   d->setSource(QUrl(QStringLiteral("qrc:/ContactDialog.qml")));
+   d->setResizeMode(QQuickView::SizeRootObjectToView);
+   auto item = d->rootObject();
+   item->setProperty("currentPerson", QVariant::fromValue(p));
+   item->setProperty("showStat"   , false     );
+   item->setProperty("showImage"  , true      );
+   item->setProperty("forcedState", "profile" );
+
+   d->resize(800, 600);
+   d->show();
+}
+
+void ActionInterface::viewChatHistory(ContactMethod* cm)
+{
+   if (!cm)
+      return;
+
+   // Get a real contact method when necessary
+   if (cm->type() == ContactMethod::Type::TEMPORARY) {
+      cm = Session::instance()->individualDirectory()->getExistingNumberIf(
+         cm->uri(),
+         [](const ContactMethod* cm) -> bool {
+            return cm->textRecording() && !cm->textRecording()->isEmpty();
+      });
+   }
+
+   if (!cm)
+      return;
+
+   //FIXME open the timeline
+}
+
+void ActionInterface::viewChatHistory(Person* p)
+{
+   if (!p)
+      return;
+
+   foreach(ContactMethod* cm, p->individual()->phoneNumbers())
+      viewChatHistory(cm);
+}
+
+void ActionInterface::copyInformation(QMimeData* data)
+{
+   QClipboard* clipboard = QGuiApplication::clipboard();
+   clipboard->setMimeData(data);
+}
+
+bool ActionInterface::warnDeletePerson(Person* p)
+{
+   const int ret = KMessageBox::questionYesNo(nullptr,
+      i18n("Are you sure you want to permanently delete %1?",
+      p->formattedName()), i18n("Delete contact")
+   );
+
+   return ret == KMessageBox::Yes;
+}
+
+bool ActionInterface::warnDeleteCall(Call* c)
+{
+   Q_UNUSED(c)
+   const int ret = KMessageBox::questionYesNo(nullptr,
+      i18n("Are you sure you wish to remove this call?"), i18n("Delete call")
+   );
+
+   return ret == KMessageBox::Yes;
+}
+
+Person* ActionInterface::selectPerson(FlagPack<SelectPersonHint> hints, const QVariant& hintVar) const
+{
+   Q_UNUSED(hints)
+   Q_UNUSED(hintVar)
+   return nullptr;
+}
+
+ContactMethod* ActionInterface::selectContactMethod(FlagPack<ActionExtenderI::SelectContactMethodHint> hints, const QVariant& hintVar) const
+{
+   Q_UNUSED(hints)
+   Q_UNUSED(hintVar)
+
+   return nullptr;
+}
diff --git a/src/widgets/filterlineedit.h b/src/jamikdeintegration/src/actioninterface.h
similarity index 60%
copy from src/widgets/filterlineedit.h
copy to src/jamikdeintegration/src/actioninterface.h
index 9720c19a..cd1f5d48 100644
--- a/src/widgets/filterlineedit.h
+++ b/src/jamikdeintegration/src/actioninterface.h
@@ -1,44 +1,37 @@
 /***************************************************************************
  *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
-#ifndef FILTERLINEEDIT_H
-#define FILTERLINEEDIT_H
+#pragma once
 
-#include <QtWidgets/QLineEdit>
+#include <interfaces/actionextenderi.h>
 
-///FilterLineEdit: An internalional filter string
-class FilterLineEdit final : public QLineEdit
+class ActionInterface final : public Interfaces::ActionExtenderI
 {
-Q_OBJECT
-
 public:
-   explicit FilterLineEdit(QWidget *parent = nullptr);
-   virtual ~FilterLineEdit();
-
-   void forwardInput(QKeyEvent* e);
-
-private Q_SLOTS:
-   void slotTextChanged(const QString& text);
-
-Q_SIGNALS:
-   ///When the text change
-   void filterStringChanged(const QString& string);
+    explicit ActionInterface() = default;
+    ActionInterface(const ActionInterface&) = delete;
+    ActionInterface& operator=(const ActionInterface&) = delete;
+
+    virtual void editPerson(Person* p) override;
+    virtual void viewChatHistory(ContactMethod* cm) override;
+    virtual void viewChatHistory(Person* p) override;
+    virtual void copyInformation(QMimeData* data) override;
+    virtual bool warnDeletePerson(Person* p) override;
+    virtual bool warnDeleteCall(Call* c) override;
+    virtual Person* selectPerson(FlagPack<SelectPersonHint> hints, const QVariant& hintVar) const override;
+    virtual ContactMethod* selectContactMethod(FlagPack<ActionExtenderI::SelectContactMethodHint>, const QVariant& hintVar) const override;
 };
-
-#endif
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/klib/akonadibackend.cpp b/src/jamikdeintegration/src/akonadibackend.cpp
similarity index 100%
rename from src/klib/akonadibackend.cpp
rename to src/jamikdeintegration/src/akonadibackend.cpp
diff --git a/src/klib/akonadibackend.h b/src/jamikdeintegration/src/akonadibackend.h
similarity index 100%
rename from src/klib/akonadibackend.h
rename to src/jamikdeintegration/src/akonadibackend.h
diff --git a/src/qmlwidgets/cmiconengine.cpp b/src/jamikdeintegration/src/cmiconengine.cpp
similarity index 100%
rename from src/qmlwidgets/cmiconengine.cpp
rename to src/jamikdeintegration/src/cmiconengine.cpp
diff --git a/src/qmlwidgets/cmiconengine.h b/src/jamikdeintegration/src/cmiconengine.h
similarity index 100%
copy from src/qmlwidgets/cmiconengine.h
copy to src/jamikdeintegration/src/cmiconengine.h
diff --git a/src/jamikdeintegration/src/colorinterface.cpp b/src/jamikdeintegration/src/colorinterface.cpp
new file mode 100644
index 00000000..91cf6aad
--- /dev/null
+++ b/src/jamikdeintegration/src/colorinterface.cpp
@@ -0,0 +1,89 @@
+/***************************************************************************
+ *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "colorinterface.h"
+
+// Qt
+#include <QtGui/QIcon>
+#include <QtGui/QGuiApplication>
+
+// RingQt
+#include <account.h>
+
+ColorInterface::ColorInterface() : m_Pal(QGuiApplication::palette())
+{
+    m_Green = QColor(m_Pal.color(QPalette::Base));
+
+    if (m_Green.green()+20 >= 255) {
+        m_Green.setRed ( ((int)m_Green.red()  -20));
+        m_Green.setBlue( ((int)m_Green.blue() -20));
+    }
+    else
+        m_Green.setGreen(((int)m_Green.green()+20));
+
+    m_Red = QColor(m_Pal.color(QPalette::Base));
+
+    if (m_Red.red()+20 >= 255) {
+        m_Red.setGreen(  ((int)m_Red.green()  -20));
+        m_Red.setBlue(   ((int)m_Red.blue()   -20));
+    }
+    else
+        m_Red.setRed(    ((int)m_Red.red()     +20));
+
+    m_Yellow = QColor(m_Pal.color(QPalette::Base));
+
+    if (m_Yellow.red()+20 >= 255 || m_Green.green()+20 >= 255) {
+        m_Yellow.setBlue(((int)m_Yellow.blue() -20));
+    }
+    else {
+        m_Yellow.setGreen(((int)m_Yellow.green()+20));
+        m_Yellow.setRed( ((int)m_Yellow.red()   +20));
+    }
+}
+
+QVariant ColorInterface::color(const Account* a)
+{
+    switch(a->registrationState()) {
+        case Account::RegistrationState::READY:
+            return m_Green;
+        case Account::RegistrationState::UNREGISTERED:
+            return m_Pal.color(QPalette::Base);
+        case Account::RegistrationState::TRYING:
+        case Account::RegistrationState::INITIALIZING:
+            return m_Yellow;
+        case Account::RegistrationState::ERROR:
+            return m_Red;
+        case Account::RegistrationState::COUNT__:
+            break;
+    };
+
+    return QVariant();
+}
+
+QVariant ColorInterface::icon(const Account* a)
+{
+    if (a->editState() == Account::EditState::MODIFIED_COMPLETE)
+        return QIcon::fromTheme(QStringLiteral("document-save"));
+
+    if (a->editState() == Account::EditState::MODIFIED_INCOMPLETE)
+        return QIcon::fromTheme(QStringLiteral("dialog-warning"));
+
+    if (a->editState() == Account::EditState::OUTDATED)
+        return QIcon::fromTheme(QStringLiteral("view-refresh"));
+
+    return QVariant();
+}
diff --git a/src/widgets/filterlineedit.cpp b/src/jamikdeintegration/src/colorinterface.h
similarity index 67%
copy from src/widgets/filterlineedit.cpp
copy to src/jamikdeintegration/src/colorinterface.h
index a3ca8a4e..15840596 100644
--- a/src/widgets/filterlineedit.cpp
+++ b/src/jamikdeintegration/src/colorinterface.h
@@ -1,43 +1,43 @@
 /***************************************************************************
  *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "filterlineedit.h"
+#pragma once
 
+// Qt
+#include <QtGui/QPalette>
 
-FilterLineEdit::FilterLineEdit(QWidget *parent) : QLineEdit(parent)
-{
-   connect(this,&QLineEdit::textChanged,this,&FilterLineEdit::slotTextChanged);
-}
-
-FilterLineEdit::~FilterLineEdit() {}
+// LibRingQt
+#include <interfaces/accountlistcolorizeri.h>
 
-void FilterLineEdit::slotTextChanged(const QString& text)
+class ColorInterface final : public QObject, public Interfaces::AccountListColorizerI
 {
-   QString normStripppedC;
-   foreach(QChar char2,text.toLower().normalized(QString::NormalizationForm_KD) ) {
-      if (!char2.combiningClass())
-         normStripppedC += char2;
-   }
-   emit filterStringChanged(normStripppedC);
-}
+   Q_OBJECT
+public:
+    explicit ColorInterface();
 
-void FilterLineEdit::forwardInput(QKeyEvent* e)
-{
-   keyPressEvent(e);
-}
+    ColorInterface(const ColorInterface&) = delete;
+    ColorInterface& operator=(const ColorInterface&) = delete;
+
+    virtual Q_INVOKABLE QVariant color(const Account* a) override;
 
-// kate: space-indent on; indent-width 3; replace-tabs on;
+    virtual Q_INVOKABLE QVariant icon(const Account* a) override;
+private:
+    QPalette m_Pal;
+    QColor   m_Green;
+    QColor   m_Yellow;
+    QColor   m_Red;
+};
diff --git a/src/widgets/filterlineedit.cpp b/src/jamikdeintegration/src/fileproverderinterface.cpp
similarity index 59%
rename from src/widgets/filterlineedit.cpp
rename to src/jamikdeintegration/src/fileproverderinterface.cpp
index a3ca8a4e..8eb7e153 100644
--- a/src/widgets/filterlineedit.cpp
+++ b/src/jamikdeintegration/src/fileproverderinterface.cpp
@@ -1,43 +1,54 @@
 /***************************************************************************
  *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "filterlineedit.h"
+#include "fileproverderinterface.h"
 
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QDir>
 
-FilterLineEdit::FilterLineEdit(QWidget *parent) : QLineEdit(parent)
+#include <kcfg_settings.h>
+
+QUrl FileProviderInterface::getAnyFile(const QStringList& extensions) const
 {
-   connect(this,&QLineEdit::textChanged,this,&FilterLineEdit::slotTextChanged);
+    Q_UNUSED(extensions)
+    return QFileDialog::getOpenFileName(
+        nullptr,
+        QStringLiteral("Open File"),
+        QDir::currentPath(),
+        QStringLiteral("Media Files (*.png *.jpg *.gif *.mp4 *.mkv *.webm *.txt *.avi *.mpg)")
+    );
 }
 
-FilterLineEdit::~FilterLineEdit() {}
-
-void FilterLineEdit::slotTextChanged(const QString& text)
+QList<QUrl> FileProviderInterface::recentFiles() const
 {
-   QString normStripppedC;
-   foreach(QChar char2,text.toLower().normalized(QString::NormalizationForm_KD) ) {
-      if (!char2.combiningClass())
-         normStripppedC += char2;
-   }
-   emit filterStringChanged(normStripppedC);
+    const QStringList files = ConfigurationSkeleton::recentStreamedFiles();
+    QList<QUrl> ret;
+
+    for (const auto& f : qAsConst(files))
+        ret << f;
+
+    return ret;
 }
 
-void FilterLineEdit::forwardInput(QKeyEvent* e)
+void FileProviderInterface::addRecentFile(const QUrl& path) const
 {
-   keyPressEvent(e);
-}
+    QStringList files = ConfigurationSkeleton::recentStreamedFiles();
+    files << path.path();
+
+    ConfigurationSkeleton::setRecentStreamedFiles(files);
 
-// kate: space-indent on; indent-width 3; replace-tabs on;
+}
diff --git a/src/widgets/filterlineedit.h b/src/jamikdeintegration/src/fileproverderinterface.h
similarity index 71%
rename from src/widgets/filterlineedit.h
rename to src/jamikdeintegration/src/fileproverderinterface.h
index 9720c19a..0f4b2126 100644
--- a/src/widgets/filterlineedit.h
+++ b/src/jamikdeintegration/src/fileproverderinterface.h
@@ -1,44 +1,35 @@
 /***************************************************************************
  *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
-#ifndef FILTERLINEEDIT_H
-#define FILTERLINEEDIT_H
+#pragma once
 
-#include <QtWidgets/QLineEdit>
+#include <interfaces/fileprovideri.h>
 
-///FilterLineEdit: An internalional filter string
-class FilterLineEdit final : public QLineEdit
+class FileProviderInterface : public Interfaces::FileProviderI
 {
-Q_OBJECT
-
 public:
-   explicit FilterLineEdit(QWidget *parent = nullptr);
-   virtual ~FilterLineEdit();
+    explicit FileProviderInterface() = default;
 
-   void forwardInput(QKeyEvent* e);
+    virtual QUrl getAnyFile(const QStringList& extensions) const override;
 
-private Q_SLOTS:
-   void slotTextChanged(const QString& text);
+    virtual QList<QUrl> recentFiles() const override;
 
-Q_SIGNALS:
-   ///When the text change
-   void filterStringChanged(const QString& string);
-};
+    virtual void addRecentFile(const QUrl& path) const override;
 
-#endif
+};
 
-// kate: space-indent on; indent-width 3; replace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/jamikdeintegration/src/jamikdeintegration.json b/src/jamikdeintegration/src/jamikdeintegration.json
new file mode 100644
index 00000000..4d21d921
--- /dev/null
+++ b/src/jamikdeintegration/src/jamikdeintegration.json
@@ -0,0 +1,4 @@
+{
+    "Keys": [ "org.kde.ringkde.jamikdeintegration" ],
+    "uri": ["org.kde.ringkde.jamikdeintegration"]
+}
diff --git a/src/notification.cpp b/src/jamikdeintegration/src/notification.cpp
similarity index 97%
rename from src/notification.cpp
rename to src/jamikdeintegration/src/notification.cpp
index fa1ac850..1b75633c 100644
--- a/src/notification.cpp
+++ b/src/jamikdeintegration/src/notification.cpp
@@ -1,266 +1,269 @@
 /***************************************************************************
  *   Copyright (C) 2015 by Emmanuel Lepage Vallee                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "notification.h"
 
 
 // Qt
 #include <QtWidgets/QApplication>
 
 // KDE
 #include <KNotification>
 #include <KLocalizedString>
 
 // LRC
 #include <callmodel.h>
 #include <accountmodel.h>
 #include <call.h>
 #include <person.h>
 #include <session.h>
 #include <contactmethod.h>
 #include <numbercategory.h>
 #include <useractionmodel.h>
 #include <media/textrecording.h>
 #include <media/mimemessage.h>
 #include <media/recordingmodel.h>
 
 // Ring-KDE
-#include <ringapplication.h>
+// #include <ringapplication.h>
 
 #define REGISTER_ACTION(list, var, name)  list << name;var = list.size();
 
 
 /*
  * IncomingCallNotification
  */
 
 class IncomingCallNotification : public KNotification
 {
    Q_OBJECT
 
 public:
    explicit IncomingCallNotification(Call* c);
 
 private:
    uint m_Answer      {99};
    //TODO uint m_AnswerVideo {99};
    uint m_HangUp      {99};
 
    Call* m_pCall;
 
 private Q_SLOTS:
    void stateChanged(Call::LifeCycleState newState, Call::LifeCycleState previousState);
    void actionPerformed(uint actionId);
 };
 
 IncomingCallNotification::IncomingCallNotification(Call* call) : KNotification(
    QStringLiteral("incomingCall"), nullptr,
    NotificationFlag::Persistent), m_pCall(call)
 {
 
    const Person* contact = call->peerContactMethod()->contact();
    if (contact) {
 
       const QPixmap px = (contact->photo()).type() == QVariant::Pixmap ? (contact->photo()).value<QPixmap>():QPixmap();
       setPixmap(px);
    }
 
    setTitle(i18n("New incoming call"));
 
    setText(i18n("New call from <b>%1</b>\n<i>(%2)</i>"
       ,call->formattedName()
       ,call->peerContactMethod()->uri()
    ));
 
    QStringList actions;
 
    REGISTER_ACTION(actions, m_Answer, i18n( "Answer"  ))
    REGISTER_ACTION(actions, m_HangUp, i18n( "Hang up" ))
 
    //TODO support answer without video
 
    setActions(actions);
 
    addContext(QStringLiteral("contact"), call->peerContactMethod()->category()->name());
 
    connect(call, &Call::lifeCycleStateChanged, this, &IncomingCallNotification::stateChanged);
 
    connect(this, SIGNAL(activated(uint)), this , SLOT(actionPerformed(uint)));
 }
 
 void IncomingCallNotification::stateChanged(Call::LifeCycleState newState, Call::LifeCycleState previousState)
 {
    Q_UNUSED(previousState)
 
    if (newState != Call::LifeCycleState::INITIALIZATION) {
 
       close();
 
       deleteLater();
    }
 }
 
 void IncomingCallNotification::actionPerformed(uint actionId)
 {
    if (actionId == m_Answer) {
       m_pCall << Call::Action::ACCEPT;
    }
    else if (actionId == m_HangUp) {
       m_pCall << Call::Action::REFUSE;
    }
 }
 
 
 /*
  * Text message notification
  */
 class IncomingTextNotification : public KNotification
 {
    Q_OBJECT
 public:
    explicit IncomingTextNotification(ContactMethod* cm, Media::TextRecording* t);
    void actionPerformed(uint actionId);
 };
 
 IncomingTextNotification::IncomingTextNotification(ContactMethod* cm, Media::TextRecording* t) : KNotification(
    QStringLiteral("incomingText"), nullptr)
 {
    setTitle(i18n("Message from %1", cm->primaryName()));
 
    if (auto contact = cm->contact()) {
 
       const QPixmap px = (contact->photo()).type() == QVariant::Pixmap ? (contact->photo()).value<QPixmap>():QPixmap();
       setPixmap(px);
    }
 
    setText(t->instantTextMessagingModel()->index(
       t->instantTextMessagingModel()->rowCount()-1, 0
    ).data().toString());
 }
 
 void IncomingTextNotification::actionPerformed(uint actionId)
 {
    Q_UNUSED(actionId)
 }
 
 /*
  * CreateContactNotification
  */
 
 class CreateContactNotification : public KNotification
 {
    Q_OBJECT
 
 public:
    explicit CreateContactNotification(ContactMethod* cm);
 
 private:
    uint m_Yes   {99};
    uint m_No    {99};
    uint m_Never {99};
 
 private Q_SLOTS:
    void actionPerformed(uint actionId);
 };
 
 CreateContactNotification::CreateContactNotification(ContactMethod* cm) :KNotification(
    QStringLiteral("incomingCall"), nullptr)
 {
    setTitle(i18n("Add %1 to contacts?", cm->uri()));
 
    setText(i18n("Do you wish to add %1 to your addressbook?", cm->primaryName()));
 
    QStringList actions;
 
    REGISTER_ACTION(actions, m_Yes  , i18n( "Yes"              ))
    REGISTER_ACTION(actions, m_No   , i18n( "No"               ))
    REGISTER_ACTION(actions, m_Never, i18n( "Do not ask again" ))
 
    setActions(actions);
 
    connect(this, SIGNAL(activated(uint)), this , SLOT(actionPerformed(uint)));
 }
 
 void CreateContactNotification::actionPerformed(uint actionId)
 {
    if (actionId == m_Yes) {
       //TODO do something
    }
    else if (actionId == m_No) {
       //Nothing to do
    }
    else if (actionId == m_Never) {
       //TODO edit the config to disable this notification
    }
 
    deleteLater();
 }
 
 
 
 
 Notification::Notification(QObject* parent) : QObject(parent)
 {
    connect(Session::instance()->callModel(), &CallModel::incomingCall, this, &Notification::incomingCall);
    connect(Session::instance()->accountModel(), &AccountModel::accountStateChanged, this, &Notification::accountStatus);
    connect(Session::instance()->recordingModel(), &Media::RecordingModel::mimeMessageInserted, this, &Notification::incomingText);
 }
 
 Notification* Notification::instance()
 {
    static auto i = new Notification(QApplication::instance());
 
    return i;
 }
 
 void Notification::contactOnline()
 {
    //TODO fix the presence model
 }
 
 void Notification::accountStatus(Account* a, const Account::RegistrationState state)
 {
    Q_UNUSED(a)
    Q_UNUSED(state)
    //TODO
 }
 
 void Notification::incomingCall(Call* call)
 {
    if (call)
       (new IncomingCallNotification(call))->sendEvent();
 }
 
 void Notification::incomingText(Media::MimeMessage* m, Media::TextRecording* t, ContactMethod* cm)
 {
+   Q_UNUSED(t)
+   Q_UNUSED(cm)
    if (m->direction() == Media::Media::Direction::OUT)
       return;
 
-   if (t && !RingApplication::instance()->mayHaveFocus())
-      (new IncomingTextNotification(cm, t))->sendEvent();
+//FIXME
+//    if (t && !RingApplication::instance()->mayHaveFocus())
+//       (new IncomingTextNotification(cm, t))->sendEvent();
 }
 
 void Notification::createContact()
 {
    //TODO
 }
 
 #undef REGISTER_ACTION
 
 #include <notification.moc>
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/notification.h b/src/jamikdeintegration/src/notification.h
similarity index 100%
rename from src/notification.h
rename to src/jamikdeintegration/src/notification.h
diff --git a/src/qmlwidgets/personiconengine.cpp b/src/jamikdeintegration/src/personiconengine.cpp
similarity index 100%
rename from src/qmlwidgets/personiconengine.cpp
rename to src/jamikdeintegration/src/personiconengine.cpp
diff --git a/src/qmlwidgets/personiconengine.h b/src/jamikdeintegration/src/personiconengine.h
similarity index 100%
rename from src/qmlwidgets/personiconengine.h
rename to src/jamikdeintegration/src/personiconengine.h
diff --git a/src/jamikdeintegration/src/pixmapinterface.cpp b/src/jamikdeintegration/src/pixmapinterface.cpp
new file mode 100644
index 00000000..ec98ccb9
--- /dev/null
+++ b/src/jamikdeintegration/src/pixmapinterface.cpp
@@ -0,0 +1,452 @@
+/****************************************************************************
+ *   Copyright (C) 2013-2014 by Savoir-Faire Linux                          *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
+ *                                                                          *
+ *   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) any later version.     *
+ *                                                                          *
+ *   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 General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
+#include "pixmapinterface.h"
+
+//Qt
+#include <QtCore/QSize>
+#include <QtCore/QBuffer>
+#include <QtGui/QColor>
+#include <QtGui/QPainter>
+#include <QtGui/QBitmap>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+#include <QtGui/QPalette>
+#include <QtGui/QIcon>
+
+//KDE
+#include <KColorScheme>
+#include <klocalizedstring.h>
+
+
+//Ring
+#include <person.h>
+#include <contactmethod.h>
+#include <presencestatusmodel.h>
+#include <securityevaluationmodel.h>
+#include <collectioninterface.h>
+#include <useractionmodel.h>
+#include <session.h>
+#include <video/sourcemodel.h>
+#include <QStandardPaths>
+#include "cmiconengine.h"
+#include "personiconengine.h"
+// #include <qrc_assets.cpp>
+#include "../callview/imageprovider.h"
+
+namespace RingIcons {
+    constexpr static const char* INCOMING                 = ":/sharedassets/phone_dark/ringing.svg"         ;
+    constexpr static const char* RINGING                  = ":/sharedassets/phone_dark/ringing.svg"         ;
+    constexpr static const char* CURRENT                  = ":/sharedassets/phone_dark/current.svg"         ;
+    constexpr static const char* DIALING                  = ":/sharedassets/phone_dark/dial.svg"            ;
+    constexpr static const char* HOLD                     = ":/sharedassets/phone_dark/hold.svg"            ;
+    constexpr static const char* FAILURE                  = ":/sharedassets/phone_dark/failed.svg"          ;
+    constexpr static const char* BUSY                     = ":/sharedassets/phone_dark/busy.svg"            ;
+    constexpr static const char* TRANSFER                 = ":/sharedassets/phone_dark/transfert.svg"       ;
+    constexpr static const char* TRANSF_HOLD              = ":/sharedassets/phone_dark/transfert.svg"       ;
+    constexpr static const char* CONFERENCE               = ":/images/icons/user-group-properties.svg"      ;
+    constexpr static const char* CALL                     = ":/sharedassets/phone_dark/current.svg"         ;
+    constexpr static const char* HANGUP                   = ":/sharedassets/phone_dark/hang_up.svg"         ;
+    constexpr static const char* UNHOLD                   = ":/sharedassets/phone_dark/unhold.svg"          ;
+    constexpr static const char* ACCEPT                   = ":/sharedassets/phone_dark/accept.svg"          ;
+    constexpr static const char* REFUSE                   = ":/sharedassets/phone_dark/failed.svg"          ;
+    constexpr static const char* INITIALIZATION           = ":/sharedassets/phone_dark/initialization.svg"  ;
+    constexpr static const char* CONNECTED                = ":/sharedassets/phone_dark/connected.svg"       ;
+    constexpr static const char* DISPLAY_VOLUME_CONSTROLS = ":/images/icons/icon_volume_off.svg"            ;
+    constexpr static const char* DISPLAY_DIALPAD          = ":/images/icons/icon_dialpad.svg"               ;
+    constexpr static const char* HISTORY_INCOMING         = ":/sharedassets/phone_dark/incoming.svg"        ;
+    constexpr static const char* HISTORY_OUTGOING         = ":/sharedassets/phone_dark/outgoing.svg"        ;
+    constexpr static const char* HISTORY_MISSED           = ":/sharedassets/phone_dark/missed_incoming.svg" ;
+    constexpr static const char* HISTORY_MISSED_OUT       = ":/sharedassets/security/missed_outgoing.svg"            ;
+}
+
+static const char* callStateIcons[] = {
+    RingIcons::DIALING       , /* NEW            */
+    RingIcons::INCOMING      , /* INCOMING       */
+    RingIcons::RINGING       , /* RINGING        */
+    RingIcons::CURRENT       , /* CURRENT        */
+    RingIcons::DIALING       , /* DIALING        */
+    RingIcons::HOLD          , /* HOLD           */
+    RingIcons::FAILURE       , /* FAILURE        */
+    RingIcons::BUSY          , /* BUSY           */
+    RingIcons::TRANSFER      , /* TRANSFERRED    */
+    RingIcons::TRANSF_HOLD   , /* TRANSF_HOLD    */
+    ""                       , /* OVER           */
+    RingIcons::FAILURE       , /* ERROR          */
+    RingIcons::CONFERENCE    , /* CONFERENCE     */
+    RingIcons::HOLD          , /* CONFERENCE_HOLD*/
+    RingIcons::INITIALIZATION, /* INITIALIZATION */
+    RingIcons::FAILURE       , /* ABORTED        */
+    RingIcons::CONNECTED     , /* CONNECTED      */
+};
+
+PixmapInterface::PixmapInterface() : Interfaces::PixmapManipulatorI()
+{
+
+}
+
+QVariant PixmapInterface::contactPhoto(Person* c, const QSize& size, bool displayPresence)
+{
+    Q_UNUSED(displayPresence)
+    Q_UNUSED(size)
+
+    // Keep the engine cached
+    if (c->property("icon").canConvert<QIcon>())
+        return c->property("icon");
+
+    auto icn = QIcon(new PersonIconEngine(c));
+    c->setProperty("icon", icn);
+
+    return icn;
+}
+
+QVariant PixmapInterface::callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence)
+{
+    // Use the photo when available
+    if (n->contact())
+        return contactPhoto(n->contact(), size, displayPresence);
+
+    // Keep the engine cached
+    if (n->property("icon2").canConvert<QIcon>())
+        return n->property("icon2");
+
+    auto cm = const_cast<ContactMethod*>(n);
+
+    QIcon icn(new CMIconEngine(cm));
+    cm->setProperty("icon2", icn);
+
+    return icn;
+}
+
+QVariant PixmapInterface::callPhoto(Call* c, const QSize& size, bool displayPresence)
+{
+    if (c->peerContactMethod()->contact()) {
+        return contactPhoto(c->peerContactMethod()->contact(),size,displayPresence);
+    }
+    else
+        return QIcon(callStateIcons[(int)c->state()]);
+}
+
+QVariant PixmapInterface::numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence, bool isPresent)
+{
+    Q_UNUSED(size);
+    if (displayPresence) {
+        QPixmap pxm;
+        if(p.isValid())
+            pxm = qvariant_cast<QPixmap>(p);
+        else
+            pxm = QPixmap(QStringLiteral(":/mini/icons/miniicons/call.png"));
+        QPainter painter(&pxm);
+        painter.setOpacity(0.3);
+        painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
+        painter.fillRect(pxm.rect(),isPresent?Qt::green:Qt::red);
+        return pxm;
+    }
+    if (p.isValid())
+        return qvariant_cast<QPixmap>(p);
+    return QPixmap(QStringLiteral(":/mini/icons/miniicons/call.png"));
+}
+
+QVariant PixmapInterface::securityIssueIcon(const QModelIndex& index)
+{
+    SecurityEvaluationModel::Severity sev = qvariant_cast<SecurityEvaluationModel::Severity>(index.data((int)SecurityEvaluationModel::Role::Severity));
+    switch(sev) {
+        case SecurityEvaluationModel::Severity::INFORMATION:
+            return QIcon::fromTheme(QStringLiteral("dialog-information"));
+        case SecurityEvaluationModel::Severity::WARNING:
+            return QIcon::fromTheme(QStringLiteral("dialog-warning"));
+        case SecurityEvaluationModel::Severity::ISSUE:
+        case SecurityEvaluationModel::Severity::FATAL_WARNING:
+            return QIcon::fromTheme(QStringLiteral("view-barcode"));
+        case SecurityEvaluationModel::Severity::ERROR:
+            return QIcon::fromTheme(QStringLiteral("dialog-error"));
+        case SecurityEvaluationModel::Severity::UNSUPPORTED:
+        case SecurityEvaluationModel::Severity::COUNT__:
+            break;
+    }
+    return QVariant();
+}
+
+QByteArray PixmapInterface::toByteArray(const QVariant& pxm, const QString& type)
+{
+    //Preparation of our QPixmap
+    QByteArray bArray;
+    QBuffer buffer(&bArray);
+    buffer.open(QIODevice::WriteOnly);
+
+    //PNG ?
+    (qvariant_cast<QPixmap>(pxm)).save(&buffer, type.toLatin1());
+    buffer.close();
+
+    return bArray;
+}
+
+QVariant PixmapInterface::personPhoto(const QByteArray& data, const QString& type)
+{
+    if (data.isEmpty()) {
+        return {};
+    }
+
+    QImage image;
+    //For now, ENCODING is only base64 and image type PNG or JPG
+    const bool ret = image.loadFromData(QByteArray::fromBase64(data),type.toLower().toLatin1());
+
+    if (!ret) {
+        qDebug() << "vCard image loading failed";
+        return {};
+    } //TODO check is width || height == 0
+
+    return QPixmap::fromImage(image);
+}
+
+QVariant PixmapInterface::userActionIcon(const UserActionElement& state) const
+{
+    switch(state.action) {
+        case UserActionModel::Action::ACCEPT          :
+            return QIcon(":/sharedassets/phone_light/accept.svg"   );
+        case UserActionModel::Action::HOLD            :
+            return QIcon(":/sharedassets/phone_light/hold.svg"     );
+        case UserActionModel::Action::MUTE_AUDIO      :
+            return QIcon(":/sharedassets/phone_light/mic_off.svg"  );
+        case UserActionModel::Action::MUTE_VIDEO      :
+            return QIcon(":/sharedassets/phone_light/mic_off.svg"  );
+        case UserActionModel::Action::SERVER_TRANSFER :
+            return QIcon(":/sharedassets/phone_light/transfert.svg" );
+        case UserActionModel::Action::RECORD          :
+            return QIcon(":/sharedassets/phone_light/record_call.svg"   );
+        case UserActionModel::Action::HANGUP          :
+            return QIcon(":/sharedassets/phone_light/refuse.svg"   );
+        case UserActionModel::Action::JOIN            :
+            return QIcon();
+        case UserActionModel::Action::ADD_NEW         :
+            return QIcon(":/sharedassets/phone_light/accept.svg"   );
+        case UserActionModel::Action::ADD_CONTACT:
+        case UserActionModel::Action::ADD_TO_CONTACT:
+        case UserActionModel::Action::ADD_CONTACT_METHOD:
+            return QIcon::fromTheme(QStringLiteral("contact-new"));
+        case UserActionModel::Action::DELETE_CONTACT:
+            return QIcon::fromTheme(QStringLiteral("list-remove-user"), QIcon::fromTheme(QStringLiteral("edit-delete")));
+        case UserActionModel::Action::EMAIL_CONTACT:
+            return QIcon::fromTheme(QStringLiteral("mail-message-new"));
+        case UserActionModel::Action::BOOKMARK:
+            return QIcon::fromTheme(QStringLiteral("bookmarks"));
+        case UserActionModel::Action::VIEW_CHAT_HISTORY:
+            return QIcon::fromTheme(QStringLiteral("view-history"));
+        case UserActionModel::Action::REMOVE_HISTORY :
+            return QIcon::fromTheme(QStringLiteral("list-remove"));
+        case UserActionModel::Action::CALL_CONTACT:
+            return QIcon::fromTheme(QStringLiteral("call-start"));
+        case UserActionModel::Action::EDIT_CONTACT:
+            return QIcon::fromTheme(QStringLiteral("contact-new"));
+        case UserActionModel::Action::COPY_CONTACT:
+            return QIcon::fromTheme(QStringLiteral("edit-copy"));
+        case UserActionModel::Action::TOGGLE_VIDEO:
+        case UserActionModel::Action::MARK_AS_CONSUMED:
+        case UserActionModel::Action::COUNT__:
+            break;
+    };
+
+    return QVariant();
+}
+
+QVariant PixmapInterface::collectionIcon(const CollectionInterface* interface, Interfaces::PixmapManipulatorI::CollectionIconHint hint) const
+{
+    Q_UNUSED(interface)
+
+    switch(hint) {
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::CONTACT:
+            return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::HISTORY:
+            return QIcon::fromTheme(QStringLiteral("view-history"));
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::BOOKMARK:
+            return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::CERTIFICATE:
+            return QIcon::fromTheme(QStringLiteral("certificate-server"));
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::RECORDING:
+            return QIcon(":/sharedassets/phone_dark/mailbox.svg");
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::RINGTONE:
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::NONE:
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::PROFILE:
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::PHONE_NUMBER:
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::ACCOUNT:
+        case Interfaces::PixmapManipulatorI::CollectionIconHint::MACRO:
+            break;
+    };
+
+    return QVariant();
+}
+
+const char* PixmapInterface::icnPath[2][2] = {
+    {
+    /* INCOMING  */ RingIcons::HISTORY_INCOMING  ,
+    /* OUTGOING  */ RingIcons::HISTORY_OUTGOING  ,
+    },
+    {
+    /* MISSED_IN */ RingIcons::HISTORY_MISSED    ,
+    /* MISSED_OUT*/ RingIcons::HISTORY_MISSED_OUT,
+    }
+};
+
+QVariant PixmapInterface::securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const
+{
+    switch (level) {
+        case SecurityEvaluationModel::SecurityLevel::COUNT__:
+        case SecurityEvaluationModel::SecurityLevel::NONE      :
+            return QIcon(":/sharedassets/security/lock_off.svg");
+        case SecurityEvaluationModel::SecurityLevel::WEAK      :
+        case SecurityEvaluationModel::SecurityLevel::MEDIUM    :
+            return QIcon(":/sharedassets/security/lock_unconfirmed.svg");
+        case SecurityEvaluationModel::SecurityLevel::ACCEPTABLE:
+        case SecurityEvaluationModel::SecurityLevel::STRONG    :
+        case SecurityEvaluationModel::SecurityLevel::COMPLETE  :
+            return QIcon(":/sharedassets/security/lock_confirmed.svg");
+    }
+
+    return QVariant();
+}
+
+QVariant PixmapInterface::historySortingCategoryIcon(const CallHistoryModel::SortedProxy::Categories cat) const
+{
+    switch(cat) {
+        case CallHistoryModel::SortedProxy::Categories::DATE      :
+            break;
+        case CallHistoryModel::SortedProxy::Categories::NAME      :
+            return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
+        case CallHistoryModel::SortedProxy::Categories::POPULARITY:
+            return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
+        case CallHistoryModel::SortedProxy::Categories::LENGTH    :
+        case CallHistoryModel::SortedProxy::Categories::SPENT_TIME:
+        case CallHistoryModel::SortedProxy::Categories::COUNT__   :
+            break;
+    }
+    return QVariant();
+}
+
+QVariant PixmapInterface::contactSortingCategoryIcon(const ContactModel::SortedProxy::Categories cat) const
+{
+    switch(cat) {
+        case ContactModel::SortedProxy::Categories::NAME        :
+            return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
+        case ContactModel::SortedProxy::Categories::RECENTLYUSED:
+            return QIcon::fromTheme(QStringLiteral("view-history"));
+        case ContactModel::SortedProxy::Categories::ORGANIZATION:
+        case ContactModel::SortedProxy::Categories::GROUP       :
+        case ContactModel::SortedProxy::Categories::DEPARTMENT  :
+        case ContactModel::SortedProxy::Categories::COUNT__     :
+            break;
+    }
+    return QVariant();
+}
+
+QVariant PixmapInterface::videoDeviceIcon(const QModelIndex& idx) const
+{
+    switch (idx.row()) {
+        case Video::SourceModel::ExtendedDeviceList::NONE:
+            return QIcon::fromTheme(QStringLiteral("camera-off"));
+        case Video::SourceModel::ExtendedDeviceList::SCREEN:
+            return QIcon::fromTheme(QStringLiteral("video-display"));
+        case Video::SourceModel::ExtendedDeviceList::FILE:
+            return QIcon::fromTheme(QStringLiteral("video-mp4"));
+        default:
+            return QIcon::fromTheme(QStringLiteral("camera-on"));
+    }
+
+    return {};
+}
+
+QString PixmapInterface::takeSnapshot(Call* call)
+{
+    return ImageProvider::takeSnapshot(call);
+}
+
+QVariant PixmapInterface::decorationRole(const QModelIndex& index)
+{
+    if (!index.isValid())
+        return QVariant();
+
+    const QVariant tv = index.data(static_cast<int>(Ring::Role::ObjectType));
+
+    if (!tv.canConvert<Ring::ObjectType>())
+        return QVariant();
+
+    const Ring::ObjectType type = qvariant_cast<Ring::ObjectType>(tv);
+
+    switch (type) {
+        case Ring::ObjectType::Person         : {
+
+            Person* p = qvariant_cast<Person*>(
+                index.data(static_cast<int>(Ring::Role::Object))
+            );
+
+            return contactPhoto(p, QSize(22,22), true);
+            }
+        case Ring::ObjectType::ContactMethod  : {
+
+            const ContactMethod* cm = qvariant_cast<ContactMethod*>(
+                index.data(static_cast<int>(Ring::Role::Object))
+            );
+
+            return callPhoto(cm, QSize(22,22), true);
+            }
+        case Ring::ObjectType::Call           : {
+
+            const Call* c = qvariant_cast<Call*>(
+                index.data(static_cast<int>(Ring::Role::Object))
+            );
+
+            return callPhoto(c->peerContactMethod(), QSize(22,22), true);
+            }
+        case Ring::ObjectType::Media          : //TODO
+        case Ring::ObjectType::Certificate    :
+        case Ring::ObjectType::ContactRequest :
+        case Ring::ObjectType::Event :
+        case Ring::ObjectType::Individual :
+        case Ring::ObjectType::COUNT__        :
+            break;
+    }
+
+    return QVariant();
+}
+
+QVariant PixmapInterface::decorationRole(const Call* c)
+{
+    return callPhoto(c->peerContactMethod(), QSize(22,22), true);
+}
+
+QVariant PixmapInterface::decorationRole(const ContactMethod* cm)
+{
+    if (!cm)
+        return {};
+
+    return callPhoto((ContactMethod*)cm, QSize(22,22), true);
+}
+
+QVariant PixmapInterface::decorationRole(const Person* p)
+{
+    if (!p)
+        return {};
+
+    return contactPhoto((Person*)p, QSize(22,22), true);
+}
+
+QVariant PixmapInterface::decorationRole(const Account* a)
+{
+    Q_UNUSED(a)
+    return {};
+}
+
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/jamikdeintegration/src/pixmapinterface.h b/src/jamikdeintegration/src/pixmapinterface.h
new file mode 100644
index 00000000..f6617c0d
--- /dev/null
+++ b/src/jamikdeintegration/src/pixmapinterface.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+ *   Copyright (C) 2013-2014 by Savoir-Faire Linux                          *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
+ *                                                                          *
+ *   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) any later version.     *
+ *                                                                          *
+ *   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 General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
+#ifndef KDEPIXMAPMANIPULATION_H
+#define KDEPIXMAPMANIPULATION_H
+
+#include <interfaces/pixmapmanipulatori.h>
+#include <call.h>
+// #include "matrixutils.h"
+
+class Person;
+
+
+class PixmapInterface final : public Interfaces::PixmapManipulatorI
+{
+public:
+    explicit PixmapInterface();
+    QVariant contactPhoto(Person* c, const QSize& size, bool displayPresence = true) override;
+
+    virtual QVariant callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence = true) override;
+
+    virtual QVariant callPhoto(Call* c, const QSize& size, bool displayPresence = true) override;
+
+    virtual QByteArray toByteArray(const QVariant& pxm, const QString& type = QStringLiteral("PNG")) override;
+
+    virtual QVariant personPhoto(const QByteArray& data, const QString& type = QStringLiteral("PNG")) override;
+
+    QVariant numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence = false, bool isPresent = false) override;
+
+    virtual QVariant securityIssueIcon(const QModelIndex& index) override;
+
+    virtual QVariant userActionIcon(const UserActionElement& state) const override;
+
+    virtual QVariant collectionIcon(const CollectionInterface* interface, Interfaces::PixmapManipulatorI::CollectionIconHint hint = Interfaces::PixmapManipulatorI::CollectionIconHint::NONE) const override;
+
+    virtual QVariant securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const override;
+
+    virtual QVariant historySortingCategoryIcon(const CallHistoryModel::SortedProxy::Categories cat) const override;
+
+    virtual QVariant contactSortingCategoryIcon(const ContactModel::SortedProxy::Categories cat) const override;
+
+    virtual QVariant videoDeviceIcon(const QModelIndex& idx) const override;
+
+    virtual QString  takeSnapshot(Call* call) override;
+
+    virtual QVariant decorationRole(const QModelIndex& index) override;
+
+    virtual QVariant decorationRole(const Call*              c    ) override;
+
+    virtual QVariant decorationRole(const ContactMethod*     cm   ) override;
+
+    virtual QVariant decorationRole(const Person*            p    ) override;
+
+    virtual QVariant decorationRole(const Account*           a    ) override;
+
+    static const char* icnPath[2][2];
+};
+
+#endif // KDEPIXMAPMANIPULATION_H
+
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/jamikdeintegration/src/plugin.cpp b/src/jamikdeintegration/src/plugin.cpp
new file mode 100644
index 00000000..5fe39341
--- /dev/null
+++ b/src/jamikdeintegration/src/plugin.cpp
@@ -0,0 +1,175 @@
+/************************************************************************************
+ *   Copyright (C) 2018 by BlueSystems GmbH                                         *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                            *
+ *                                                                                  *
+ *   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) any later version.             *
+ *                                                                                  *
+ *   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, write to the Free Software            *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
+ ***********************************************************************************/
+#include "plugin.h"
+
+// Qt
+#include <QQmlEngine>
+#include <QQmlContext>
+#include <QtGui/QIcon>
+#include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
+
+// KDE
+#include <KLocalizedString>
+
+// LinRingQt
+#include <globalinstances.h>
+#include <interfaces/itemmodelstateserializeri.h>
+#include <session.h>
+#include <numbercategorymodel.h>
+#include <callmodel.h>
+#include <accountmodel.h>
+#include <profilemodel.h>
+#include <certificatemodel.h>
+#include <bookmarkmodel.h>
+#include <persondirectory.h>
+#include <libcard/historyimporter.h>
+
+// Collections
+#include <foldercertificatecollection.h>
+#include <fallbackpersoncollection.h>
+#include <peerprofilecollection2.h>
+#include <localhistorycollection.h>
+#include <localbookmarkcollection.h>
+#include <localrecordingcollection.h>
+#include <localprofilecollection.h>
+#include <localtextrecordingcollection.h>
+
+// Ring-KDE
+#include "notification.h"
+#include "actioncollection.h"
+#include "actioninterface.h"
+#include "colorinterface.h"
+#include "pixmapinterface.h"
+#include "serializationinterface.h"
+#include "windowevent.h"
+#include "systray.h"
+#include "kcfg_settings.h"
+
+static QQmlEngine* e = nullptr;
+
+static void loadNumberCategories()
+{
+   auto model = Session::instance()->numberCategoryModel();
+   static const QString pathTemplate = QStringLiteral(":/mini/icons/miniicons/%1.png");
+#define ICN(name) QPixmap(QString(pathTemplate).arg(QStringLiteral(name)))
+   model->addCategory(i18n("Home")     ,ICN("home")     , 1 /*KABC::PhoneNumber::Home */);
+   model->addCategory(i18n("Work")     ,ICN("work")     , 2 /*KABC::PhoneNumber::Work */);
+   model->addCategory(i18n("Msg")      ,ICN("mail")     , 3 /*KABC::PhoneNumber::Msg  */);
+   model->addCategory(i18n("Pref")     ,ICN("call")     , 4 /*KABC::PhoneNumber::Pref */);
+   model->addCategory(i18n("Voice")    ,ICN("video")    , 5 /*KABC::PhoneNumber::Voice*/);
+   model->addCategory(i18n("Fax")      ,ICN("call")     , 6 /*KABC::PhoneNumber::Fax  */);
+   model->addCategory(i18n("Cell")     ,ICN("mobile")   , 7 /*KABC::PhoneNumber::Cell */);
+   model->addCategory(i18n("Video")    ,ICN("call")     , 8 /*KABC::PhoneNumber::Video*/);
+   model->addCategory(i18n("Bbs")      ,ICN("call")     , 9 /*KABC::PhoneNumber::Bbs  */);
+   model->addCategory(i18n("Modem")    ,ICN("call")     , 10/*KABC::PhoneNumber::Modem*/);
+   model->addCategory(i18n("Car")      ,ICN("car")      , 11/*KABC::PhoneNumber::Car  */);
+   model->addCategory(i18n("Isdn")     ,ICN("call")     , 12/*KABC::PhoneNumber::Isdn */);
+   model->addCategory(i18n("Pcs")      ,ICN("call")     , 13/*KABC::PhoneNumber::Pcs  */);
+   model->addCategory(i18n("Pager")    ,ICN("pager")    , 14/*KABC::PhoneNumber::Pager*/);
+   model->addCategory(i18n("Preferred"),ICN("preferred"), 10000                         );
+#undef ICN
+#undef IS_ENABLED
+}
+
+static void initCollections()
+{
+   loadNumberCategories();
+
+   Session::instance()->callModel()->setAudoCleanDelay(5000);
+
+   // Load the old phone call history and port it to the newer calendar events format.
+   if (QFile::exists(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') +"history.ini")) {
+      auto histo = Session::instance()->historyModel()->addCollection<LocalHistoryCollection>(LoadOptions::FORCE_ENABLED);
+      HistoryImporter::importHistory(histo);
+      histo->clear();
+   }
+
+   //HACK load the Calendar now to speedup everything else
+   const int accountCount = Session::instance()->accountModel()->size();
+   for (int i=0; i < accountCount; i++)
+      (*Session::instance()->accountModel())[i]->calendar();
+
+   Session::instance()->profileModel()->addCollection<LocalProfileCollection>(LoadOptions::FORCE_ENABLED);
+
+#ifdef Q_OS_LINUX
+   CertificateModel::instance().addCollection<FolderCertificateCollection,QString, FlagPack<FolderCertificateCollection::Options>,QString>(
+      QStringLiteral("/usr/share/ca-certificates/"),
+      FolderCertificateCollection::Options::ROOT
+         | FolderCertificateCollection::Options::RECURSIVE
+         | FolderCertificateCollection::Options::READ_ONLY,
+      i18n("System root certificates"),
+      LoadOptions::FORCE_ENABLED
+   );
+#endif
+
+   Session::instance()->bookmarkModel()->addCollection<LocalBookmarkCollection>();
+   Session::instance()->bookmarkModel()->setDisplayPopular(
+      ConfigurationSkeleton::displayPopularAsBookmark()
+   );
+
+   Session::instance()->personDirectory()->addCollection<FallbackPersonCollection>(LoadOptions::FORCE_ENABLED);
+   auto ppc = Session::instance()->personDirectory()->addCollection<PeerProfileCollection2>(LoadOptions::FORCE_ENABLED);
+
+   const auto m = static_cast<PeerProfileCollection2::DefaultMode>(ConfigurationSkeleton::defaultPeerProfileMode());
+   ppc->setDefaultMode(m);
+
+#ifdef ENABLE_AKONADI
+   AkonadiBackend::initCollections();
+#endif
+
+   Session::instance()->profileModel();
+
+}
+
+void JamiKDEIntegration::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QByteArray("org.kde.ringkde.jamikdeintegration"));
+
+    GlobalInstances::setInterface<ActionInterface>();
+
+    GlobalInstances::setInterface<ColorInterface>();
+
+    GlobalInstances::setInterface<PixmapInterface>();
+
+    GlobalInstances::setInterface<SerializationInterface>();
+    GlobalInstances::itemModelStateSerializer().load();
+
+    qmlRegisterType<WindowEvent>(uri, 1, 0, "WindowEvent");
+}
+
+void JamiKDEIntegration::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    e = engine;
+    Notification::instance();
+    ActionCollection::instance()->setupAction();
+
+    initCollections();
+
+    engine->rootContext()->setContextProperty(
+        QStringLiteral("ActionCollection"), ActionCollection::instance()
+    );
+
+    new SysTray(QIcon(QStringLiteral(":appicon/icons/64-apps-ring-kde.png")));
+}
+
+QQmlEngine* JamiKDEIntegration::engine()
+{
+    return e;
+}
diff --git a/src/jamikdeintegration/src/plugin.h b/src/jamikdeintegration/src/plugin.h
new file mode 100644
index 00000000..b352e44c
--- /dev/null
+++ b/src/jamikdeintegration/src/plugin.h
@@ -0,0 +1,32 @@
+/************************************************************************************
+ *   Copyright (C) 2018 by BlueSystems GmbH                                         *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                            *
+ *                                                                                  *
+ *   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) any later version.             *
+ *                                                                                  *
+ *   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, write to the Free Software            *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
+ ***********************************************************************************/
+#pragma once
+
+#include <QQmlExtensionPlugin>
+
+class Q_DECL_EXPORT JamiKDEIntegration final : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.kde.ringkde.jamikdeintegration" FILE "jamikdeintegration.json")
+
+public:
+    static QQmlEngine* engine();
+    void registerTypes(const char* uri) override;
+    virtual void initializeEngine(QQmlEngine* engine, const char* uri) override;
+};
diff --git a/src/jamikdeintegration/src/serializationinterface.cpp b/src/jamikdeintegration/src/serializationinterface.cpp
new file mode 100644
index 00000000..9e8e2e5d
--- /dev/null
+++ b/src/jamikdeintegration/src/serializationinterface.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+ *   Copyright (C) 2014-2015 by Savoir-Faire Linux                          *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
+ *                                                                          *
+ *   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) any later version.     *
+ *                                                                          *
+ *   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 General Public License      *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
+ ***************************************************************************/
+#include "serializationinterface.h"
+
+#include <persondirectory.h>
+
+#ifdef ENABLE_AKONADI
+ #include "akonadibackend.h"
+#endif
+
+#include "collectioninterface.h"
+#include "kcfg_settings.h"
+
+SerializationInterface::~SerializationInterface()
+{
+
+}
+
+bool SerializationInterface::save()
+{
+    //FIXME this is too tied to the contact backend, it need to support roles for
+    //other collection types (aka: bookmarks)
+    QStringList ret;
+    for (QHash<QByteArray,bool>::iterator i = m_hChecked.begin(); i != m_hChecked.end(); ++i) {
+        if (i.value())
+            ret << i.key();
+    }
+    //    digg(QModelIndex());
+    ConfigurationSkeleton::setDisabledCollectionList(ret);
+    return true;
+}
+
+bool SerializationInterface::load()
+{
+    m_hChecked.clear();
+    const QStringList disabled = ConfigurationSkeleton::disabledCollectionList();
+    foreach(const QString& str, disabled) {
+        m_hChecked[str.toLatin1()] = true; //Disabled == true, enabled == false
+    }
+    return true;
+}
+
+bool SerializationInterface::isChecked(const CollectionInterface* backend) const
+{
+    return backend ? (!(m_hChecked[backend->id()])) : false;
+}
+
+bool SerializationInterface::setChecked(const CollectionInterface* backend, bool enabled)
+{
+    m_hChecked[backend->id()] = ! enabled;
+    return true;
+}
+
+CollectionInterface* SerializationInterface::preferredCollection(CollectionManagerInterfaceBase* manager, FlagPack<CollectionInterface::SupportedFeatures> features, FlagPack<Interfaces::ItemModelStateSerializerI::Hints> hints )
+{
+    Q_UNUSED(hints)
+
+#ifdef ENABLE_AKONADI
+    if (manager == Session::instance()->personDirectory()) {
+        foreach(CollectionInterface* i, Session::instance()->personDirectory()->collections(features)) {
+            if (dynamic_cast<AkonadiBackend*>(i)) //TODO use something better
+                return i;
+        }
+    }
+#else
+    Q_UNUSED(manager )
+    Q_UNUSED(features)
+#endif
+
+    return nullptr;
+}
+
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/klib/itemmodelserialization.h b/src/jamikdeintegration/src/serializationinterface.h
similarity index 67%
rename from src/klib/itemmodelserialization.h
rename to src/jamikdeintegration/src/serializationinterface.h
index 89f3e429..59b0f225 100644
--- a/src/klib/itemmodelserialization.h
+++ b/src/jamikdeintegration/src/serializationinterface.h
@@ -1,55 +1,55 @@
 /****************************************************************************
  *   Copyright (C) 2014-2015 by Savoir-Faire Linux                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
  *                                                                          *
  *   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) any later version.     *
  *                                                                          *
  *   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 General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 #ifndef ITEMMODELSTATESERIALIZATION_H
 #define ITEMMODELSTATESERIALIZATION_H
 
 #include <QtCore/QHash>
 
 #include "typedefs.h"
 #include <interfaces/itemmodelstateserializeri.h>
 class Account;
 class CollectionInterface;
 
-class LIB_EXPORT ItemModelStateSerialization : public Interfaces::ItemModelStateSerializerI
+class SerializationInterface : public Interfaces::ItemModelStateSerializerI
 {
 public:
-   virtual bool save() override;
-   virtual bool load() override;
-   virtual ~ItemModelStateSerialization();
+    virtual bool save() override;
+    virtual bool load() override;
+    virtual ~SerializationInterface();
 
-   //Getter
-   virtual bool isChecked(const CollectionInterface* backend) const override;
-   virtual CollectionInterface* preferredCollection(
-      CollectionManagerInterfaceBase* manager,
-      FlagPack<CollectionInterface::SupportedFeatures> features,
-      FlagPack<Interfaces::ItemModelStateSerializerI::Hints> hints
-   ) override;
+    //Getter
+    virtual bool isChecked(const CollectionInterface* backend) const override;
+    virtual CollectionInterface* preferredCollection(
+        CollectionManagerInterfaceBase* manager,
+        FlagPack<CollectionInterface::SupportedFeatures> features,
+        FlagPack<Interfaces::ItemModelStateSerializerI::Hints> hints
+    ) override;
 
-   //Setter
-   virtual bool setChecked(const CollectionInterface* backend, bool enabled) override;
+    //Setter
+    virtual bool setChecked(const CollectionInterface* backend, bool enabled) override;
 
 private:
-   QHash<QByteArray,bool> m_hChecked;
-   QHash<QByteArray,bool> m_hLoaded ;
+    QHash<QByteArray,bool> m_hChecked;
+    QHash<QByteArray,bool> m_hLoaded ;
    //Helper
 //    void digg(const CollectionInterface* idx);
 };
 
 #endif
 
-// kate: space-indent on; indent-width 3; replace-tabs on;
+// kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/accountview/accountviewplugin.cpp b/src/jamikdeintegration/src/shortcutinterface.cpp
similarity index 86%
copy from src/accountview/accountviewplugin.cpp
copy to src/jamikdeintegration/src/shortcutinterface.cpp
index e16dad5f..ee0541ad 100644
--- a/src/accountview/accountviewplugin.cpp
+++ b/src/jamikdeintegration/src/shortcutinterface.cpp
@@ -1,26 +1,24 @@
 /***************************************************************************
- *   Copyright (C) 2017 by Bluesystems                                     *
+ *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "accountviewplugin.h"
+#include "shortcutinterface.h"
 
-#include <QtCore/QDebug>
-
-#include <qrc_accountview.cpp>
-
-void AccountView::registerTypes(const char *)
+QVariant ShortcutInterface::createAction(Macro* macro)
 {
+   Q_UNUSED(macro)
+   return {};
 }
diff --git a/src/accountview/accountviewplugin.h b/src/jamikdeintegration/src/shortcutinterface.h
similarity index 81%
copy from src/accountview/accountviewplugin.h
copy to src/jamikdeintegration/src/shortcutinterface.h
index d635dd91..7bf90f42 100644
--- a/src/accountview/accountviewplugin.h
+++ b/src/jamikdeintegration/src/shortcutinterface.h
@@ -1,30 +1,30 @@
 /***************************************************************************
- *   Copyright (C) 2018 by Bluesystems                                     *
+ *   Copyright (C) 2013-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 <QtCore/QObject>
+class Macro;
 
-//![plugin]
-class AccountView final : public QObject
-{
-    Q_OBJECT
+#include <interfaces/shortcutcreatori.h>
 
+class ShortcutInterface final : public Interfaces::ShortcutCreatorI
+{
 public:
-    void registerTypes(const char *uri);
+    virtual ~ShortcutInterface(){}
+    virtual QVariant createAction(Macro* macro) override;
 };
-//![plugin]
+
diff --git a/src/widgets/systray.cpp b/src/jamikdeintegration/src/systray.cpp
similarity index 97%
rename from src/widgets/systray.cpp
rename to src/jamikdeintegration/src/systray.cpp
index b02b0619..9a59a9bb 100644
--- a/src/widgets/systray.cpp
+++ b/src/jamikdeintegration/src/systray.cpp
@@ -1,96 +1,96 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>         *
  *            Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 
 //Parent
 #include "systray.h"
 
 //Qt
 #include <QtWidgets/QMenu>
 #include <QtGui/QIcon>
 #include <QtCore/QDebug>
 #include <QQuickWindow>
 
 //KDE
 #include <QtWidgets/QAction>
 
 // Ring
 #include "actioncollection.h"
-#include "ringapplication.h"
+#include "windowevent.h"
 
 ///Constructor
 SysTray::SysTray(const QIcon &icon, QWidget *parent)
       : KStatusNotifierItem(parent),
          m_pTrayIconMenu(0)
 {
    setIconByPixmap(icon);
    m_pTrayIconMenu = new QMenu(/*parentWidget()*/);
    setContextMenu(m_pTrayIconMenu);
    connect(this,&KStatusNotifierItem::activateRequested,this,&SysTray::slotActivated);
 
    // The app is always active in the sense there is a network connection and
    // registration status
  #ifndef Q_OS_MAC //FIXME segfault as of mid 2017
    setStatus(KStatusNotifierItem::ItemStatus::Active);
  #endif
 
    addAction( ActionCollection::instance()->acceptAction  () );
    addAction( ActionCollection::instance()->holdAction    () );
    addAction( ActionCollection::instance()->transferAction() );
    addAction( ActionCollection::instance()->recordAction  () );
    addSeparator();
 
    addAction( ActionCollection::instance()->closeAction() );
 
    setObjectName( QStringLiteral("m_pTrayIcon") );
 }
 
 ///Destructor
 SysTray::~SysTray()
 {
    //KStatusNotifierItem take ownership of the menu
 }
 
 
 /*****************************************************************************
  *                                                                           *
  *                                  Mutator                                  *
  *                                                                           *
  ****************************************************************************/
 
 ///Add a new action
 void SysTray::addAction(QAction *action)
 {
    m_pTrayIconMenu->addAction(action);
 }
 
 ///Add a menu separator
 void SysTray::addSeparator()
 {
    m_pTrayIconMenu->addSeparator();
 }
 
 void SysTray::slotActivated(bool active, const QPoint& pos)
 {
    Q_UNUSED(active)
    Q_UNUSED(pos)
 
-   RingApplication::instance()->desktopWindow()->show();
+   WindowEvent::instance()->raiseWindow();
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/widgets/systray.h b/src/jamikdeintegration/src/systray.h
similarity index 100%
rename from src/widgets/systray.h
rename to src/jamikdeintegration/src/systray.h
diff --git a/src/qmlwidgets/cmiconengine.h b/src/jamikdeintegration/src/windowevent.cpp
similarity index 55%
copy from src/qmlwidgets/cmiconengine.h
copy to src/jamikdeintegration/src/windowevent.cpp
index 88172154..8176fced 100644
--- a/src/qmlwidgets/cmiconengine.h
+++ b/src/jamikdeintegration/src/windowevent.cpp
@@ -1,43 +1,80 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "windowevent.h"
 
-#include <QtGui/QIconEngine>
+#include <QtCore/QList>
+#include <QtCore/QCoreApplication>
 
-class ContactMethod;
-class CMIconEnginePrivate;
+static QList<WindowEvent*>& instances()
+{
+    static QList<WindowEvent*> l;
+
+    return l;
+}
+
+WindowEvent::WindowEvent(QObject* parent) : QObject(parent)
+{
+    instances() << this;
+}
+
+WindowEvent::~WindowEvent()
+{
+    instances().removeAll(this);
+}
+
+WindowEvent* WindowEvent::instance()
+{
+    static WindowEvent e(QCoreApplication::instance());
+
+    return &e;
+}
 
-/**
- * Generate pixmap with photo and presence data.
- */
-class CMIconEngine : public QIconEngine
+void WindowEvent::raiseWindow()
 {
-public:
-    explicit CMIconEngine(ContactMethod* cm);
-    virtual ~CMIconEngine();
+    for (auto o : qAsConst(instances())) {
+        emit o->requestsWindowRaised();
+    }
+}
 
-    virtual void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override;
-    virtual QIconEngine* clone() const override;
-    virtual QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
+void WindowEvent::quit()
+{
+    for (auto o : qAsConst(instances())) {
+        emit o->requestsQuit();
+    }
+}
 
-    static void staticPaint(QPainter* painter, const QRect& rect, bool isPresent, bool isTracked);
+void WindowEvent::showWizard()
+{
+    for (auto o : qAsConst(instances())) {
+        emit o->requestsWizard();
+    }
+}
 
-private:
-    Q_DISABLE_COPY(CMIconEngine)
-    CMIconEnginePrivate* d_ptr;
-};
+void WindowEvent::configureAccounts()
+{
+    for (auto o : qAsConst(instances())) {
+        emit o->requestsConfigureAccounts();
+    }
+}
+
+void WindowEvent::hideWindow()
+{
+    for (auto o : qAsConst(instances())) {
+        emit o->requestsHideWindow();
+    }
+}
diff --git a/src/qmlwidgets/cmiconengine.h b/src/jamikdeintegration/src/windowevent.h
similarity index 57%
rename from src/qmlwidgets/cmiconengine.h
rename to src/jamikdeintegration/src/windowevent.h
index 88172154..2bba2d03 100644
--- a/src/qmlwidgets/cmiconengine.h
+++ b/src/jamikdeintegration/src/windowevent.h
@@ -1,43 +1,55 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 <QtGui/QIconEngine>
-
-class ContactMethod;
-class CMIconEnginePrivate;
+#include <QtCore/QObject>
 
 /**
- * Generate pixmap with photo and presence data.
+ * This class offers a proxy between the code unaware of how windows are
+ * handled and the code unaware of the events it needs to handle.
+ *
+ * This way they can communicate with each other without knowing the
+ * implementation details. This is useful to support Android and Plasma Mobile.
+ * Their window model is very different from classic floating and tiling WMs.
+ *
+ * Note that there can be many instances of this class. The signals will be
+ * emitted in all of them.
  */
-class CMIconEngine : public QIconEngine
+class Q_DECL_EXPORT WindowEvent : public QObject
 {
+    Q_OBJECT
 public:
-    explicit CMIconEngine(ContactMethod* cm);
-    virtual ~CMIconEngine();
+    Q_INVOKABLE WindowEvent(QObject* parent = nullptr);
+    virtual ~WindowEvent();
 
-    virtual void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override;
-    virtual QIconEngine* clone() const override;
-    virtual QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
+    static WindowEvent* instance();
 
-    static void staticPaint(QPainter* painter, const QRect& rect, bool isPresent, bool isTracked);
+public Q_SLOTS:
+    void raiseWindow();
+    void quit();
+    void showWizard();
+    void configureAccounts();
+    void hideWindow();
 
-private:
-    Q_DISABLE_COPY(CMIconEngine)
-    CMIconEnginePrivate* d_ptr;
+Q_SIGNALS:
+    void requestsWindowRaised();
+    void requestsQuit();
+    void requestsWizard();
+    void requestsConfigureAccounts();
+    void requestsHideWindow();
 };
diff --git a/src/klib/CMakeLists.txt b/src/klib/CMakeLists.txt
deleted file mode 100644
index c05bb6b8..00000000
--- a/src/klib/CMakeLists.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
-
-ADD_DEFINITIONS("-std=c++0x")
-
-PROJECT(libkring)
-
-IF(POLICY CMP0063)
-   CMAKE_POLICY(SET CMP0063 NEW)
-ENDIF(POLICY CMP0063)
-
-IF(POLICY CMP0048)
-   CMAKE_POLICY(SET CMP0048 NEW)
-ENDIF(POLICY CMP0048)
-
-IF(POLICY CMP0017)
-   CMAKE_POLICY(SET CMP0017 NEW)
-ENDIF(POLICY CMP0017)
-
-IF(POLICY CMP0028)
-   CMAKE_POLICY(SET CMP0028 NEW)
-ENDIF(POLICY CMP0028)
-
-FIND_PACKAGE(ECM 1.1.0 REQUIRED NO_MODULE)
-
-INCLUDE(ECMInstallIcons)
-INCLUDE(ECMOptionalAddSubdirectory)
-
-INCLUDE(KDEInstallDirs)
-INCLUDE(KDECMakeSettings)
-INCLUDE(KDECompilerSettings)
-
-FIND_PACKAGE ( LibRingQt QUIET )
-
-FIND_PACKAGE(Qt5 CONFIG REQUIRED Core Widgets Gui)
-
-FIND_PACKAGE(KF5 REQUIRED COMPONENTS
-  Config
-  GuiAddons
-  I18n
-  WindowSystem
-  WidgetsAddons
-  XmlGui
-)
-
-FIND_PACKAGE(KF5 QUIET COMPONENTS
-  Akonadi
-  AkonadiContact
-  Contacts
-)
-
-IF ( KF5_AKONADI_FOUND AND  KF5_AKONADICONTACT_FOUND AND  KF5_CONTACTS_FOUND)
-   SET(AKONADI_FOUND 1)
-ENDIF()
-
-INCLUDE_DIRECTORIES(SYSTEM ${Qt5Widgets_INCLUDES} ${Qt5Core_INCLUDES} ${ringqt_INCLUDE_DIR})
-
-ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
-
-SET(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
-SET(GENERIC_LIB_VERSION "2.0.0")
-
-#File to compile
-SET( libkring_LIB_SRCS
-   itemmodelserialization.cpp
-)
-
-IF ( ${AKONADI_FOUND} )
-   SET(libkring_LIB_SRCS
-      ${libkring_LIB_SRCS}
-      akonadibackend.cpp
-   )
-ENDIF()
-
-KCONFIG_ADD_KCFG_FILES (libkring_LIB_SRCS kcfg_settings.kcfgc)
-
-ADD_LIBRARY( libkring  STATIC ${libkring_LIB_SRCS} )
-
-target_link_libraries( libkring
-  ringqt
-
-  Qt5::Widgets
-  Qt5::Core
-  Qt5::Gui
-
-  KF5::I18n
-  KF5::WidgetsAddons
-  KF5::ConfigCore
-  KF5::ConfigGui
-)
-
-# Akonadi support is optional
-IF ( ${AKONADI_FOUND} )
-   target_link_libraries( libkring
-      KF5::AkonadiCore
-      KF5::AkonadiContact
-      KF5::Contacts
-   )
-ENDIF()
-
-SET( libkring_LIB_HDRS
-  akonadibackend.h
-  itemmodelserialization.h
-)
-
-INSTALL(FILES ring-kde.kcfg DESTINATION ${KCFG_INSTALL_DIR})
diff --git a/src/klib/itemmodelserialization.cpp b/src/klib/itemmodelserialization.cpp
deleted file mode 100644
index bf8d043e..00000000
--- a/src/klib/itemmodelserialization.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2014-2015 by Savoir-Faire Linux                          *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "itemmodelserialization.h"
-
-#include <persondirectory.h>
-
-
-#ifdef ENABLE_AKONADI
- #include "akonadibackend.h"
-#endif
-
-#include "collectioninterface.h"
-#include "kcfg_settings.h"
-
-ItemModelStateSerialization::~ItemModelStateSerialization()
-{
-   
-}
-
-bool ItemModelStateSerialization::save()
-{
-   //FIXME this is too tied to the contact backend, it need to support roles for
-   //other collection types (aka: bookmarks)
-   QStringList ret;
-   for (QHash<QByteArray,bool>::iterator i = m_hChecked.begin(); i != m_hChecked.end(); ++i) {
-      if (i.value())
-         ret << i.key();
-   }
-//    digg(QModelIndex());
-   ConfigurationSkeleton::setDisabledCollectionList(ret);
-   return true;
-}
-
-bool ItemModelStateSerialization::load()
-{
-   m_hChecked.clear();
-   const QStringList disabled = ConfigurationSkeleton::disabledCollectionList();
-   foreach(const QString& str, disabled) {
-      m_hChecked[str.toLatin1()] = true; //Disabled == true, enabled == false
-   }
-   return true;
-}
-
-bool ItemModelStateSerialization::isChecked(const CollectionInterface* backend) const
-{
-   return backend ? (!(m_hChecked[backend->id()])) : false;
-}
-
-bool ItemModelStateSerialization::setChecked(const CollectionInterface* backend, bool enabled)
-{
-   m_hChecked[backend->id()] = ! enabled;
-   return true;
-}
-
-CollectionInterface* ItemModelStateSerialization::preferredCollection(CollectionManagerInterfaceBase* manager, FlagPack<CollectionInterface::SupportedFeatures> features, FlagPack<Interfaces::ItemModelStateSerializerI::Hints> hints )
-{
-   Q_UNUSED(hints)
-
-#ifdef ENABLE_AKONADI
-   if (manager == Session::instance()->personDirectory()) {
-      foreach(CollectionInterface* i, Session::instance()->personDirectory()->collections(features)) {
-         if (dynamic_cast<AkonadiBackend*>(i)) //TODO use something better
-            return i;
-      }
-   }
-#else
-   Q_UNUSED(manager )
-   Q_UNUSED(features)
-#endif
-
-   return nullptr;
-}
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/main.cpp b/src/main.cpp
index fb3f2b85..808ae6b7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,126 +1,171 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>         *
  *            Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 
 //Qt
 #include <QtCore/QString>
 #include <QtCore/QtPlugin>
 #include <QtGui/QImage>
 #include <QQmlApplicationEngine>
 
 //KDE
 #include <KDBusService>
 #include <KAboutData>
 #include <KLocalizedString>
 
 //Ring
 #include "ringapplication.h"
-#include "klib/kcfg_settings.h"
+#include "kcfg_settings.h"
 #include "cmd.h"
 #include <QQmlDebuggingEnabler>
 
 #include <QQmlExtensionPlugin>
 
 #ifdef KQUICKITEMVIEWS_USE_STATIC_PLUGIN
 Q_IMPORT_PLUGIN(KQuickItemViews)
 #else
 #include <KQuickItemViews/plugin.h>
 #endif
 
+#ifdef JAMIKDEINTEGRATION_USE_STATIC_PLUGIN
+Q_IMPORT_PLUGIN(JamiKDEIntegration)
+#else
+#include <jamikdeintegration/src/plugin.h>
+#endif
+
+#ifdef JAMIWIZARD_USE_STATIC_PLUGIN
+Q_IMPORT_PLUGIN(JamiWizard)
+#else
+#include <wizard/plugin.h>
+#endif
+
+#ifdef JAMIACCOUNTVIEW_USE_STATIC_PLUGIN
+Q_IMPORT_PLUGIN(JamiAccountView)
+#else
+#include <accountview/accountviewplugin.h>
+#endif
+
 Q_IMPORT_PLUGIN(RingQtQuick)
 
 constexpr static const char version[] = "3.1.0";
 
 int main(int argc, char **argv)
 {
    try
    {
       //QQmlDebuggingEnabler enabler;
 
       QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
       RingApplication app( argc, argv );
 
       KLocalizedString::setApplicationDomain("ring-kde");
 
       //FIXME remove
 #ifdef KQUICKITEMVIEWS_USE_STATIC_PLUGIN
       qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_KQuickItemViews().instance())->registerTypes("org.kde.playground.kquickitemviews");
 #else
       KQuickItemViews v;
       v.registerTypes("org.kde.playground.kquickitemviews");
 #endif
 
       qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_RingQtQuick().instance())->registerTypes("net.lvindustries.ringqtquick");
       qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_RingQtQuick().instance())->initializeEngine(app.engine(), "net.lvindustries.ringqtquick");
 
+#ifdef JAMIKDEINTEGRATION_USE_STATIC_PLUGIN
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_JamiKDEIntegration().instance())->registerTypes("org.kde.ringkde.jamikdeintegration");
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_JamiKDEIntegration().instance())->initializeEngine(app.engine(), "org.kde.ringkde.jamikdeintegration");
+#else
+      JamiKDEIntegration v2;
+      v2.registerTypes("org.kde.ringkde.jamikdeintegration");
+      v2.initializeEngine(app.engine(), "org.kde.ringkde.jamikdeintegration");
+#endif
+
+#ifdef JAMIWIZARD_USE_STATIC_PLUGIN
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_JamiWizard().instance())->registerTypes("org.kde.ringkde.jamiwizard");
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_JamiWizard().instance())->initializeEngine(app.engine(), "org.kde.ringkde.jamiwizard");
+#else
+      JamiWizard v3;
+      v3.registerTypes("org.kde.ringkde.jamiwizard");
+      v3.initializeEngine(app.engine(), "org.kde.ringkde.jamiwizard");
+#endif
+
+#ifdef JAMIACCOUNTVIEW_USE_STATIC_PLUGIN
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_JamiAccountView().instance())->registerTypes("org.kde.ringkde.jamiaccountview");
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_JamiAccountView().instance())->initializeEngine(app.engine(), "org.kde.ringkde.jamiaccountview");
+#else
+      JamiAccountView v4;
+      v4.registerTypes("org.kde.ringkde.jamiaccountview");
+      v4.initializeEngine(app.engine(), "org.kde.ringkde.jamiaccountview");
+#endif
+
       KAboutData about(QStringLiteral("ring-kde"),
          i18n("ring-kde"),
          /*QStringLiteral(*/version/*)*/,
          i18n("RING, a secured and distributed communication software"),
          KAboutLicense::GPL_V3,
          i18n("(C) 2004-2015 Savoir-faire Linux\n2016-2017 Emmanuel Lepage Vallee"),
          QString(),
          QStringLiteral("http://www.ring.cx"),
          QStringLiteral("ring@gnu.org")
       );
       about.setOrganizationDomain(QByteArray("kde.org"));
       about.setProgramLogo(QImage(QStringLiteral(":appicon/icons/64-apps-ring-kde.png")));
 
       about.addAuthor( i18n( "Emmanuel Lepage-Vallée"          ), QString(), QStringLiteral("elv1313@gmail.com"                    ));
       about.addAuthor( i18n( "Alexandre Lision"                ), QString(), QStringLiteral("alexandre.lision@savoirfairelinux.com"));
       about.addCredit( i18n( "Based on the SFLphone teamworks" ), QString(), QString()                                              );
 
       if (!Cmd::parseCmd(argc, argv, about))
          return 0;
 
       KAboutData::setApplicationData(about);
 
 
       app.setOrganizationDomain(QStringLiteral("ring.cx"));
 
       //Only start the application once
 #ifdef Q_OS_LINUX
 #ifndef DISABLE_KDBUS_SERVICE
       KDBusService service(KDBusService::Unique);
       QObject::connect(&service, &KDBusService::activateActionRequested, Cmd::instance(), &Cmd::slotActivateActionRequested);
       QObject::connect(&service, &KDBusService::activateRequested      , Cmd::instance(), &Cmd::slotActivateRequested      );
       QObject::connect(&service, &KDBusService::openRequested          , Cmd::instance(), &Cmd::slotOpenRequested          );
 #endif
 #endif
 
       //The app will have quitted by now if an instance already exist
       app.newInstance();
 
       const int retVal = app.exec();
 
       ConfigurationSkeleton::self()->save();
 
       return retVal;
    }
    catch(const char * msg)
    {
       qDebug() << msg;
    }
    catch(QString& msg)
    {
       qDebug() << msg;
    }
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/model/extendedprotocolmodel.cpp b/src/model/extendedprotocolmodel.cpp
deleted file mode 100644
index 302b0639..00000000
--- a/src/model/extendedprotocolmodel.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2015 by Savoir-Faire Linux                              *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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 "extendedprotocolmodel.h"
-
-// LRC
-#include <account.h>
-
-// KDE
-#include <klocalizedstring.h>
-
-
-ExtendedProtocolModel::ExtendedProtocolModel(QObject* parent) : QIdentityProxyModel(parent)
-{
-   setSourceModel(m_pSource);
-}
-
-ExtendedProtocolModel::~ExtendedProtocolModel()
-{
-   delete m_pSource;
-}
-
-QItemSelectionModel* ExtendedProtocolModel::selectionModel() const
-{
-   return m_pSource->selectionModel();
-}
-
-QVariant ExtendedProtocolModel::data( const QModelIndex& index, int role ) const
-{
-   const int offset = index.row() - static_cast<int>(Account::Protocol::COUNT__);
-   if (index.isValid() && offset >= 0 && role == Qt::DisplayRole && offset < static_cast<int>(ExtendedRole::COUNT__)) {
-      switch(static_cast<ExtendedRole>(offset)) {
-         case ExtendedRole::PROFILE:
-            return i18n("Profile");
-         case ExtendedRole::IMPORT:
-            return i18n("Import");
-         case ExtendedRole::COUNT__:
-            break;
-      }
-   }
-   else
-      return m_pSource->data(mapToSource(index), role);
-
-   return QVariant();
-}
-
-int ExtendedProtocolModel::rowCount( const QModelIndex& parent ) const
-{
-   return parent.isValid() ? 0 : m_pSource->rowCount()
-      + static_cast<int>(ExtendedProtocolModel::ExtendedRole::COUNT__);
-}
-
-QModelIndex ExtendedProtocolModel::index( int row, int column, const QModelIndex& parent) const
-{
-   constexpr static const int total = static_cast<int>(Account::Protocol::COUNT__)
-      + static_cast<int>(ExtendedRole::COUNT__);
-
-   if ( row >= static_cast<int>(Account::Protocol::COUNT__) && row < total)
-      return createIndex(row, column, row);
-   else
-      return mapFromSource(m_pSource->index(row, column, mapToSource(parent)));
-}
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/model/extendedprotocolmodel.h b/src/model/extendedprotocolmodel.h
deleted file mode 100644
index 45164f14..00000000
--- a/src/model/extendedprotocolmodel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2015 by Savoir-Faire Linux                              *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
- **************************************************************************/
-#ifndef EXTENDEDPROTOCOLMODEL_H
-#define EXTENDEDPROTOCOLMODEL_H
-
-#include <QtCore/QIdentityProxyModel>
-#include <QtCore/QItemSelectionModel>
-
-#include <protocolmodel.h>
-
-class ExtendedProtocolModel final : public QIdentityProxyModel
-{
-   Q_OBJECT
-
-public:
-   explicit ExtendedProtocolModel(QObject* parent = nullptr);
-   virtual ~ExtendedProtocolModel();
-
-   enum class ExtendedRole {
-      PROFILE = 0,
-      IMPORT  = 1,
-      COUNT__,
-   };
-
-   //Model
-   virtual QVariant    data     ( const QModelIndex& index, int role = Qt::DisplayRole ) const override;
-   virtual int         rowCount ( const QModelIndex& parent = QModelIndex()            ) const override;
-   virtual QModelIndex index    ( int row, int column, const QModelIndex& parent       ) const override;
-
-   QItemSelectionModel* selectionModel() const;
-
-private:
-   ProtocolModel* m_pSource {new ProtocolModel()};
-};
-
-#endif
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/proxies/deduplicateproxy.cpp b/src/proxies/deduplicateproxy.cpp
deleted file mode 100644
index a355dbfe..00000000
--- a/src/proxies/deduplicateproxy.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "deduplicateproxy.h"
-
-#include <QtCore/QDebug>
-
-typedef std::function<bool(const QModelIndex&, const QModelIndex&)> Comparator;
-
-class DeduplicateProxyPrivate final
-{
-public:
-   // Attributes
-   bool                   m_AddChildren    { false                         };
-   Comparator             m_fCompare       {                               };
-   DeduplicateProxy::Mode m_Mode           { DeduplicateProxy::Mode::ROLE  };
-   bool                   m_isSrcProxy     { false                         };
-   QVector<int>           m_lOtherRoles    {                               };
-   int                    m_HiddenRoleId   { -1                            };
-   bool                   m_isHiddenRoleSet{ false                         };
-   QString                m_HiddenRoleName {                               };
-};
-
-DeduplicateProxy::DeduplicateProxy(QObject* parent) : QSortFilterProxyModel(parent),
-d_ptr(new DeduplicateProxyPrivate())
-{
-}
-
-DeduplicateProxy::~DeduplicateProxy()
-{
-   delete d_ptr;
-}
-
-void DeduplicateProxy::setComparator(const Comparator& f)
-{
-   d_ptr->m_Mode = DeduplicateProxy::Mode::FUNCTION;
-   d_ptr->m_fCompare = f;
-
-   invalidateFilter();
-}
-
-/**
- * Useful when there is a main filter role, but some items need to be kept.
- *
- * If any role added to this list is different, the index won't be hidden
- *
- * For example using this proxy to create instant messaging thread if they
- * come from the same person, but also create different threads if the date
- * differ.
- */
-void DeduplicateProxy::addFilterRole(int role)
-{
-   d_ptr->m_lOtherRoles << role;
-
-   invalidateFilter();
-}
-
-QVector<int> DeduplicateProxy::filterRoles() const
-{
-   return d_ptr->m_lOtherRoles;// + filterRole();
-}
-
-/**
-   * Add rejected items as children of the non-rejected matching item
-   *
-   * @warning This is ignored for indexes that already have children
-   */
-void DeduplicateProxy::setAddChildren(bool add)
-{
-   d_ptr->m_AddChildren = add;
-}
-
-bool DeduplicateProxy::areChildrenAdded()
-{
-   return d_ptr->m_AddChildren;
-}
-
-Comparator DeduplicateProxy::comparator()
-{
-   return d_ptr->m_fCompare;
-}
-
-/**
- * Check if the source_row index is identical to the previous index
- */
-bool DeduplicateProxy::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
-{
-   // Get both source QModelIndex and compare them
-   if (source_row > 0) {
-      const QModelIndex idx = sourceModel()->index(source_row, filterKeyColumn(), source_parent);
-
-      // It is correct to assume sourceModelIndex - 1 will be part of the same group
-      if (idx.row() > 0) {
-         const QModelIndex sibling = sourceModel()->index(idx.row() - 1, idx.column(), idx.parent());
-
-         bool accept = false;
-
-         // Allow to filter with more than one role, apply only if they exist
-         foreach(const int r, d_ptr->m_lOtherRoles) {
-            const QVariant v1 = idx.data    (r);
-            const QVariant v2 = sibling.data(r);
-
-            // Yes, this is an "=", not "=="
-            if ((accept = !(v1.isValid() && v2.isValid() && (v1 == v2))))
-               break;
-         }
-
-         return accept || idx.data(filterRole()) != sibling.data(filterRole());
-      }
-   }
-
-   return true;
-}
-
-//TODO support for columns too
-
-///Return the number of hidden siblings of idx
-int DeduplicateProxy::hiddenSiblingCount(const QModelIndex& idx) const
-{
-   if ((!sourceModel()) || (!idx.isValid()) || idx.model() != this)
-      return 0;
-
-   const QModelIndex nextIdx = index(idx.row()+1, idx.column(), idx.parent());
-
-   const QModelIndex srcIdx  = mapToSource(idx);
-
-   if (!nextIdx.isValid())
-      return sourceModel()->rowCount(srcIdx.parent()) - srcIdx.row();
-
-   const QModelIndex srcNextIdx = mapToSource(nextIdx);
-
-   return srcNextIdx.row() - srcIdx.row();
-}
-
-/**
- * Return the list of source model QModelIndex that have been hidden
- */
-QList<QModelIndex> DeduplicateProxy::hiddenSiblings(const QModelIndex& idx) const
-{
-   const int count = hiddenSiblingCount(idx);
-
-   if (!count)
-      return {};
-
-   QList<QModelIndex> ret;
-
-   const int         parentRow    = mapToSource(idx).row();
-   const QModelIndex srcParentIdx = mapToSource(idx).parent();
-
-   for (int i = 0; i < count; i++)
-      ret << sourceModel()->index(parentRow + count, idx.column(), srcParentIdx);
-
-   return ret;
-}
-
-/**
- * Add a model data role to report the number of hidden siblings
- */
-void DeduplicateProxy::setHiddenCountRole(int role, const QString& name)
-{
-   d_ptr->m_isHiddenRoleSet = true;
-   d_ptr->m_HiddenRoleId    = role;
-   d_ptr->m_HiddenRoleName  = name;
-}
-
-///This proxy doesn't sort anything
-void DeduplicateProxy::sort ( int column, Qt::SortOrder order)
-{
-   sourceModel()->sort(column, order);
-}
-
-void DeduplicateProxy::setSourceModel ( QAbstractItemModel * sourceModel )
-{
-   QSortFilterProxyModel::setSourceModel(sourceModel);
-
-   d_ptr->m_isSrcProxy = sourceModel && qobject_cast<QAbstractProxyModel*>(sourceModel);
-
-   //TODO find a way to catch setFilterString to forward it as this proxy
-   // is likely in front of another QSortFilterProxyModel re-implement ::invalidateFilter?
-}
-
-int DeduplicateProxy::rowCount(const QModelIndex& parent) const
-{
-   if (!d_ptr->m_AddChildren)
-      return QSortFilterProxyModel::rowCount(parent);
-
-
-   //TODO ::index, ::mapToSource and ::mapFromSource still need to be implemented
-   /*int hidden = 0;
-   // Handle when the rejected items need to be added as children
-   if (d_ptr->m_AddChildren && (hidden = hiddenSiblingCount(parent))) {
-      const QModelIndex src = mapToSource(parent);
-
-      // Only add the children if there is none
-      int parentRowCount = sourceModel()->rowCount(src);
-
-      if (!parentRowCount)
-         return hidden;
-   }*/
-
-   return QSortFilterProxyModel::rowCount(parent); //TODO
-}
-
-QVariant DeduplicateProxy::data( const QModelIndex& index, int role ) const
-{
-   if (d_ptr->m_isHiddenRoleSet && role == d_ptr->m_HiddenRoleId)
-      return hiddenSiblingCount(index);
-
-   return QSortFilterProxyModel::data(index, role);
-}
diff --git a/src/proxies/deduplicateproxy.h b/src/proxies/deduplicateproxy.h
deleted file mode 100644
index e4401bf5..00000000
--- a/src/proxies/deduplicateproxy.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef DEDUPLICATEPROXY_H
-#define DEDUPLICATEPROXY_H
-
-#include <functional>
-
-#include <QtCore/QSortFilterProxyModel>
-
-class DeduplicateProxyPrivate;
-
-/**
- * This proxy take a role and remove additional rows matching the operator==
- * of the role. It only deduplication indexes without child.
- *
- * Further QIdentityProxyModels can be created to extract the number of
- *
- * Example:
- *                         ==Without addChildren==   ==With addChildren==
- * Foo                          Foo                    Foo
- *   |->  Bar                     |->  Bar               |->  Bar
- *   |->  Bar                     |->  Baz                 |->  Bar
- *   |->  Bar                     |->  Bar                 |->  Bar
- *   |->  Baz                   Bar                      |->  Baz
- *   |->  Bar                     |->  Foo               |->  Bar
- * Bar             ====== >       |->  Baz             Bar
- *   |->  Foo                   Bar                      |->  Foo
- *   |->  Baz                     |->  Foo               |->  Baz
- * Bar                                                 Bar
- *   |->  Foo                                            |->  Foo
- *   |->  Foo                                              |->  Foo
- *
- * Additional roles can be added to filter prevent some items from being
- * hidden.
- *
- * @warning The default role comparaison only work for QVariant basic types \
- * for custom types, it is better to use the function comparaison
- *
- * @note The filter string and sort role will be forwarded down the proxy chain\
- * so this model can be used as a drop in replacment in existing code TODO
- */
-class DeduplicateProxy : public QSortFilterProxyModel
-{
-   Q_OBJECT
-
-public:
-   enum class Mode {
-      ROLE,
-      FUNCTION //TODO
-   };
-
-   explicit DeduplicateProxy(QObject* parent = nullptr);
-   virtual ~DeduplicateProxy();
-
-   void addFilterRole(int role);
-
-   QVector<int> filterRoles() const;
-
-   void setComparator(const std::function<bool(const QModelIndex&, const QModelIndex&)>& f); //TODO
-
-   void setHiddenCountRole(int role, const QString& name = QString());
-
-   QList<QModelIndex> hiddenSiblings(const QModelIndex& idx) const;
-
-   void setAddChildren(bool add); //TODO
-
-   int hiddenSiblingCount(const QModelIndex& idx) const;
-
-   bool areChildrenAdded(); //TODO
-   std::function<bool(const QModelIndex&, const QModelIndex&)> comparator(); //TODO
-
-   // Model override
-   virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
-   virtual void sort ( int column, Qt::SortOrder order) override;
-   virtual void setSourceModel ( QAbstractItemModel * sourceModel ) override;
-   virtual int  rowCount(const QModelIndex& parent) const override;
-   virtual QVariant data( const QModelIndex& index, int role ) const override;
-
-
-
-private:
-   DeduplicateProxyPrivate* d_ptr;
-   Q_DECLARE_PRIVATE(DeduplicateProxy)
-};
-
-#endif
diff --git a/src/proxies/filtertoplevelproxy.cpp b/src/proxies/filtertoplevelproxy.cpp
deleted file mode 100644
index fcfb6e02..00000000
--- a/src/proxies/filtertoplevelproxy.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "filtertoplevelproxy.h"
-
-class FilterTopLevelProxyPrivate final : public QObject
-{
-   Q_OBJECT
-public:
-   explicit FilterTopLevelProxyPrivate(FilterTopLevelProxy* parent);
-
-   bool m_RecursionLock {false}; //Avoid infinite loop (not thread safe)
-
-public Q_SLOTS:
-   void changeParent(const QModelIndex& parent, int start, int end );
-
-private:
-   FilterTopLevelProxy* q_ptr;
-};
-
-FilterTopLevelProxyPrivate::FilterTopLevelProxyPrivate(FilterTopLevelProxy* parent) : QObject(parent),
-q_ptr(parent)
-{
-}
-
-
-FilterTopLevelProxy::FilterTopLevelProxy(QAbstractItemModel* parent) : QSortFilterProxyModel(parent),
-d_ptr(new FilterTopLevelProxyPrivate(this))
-{
-   setSourceModel(parent);
-
-   connect(parent, &QAbstractItemModel::rowsRemoved , d_ptr, &FilterTopLevelProxyPrivate::changeParent);
-   connect(parent, &QAbstractItemModel::rowsInserted, d_ptr, &FilterTopLevelProxyPrivate::changeParent);
-}
-
-FilterTopLevelProxy::~FilterTopLevelProxy()
-{
-   delete d_ptr;
-}
-
-bool FilterTopLevelProxy::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
-{
-   if (d_ptr->m_RecursionLock && !source_parent.isValid())
-      return sourceModel()->rowCount(
-         sourceModel()->index(source_row, 0, source_parent)
-      );
-
-   return true;
-}
-
-///This proxy doesn't sort anything
-void FilterTopLevelProxy::sort ( int column, Qt::SortOrder order)
-{
-   sourceModel()->sort(column, order);
-}
-
-///Force filterAcceptsRow to be called when children cound change
-void FilterTopLevelProxyPrivate::changeParent(const QModelIndex& parent, int start, int end )
-{
-   Q_UNUSED(end)
-
-   /// (performance) Only bother when the first child is involved
-   if ((!start) && parent.isValid() && !parent.parent().isValid()) {
-      m_RecursionLock = true;
-      emit q_ptr->sourceModel()->dataChanged(parent,parent);
-      m_RecursionLock = false;
-   }
-}
-
-#include "filtertoplevelproxy.moc"
diff --git a/src/proxies/filtertoplevelproxy.h b/src/proxies/filtertoplevelproxy.h
deleted file mode 100644
index e9c65191..00000000
--- a/src/proxies/filtertoplevelproxy.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef FILTERTOPLEVELPROXY_H
-#define FILTERTOPLEVELPROXY_H
-
-#include <QtCore/QSortFilterProxyModel>
-
-class FilterTopLevelProxyPrivate;
-
-/**
- * Remove top level items without any children
- *
- * This model is useful for 2+ level trees where the top level represent a
- * category. In some case, empty categories may be present and do not add
- * value while poluting the output.
- *
- * For filtering use case, KRecursiveFilterProxyModel is usually recomanded,
- * but a FilterTopLevelProxy may in some specific case, such as when proxies
- * are provided by external libraries, be useful.
- *
- * Example:
- *
- * |->Foo               |->Bar
- * |->Bar                |-> Foo
- *  |-> Foo    =====>    |-> Baz
- *  |-> Baz
- * |->Baz
- *
- */
-class FilterTopLevelProxy : public QSortFilterProxyModel
-{
-   Q_OBJECT
-public:
-   explicit FilterTopLevelProxy(QAbstractItemModel* parent);
-   virtual ~FilterTopLevelProxy();
-
-   virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
-
-   virtual void sort ( int column, Qt::SortOrder order) override;
-
-private:
-   FilterTopLevelProxyPrivate* d_ptr;
-   Q_DECLARE_PRIVATE(FilterTopLevelProxy)
-};
-
-#endif
diff --git a/src/proxies/flagsfilterproxy.cpp b/src/proxies/flagsfilterproxy.cpp
deleted file mode 100644
index 02c59b70..00000000
--- a/src/proxies/flagsfilterproxy.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "flagsfilterproxy.h"
-
-class FlagsFilterProxyPrivate final
-{
-public:
-   bool m_IsRecursive   { false                                    };
-   uint m_RetainedFlags { Qt::ItemIsEnabled | Qt::ItemIsSelectable };
-};
-
-FlagsFilterProxy::FlagsFilterProxy(QObject* parent) : QSortFilterProxyModel(parent),
-d_ptr(new FlagsFilterProxyPrivate())
-{}
-
-FlagsFilterProxy::~FlagsFilterProxy()
-{
-   delete d_ptr;
-}
-
-void FlagsFilterProxy::setRetainedFlags(int flags)
-{
-   d_ptr->m_RetainedFlags = flags;
-   invalidateFilter();
-}
-
-void FlagsFilterProxy::setRecursive(bool rec)
-{
-   //TODO
-   d_ptr->m_IsRecursive = rec;
-   invalidateFilter();
-}
-
-int FlagsFilterProxy::retainedFlags() const
-{
-   return d_ptr->m_RetainedFlags;
-}
-
-bool FlagsFilterProxy::isRecursive() const
-{
-   return d_ptr->m_IsRecursive;
-}
-
-bool FlagsFilterProxy::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
-{
-   const QModelIndex srcIdx = sourceModel()->index(source_row, filterKeyColumn(), source_parent);
-
-   return (srcIdx.flags() & d_ptr->m_RetainedFlags) == d_ptr->m_RetainedFlags;
-}
-
-void FlagsFilterProxy::sort( int column, Qt::SortOrder order)
-{
-   sourceModel()->sort(column, order);
-}
diff --git a/src/proxies/flagsfilterproxy.h b/src/proxies/flagsfilterproxy.h
deleted file mode 100644
index c71b1a2a..00000000
--- a/src/proxies/flagsfilterproxy.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef FLAGSFILTERPROXY_H
-#define FLAGSFILTERPROXY_H
-
-#include <QtCore/QSortFilterProxyModel>
-
-class FlagsFilterProxyPrivate;
-
-/**
- * Filter a model based on the source model flags
- *
- * This can be used to remove disabled and unselectable items
- *
- * The default retainedFlags are:
- *
- * * Qt::ItemIsEnabled
- * * Qt::ItemIsSelectable
- *
- */
-class FlagsFilterProxy : public QSortFilterProxyModel
-{
-   Q_OBJECT
-public:
-   explicit FlagsFilterProxy(QObject* parent = nullptr);
-   virtual ~FlagsFilterProxy();
-
-   void setRetainedFlags(int flags);
-   void setRecursive(bool rec); //TODO
-
-   int retainedFlags() const;
-   bool isRecursive() const; //TODO
-
-   virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override;
-
-   virtual void sort ( int column, Qt::SortOrder order) override;
-
-private:
-   FlagsFilterProxyPrivate* d_ptr;
-   Q_DECLARE_PRIVATE(FlagsFilterProxy)
-};
-
-#endif
diff --git a/src/proxies/pollingproxy.cpp b/src/proxies/pollingproxy.cpp
deleted file mode 100644
index 73aea01d..00000000
--- a/src/proxies/pollingproxy.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2016 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "pollingproxy.h"
-
-// Qt
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
-
-PollingProxy::PollingProxy(QObject* parent) : QIdentityProxyModel(parent),
-m_pTimer(new QTimer(this))
-{
-   m_pTimer->setInterval(1000);
-   m_pTimer->start();
-   connect(m_pTimer, &QTimer::timeout, this, &PollingProxy::pollSlot);
-}
-
-PollingProxy::PollingProxy(QAbstractItemModel* model) : PollingProxy(
-   static_cast<QObject*>(model)
-)
-{
-   setSourceModel(model);
-}
-
-void PollingProxy::pollSlot()
-{
-   emit dataChanged(index(0,0), index(rowCount(), columnCount()));
-}
-
-//kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/proxies/pollingproxy.h b/src/proxies/pollingproxy.h
deleted file mode 100644
index bb3d2a08..00000000
--- a/src/proxies/pollingproxy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2016 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef POLLINGPROXY_H
-#define POLLINGPROXY_H
-
-#include <QtCore/QIdentityProxyModel>
-
-class QTimer;
-
-/**
- * This proxy add a dataChanged signal at a defined interval. This is useful
- * for small and trivial models where adding proper synchronization add more
- * complexity than it is worth.
- *
- * One use case would be to take a static/constant data source with dates or
- * time and update the elapsed time.
- *
- * Using this model is not recommended.
- */
-class PollingProxy : public QIdentityProxyModel
-{
-   Q_OBJECT
-public:
-   explicit PollingProxy(QObject * parent = 0);
-   PollingProxy(QAbstractItemModel* model);
-
-private:
-   QTimer* m_pTimer {nullptr};
-
-private Q_SLOTS:
-   void pollSlot();
-};
-Q_DECLARE_METATYPE(PollingProxy*)
-
-#endif
-
-//kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/proxies/roletransformationproxy.cpp b/src/proxies/roletransformationproxy.cpp
deleted file mode 100644
index e10f8a11..00000000
--- a/src/proxies/roletransformationproxy.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "roletransformationproxy.h"
-
-typedef std::function<QVariant(const QModelIndex&)> Mutator;
-
-class RoleTransformationProxyPrivate final
-{
-public:
-
-   // Types
-   enum class Mode {
-      NONE,
-      ROLE,
-      STATIC,
-      FUNCTION
-   };
-
-   ///Save some memory as only one type is currently supported, this may change
-   typedef union Storage {
-      int      role;
-      QVariant var ;
-      Mutator* func;
-   } Storage; //TODO make sure to cleanup when mode change or enjoy SIGSEGV
-
-   // Attributes
-
-   //TODO make this lfexible beyons Qt::UserRole
-   Mode m_Mode {Mode::NONE};
-   Storage* m_Map[Qt::UserRole+1] {nullptr}; //TODO don't do this
-
-   // Helpers
-   inline void initRole(int destination);
-};
-
-void RoleTransformationProxyPrivate::initRole(int destination)
-{
-   if (!m_Map[destination])
-      m_Map[destination] = (Storage*) malloc(sizeof(Storage));;
-}
-
-RoleTransformationProxy::RoleTransformationProxy(QObject* parent) : QIdentityProxyModel(parent),
-d_ptr( new RoleTransformationProxyPrivate() )
-{
-}
-
-RoleTransformationProxy::~RoleTransformationProxy()
-{
-   for(int i = 0; i < Qt::UserRole; i++) {
-      if (d_ptr->m_Map[i]) {
-         if (d_ptr->m_Mode == RoleTransformationProxyPrivate::Mode::FUNCTION)
-           delete d_ptr->m_Map[i]->func;
-
-         free(d_ptr->m_Map[i]);
-      }
-   }
-   delete d_ptr;
-}
-
-void RoleTransformationProxy::setRole(int destination, int sourceRole)
-{
-   if (destination < 0 || destination > Qt::UserRole)
-      return; //TODO remove limitation
-
-   d_ptr->initRole(destination);
-
-   d_ptr->m_Map[destination]->role = sourceRole;
-
-   d_ptr->m_Mode = RoleTransformationProxyPrivate::Mode::ROLE;
-}
-
-void RoleTransformationProxy::setRole(int destination, const QVariant& var)
-{
-   if (destination < 0 || destination > Qt::UserRole)
-      return; //TODO remove limitation
-
-   d_ptr->initRole(destination);
-
-   d_ptr->m_Map[destination]->var = var;
-
-   d_ptr->m_Mode = RoleTransformationProxyPrivate::Mode::STATIC;
-}
-
-void RoleTransformationProxy::setRole(int destination, const std::function<QVariant(const QModelIndex&)>& f)
-{
-   if (destination < 0 || destination > Qt::UserRole)
-      return; //TODO remove limitation
-
-   d_ptr->initRole(destination);
-
-   d_ptr->m_Map[destination]->func = new Mutator(f);
-
-   d_ptr->m_Mode = RoleTransformationProxyPrivate::Mode::FUNCTION;
-}
-
-QVariant RoleTransformationProxy::data( const QModelIndex& index, int role ) const
-{
-   if (!index.isValid())
-      return {};
-
-   if (role >= 0 && role <= Qt::UserRole && d_ptr->m_Map[role]) { //TODO remove limitation
-      switch (d_ptr->m_Mode) {
-         case RoleTransformationProxyPrivate::Mode::NONE    :
-            return QIdentityProxyModel::data(index, role);
-         case RoleTransformationProxyPrivate::Mode::ROLE    :
-            return QIdentityProxyModel::data(index, d_ptr->m_Map[role]->role);
-         case RoleTransformationProxyPrivate::Mode::STATIC  :
-            return d_ptr->m_Map[role]->var;
-         case RoleTransformationProxyPrivate::Mode::FUNCTION:
-            return (*d_ptr->m_Map[role]->func)(index);
-      }
-   }
-
-   return QIdentityProxyModel::data(index, role);
-}
diff --git a/src/proxies/roletransformationproxy.h b/src/proxies/roletransformationproxy.h
deleted file mode 100644
index aa7254d8..00000000
--- a/src/proxies/roletransformationproxy.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Emmanuel Lepage Vallee                           *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef ROLETRANSFORMATIONPROXY_H
-#define ROLETRANSFORMATIONPROXY_H
-
-#include <functional>
-
-#include <QtCore/QIdentityProxyModel>
-
-class RoleTransformationProxyPrivate;
-
-/**
- * Proxy that replace, manipulate, modify, remove or add roles
- *
- * This proxy can be useful to slightly change a model behavior without
- * have to sub-class it.
- *
- * It can be used at runtime to add dynamic filters. For example, one could
- * use this class to set the Qt::BackgroundRole based on runtime search
- * and criterias.
- *
- * <code>
- * auto highlight = new RoleTransformationProxy(dedup);
- *
- * highlight->setRole(Qt::BackgroundRole, [](const QModelIndex& idx) {
- *    return idx.data().toString().indexOf('-') != -1 ?
- *       QColor(Qt::red) : QColor();
- * });
- *
- * highlight->setSourceModel(source);
- * </code>
- *
- * Another use case is to replace Qt::DisplayRole with another role or add
- * new formated roles based on existing ones (like converting a timestamp
- * string to a formated date or convert string number of proper numbers
- * before passing the model to KDChart)
- *
- * <code>
- * auto highlight = new RoleTransformationProxy(dedup);
- *
- * highlight->setRole(Qt::DisplayRole, MyModel::Role::Email);
- *
- * highlight->setSourceModel(source);
- * </code>
- *
- * @note The current implementation is not as generic as it could be, this\
- * could change if there is interest in upstreaming the concept
- */
-class RoleTransformationProxy : public QIdentityProxyModel
-{
-   Q_OBJECT
-
-public:
-   explicit RoleTransformationProxy(QObject* parent);
-   virtual ~RoleTransformationProxy();
-
-   void setRole(int destination, int sourceRole);
-   void setRole(int destination, const QVariant& var);
-   void setRole(int destination, const std::function<QVariant(const QModelIndex&)>& f);
-
-   virtual QVariant data( const QModelIndex& index, int role ) const override;
-
-private:
-   RoleTransformationProxyPrivate* d_ptr;
-   Q_DECLARE_PRIVATE(RoleTransformationProxy)
-};
-
-#endif
diff --git a/src/proxies/simplerotateproxy.cpp b/src/proxies/simplerotateproxy.cpp
deleted file mode 100644
index 5194df2b..00000000
--- a/src/proxies/simplerotateproxy.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Savoir-Faire Linux                               *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#include "simplerotateproxy.h"
-
-SimpleRotateProxy::SimpleRotateProxy(QObject * parent) : QAbstractProxyModel(parent)
-{
-   //TODO implement it correctly, this is the lazy way
-   connect(this, &SimpleRotateProxy::sourceModelChanged, [this]() {
-      connect(this->sourceModel(),&QAbstractItemModel::dataChanged, this, [this](const QModelIndex&, const QModelIndex&) {
-         emit this->layoutChanged();
-      });
-      connect(this->sourceModel(),&QAbstractItemModel::layoutChanged, this, [this]() {
-         emit this->layoutChanged();
-      });
-      connect(this->sourceModel(),&QAbstractItemModel::rowsInserted, this, [this](const QModelIndex & , int , int ) {
-         emit this->layoutChanged();
-      });
-      connect(this->sourceModel(),&QAbstractItemModel::rowsMoved, this, [this](const QModelIndex&, int, int, const QModelIndex&, int) {
-         emit this->layoutChanged();
-      });
-      connect(this->sourceModel(),&QAbstractItemModel::rowsRemoved, this, [this](const QModelIndex & , int , int ) {
-         emit this->layoutChanged();
-      });
-   });
-}
-
-QModelIndex SimpleRotateProxy::mapFromSource(const QModelIndex& sourceIndex) const
-{
-   if (!sourceIndex.isValid())
-      return QModelIndex();
-
-   if (sourceIndex.parent().isValid()) {
-      return createIndex(sourceIndex.row(),sourceIndex.column(),sourceIndex.internalPointer());
-   }
-   else {
-      return createIndex(sourceIndex.column(),sourceIndex.row(),sourceIndex.internalPointer());
-   }
-}
-
-QModelIndex SimpleRotateProxy::mapToSource(const QModelIndex& proxyIndex) const
-{
-   if (!proxyIndex.isValid())
-      return QModelIndex();
-
-   if (proxyIndex.parent().isValid()) {
-      return sourceModel()->index(proxyIndex.row(),proxyIndex.column());
-   }
-   else {
-      return sourceModel()->index(proxyIndex.column(),proxyIndex.row());
-   }
-}
-
-QModelIndex SimpleRotateProxy::index(int row, int column, const QModelIndex& parent) const
-{
-   Q_UNUSED(parent)
-   return createIndex(row,column,nullptr);
-}
-
-QModelIndex SimpleRotateProxy::parent(const QModelIndex& ) const
-{
-   return QModelIndex();
-}
-
-int SimpleRotateProxy::rowCount(const QModelIndex& idx) const
-{
-   return idx.parent().isValid() ?
-      sourceModel()->rowCount   (idx) :
-      sourceModel()->columnCount(idx);
-}
-
-int SimpleRotateProxy::columnCount(const QModelIndex& idx) const
-{
-   return idx.parent().isValid() ?
-      sourceModel()->columnCount(idx) :
-      sourceModel()->rowCount   (idx);
-}
diff --git a/src/proxies/simplerotateproxy.h b/src/proxies/simplerotateproxy.h
deleted file mode 100644
index fca4688b..00000000
--- a/src/proxies/simplerotateproxy.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2015 by Savoir-Faire Linux                               *
- *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
- *                                                                          *
- *   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) any later version.     *
- *                                                                          *
- *   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 General Public License      *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
- ***************************************************************************/
-#ifndef SimpleRotateProxy_H
-#define SimpleRotateProxy_H
-
-#include <QtCore/QAbstractProxyModel>
-
-/**
- * This proxy model turn each top level rows into columns and columns into rows.
- *
- * This is equivalent to I * {{0,1},{-1,0}}
- *
- * This models proxy children items as is with no transformation.
- *
- * This model can be used when:
- *
- * 1) The model is based on a QAbtractListModel and it is preferable to
- * display it into a QTableView horizontally.
- *
- * 2) The top level items represent a concept different from the lower levels and
- * displaying them horizontally create a better visual separation.
- *
- * 3) The source model is external and display data in inverted order, such as
- * many real world CSV export tools or badly designed spreadsheets
- *
- * Example:
- *
- * |-> Foo
- * |-> Bar                    -----------------
- * |-> Baz          ====>      |    |    |
- *   |-> Foobar               Foo  Bar  Baz
- *   |-> Foobaz                          |-> Foobar
- *                                       |-> Foobaz
- */
-class SimpleRotateProxy : public QAbstractProxyModel
-{
-   Q_OBJECT
-public:
-   explicit SimpleRotateProxy(QObject * parent = 0);
-   virtual QModelIndex  mapFromSource(const QModelIndex & sourceIndex) const override;
-   virtual QModelIndex  mapToSource  (const QModelIndex & proxyIndex ) const override;
-   virtual QModelIndex  index        (int, int, const QModelIndex&   ) const override;
-   virtual QModelIndex  parent       (const QModelIndex&             ) const override;
-   virtual int          rowCount     (const QModelIndex&             ) const override;
-   virtual int          columnCount  (const QModelIndex&             ) const override;
-};
-Q_DECLARE_METATYPE(SimpleRotateProxy*)
-
-#endif
diff --git a/src/qmlwidgets/CMakeLists.txt b/src/qmlwidgets/CMakeLists.txt
index d6f81274..37082421 100644
--- a/src/qmlwidgets/CMakeLists.txt
+++ b/src/qmlwidgets/CMakeLists.txt
@@ -1,90 +1,87 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 ADD_DEFINITIONS("-std=c++11")
 
 PROJECT(libqmlwidgets)
 
 IF(POLICY CMP0063)
    CMAKE_POLICY(SET CMP0063 NEW)
 ENDIF(POLICY CMP0063)
 
 FIND_PACKAGE(ECM 1.1.0 REQUIRED NO_MODULE)
 
 INCLUDE(ECMInstallIcons)
 INCLUDE(ECMOptionalAddSubdirectory)
 
 INCLUDE(KDEInstallDirs)
 INCLUDE(KDECMakeSettings)
 INCLUDE(KDECompilerSettings)
 
 SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTORCC ON)
 SET(CMAKE_AUTOUIC ON)
 
 FIND_PACKAGE ( LibRingQt QUIET )
 
 FIND_PACKAGE(Qt5 CONFIG REQUIRED
     Core
     Gui
 
     Quick
     QuickWidgets
     QuickControls2
 )
 
 FIND_PACKAGE(KF5 REQUIRED COMPONENTS
     I18n
     Config
     ConfigWidgets
 )
 
 INCLUDE_DIRECTORIES(SYSTEM ${Qt5Widgets_INCLUDES} ${Qt5Core_INCLUDES} ${ringqt_INCLUDE_DIR})
 
 ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
 
 SET(GENERIC_LIB_VERSION "1.0.0")
 
 #File to compile
 SET( libqmlwidgets_LIB_SRCS
     bubble.cpp
     plugin.cpp
     messagebuilder.cpp
     contactbuilder.cpp
-    cmiconengine.cpp
-    personiconengine.cpp
     treehelper.cpp
     multicall.cpp
     snapshotadapter.cpp
     timelinedots.cpp
     qmlaction.cpp
     qactionbinder.cpp
     symboliccolorizer.cpp
 )
 
 QT5_ADD_RESOURCES(libqmlwidgets_LIB_SRCS
    qmlwidgets.qrc
 )
 
 ADD_LIBRARY( libqmlwidgets  STATIC ${libqmlwidgets_LIB_SRCS} )
 
 target_link_libraries( libqmlwidgets
     ringqt
-    libkring
 
     Qt5::Core
     Qt5::Gui
     Qt5::Quick
     Qt5::QuickWidgets
     Qt5::QuickControls2
 
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::ConfigWidgets
     KF5::XmlGui
 )
 
 SET( libqmlwidgets_LIB_HDRS
     bubble.h
     plugin.h
     messagebuilder.h
 )
diff --git a/src/ringapplication.cpp b/src/ringapplication.cpp
index 75652948..ed224ca0 100644
--- a/src/ringapplication.cpp
+++ b/src/ringapplication.cpp
@@ -1,492 +1,351 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Valle <emmanuel.lepage@savoirfairelinux.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 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/>. *
  **************************************************************************/
 
 //Parent
 #include "ringapplication.h"
 
 //Qt
 #include <QtCore/QTimer>
 #include <QtCore/QDebug>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QItemSelectionModel>
 #include <QtWidgets/QAction>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQuickItem>
 #include <QQuickWindow>
 #include <QQmlExtensionPlugin>
 #include <QQmlComponent>
 
 //KDE
 #include <KIconLoader>
 #include <KActionCollection>
 #include <kmessagebox.h>
 #include <KDeclarative/KDeclarative>
 
 //LRC
 #include <itemdataroles.h>
 #include <session.h>
 #include <callmodel.h>
 #include <accountmodel.h>
 #include <account.h>
 #include <bookmarkmodel.h>
 #include <libcard/historyimporter.h>
 
 //Ring
-#include "klib/kcfg_settings.h"
+#include "kcfg_settings.h"
 #include "cmd.h"
 #include "errormessage.h"
-#include "implementation.h"
 #include "wizard/welcome.h"
+#include "jamikdeintegration/src/windowevent.h"
 #include "callview/videowidget.h"
-#include "notification.h"
-#include "actioncollection.h"
 
 //Models
 #include <profilemodel.h>
+#include <callhistorymodel.h>
 #include <certificatemodel.h>
 #include <numbercategorymodel.h>
 #include <persondirectory.h>
 
-//Collections
-#include <foldercertificatecollection.h>
-#include <fallbackpersoncollection.h>
-#include <peerprofilecollection2.h>
-#include <localhistorycollection.h>
-#include <localbookmarkcollection.h>
-#include <localrecordingcollection.h>
-#include <localprofilecollection.h>
-#include <localtextrecordingcollection.h>
-#include <globalinstances.h>
-
 //Delegates
-#include <delegates/kdepixmapmanipulation.h>
-#include <interfaces/itemmodelstateserializeri.h>
-#include "klib/itemmodelserialization.h"
 #include "extensions/presencecollectionextension.h"
 
 //QML
 #include <KQuickItemViews/plugin.h>
 #include "qmlwidgets/plugin.h"
 #include "qmlwidgets/symboliccolorizer.h"
 #include "photoselector/photoplugin.h"
 #include "canvasindicators/canvasindicator.h"
 #include "canvasindicators/ringingimageprovider.h"
 #include "desktopview/desktopviewplugin.h"
 #include "contactview/contactviewplugin.h"
-#include "accountview/accountviewplugin.h"
 #include "dialview/dialviewplugin.h"
 #include "timeline/timelineplugin.h"
 
-//Widgets
-#include "widgets/systray.h"
-
 KDeclarative::KDeclarative* RingApplication::m_pDeclarative {nullptr};
 RingQmlWidgets* RingApplication::m_pQmlWidget {nullptr};
 PhotoSelectorPlugin* RingApplication::m_pPhotoSelector {nullptr};
 DesktopView* RingApplication::m_pDesktopView {nullptr};
 ContactView* RingApplication::m_pContactView {nullptr};
-AccountView* RingApplication::m_pAccountView {nullptr};
 DialView* RingApplication::m_pDialView {nullptr};
 TimelinePlugin* RingApplication::m_pTimeline {nullptr};
 CanvasIndicator* RingApplication::m_pCanvasIndicator {nullptr};
 RingApplication* RingApplication::m_spInstance {nullptr};
 
 //This code detect if the window is active, innactive or minimzed
 class PhoneWindowEvent final : public QObject {
    Q_OBJECT
 public:
    PhoneWindowEvent(RingApplication* ev) : QObject(ev),m_pParent(ev) {
       QTimer::singleShot(0, [this]() {
          m_pParent->desktopWindow()->installEventFilter(this);
       });
    }
 protected:
    virtual bool eventFilter(QObject *obj, QEvent *event)  override {
       Q_UNUSED(obj)
       if (event->type() == QEvent::WindowDeactivate) {
          m_pParent->m_HasFocus = false;
       }
       else if (event->type() == QEvent::WindowActivate) {
          m_pParent->m_HasFocus = true;
       }
       return false;
    }
 
 private:
    RingApplication* m_pParent;
 
 Q_SIGNALS:
    void minimized(bool);
 };
 
 /**
  * The application constructor
  */
 RingApplication::RingApplication(int & argc, char ** argv) : QApplication(argc,argv),m_StartIconified(false)
 {
    Q_ASSERT(argc != -1);
-#ifdef ENABLE_VIDEO
-   //Necessary to draw OpenGL from a separated thread
-   setAttribute(Qt::AA_X11InitThreads,true);
-#endif
+
    setAttribute(Qt::AA_EnableHighDpiScaling);
 
    m_pEventFilter = new PhoneWindowEvent(this);
 
    m_spInstance = this;
 }
 
 void RingApplication::init()
 {
    if ((!Session::instance()->callModel()->isConnected()) || (!Session::instance()->callModel()->isValid())) {
       QTimer::singleShot(5000,this,&RingApplication::daemonTimeout);
    }
-
-   initCollections();
 }
 
 /**
  * Destructor
  */
 RingApplication::~RingApplication()
 {
    delete m_pDeclarative;
    delete engine();
    delete m_pCanvasIndicator;
    delete m_pPhotoSelector;
    delete m_pQmlWidget;
    m_spInstance = nullptr;
 }
 
 RingApplication* RingApplication::instance()
 {
    Q_ASSERT(m_spInstance);
    return m_spInstance;
 }
 
-static void loadNumberCategories()
-{
-   auto model = Session::instance()->numberCategoryModel();
-   static const QString pathTemplate = QStringLiteral(":/mini/icons/miniicons/%1.png");
-#define ICN(name) QPixmap(QString(pathTemplate).arg(QStringLiteral(name)))
-   model->addCategory(i18n("Home")     ,ICN("home")     , 1 /*KABC::PhoneNumber::Home */);
-   model->addCategory(i18n("Work")     ,ICN("work")     , 2 /*KABC::PhoneNumber::Work */);
-   model->addCategory(i18n("Msg")      ,ICN("mail")     , 3 /*KABC::PhoneNumber::Msg  */);
-   model->addCategory(i18n("Pref")     ,ICN("call")     , 4 /*KABC::PhoneNumber::Pref */);
-   model->addCategory(i18n("Voice")    ,ICN("video")    , 5 /*KABC::PhoneNumber::Voice*/);
-   model->addCategory(i18n("Fax")      ,ICN("call")     , 6 /*KABC::PhoneNumber::Fax  */);
-   model->addCategory(i18n("Cell")     ,ICN("mobile")   , 7 /*KABC::PhoneNumber::Cell */);
-   model->addCategory(i18n("Video")    ,ICN("call")     , 8 /*KABC::PhoneNumber::Video*/);
-   model->addCategory(i18n("Bbs")      ,ICN("call")     , 9 /*KABC::PhoneNumber::Bbs  */);
-   model->addCategory(i18n("Modem")    ,ICN("call")     , 10/*KABC::PhoneNumber::Modem*/);
-   model->addCategory(i18n("Car")      ,ICN("car")      , 11/*KABC::PhoneNumber::Car  */);
-   model->addCategory(i18n("Isdn")     ,ICN("call")     , 12/*KABC::PhoneNumber::Isdn */);
-   model->addCategory(i18n("Pcs")      ,ICN("call")     , 13/*KABC::PhoneNumber::Pcs  */);
-   model->addCategory(i18n("Pager")    ,ICN("pager")    , 14/*KABC::PhoneNumber::Pager*/);
-   model->addCategory(i18n("Preferred"),ICN("preferred"), 10000                         );
-#undef ICN
-#undef IS_ENABLED
-}
-
-void RingApplication::initCollections()
-{
-   GlobalInstances::setInterface<KDEActionExtender>();
-
-   GlobalInstances::setInterface<ColorDelegate>();
-
-   GlobalInstances::setInterface<KDEPixmapManipulation>();
-
-   loadNumberCategories();
-
-   Session::instance()->callModel()->setAudoCleanDelay(5000);
-
-   /*******************************************
-      *           Load the collections          *
-      ******************************************/
-
-   // Load the old phone call history and port it to the newer calendar events format.
-   if (QFile::exists(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') +"history.ini")) {
-      auto histo = Session::instance()->historyModel()->addCollection<LocalHistoryCollection>(LoadOptions::FORCE_ENABLED);
-      HistoryImporter::importHistory(histo);
-      histo->clear();
-   }
-
-   //HACK load the Calendar now to speedup everything else
-   const int accountCount = Session::instance()->accountModel()->size();
-   for (int i=0; i < accountCount; i++)
-      (*Session::instance()->accountModel())[i]->calendar();
-
-   Session::instance()->profileModel()->addCollection<LocalProfileCollection>(LoadOptions::FORCE_ENABLED);
-
-#ifdef Q_OS_LINUX
-   CertificateModel::instance().addCollection<FolderCertificateCollection,QString, FlagPack<FolderCertificateCollection::Options>,QString>(
-      QStringLiteral("/usr/share/ca-certificates/"),
-      FolderCertificateCollection::Options::ROOT
-         | FolderCertificateCollection::Options::RECURSIVE
-         | FolderCertificateCollection::Options::READ_ONLY,
-      i18n("System root certificates"),
-      LoadOptions::FORCE_ENABLED
-   );
-#endif
-
-   Session::instance()->bookmarkModel()->addCollection<LocalBookmarkCollection>();
-   Session::instance()->bookmarkModel()->setDisplayPopular(
-      ConfigurationSkeleton::displayPopularAsBookmark()
-   );
-
-   Session::instance()->personDirectory()->addCollection<FallbackPersonCollection>(LoadOptions::FORCE_ENABLED);
-   auto ppc = Session::instance()->personDirectory()->addCollection<PeerProfileCollection2>(LoadOptions::FORCE_ENABLED);
-
-   const auto m = static_cast<PeerProfileCollection2::DefaultMode>(ConfigurationSkeleton::defaultPeerProfileMode());
-   ppc->setDefaultMode(m);
-
-   GlobalInstances::setInterface<ItemModelStateSerialization>();
-   GlobalInstances::itemModelStateSerializer().load();
-
-#ifdef ENABLE_AKONADI
-   AkonadiBackend::initCollections();
-#endif
-
-//       PresenceCollectionModelExtension* ext = new PresenceCollectionModelExtension(this);
-//       Session::instance()->personDirectory()->backendModel()->addExtension(ext); //FIXME
-
-   Session::instance()->profileModel();
-
-   Notification::instance();
-}
-
 ///Parse command line arguments
 int RingApplication::newInstance()
 {
    static bool displayWizard  = ConfigurationSkeleton::enableWizard() || ConfigurationSkeleton::showSplash();
    const  bool displayOnStart = ConfigurationSkeleton::displayOnStart() && !startIconified();
 
    static bool init = true;
    //Only call on the first instance
    if (init) {
       init = false;
 
-      ActionCollection::instance()->setupAction();
       desktopWindow();
-      new SysTray(QIcon(QStringLiteral(":appicon/icons/64-apps-ring-kde.png")));
    }
 
    // The first run wizard
    if (displayOnStart && displayWizard) {
       // Also add this object
       engine()->rootContext()->setContextProperty(
          QStringLiteral("RingApplication"), this
       );
 
-      engine()->rootContext()->setContextProperty(
-         QStringLiteral("wizardWelcomeOnly"), QVariant(!ConfigurationSkeleton::enableWizard())
-      );
+      if (ConfigurationSkeleton::enableWizard())
+         WindowEvent::instance()->showWizard();
 
       if (!Session::instance()->accountModel()->size())
-         showWizard();
+         WindowEvent::instance()->showWizard();
 
       ConfigurationSkeleton::setEnableWizard(false);
       displayWizard = false;
       return 0;
    }
 
    return 0;
 }
 
 bool RingApplication::startIconified() const
 {
    return m_StartIconified;
 }
 
 void RingApplication::setIconify(bool iconify)
 {
    m_StartIconified = iconify;
 }
 
 #define QML_TYPE(name) qmlRegisterUncreatableType<name>(AppName, 1,0, #name, #name "cannot be instantiated");
 #define QML_NS(name) qmlRegisterUncreatableMetaObject( name :: staticMetaObject, #name, 1, 0, #name, "Namespaces cannot be instantiated" );
 #define QML_CRTYPE(name) qmlRegisterType<name>(AppName, 1,0, #name);
-#define QML_SINGLETON2(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), name::instance());
 
 constexpr static const char AppName[]= "Ring";
 
 /// Create a QML engine for various canvas widgets
 QQmlApplicationEngine* RingApplication::engine()
 {
    static QQmlApplicationEngine* e = nullptr;
    static std::atomic_flag engineInit = ATOMIC_FLAG_INIT;
 
    if (!engineInit.test_and_set()) {
       m_pQmlWidget = new RingQmlWidgets;
       m_pQmlWidget->registerTypes("RingQmlWidgets");
 
       m_pPhotoSelector = new PhotoSelectorPlugin;
       m_pPhotoSelector->registerTypes("PhotoSelectorPlugin");
 
       m_pDesktopView = new DesktopView;
       m_pDesktopView->registerTypes("DesktopView");
 
       m_pContactView = new ContactView;
       m_pContactView->registerTypes("ContactView");
 
-      m_pAccountView = new AccountView;
-      m_pAccountView->registerTypes("AccountView");
-
       m_pDialView = new DialView;
       m_pDialView->registerTypes("DialView");
 
       m_pTimeline = new TimelinePlugin;
       m_pTimeline->registerTypes("TimeLine");
 
       m_pCanvasIndicator = new CanvasIndicator;
       m_pCanvasIndicator->registerTypes("CanvasIndicator");
 
       QML_TYPE( QAction)
 
       QML_CRTYPE( QItemSelectionModel )
 
       QML_NS(Ring)
 
       e = new QQmlApplicationEngine(QGuiApplication::instance());
 
       // Setup the icon theme provider and ki18n
       m_pDeclarative = new KDeclarative::KDeclarative;
       m_pDeclarative->setDeclarativeEngine(e);
       try {
-         QML_SINGLETON2( ActionCollection        );
 
          auto im = new RingingImageProvider();
          e->addImageProvider( QStringLiteral("RingingImageProvider"), im );
          e->addImportPath(QStringLiteral("qrc:/"));
 
          auto im2 = new SymbolicColorizer();
          e->addImageProvider( QStringLiteral("SymbolicColorizer"), im2 );
 
          VideoWidget3::initProvider();
       }
       catch(char const* e) {
          qDebug() << "Failed to connect to the daemon" << e;
          sync();
          ::exit(1);
       }
       catch(...) {
          qDebug() << "Failed to connect to the daemon with an unknown problem";
          ::exit(2);
       }
    }
    return e;
 }
 
 #undef QML_TYPE
 #undef QML_CRTYPE
 
 QQuickWindow* RingApplication::desktopWindow() const
 {
    static QQuickWindow* dw = nullptr;
    if (!dw) {
       QQmlComponent component(engine());
       component.loadUrl(QUrl(QStringLiteral("qrc:/DesktopWindow.qml")));
       if ( component.isReady() ) {
          qDebug() << "Previous error" << component.errorString();
 
          auto obj2 = component.create();
 
          // I have *no* clue why this is needed... A race somewhere
          while (component.errorString().isEmpty() && !obj2)
             obj2 = component.create();
 
          if (!(dw = qobject_cast<QQuickWindow*>(obj2)))
             qWarning() << "Failed to load:" << component.errorString();
       }
       else
          qWarning() << component.errorString();
    }
 
    Q_ASSERT(dw);
 
    return dw;
 }
 
 ///The daemon is not found
 void RingApplication::daemonTimeout()
 {
    if ((!Session::instance()->callModel()->isConnected()) || (!Session::instance()->callModel()->isValid())) {
       KMessageBox::error(nullptr, ErrorMessage::NO_DAEMON_ERROR);
       exit(1);
    }
 }
 
-void RingApplication::showWizard()
-{
-   RingApplication::engine()->rootContext()->setContextProperty(
-      QStringLiteral("wizardWelcomeOnly"), QVariant(false)
-   );
-
-   auto wiz = new WelcomeDialog();
-   wiz->show();
-}
-
-void RingApplication::configureAccounts()
-{
-   desktopWindow()->setProperty(
-      "accountMode", true
-   );
-}
-
 ///Exit gracefully
 bool RingApplication::notify (QObject* receiver, QEvent* e)
 {
    try {
       return QApplication::notify(receiver,e);
    }
    catch (const Call::State& state) {
       qDebug() << ErrorMessage::GENERIC_ERROR << "CallState" << state;
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    catch (const Call::Action& state) {
       qDebug() << ErrorMessage::GENERIC_ERROR << "Call Action" << state;
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    catch (const QString& errorMessage) {
       KMessageBox::error(nullptr,errorMessage);
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    catch (const std::exception& e) {
       qDebug() << ErrorMessage::GENERIC_ERROR << e.what();
       KMessageBox::error(nullptr,ErrorMessage::GENERIC_ERROR);
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
 
    }
    catch (...) {
       Q_ASSERT(false);
       qDebug() << ErrorMessage::GENERIC_ERROR;
       KMessageBox::error(nullptr, ErrorMessage::GENERIC_ERROR);
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    return false;
 }
 
 bool RingApplication::mayHaveFocus()
 {
    return m_HasFocus;
 }
 
 #include <ringapplication.moc>
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/ringapplication.h b/src/ringapplication.h
index 613b60a0..b1185407 100644
--- a/src/ringapplication.h
+++ b/src/ringapplication.h
@@ -1,115 +1,108 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>         *
  *            Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 #ifndef RINGAPPLICATION_H
 #define RINGAPPLICATION_H
 
 #include <QtWidgets/QApplication>
 
 //Qt
 class QEvent;
 class QQmlApplicationEngine;
 class QQuickWindow;
 
 //KF5
 
 namespace KDeclarative {
    class KDeclarative;
 }
 
 //Ring
 class RingQmlWidgets;
 class PhotoSelectorPlugin;
 class CanvasIndicator;
 class DesktopView;
 class ContactView;
-class AccountView;
 class DialView;
 class TimelinePlugin;
 class Call;
 class PhoneWindowEvent;
 
 ///RingApplication: Main application
 class RingApplication final : public QApplication
 {
   Q_OBJECT
 
 public:
    // Constructor
    RingApplication(int & argc, char ** argv);
 
    // Destructor
    virtual ~RingApplication();
 
    // Manage new instances
    Q_INVOKABLE virtual int newInstance();
-   void initCollections();
 
    // Exit gracefully
    virtual bool notify (QObject* receiver, QEvent* e) override;
 
    //Getter
    bool startIconified() const;
 
    QQuickWindow* desktopWindow() const;
 
    static QQmlApplicationEngine* engine();
 
    static RingApplication* instance();
    void init();
 
    /**
     * An unreliable way to track the application focus
     *
     * It is better than nothing
     */
    bool mayHaveFocus();
 
    //Setter
    void setIconify(bool iconify);
 
    bool m_HasFocus       {false};
 private:
    //Attributes
    bool m_StartIconified {false};
    bool m_StartPhone     {false};
    bool m_StartTimeLine  {false};
 
    static KDeclarative::KDeclarative* m_pDeclarative;
    static RingQmlWidgets* m_pQmlWidget;
    static PhotoSelectorPlugin* m_pPhotoSelector;
    static CanvasIndicator* m_pCanvasIndicator;
    static RingApplication* m_spInstance;
    static DesktopView* m_pDesktopView;
    static ContactView* m_pContactView;
-   static AccountView* m_pAccountView;
    static DialView* m_pDialView;
    static TimelinePlugin* m_pTimeline;
    PhoneWindowEvent* m_pEventFilter {nullptr};
 
 private Q_SLOTS:
    void daemonTimeout();
-
-public Q_SLOTS:
-   void showWizard();
-   void configureAccounts();
 };
 
 #endif // RINGAPPLICATION_H
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
deleted file mode 100644
index 2c9dcaf1..00000000
--- a/src/test/CMakeLists.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-if(POLICY CMP0017)
-   cmake_policy(SET CMP0017 NEW)
-endif(POLICY CMP0017)
-
-FIND_PACKAGE ( KDE4       REQUIRED            )
-FIND_PACKAGE ( Qt4        REQUIRED QtCore QtGui QtXml QtDBus QtTest QtSVG QT_USE_QT* )
-
-INCLUDE(   ${QT_USE_FILE}   )
-include(KDE4Defaults)
-
-ADD_DEFINITIONS("-std=c++0x")
-
-message("Compiling tests")
-
-
-SET(using_qtest 1)
-
-#DBUS tests
-set( dbus_SRCS dbus_test.cpp )
-
-# kde4_add_unit_test( dbus
-#    TESTNAME "DBus_connection"
-#    ${dbus_SRCS}
-# )
-
-# target_link_libraries( dbus 
-#    ${KDE4_KDECORE_LIBS}
-#    ${QT_QTTEST_LIBRARY}
-#    ${KDE4_KDEUI_LIBS}
-#    kring
-#    ringqt
-# )
-
-#ACCOUNT tests
-set( account_SRCS account_test.cpp )
-
-# kde4_add_unit_test( account
-#    TESTNAME "Account_serialization"
-#    ${account_SRCS}
-# )
-# 
-# target_link_libraries( account
-#    ${KDE4_KDECORE_LIBS}
-#    ${QT_QTTEST_LIBRARY}
-#    ${KDE4_KDEUI_LIBS}
-#    kring
-#    ringqt
-# )
-
-#Auto completion test
-set( autocompletion_SRCS autocompletion_test.cpp )
-
-kde4_add_unit_test( autocompletion
-   TESTNAME "Auto completion"
-   ${autocompletion_SRCS}
-)
-
-target_link_libraries( autocompletion
-   ${KDE4_KDECORE_LIBS}
-   ${QT_QTTEST_LIBRARY}
-   ${KDE4_KDEUI_LIBS}
-   kring
-   ringqt
-)
-
-#CALL tests
-# set( call_SRCS call_test.cpp )
-# 
-# kde4_add_unit_test( call
-#    TESTNAME "Basic_calls"
-#    ${call_SRCS}
-# )
-# 
-# 
-# 
-# target_link_libraries( call
-#    ${KDE4_KDECORE_LIBS}
-#    ${QT_QTTEST_LIBRARY}
-#    ${KDE4_KDEUI_LIBS}
-#    kring
-#    ringqt
-# )
diff --git a/src/test/account_test.cpp b/src/test/account_test.cpp
deleted file mode 100644
index 3673b8e2..00000000
--- a/src/test/account_test.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-/******************************************************************************
- *   Copyright (C) 2012-2014 by Savoir-Faire Linux                            *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
- *                                                                            *
- *   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) any later version.       *
- *                                                                            *
- *   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 Lesser GNU General Public License *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
- *****************************************************************************/
-#include <QtCore/QString>
-#include <QtTest/QtTest>
-//#include <QtCore>
-
-#include "../src/lib/dbus/configurationmanager.h"
-#include "../src/lib/dbus/callmanager.h"
-#include "../src/lib/dbus/instancemanager.h"
-#include "../src/lib/typedefs.h"
-#include "../src/lib/account.h"
-#include "../src/lib/accountlistmodel.h"
-#include "../src/lib/dbus/metatypes.h"
-
-class AccountTests: public QObject
-{
-   Q_OBJECT
-private slots:
-   /*void testValidity();
-   void testMonth_data();
-   void testMonth();*/
-
-   //Testing accountlist
-   void testAccountList();
-   void testIP2IP();
-   void testIP2IPAlias();
-
-   //Building account
-   void testCreateAccount();
-   void testGetNewAccount();
-   void cleanupTestCase();
-
-   //Attributes test
-   void testAccountAlias_data();
-   void testAccountAlias                  ();
-   
-   void testAccountType                   ();
-   void testAccountHostname_data();
-   void testAccountHostname               ();
-   void testAccountHostnameInvalid_data   ();
-   void testAccountHostnameInvalid        ();
-   void testAccountUsername               ();
-   void testAccountPassword_data          ();
-   void testAccountPassword               ();
-   void testAccountMailbox                ();
-   void testTlsPassword                   ();
-   void testTlsCaListFile                 ();
-   void testTlsCertificateFile            ();
-   void testTlsPrivateKeyFile             ();
-   void testTlsCiphers                    ();
-   void testTlsServerName                 ();
-   void testAccountSipStunServer          ();
-   void testPublishedAddress              ();
-   void testLocalInterface                ();
-   void testRingtonePath_data();
-   void testRingtonePath                  ();
-   void testTlsMethod                     ();
-   void testAccountRegistrationExpire     ();
-   void testTlsNegotiationTimeoutSec      ();
-   void testTlsNegotiationTimeoutMsec     ();
-   void testLocalPort_data();
-   void testLocalPort                     ();
-   void testTlsListenerPort_data();
-   void testTlsListenerPort               ();
-   void testPublishedPort_data();
-   void testPublishedPort                 ();
-   void testAccountEnabled                ();
-   void testTlsVerifyServer               ();
-   void testTlsVerifyClient               ();
-   void testTlsRequireClientCertificate   ();
-   void testTlsEnable                     ();
-   void testAccountDisplaySasOnce         ();
-   void testAccountSrtpRtpFallback        ();
-   void testAccountZrtpDisplaySas         ();
-   void testAccountZrtpNotSuppWarning     ();
-   void testAccountZrtpHelloHash          ();
-   void testAccountSipStunEnabled         ();
-   void testPublishedSameAsLocal          ();
-   void testConfigRingtoneEnabled         ();
-   void testDisableAllAccounts            ();
-
-private:
-   QString id;
-   
-};
-
-
-//BEGIN Getting a valid account
-void AccountTests::testAccountList()
-{
-   AccountList* list = AccountListModel::instance();
-   QCOMPARE( list != nullptr , true);
-   QCOMPARE( list->size() >= 1, true);
-}
-
-void AccountTests::testIP2IP() {
-   Account* acc = AccountListModel::instance()->getAccountById("IP2IP");
-   QCOMPARE( acc != nullptr, true);
-   if (acc) {
-      QCOMPARE( acc->getAlias(), QString("IP2IP"));
-   }
-}
-
-void AccountTests::testIP2IPAlias() {
-   Account* acc = AccountListModel::instance()->getAccountById("IP2IP");
-   if (acc) {
-      QCOMPARE( acc->getAlias(), QString("IP2IP"));
-      QCOMPARE( acc->getAlias() != QString("qwerty"), true);
-   }
-}
-//END Getting a valid account
-
-
-//BEGIN Creating a new account
-void AccountTests::testCreateAccount()
-{
-   Account* acc = Account::buildNewAccountFromAlias("unit_test_account");
-   acc->save();
-   id = acc->accountId();
-   QCOMPARE( acc != nullptr, true);
-}
-
-void AccountTests::testGetNewAccount()
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   QCOMPARE( acc != nullptr, true);
-}
-//END creating a new account
-
-//BEGIN Testing every account attributes
-
-void AccountTests::testAccountAlias_data()
-{
-   QTest::addColumn<QString>("alias");
-
-   QTest::newRow("valid"      ) << QString( "unit_alias" );
-   QTest::newRow("valid_reset") << QString( "unit_alias1");
-   QTest::newRow("numeric"    ) << QString( "2314234"    );
-   QTest::newRow("non-ascii"  ) << QString( "ééèè>>||``" );
-}
-
-void AccountTests::testAccountAlias                  ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   //acc->setAccountAlias("unit_alias");
-   //QCOMPARE( acc->getAccountAlias(), QString("unit_alias"));
-
-   QFETCH(QString, alias);
-   acc->setAccountAlias(alias);
-   acc->save();
-   QCOMPARE( acc->getAccountAlias(), alias );
-   
-}
-
-void AccountTests::testAccountType                   ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountType("IAX");
-   acc->save();
-   QCOMPARE( acc->getAccountType(), QString("IAX") );
-   acc->setAccountType("SIP");
-   acc->save();
-   QCOMPARE( acc->getAccountType(), QString("SIP") );
-
-   //Test invalid
-   acc->setAccountType("OTH");
-   QCOMPARE( acc->getAccountType() == "OTH", false );
-}
-
-void AccountTests::testAccountHostname_data()
-{
-   QTest::addColumn<QString>("hostname");
-   QTest::newRow("valid"          ) << QString( "validHostname"  );
-   QTest::newRow("validPlusDigit" ) << QString( "validHostname2" );
-   QTest::newRow("ipv4"           ) << QString( "192.168.77.12"  );
-   QTest::newRow("ipv42"          ) << QString( "10.0.250.1"     );
-}
-
-//This test the various hostnames that should be allowed by the daemon
-void AccountTests::testAccountHostname               ()
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   QFETCH(QString, hostname);
-   acc->setAccountHostname(hostname);
-   acc->save();
-   QCOMPARE( acc->getAccountHostname(), hostname );
-}
-
-void AccountTests::testAccountHostnameInvalid_data()
-{
-   QTest::addColumn<QString>("hostname");
-   QTest::newRow("invalid_ipv4"       ) << QString( "192.256.12.0"    );
-   QTest::newRow("invalid_ipv42"      ) << QString( "192.168.12.0000" );
-   QTest::newRow("invalid_ipv43"      ) << QString( "192.168.12."     );
-   QTest::newRow("invalid_ipv44"      ) << QString( "192.168.1"       );
-   QTest::newRow("invalid_ipv45"      ) << QString( ".192.168.1.1"    );
-   QTest::newRow("invalid_ipv46"      ) << QString( ".192.1E8.1.1"    );
-   QTest::newRow("invalid_hostname"   ) << QString( ".23423"          );
-}
-
-//This test hostname that should be rejected by the daemon
-void AccountTests::testAccountHostnameInvalid        ()
-{
-   QFETCH(QString, hostname);
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountHostname(hostname);
-   acc->save();
-   QVERIFY(acc->getAccountHostname() != hostname);
-}
-
-void AccountTests::testAccountUsername               ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountHostname("1234567879");
-   acc->save();
-   QString username = acc->getAccountHostname();
-   QCOMPARE(username,QString("1234567879"));
-   
-}
-
-void AccountTests::testAccountPassword_data()
-{
-   QTest::addColumn<QString>("password");
-   QTest::newRow( "numeric"      ) << QString( "1234567879"   );
-   QTest::newRow( "alphanumeric" ) << QString( "asdf1234"     );
-   QTest::newRow( "strong"       ) << QString( "!\"'''4)(--@" );
-}
-
-void AccountTests::testAccountPassword               ()/*QString detail*/
-{
-   /*QFETCH(QString, password);
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountPassword(password);
-   QString pwd = acc->getAccountPassword();
-   QCOMPARE(pwd,password);*/
-}
-
-void AccountTests::testAccountMailbox                ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountMailbox("1234567879");
-   acc->save();
-   QString mailbox = acc->getAccountMailbox();
-   QCOMPARE(mailbox,QString("1234567879"));
-   
-}
-
-void AccountTests::testTlsPassword                   ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setTlsPassword("1234567879");
-   acc->save();
-   QString tlspass = acc->getTlsPassword();
-   QCOMPARE(tlspass,QString("1234567879"));
-}
-
-void AccountTests::testTlsCaListFile                 ()/*QString detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testTlsCertificateFile            ()/*QString detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testTlsPrivateKeyFile             ()/*QString detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testTlsCiphers                    ()/*QString detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testTlsServerName                 ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setTlsServerName("qwerty");
-   acc->save();
-   QString tlsserver = acc->getTlsServerName();
-   QCOMPARE(tlsserver,QString("qwerty"));
-}
-
-void AccountTests::testAccountSipStunServer          ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountSipStunServer("qwerty");
-   acc->save();
-   QString tlsserver = acc->getAccountSipStunServer();
-   QCOMPARE(tlsserver,QString("qwerty"));
-}
-
-void AccountTests::testPublishedAddress              ()/*QString detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testLocalInterface                ()/*QString detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testRingtonePath_data()
-{
-   QTest::addColumn<QString>("path");
-   QMap<QString,QString> ringtonePaths = DBus::ConfigurationManager::instance().getRingtoneList();
-   QMutableMapIterator<QString, QString> iter(ringtonePaths);
-   while (iter.hasNext()) {
-      iter.next();
-      QTest::newRow( iter.value().toAscii() ) << iter.key();
-   }
-   QTest::newRow( "invalidWav" ) << QString("invalid/tmp2/fake_file.wav");
-   QTest::newRow( "invalidAu"  ) << QString("invalid/tmp2/fake_file.au");
-   QTest::newRow( "invalidUl"  ) << QString("invalid/tmp2/fake_file.ul");
-   
-   QString tmpPath = QDir::tempPath();
-   QFile file (tmpPath+"/testWav.wav");
-   file.open(QIODevice::WriteOnly);
-   file.close();
-   QTest::newRow( "wav_file"      ) << tmpPath+"/testWav.wav";
-   
-   QFile file2 (tmpPath+"/testAu.au");
-   file2.open(QIODevice::WriteOnly);
-   file2.close();
-   QTest::newRow( "au_file"      ) << tmpPath+"/testAu.au";
-
-   QFile file3 (tmpPath+"/testUl.ul");
-   file3.open(QIODevice::WriteOnly);
-   file3.close();
-   QTest::newRow( "ul_file"      ) << tmpPath+"/testUl.ul";
-   
-}
-
-void AccountTests::testRingtonePath                  ()/*QString detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   QFETCH(QString, path);
-   acc->setRingtonePath(path);
-   acc->save();
-   if (path.indexOf("invalid") != -1)
-      QCOMPARE(acc->getRingtonePath() == path ,false);
-   else
-      QCOMPARE(acc->getRingtonePath(),path);
-}
-
-void AccountTests::testTlsMethod                     ()/*int     detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testAccountRegistrationExpire     ()/*int     detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountRegistrationExpire(10000);
-   acc->save();
-   QCOMPARE(acc->getAccountRegistrationExpire(),10000);
-
-   //Time machines are not on the market yet
-   acc->setAccountRegistrationExpire(-10000);
-   acc->save();
-   QCOMPARE(acc->getAccountRegistrationExpire() == -10000,false);
-}
-
-void AccountTests::testTlsNegotiationTimeoutSec      ()/*int     detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setTlsNegotiationTimeoutSec(10000);
-   acc->save();
-
-   QCOMPARE(acc->getTlsNegotiationTimeoutSec(),10000);
-
-   //Time machines are not on the market yet
-   acc->setTlsNegotiationTimeoutSec(-10000);
-   acc->save();
-   QCOMPARE(acc->getTlsNegotiationTimeoutSec() == -10000,false);
-}
-
-void AccountTests::testTlsNegotiationTimeoutMsec     ()/*int     detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-
-   acc->setTlsNegotiationTimeoutMsec(10000);
-   acc->save();
-   QCOMPARE(acc->getTlsNegotiationTimeoutMsec(),10000);
-
-   //Time machines are not on the market yet
-   acc->setTlsNegotiationTimeoutMsec(-10000);
-   acc->save();
-   QCOMPARE(acc->getTlsNegotiationTimeoutMsec() == -10000,false);
-}
-
-void AccountTests::testLocalPort_data()
-{
-   //It is really an unsigned short, but lets do real tests instead
-   QTest::addColumn<int>("port");
-   QTest::newRow( "null"     ) << 0      ;
-   QTest::newRow( "2000"     ) << 2000   ;
-   QTest::newRow( "high"     ) << 65533  ;
-   QTest::newRow( "over"     ) << 1000000;
-   QTest::newRow( "negative" ) << -1000  ;
-
-}
-
-void AccountTests::testLocalPort                     ()/*short   detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   QFETCH(int, port);
-   acc->setLocalPort(port);
-   acc->save();
-   if (port < 0 || port > 65533)
-      QCOMPARE(acc->getLocalPort() == port,false);
-   else
-      QCOMPARE(acc->getLocalPort(),port);
-}
-
-void AccountTests::testTlsListenerPort_data()
-{
-   //It is really an unsigned short, but lets do real tests instead
-   QTest::addColumn<int>("port");
-   QTest::newRow( "null"     ) << 0      ;
-   QTest::newRow( "2000"     ) << 2000   ;
-   QTest::newRow( "high"     ) << 65533  ;
-   QTest::newRow( "over"     ) << 1000000;
-   QTest::newRow( "negative" ) << -1000  ;
-
-}
-
-void AccountTests::testTlsListenerPort               ()/*short   detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   QFETCH(int, port);
-   acc->setTlsListenerPort(port);
-   acc->save();
-   if (port < 0 || port > 65533)
-      QCOMPARE(acc->getTlsListenerPort() == port,false);
-   else
-      QCOMPARE(acc->getTlsListenerPort(),port);
-}
-
-void AccountTests::testPublishedPort_data()
-{
-   //It is really an unsigned short, but lets do real tests instead
-   QTest::addColumn<int>("port");
-   QTest::newRow( "null"     ) << 0      ;
-   QTest::newRow( "2000"     ) << 2000   ;
-   QTest::newRow( "high"     ) << 65533  ;
-   QTest::newRow( "over"     ) << 1000000;
-   QTest::newRow( "negative" ) << -1000  ;
-
-}
-
-void AccountTests::testPublishedPort                 ()/*short   detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   QFETCH(int, port);
-   acc->setPublishedPort(port);
-   acc->save();
-   if (port < 0 || port > 65533)
-      QCOMPARE(acc->getPublishedPort() == port,false);
-   else
-      QCOMPARE(acc->getPublishedPort(),port);
-}
-
-void AccountTests::testAccountEnabled                ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountEnabled(false);
-   QCOMPARE(acc->isAccountEnabled(),false);
-   acc->setAccountEnabled(true);
-   QCOMPARE(acc->isAccountEnabled(),true);
-}
-
-void AccountTests::testTlsVerifyServer               ()/*bool    detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testTlsVerifyClient               ()/*bool    detail*/
-{
-   //Account* acc = AccountListModel::instance()->getAccountById(id);
-   QSKIP("TODO",SkipAll);
-}
-
-void AccountTests::testTlsRequireClientCertificate   ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setTlsRequireClientCertificate(true);
-   acc->save();
-   QCOMPARE(acc->isTlsRequireClientCertificate(),true);
-   acc->setTlsRequireClientCertificate(false);
-   acc->save();
-   QCOMPARE(acc->isTlsRequireClientCertificate(),false);
-}
-
-void AccountTests::testTlsEnable                     ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setTlsEnable(true);
-   acc->save();
-   QCOMPARE(acc->isTlsEnable(),true);
-   acc->setTlsEnable(false);
-   acc->save();
-   QCOMPARE(acc->isTlsEnable(),false);
-}
-
-void AccountTests::testAccountDisplaySasOnce         ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountDisplaySasOnce(true);
-   acc->save();
-   QCOMPARE(acc->isAccountDisplaySasOnce(),true);
-   acc->setAccountDisplaySasOnce(false);
-   acc->save();
-   QCOMPARE(acc->isAccountDisplaySasOnce(),false);
-}
-
-void AccountTests::testAccountSrtpRtpFallback        ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountSrtpRtpFallback(true);
-   acc->save();
-   QCOMPARE(acc->isAccountSrtpRtpFallback(),true);
-   acc->setAccountSrtpRtpFallback(false);
-   acc->save();
-   QCOMPARE(acc->isAccountSrtpRtpFallback(),false);
-}
-
-void AccountTests::testAccountZrtpDisplaySas         ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountSrtpRtpFallback(true);
-   acc->save();
-   QCOMPARE(acc->isAccountSrtpRtpFallback(),true);
-   acc->setAccountSrtpRtpFallback(false);
-   acc->save();
-   QCOMPARE(acc->isAccountSrtpRtpFallback(),false);
-}
-
-void AccountTests::testAccountZrtpNotSuppWarning     ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountZrtpNotSuppWarning(true);
-   acc->save();
-   QCOMPARE(acc->isAccountZrtpNotSuppWarning(),true);
-   acc->setAccountZrtpNotSuppWarning(false);
-   acc->save();
-   QCOMPARE(acc->isAccountZrtpNotSuppWarning(),false);
-}
-
-void AccountTests::testAccountZrtpHelloHash          ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountZrtpHelloHash(true);
-   acc->save();
-   QCOMPARE(acc->isAccountZrtpHelloHash(),true);
-   acc->setAccountZrtpHelloHash(false);
-   acc->save();
-   QCOMPARE(acc->isAccountZrtpHelloHash(),false);
-}
-
-void AccountTests::testAccountSipStunEnabled         ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setAccountSipStunEnabled(true);
-   acc->save();
-   QCOMPARE(acc->isAccountSipStunEnabled(),true);
-   acc->setAccountSipStunEnabled(false);
-   acc->save();
-   QCOMPARE(acc->isAccountSipStunEnabled(),false);
-}
-
-void AccountTests::testPublishedSameAsLocal          ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setPublishedSameAsLocal(true);
-   acc->save();
-   QCOMPARE(acc->isPublishedSameAsLocal(),true);
-   acc->setPublishedSameAsLocal(false);
-   acc->save();
-   QCOMPARE(acc->isPublishedSameAsLocal(),false);
-}
-
-void AccountTests::testConfigRingtoneEnabled         ()/*bool    detail*/
-{
-   Account* acc = AccountListModel::instance()->getAccountById(id);
-   acc->setRingtoneEnabled(true);
-   acc->save();
-   QCOMPARE(acc->isRingtoneEnabled(),true);
-   acc->setRingtoneEnabled(false);
-   acc->save();
-   QCOMPARE(acc->isRingtoneEnabled(),false);
-}
-
-//END Testing every account attributes
-
-//BEGIN testing account list
-
-void AccountTests::testDisableAllAccounts()
-{
-   QList<bool> saveState;
-   //Disable all accounts
-   for (int i=0;i<AccountListModel::instance()->size();i++) {
-      saveState << (*AccountListModel::instance())[i]->isAccountEnabled();
-      (*AccountListModel::instance())[i]->setAccountEnabled(false);
-      (*AccountListModel::instance())[i]->save();
-   }
-
-   QCOMPARE(AccountListModel::currentAccount(),(Account*)nullptr);
-
-   //Restore state
-   for (int i=0;i<AccountListModel::instance()->size();i++) {
-      (*AccountListModel::instance())[i]->setAccountEnabled(saveState[i]);
-      (*AccountListModel::instance())[i]->save();
-   }
-}
-
-//END testing account list
-
-//BEGIN cleanup
-void AccountTests::cleanupTestCase() {
-   AccountListModel::instance()->removeAccount(AccountListModel::instance()->getAccountById(id));
-   QCOMPARE( AccountListModel::instance()->getAccountById(id) == nullptr, true);
-}
-//END cleanup
-
-QTEST_MAIN(AccountTests)
-#include "account_test.moc"
diff --git a/src/test/autocompletion_test.cpp b/src/test/autocompletion_test.cpp
deleted file mode 100644
index 0e4b938f..00000000
--- a/src/test/autocompletion_test.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************
- *   Copyright (C) 2014 by Savoir-Faire Linux                                 *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
- *                                                                            *
- *   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) any later version.       *
- *                                                                            *
- *   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 Lesser GNU General Public License *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
- *****************************************************************************/
-#include <QtCore/QString>
-#include <QtTest/QtTest>
-
-#include "../lib/individualdirectory.h"
-#include "../lib/phonenumber.h"
-#include "../lib/numbercompletionmodel.h"
-
-
-// #include "../src/lib/dbus/configurationmanager.h"
-// #include "../src/lib/dbus/callmanager.h"
-// #include "../src/lib/dbus/instancemanager.h"
-// #include "../src/lib/accountlistmodel.h"
-// #include "../src/lib/callmodel.h"
-/*
-callModel<>* m_pModel = new CallModel<>();*/
-
-QDebug operator<<(QDebug dbg, const PhoneNumber* c)
-{
-   dbg.nospace() << QString(c->uri());
-   return dbg.space();
-}
-
-
-
-class AutoCompletionTest: public NumberCompletionModel
-{
-   Q_OBJECT
-public:
-   typedef QMap<QString,PhoneDirectoryModel::NumberWrapper*> NbWrap;
-private slots:
-   void testGetRange();
-   void testGetRange_data();
-private:
-   QString getMapContent(AutoCompletionTest::NbWrap* map)
-   {
-      QString ret ='\'';
-      foreach(PhoneDirectoryModel::NumberWrapper* wrap,*map)
-         ret += ' ' + wrap->numbers[0]->uri();
-      return ret+'\'';
-   }
-   QString getSetContent(QSet<PhoneNumber*> set)
-   {
-      QString ret ='\'';
-      foreach(PhoneNumber* n,set)
-         ret += ' ' + n->uri();
-      return ret+'\'';
-   }
-};
-Q_DECLARE_METATYPE(AutoCompletionTest::NbWrap*)
-// Q_DECLARE_METATYPE(NbWrap*)
-
-//We mainly want to make sure it doesn't crash or go into an infinite loop
-void AutoCompletionTest::testGetRange()
-{
-   QFETCH( QVariant , data  );
-   QFETCH(QString   , prefix);
-   AutoCompletionTest::NbWrap* realData = data.value<AutoCompletionTest::NbWrap*>();
-   //qDebug() << "Values are" << prefix << *realData;
-
-   //Check if there is a result
-   QSet<PhoneNumber*> set;
-   getRange(PhoneDirectoryModel::instance()->m_hSortedNumbers,prefix,set);
-   if (realData->size()) {
-      QVERIFY2(set.size() == realData->size(), QString("Prefix: %1 Result: %2 %3 Data: %4 Result: ").arg(prefix).arg(set.size()).arg(realData->size()).arg(getMapContent(realData)).arg(getSetContent(set)).toAscii());
-   }
-   else {
-      QCOMPARE(set.size() == 0, true);
-   }
-//    QCOMPARE( QString("123") == prefix, true );
-}
-
-void AutoCompletionTest::testGetRange_data()
-{
-   QTest::addColumn< QVariant >( "data"   );
-   QTest::addColumn< QString  >( "prefix" );
-
-   PhoneDirectoryModel* ins = PhoneDirectoryModel::instance();
-
-   QVariant val = QVariant::fromValue(&ins->m_lSortedNames );
-   QTest::newRow(QString("SortedName set"+QString::number(1)).toAscii()) << val << "123";
-
-   //1) Test if it worj with only 1 value
-   //2) See if it still work with multiple values
-   QString prefix = "";
-   for (int i =1;i<10;i++) {
-      prefix += QString::number(i);
-      QVariant val2 = QVariant::fromValue(&ins->m_hSortedNumbers );
-//       QTest::newRow(QString("SortedNumber set (b)"+QString::number(1)).toAscii()) << val2 << prefix;
-      ins->getNumber(prefix);
-      QTest::newRow(QString("SortedNumber set (a)"+QString::number(1)).toAscii()) << val2 << prefix;
-   }
-}
-
-QTEST_MAIN(AutoCompletionTest)
-#include "autocompletion_test.moc"
diff --git a/src/test/call_test.cpp b/src/test/call_test.cpp
deleted file mode 100644
index 2f422c5b..00000000
--- a/src/test/call_test.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- *   Copyright (C) 2012-2014 by Savoir-Faire Linux                            *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
- *                                                                            *
- *   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) any later version.       *
- *                                                                            *
- *   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 Lesser GNU General Public License *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
- *****************************************************************************/
-#include <QtCore/QString>
-#include <QtTest/QtTest>
-
-#include "../src/lib/dbus/configurationmanager.h"
-#include "../src/lib/dbus/callmanager.h"
-#include "../src/lib/dbus/instancemanager.h"
-#include "../src/lib/accountlistmodel.h"
-#include "../src/lib/callmodel.h"
-
-callModel<>* m_pModel = new CallModel<>();
-
-class CallTests: public QObject
-{
-   Q_OBJECT
-private slots:
-   void testCallWithoutAccounts();
-private:
-
-};
-
-///When there is no accounts, no call should be created
-void CallTests::testCallWithoutAccounts()
-{
-   QMap<Account*,bool> saveState;
-   //Disable all accounts
-   for (int i=0;i<AccountListModel::instance()->size();i++) {
-      saveState[(*AccountListModel::instance())[i]] = (*AccountListModel::instance())[i]->isAccountEnabled();
-      qDebug() << "Disabling" << (*AccountListModel::instance())[i]->accountId();
-      (*AccountListModel::instance())[i]->setAccountEnabled(false);
-      (*AccountListModel::instance())[i]->save();
-   }
-
-    Call* call = m_pModel->addDialingCall("test call", AccountListModel::currentAccount());
-    QCOMPARE( call, (Call*)nullptr );
-
-   //Restore state
-   for (int i=0;i<AccountListModel::instance()->size();i++) {
-      (*AccountListModel::instance())[i]->setAccountEnabled(saveState[(*AccountListModel::instance())[i]]);
-      (*AccountListModel::instance())[i]->save();
-   }
-}
-
-QTEST_MAIN(CallTests)
-#include "call_test.moc"
diff --git a/src/test/dbus_test.cpp b/src/test/dbus_test.cpp
deleted file mode 100644
index 25225aa9..00000000
--- a/src/test/dbus_test.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- *   Copyright (C) 2012-2014 by Savoir-Faire Linux                            *
- *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
- *                                                                            *
- *   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) any later version.       *
- *                                                                            *
- *   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 Lesser GNU General Public License *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
- *****************************************************************************/
-#include <QtCore/QString>
-#include <QtTest/QtTest>
-
-#include "../src/lib/dbus/configurationmanager.h"
-#include "../src/lib/dbus/callmanager.h"
-#include "../src/lib/dbus/instancemanager.h"
-
-class DBusTests: public QObject
-{
-   Q_OBJECT
-private slots:
-   void testConfigurationManagerConnection();
-   void testCallManagerConnection();
-   void testInstanceManagerConnection();
-};
-
-void DBusTests::testConfigurationManagerConnection()
-{
-   ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
-   QDBusReply<QStringList> audioPlugins = configurationManager.getAudioPluginList();
-   QCOMPARE( audioPlugins.isValid(), true );
-}
-
-void DBusTests::testCallManagerConnection()
-{
-   CallManagerInterface& callManager = DBus::CallManager::instance();
-   QDBusReply<QStringList> callList = callManager.getCallList();
-   QCOMPARE( callList.isValid(), true );
-}
-
-void DBusTests::testInstanceManagerConnection()
-{
-   InstanceInterface& instance = DBus::InstanceManager::instance();
-   QDBusReply<void> ret = instance.Register(getpid(), "unitTest");
-   instance.Unregister(getpid());
-   QCOMPARE( ret.isValid(), true );
-}
-
-QTEST_MAIN(DBusTests)
-#include "dbus_test.moc"
diff --git a/src/wizard/CMakeLists.txt b/src/wizard/CMakeLists.txt
index 0564231b..5f0db0db 100644
--- a/src/wizard/CMakeLists.txt
+++ b/src/wizard/CMakeLists.txt
@@ -1,86 +1,120 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
+cmake_minimum_required(VERSION 3.0)
 
-ADD_DEFINITIONS("-std=c++11")
+project(jamiwizard)
 
-PROJECT(libwizard)
-
-IF(POLICY CMP0063)
+if(POLICY CMP0063)
    CMAKE_POLICY(SET CMP0063 NEW)
-ENDIF(POLICY CMP0063)
+endif(POLICY CMP0063)
+
+find_package(ECM 1.1.0 REQUIRED NO_MODULE)
+list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}")
 
-IF(POLICY CMP0048)
-   CMAKE_POLICY(SET CMP0048 NEW)
-ENDIF(POLICY CMP0048)
+include(ECMInstallIcons)
+include(ECMOptionalAddSubdirectory)
+include(CMakePackageConfigHelpers)
 
-IF(POLICY CMP0017)
-   CMAKE_POLICY(SET CMP0017 NEW)
-ENDIF(POLICY CMP0017)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
 
-IF(POLICY CMP0028)
-   CMAKE_POLICY(SET CMP0028 NEW)
-ENDIF(POLICY CMP0028)
+SET(CMAKE_C_VISIBILITY_PRESET hidden)
+SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
+SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 
-FIND_PACKAGE(ECM 1.1.0 REQUIRED NO_MODULE)
+# When used with `add_subdirectory`, assume it is a static Qt plugin
+get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY)
+if(USES_ADD_SUBDIRECTORY)
+   set(BUILD_SHARED_LIBS OFF)
+endif()
 
-INCLUDE(ECMInstallIcons)
-INCLUDE(ECMOptionalAddSubdirectory)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 
-INCLUDE(KDEInstallDirs)
-INCLUDE(KDECMakeSettings)
-INCLUDE(KDECompilerSettings)
+set(CMAKE_CXX_STANDARD 14)
 
-SET(CMAKE_AUTOMOC ON)
-SET(CMAKE_AUTORCC ON)
-SET(CMAKE_AUTOUIC ON)
+if(NOT BUILD_SHARED_LIBS)
+    set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in
+    add_definitions(-DQT_PLUGIN)
+    add_definitions(-DQT_STATICPLUGIN=1)
+    add_definitions(-DJAMIWIZARD_USE_STATIC_PLUGIN=1)
+endif()
 
-FIND_PACKAGE ( LibRingQt QUIET )
+find_package(Qt5 CONFIG REQUIRED
+    Core Gui Quick QuickControls2
+)
 
-FIND_PACKAGE(Qt5 CONFIG REQUIRED
-    Core
-    Gui
+set(GENERIC_LIB_VERSION "1.0.0")
 
-    Quick
-    QuickWidgets
-    QuickControls2
+#File to compile
+set( jamiwizard_LIB_SRCS
+    welcome.cpp
+    plugin.cpp
 )
 
-FIND_PACKAGE(KF5 REQUIRED COMPONENTS
-  I18n
+qt5_add_resources(jamiwizard_LIB_SRCS
+   wizard.qrc
 )
 
-INCLUDE_DIRECTORIES(SYSTEM ${Qt5Widgets_INCLUDES} ${Qt5Core_INCLUDES} ${ringqt_INCLUDE_DIR})
+set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamiwizard)
 
-ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
+add_library(jamiwizard ${jamiwizard_LIB_SRCS} )
 
-SET(GENERIC_LIB_VERSION "1.0.0")
+target_link_libraries( jamiwizard
+    # Project
+    ringqt
+    ringqtquick
 
-#File to compile
-SET( libwizard_LIB_SRCS
-   welcome.cpp
+    # Qt
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Quick
+    Qt5::QuickControls2
 )
 
-QT5_ADD_RESOURCES(libwizard_LIB_SRCS
-   wizard.qrc
+# Configure the target config
+set(jamiwizard_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiWizardConfig.cmake")
+
+if(USES_ADD_SUBDIRECTORY)
+   set(JamiWizard_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
+endif()
+
+configure_package_config_file(
+   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiWizardConfig.cmake.in" ${jamiwizard_CONFIG_PATH}
+   INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiWizard/
+   PATH_VARS INCLUDE_INSTALL_DIR
 )
 
-ADD_LIBRARY( libwizard  STATIC ${libwizard_LIB_SRCS} )
+install( FILES ${jamiwizard_CONFIG_PATH}
+    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiWizard/
+    COMPONENT Devel
+)
 
-target_link_libraries( libwizard
-   ringqt
+# Create the target
+target_include_directories(jamiwizard
+    PUBLIC
+        $<INSTALL_INTERFACE:include/JamiWizard>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/
+)
 
-   Qt5::Widgets
-   Qt5::Core
-   Qt5::Gui
-   Qt5::Quick
-   Qt5::QuickWidgets
-   Qt5::QuickControls2
+set_target_properties(jamiwizard PROPERTIES
+    PUBLIC_HEADER
+    "${jamiwizard_EXPORT_HDRS}"
+)
+
+export(TARGETS jamiwizard
+    FILE "${PROJECT_BINARY_DIR}/cmake/JamiWizardTargets.cmake"
+)
 
-   KF5::I18n
-   KF5::WidgetsAddons
-   KF5::ConfigCore
-   KF5::ConfigGui
+install(TARGETS jamiwizard
+    EXPORT JamiWizardTargets
+    LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamiwizard
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    COMPONENT Devel
 )
 
-SET( libwizard_LIB_HDRS
-   welcome.h
+install(EXPORT JamiWizardTargets
+    DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiWizard
+    COMPONENT Devel
 )
diff --git a/src/wizard/cmake/JamiWizardConfig.cmake.in b/src/wizard/cmake/JamiWizardConfig.cmake.in
new file mode 100644
index 00000000..bf6f57d8
--- /dev/null
+++ b/src/wizard/cmake/JamiWizardConfig.cmake.in
@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+#Allow users to when to use Q_IMPORT_PLUGIN in main.cpp
+if(@ENABLE_STATIC_PLUGIN@ MATCHES 1)
+    add_definitions(-DJAMIWIZARD_USE_STATIC_PLUGIN=1)
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/JamiWizardTargets.cmake")
diff --git a/src/wizard/jamiwizard.json b/src/wizard/jamiwizard.json
new file mode 100644
index 00000000..a39a88cf
--- /dev/null
+++ b/src/wizard/jamiwizard.json
@@ -0,0 +1,4 @@
+{
+    "Keys": [ "org.kde.ringkde.jamiwizard" ],
+    "uri": ["org.kde.ringkde.jamiwizard"]
+}
diff --git a/src/wizard/plugin.cpp b/src/wizard/plugin.cpp
new file mode 100644
index 00000000..ebc99612
--- /dev/null
+++ b/src/wizard/plugin.cpp
@@ -0,0 +1,52 @@
+/************************************************************************************
+ *   Copyright (C) 2018 by BlueSystems GmbH                                         *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                            *
+ *                                                                                  *
+ *   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) any later version.             *
+ *                                                                                  *
+ *   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, write to the Free Software            *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
+ ***********************************************************************************/
+#include "plugin.h"
+
+// Qt
+#include <QQmlEngine>
+#include <QQmlContext>
+#include <QtGui/QIcon>
+
+// QRC
+#include <qrc_wizard.cpp>
+
+// Ring-KDE
+#include "welcome.h"
+
+void JamiWizard::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QByteArray("org.kde.ringkde.jamiwizard"));
+
+    qmlRegisterType<WelcomeDialog>(uri, 1, 0, "WelcomeDialog");
+    qmlRegisterType(QStringLiteral("qrc:/ButtonBar.qml"), uri, 1, 0, "ButtonBar");
+    qmlRegisterType(QStringLiteral("qrc:/CreateRing.qml"), uri, 1, 0, "CreateRing");
+    qmlRegisterType(QStringLiteral("qrc:/ImportRing.qml"), uri, 1, 0, "ImportRing");
+    qmlRegisterType(QStringLiteral("qrc:/Page1.qml"), uri, 1, 0, "Page1");
+    qmlRegisterType(QStringLiteral("qrc:/Page1Form.ui.qml"), uri, 1, 0, "Page1Form");
+    qmlRegisterType(QStringLiteral("qrc:/ProfilePage.qml"), uri, 1, 0, "ProfilePage");
+    qmlRegisterType(QStringLiteral("qrc:/StartingPage.qml"), uri, 1, 0, "StartingPage");
+    qmlRegisterType(QStringLiteral("qrc:/StartingPageForm.ui.qml"), uri, 1, 0, "StartingPageForm");
+    qmlRegisterType(QStringLiteral("qrc:/Wizard.qml"), uri, 1, 0, "Wizard");
+}
+
+void JamiWizard::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(uri)
+}
diff --git a/src/wizard/plugin.h b/src/wizard/plugin.h
new file mode 100644
index 00000000..0b318f94
--- /dev/null
+++ b/src/wizard/plugin.h
@@ -0,0 +1,31 @@
+/************************************************************************************
+ *   Copyright (C) 2019 by BlueSystems GmbH                                         *
+ *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                            *
+ *                                                                                  *
+ *   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) any later version.             *
+ *                                                                                  *
+ *   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, write to the Free Software            *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA *
+ ***********************************************************************************/
+#pragma once
+
+#include <QQmlExtensionPlugin>
+
+class Q_DECL_EXPORT JamiWizard final : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.kde.ringkde.jamiwizard" FILE "jamiwizard.json")
+
+public:
+    void registerTypes(const char* uri) override;
+    virtual void initializeEngine(QQmlEngine* engine, const char* uri) override;
+};
diff --git a/src/wizard/qml/ImportRing.qml b/src/wizard/qml/ImportRing.qml
index 76b4bad6..7e846fc6 100644
--- a/src/wizard/qml/ImportRing.qml
+++ b/src/wizard/qml/ImportRing.qml
@@ -1,201 +1,206 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 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/>. *
  **************************************************************************/
 import QtQuick 2.0
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
+import org.kde.ringkde.jamiwizard 1.0 as JamiWizard
 import Ring 1.0
 
 Item {
     id: importRing
 
     property bool nextAvailable: false
     property var account: null
 
     signal registrationCompleted()
 
     width: Math.min(createForm.implicitWidth, parent.width - 20)
     height: createForm.implicitHeight
 
+    JamiWizard.WelcomeDialog {
+        id: welcomeDialog
+    }
+
     function isNextAvailable() {
         nextAvailable = pinField.text.length > 0 && password.text.length > 0
     }
 
     function createAccount() {
         if (!nextAvailable) {
             console.log("Account creation failed: missing fields")
             return;
         }
 
         registrationPopup.visible   = true
         registrationTimeout.running = true
         registrationPopup.color     = "white"
 
-        account = RingSession.accountModel.add(WelcomeDialog.defaultUserName, RingQtQuick.Account.RING)
+        account = RingSession.accountModel.add(welcomeDialog.defaultUserName, RingQtQuick.Account.RING)
         account.archivePassword = password.text
         account.archivePin      = pinField.text
         account.upnpEnabled     = true;
 
         account.performAction(RingQtQuick.Account.SAVE)
         account.performAction(RingQtQuick.Account.RELOAD)
     }
 
     ColumnLayout {
         anchors.fill: parent
 
         Label {
             id: label2
             clip: false
             text: i18n("Link this device")
             verticalAlignment: Text.AlignVCenter
             color: "white"
             padding: 0
             font.bold: true
             horizontalAlignment: Text.AlignHCenter
             anchors.leftMargin: 8
             anchors.left: parent.left
             Layout.fillWidth: true
 
             /*Behavior on Layout.maximumHeight {
                 NumberAnimation {
                     easing.type: Easing.OutQuad
                     duration: 500
                 }
             }*/
         }
 
         Label {
             id: label1
             text: i18n("Enter your main Ring account password")
             color: "white"
             Layout.fillWidth: true
             anchors.leftMargin: 8
             anchors.left: parent.left
         }
 
         TextField {
             id: password
             echoMode: "Password"
             Layout.fillWidth: true
             onTextChanged: isNextAvailable()
         }
 
         Label {
             id: label
             wrapMode: "WordWrap"
             color: "white"
             text: i18n("Enter the PIN number from another configured Ring account. Use the \"Export account on Ring\" feature to obtain a PIN.")
             Layout.fillWidth: true
             anchors.leftMargin: 8
         }
 
         TextField {
             id: pinField
             echoMode: "Password"
             Layout.fillWidth: true
             onTextChanged: isNextAvailable()
         }
 
         Rectangle {
             Layout.fillHeight: true
         }
     }
 
     Rectangle {
         id: registrationPopup
         width: 200
         height: 75
         color: "#eeeeee"
         visible: false
         z: 200
         anchors.centerIn: item1
         RowLayout {
             anchors.verticalCenter: parent.verticalCenter
 
             BusyIndicator {
                 id: registrationIndicator
                 Layout.fillHeight: false
             }
 
             Label {
                 id: registrationStatus
                 text: i18n("Importing account")
                 Layout.fillHeight: false
                 Layout.fillWidth: true
                 color: "black"
             }
         }
     }
 
     // Hide the error message after a second
     Timer {
         id: hidePopup
         repeat: false
         running: false
         interval: 1000
         onTriggered: {
             registrationPopup.visible = false
         }
     }
 
     // Remove the popup after 30 seconds if it didn't finish by then
     Timer {
         id: registrationTimeout
         repeat: false
         interval: 30000
         running: false
         onTriggered: {
             registrationPopup.color = "red"
             registerFoundLabel.text = i18n("Timeout")
             hidePopup.running       = true
         }
     }
 
     /*transitions: Transition {
         NumberAnimation {
             properties: "opacity"
             easing.type: Easing.OutQuad
             duration: 500
             onStopped: {
                 label2.visible = false
                 userName.visible = false
                 rowLayout.visible = false
             }
         }
     }*/
 
     Connections {
         target: account
         onStateChanged: {
             switch(state) {
                 case RingQtQuick.Account.ERROR:
                     registrationPopup.color = "red"
                     registrationStatus.text = i18n("Importing failed")
                     hidePopup.running = true
                     registrationTimeout.stop()
                     break
                 case RingQtQuick.Account.READY:
                     registrationPopup.visible = false
                     registrationTimeout.stop()
                     importRing.registrationCompleted()
                     account = null
                     break
             }
         }
     }
 }
diff --git a/src/wizard/welcome.cpp b/src/wizard/welcome.cpp
index 5a3c21ee..dbf175d5 100644
--- a/src/wizard/welcome.cpp
+++ b/src/wizard/welcome.cpp
@@ -1,56 +1,54 @@
 /***************************************************************************
  *   Copyright (C) 2017 by bluesystems                                     *
  *   Copyright (C) 2016 by Marat Moustafine                                *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                   *
  *   Author : Marat Moustafine <moustafine@tuta.io>                        *
  *                                                                         *
  *   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 "welcome.h"
 
 #include <QQmlContext>
 #include <QQmlApplicationEngine>
 #include <QtGui/QGuiApplication>
 #include <QQuickWindow>
 
 #include <../ringapplication.h>
 
-#include <qrc_wizard.cpp>
-
 WelcomeDialog::WelcomeDialog(QObject* parent) : QObject(parent)
 {
 
 }
 
 WelcomeDialog::~WelcomeDialog()
 {
 
 }
 
 void WelcomeDialog::show()
 {
    RingApplication::engine()->rootContext()->setContextProperty(
       QStringLiteral("WelcomeDialog"), this
    );
 
    QMetaObject::invokeMethod(RingApplication::instance()->desktopWindow(), "showWizard");
 }
 
 QString WelcomeDialog::defaultUserName() const
 {
    return qgetenv("USER");
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;