diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60e6ca26..4f987381 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,475 +1,370 @@
 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 )
 
 # 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 )
 
 IF(${CMAKE_BUILD_TYPE} MATCHES Release)
    MESSAGE("NO DEBUG OUTPUT")
    ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT)
 ELSE()
-#     ADD_DEFINITIONS(-Werror)
-ENDIF(${CMAKE_BUILD_TYPE} MATCHES Release)
 
-# SET ( KF5_KABC_LIBS  -lkabc )
+ENDIF(${CMAKE_BUILD_TYPE} MATCHES Release)
 
 # Delegates
 SET(
    ring_kde_PROXIES
-#    delegates/conferencedelegate.cpp
-#    delegates/contactdelegate.cpp
-#    delegates/historydelegate.cpp
-#    delegates/phonenumberdelegate.cpp
-#    delegates/delegatedropoverlay.cpp
-#    delegates/dialpaddelegate.cpp
-#    delegates/autocompletiondelegate.cpp
-#    delegates/autocompletiondelegate2.cpp
-#    delegates/toolbardelegate.cpp
-#    delegates/accountinfodelegate.cpp
-#    delegates/categorizeddelegate.cpp
-#    delegates/righticondelegate.cpp
    delegates/kdepixmapmanipulation.cpp
    proxies/simplerotateproxy.cpp
    proxies/deduplicateproxy.cpp
    proxies/filtertoplevelproxy.cpp
    proxies/roletransformationproxy.cpp
    proxies/flagsfilterproxy.cpp
    proxies/pollingproxy.cpp
-   #proxies/valuefilterproxy.cpp
 )
 
-# Configuration pages
-# SET(
-#    ring_kde_CONF
-#    conf/accountserializationadapter.cpp
-#    conf/configurationdialog.cpp
-#    conf/dlgdisplay.cpp
-#    conf/dlgaudio.cpp
-#    conf/dlgaddressbook.cpp
-#    conf/dlgaccessibility.cpp
-#    conf/dlgpresence.cpp
-#    conf/dlgaccount.cpp
-# )
-
-# Account pages
-# SET(
-#    ring_kde_ACCOUNT
-#    conf/accountpages/advanced.cpp
-#    conf/accountpages/credentials.cpp
-#    conf/accountpages/basic.cpp
-#    conf/accountpages/network.cpp
-#    conf/accountpages/codecs.cpp
-#    conf/accountpages/ringtone.cpp
-#    conf/accountpages/security.cpp
-#    conf/accountpages/pagebase.cpp
-#    conf/accountpages/account.cpp
-#    conf/accountpages/devices.cpp
-#    conf/accountpages/dlgprofiles.cpp
-# )
-
-# Widgets
-# SET(
-#    ring_kde_WIDGETS
-#    widgets/systray.cpp
-#    widgets/categorizedtreeview.cpp
-#    widgets/fileselector.cpp
-#    widgets/kphonenumberselector.cpp
-#    widgets/directoryview.cpp
-#    widgets/menumodelview.cpp
-#    widgets/accountstatusviewer.cpp
-#    widgets/autocombobox.cpp
-#    widgets/categorizedtree.cpp
-#    widgets/certificateviewer.cpp
-#    widgets/contextlistview.cpp
-#    widgets/groupedtoolbutton.cpp
-#    widgets/securityprogress.cpp
-# )
-
-# Video Widgets
-# IF(NOT (${ENABLE_VIDEO} MATCHES false))
-#    SET(
-#       ring_kde_VIDEO
-#       conf/dlgvideo.cpp
-#    )
-# ENDIF(NOT (${ENABLE_VIDEO} MATCHES false))
-
 SET(
    ring_kde_SRCS
    main.cpp
    cmd.cpp
    notification.cpp
    ringapplication.cpp
    errormessage.cpp
-#    canvasobjectmanager.cpp
-#    eventmanager.cpp
    actioncollection.cpp
    implementation.cpp
    model/extendedprotocolmodel.cpp
    ${ring_kde_PROXIES}
-#    ${ring_kde_CONF}
-#    ${ring_kde_WIDGETS}
-#    ${ring_kde_ACCOUNT}
-#    ${ring_kde_VIDEO}
    widgets/systray.cpp
    configurator/localhistoryconfigurator.cpp
    configurator/peerprofileconfigurator.cpp
    configurator/bookmarkconfigurator.cpp
    configurator/audiorecordingconfigurator.cpp
    configurator/fallbackpersonconfigurator.cpp
    conf/dlggeneral.cpp
    widgets/filterlineedit.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})
 
-
-# kde4_automoc(${ring_kde_SRCS})
-# SET(
-#    config_ui_files
-#    conf/dlggeneralbase.ui
-#    conf/dlgdisplaybase.ui
-#    conf/dlgaudiobase.ui
-#    conf/dlgaddressbookbase.ui
-#    conf/dlgaccessibility.ui
-#    conf/dlgaudiorecording.ui
-#    conf/dlgpresence.ui
-#    conf/dlgfallbackperson.ui
-#    conf/accountdlg.ui
-#    conf/accountpages/advanced.ui
-#    conf/accountpages/credentials.ui
-#    conf/accountpages/basic.ui
-#    conf/accountpages/network.ui
-#    conf/accountpages/codecs.ui
-#    conf/accountpages/ringtone.ui
-#    conf/accountpages/security.ui
-#    conf/accountpages/tabs.ui
-#    widgets/ui/directoryview.ui
-#    widgets/ui/accountcreator.ui
-#    widgets/ui/fileselect.ui
-#    configurator/peerprofile.ui
-#    configurator/bookmark.ui
-#    configurator/recording.ui
-# )
-
 # 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
   libcallview
   dialview
   libtimeline
   libphotoselector
   libcanvasindicator
   desktopview
   contactview
   accountview
   libqmlwidgets
   kquickitemviews
 
   # 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/actioncollection.cpp b/src/actioncollection.cpp
index 09a44e87..c5d36d4c 100644
--- a/src/actioncollection.cpp
+++ b/src/actioncollection.cpp
@@ -1,561 +1,499 @@
 /***************************************************************************
  *   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/QStandardPaths>
 #include <QtCore/QTimer>
 #include <QtGui/QKeySequence>
-#include <QtWidgets/QAction>
 #include <QQuickWindow>
 
 //KDE
 #include <KLocalizedString>
-#include <kmessagebox.h>
 #include <KStandardAction>
 #include <KShortcutsDialog>
 #include <KActionCollection>
-#include <KEditToolBar>
 #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 <call.h>
-#include <account.h>
-#include <availableaccountmodel.h>
 #include <callmodel.h>
 #include <implementation.h>
 #include <useractionmodel.h>
 #include <audio/settings.h>
 #include <personmodel.h>
 #include <delegates/kdepixmapmanipulation.h>
-// #include "widgets/directoryview.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       ( RingApplication::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_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_directory        , {}                                                  , i18n("Show the phone directory"));
+   INIT_ACTION(action_displayDialpad        , QIcon(RingIcons::DISPLAY_DIALPAD), 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_editToolBar           , QIcon::fromTheme(QStringLiteral("configure-toolbars"              )), i18n("Configure Toolbars"      ));
    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 = CallModel::instance().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_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_show_directory         , &QAction::triggered , this               , &ActionCollection::showDirectory          );
    connect(action_configureNotifications , &QAction::triggered , this               , &ActionCollection::showNotificationEditor );
-   connect(action_editToolBar            , &QAction::triggered , this               , &ActionCollection::editToolBar            );
    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                  );
+   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_editToolBar       ,
+      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_directory    ,
+      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>();
 
 #ifdef HAVE_SPEECH
    QList<QAction *> acList = *Accessibility::instance();
 
    foreach(QAction * ac,acList) {
       col->addAction(ac->objectName() , ac);
    }
 #endif
 
    QTimer::singleShot(0, [this]() {
       updateRecordButton();
       updateVolumeButton();
    });
 }
 
-
-void ActionCollection::setupPhoneAction(PhoneWindow* mw)
-{
-   Q_UNUSED(mw)
-   //FIXME DROP QTWIDGET
-//    connect(action_displayAccountCbb      , &QAction::toggled   , mw         , &PhoneWindow::displayAccountCbb            );
-//    connect(action_displayVolumeControls  , &QAction::toggled   , mw->view() , &View::displayVolumeControls              );
-//    connect(action_displayDialpad         , &QAction::toggled   , mw->view() , &View::displayDialpad                     );
-//    connect(action_pastenumber            , &QAction::triggered , mw->view() , &View::paste                              );
-
-}
-
 ///Display the shortcuts dialog
 void ActionCollection::showShortCutEditor()
 {
    KShortcutsDialog::configure(
       qobject_cast<KXmlGuiWindow*>(
          ActionCollection::instance()->fakeMainWindow()
       )->actionCollection()
    );
 }
 
-///Display the shortcuts dialog
-void ActionCollection::showDirectory()
-{
-//    new DirectoryView(nullptr);
-}
-
 ///Display the notification manager
 void ActionCollection::showNotificationEditor()
 {
    KNotifyConfigWidget::configure(nullptr, QStringLiteral("ring-kde"));
 }
 
-///Show the toolbar editor
-void ActionCollection::editToolBar()
-{
-//    QPointer<KEditToolBar> toolbareditor = new KEditToolBar(RingApplication::instance()->mainWindow()->guiFactory());
-//    toolbareditor->setModal(true);
-//    toolbareditor->setDefaultToolBar(QStringLiteral("mainToolBar"));
-//    toolbareditor->exec();
-//    delete toolbareditor;
-}
-
 void ActionCollection::slotAddPerson()
 {
    Person* aPerson = new Person();
    PersonModel::instance().addNewPerson(aPerson);
 }
 
 ///Change icon of the record button
 void ActionCollection::updateRecordButton()
 {
-//FIXME DROP QTWIDGET
-//    if (!RingApplication::instance()->isPhoneVisible())
-//       return;
-
    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]);
-//FIXME DROP QTWIDGET
-//    PhoneWindow::app()->view()->updateVolumeControls();
 }
 
 ///Update the colunm button icon
 void ActionCollection::updateVolumeButton()
 {
-//FIXME DROP QTWIDGET
-//    if (!RingApplication::instance()->isPhoneVisible())
-//       return;
-
-//    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]);
-
-//FIXME DROP QTWIDGET
-//   PhoneWindow::app()->view()->updateVolumeControls();
+   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 = PersonModel::instance().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();
 }
 
 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)
 {
-//FIXME
-//    RingApplication::instance()->mainWindow()->show          ();
-//    RingApplication::instance()->mainWindow()->activateWindow();
-//    RingApplication::instance()->mainWindow()->raise         ();
-
    if (focus) {
       // Add a new call if there is none
       if (!CallModel::instance().rowCount())
          CallModel::instance().userActionModel() << UserActionModel::Action::ADD_NEW;
-
-
-//FIXME DROP QTWIDGET
-//       if (RingApplication::instance()->isPhoneVisible())
-//          RingApplication::instance()->phoneWindow()->view()->setFocus(Qt::OtherFocusReason);
    }
 }
 
 #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/actioncollection.h
index 4b4b13d1..be4178e2 100644
--- a/src/actioncollection.h
+++ b/src/actioncollection.h
@@ -1,222 +1,218 @@
 /***************************************************************************
  *   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
 {
    Q_OBJECT
 public:
 
    //Constructor
    explicit ActionCollection(QObject* parent = nullptr);
    virtual ~ActionCollection();
    static ActionCollection* instance();
    void setupAction();
-   void setupPhoneAction(PhoneWindow* mw);
 
    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_editToolBar            {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 showDirectory         ();
-   void editToolBar           ();
    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/cmd.cpp b/src/cmd.cpp
index 9c82d843..2e0f948b 100644
--- a/src/cmd.cpp
+++ b/src/cmd.cpp
@@ -1,239 +1,224 @@
 /***************************************************************************
  *   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 <media/text.h>
 #include "ringapplication.h"
 #include "klib/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 = CallModel::instance().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 = CallModel::instance().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()
 {
    if (RingApplication::instance()) {
       RingApplication::instance()->setStartPhone(true);
    }
 }
 
 void Cmd::timelineInterface()
 {
    if (RingApplication::instance()) {
       RingApplication::instance()->setStartTimeline(true);
    }
 }
 
 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)
-//TODO manage to share the parseArgs implementation, QCommandLineOption cannot
-//    char** l = new char*[args.size()];
-//    int i=0;
-//    for (const QString& str : args) {
-//       l[i] = (char*) malloc(sizeof(char)*(str.toLatin1().size()+1/*for \0*/));
-//       strcpy(l[i++],str.toLatin1().data());
-//    }
-//    parseCmd(args.size(), l);
 
    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);
    }
-
-   if (ConfigurationSkeleton::displayOnStart()) {
-//FIXME DROP QTWIDGET
-//       PhoneWindow::app()->show();
-//       PhoneWindow::app()->activateWindow();
-//       PhoneWindow::app()->raise();
-   }
 }
 
 void Cmd::slotOpenRequested (const QList<QUrl>&)
 {
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/delegates/kdepixmapmanipulation.cpp b/src/delegates/kdepixmapmanipulation.cpp
index 3d41e8b2..e51763e9 100644
--- a/src/delegates/kdepixmapmanipulation.cpp
+++ b/src/delegates/kdepixmapmanipulation.cpp
@@ -1,428 +1,428 @@
 /****************************************************************************
  *   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 <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"
 
 
-const TypedStateMachine< const char* , Call::State > KDEPixmapManipulation::callStateIcons = {{
+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[c->state()]);
+      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 CategorizedHistoryModel::SortedProxy::Categories cat) const
 {
    switch(cat) {
       case CategorizedHistoryModel::SortedProxy::Categories::DATE      :
          break;
       case CategorizedHistoryModel::SortedProxy::Categories::NAME      :
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
       case CategorizedHistoryModel::SortedProxy::Categories::POPULARITY:
          return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
       case CategorizedHistoryModel::SortedProxy::Categories::LENGTH    :
       case CategorizedHistoryModel::SortedProxy::Categories::SPENT_TIME:
       case CategorizedHistoryModel::SortedProxy::Categories::COUNT__   :
          break;
    }
    return QVariant();
 }
 
 QVariant KDEPixmapManipulation::contactSortingCategoryIcon(const CategorizedContactModel::SortedProxy::Categories cat) const
 {
    switch(cat) {
       case CategorizedContactModel::SortedProxy::Categories::NAME        :
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
       case CategorizedContactModel::SortedProxy::Categories::RECENTLYUSED:
          return QIcon::fromTheme(QStringLiteral("view-history"));
       case CategorizedContactModel::SortedProxy::Categories::ORGANIZATION:
       case CategorizedContactModel::SortedProxy::Categories::GROUP       :
       case CategorizedContactModel::SortedProxy::Categories::DEPARTMENT  :
       case CategorizedContactModel::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
index 22ee98e3..b0be945a 100644
--- a/src/delegates/kdepixmapmanipulation.h
+++ b/src/delegates/kdepixmapmanipulation.h
@@ -1,77 +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"
+// #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 CategorizedHistoryModel::SortedProxy::Categories cat) const override;
 
    virtual QVariant contactSortingCategoryIcon(const CategorizedContactModel::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];
-private:
-   static const TypedStateMachine< const char* , Call::State > callStateIcons;
 };
 
 #endif // KDEPIXMAPMANIPULATION_H
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/implementation.cpp b/src/implementation.cpp
index 3c846c96..b73dd73a 100644
--- a/src/implementation.cpp
+++ b/src/implementation.cpp
@@ -1,320 +1,197 @@
 /***************************************************************************
  *   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 <QtCore/QDebug>
 #include <QtGui/QColor>
-#include <QtGui/QPainter>
-#include <QtGui/QBitmap>
 #include <QtGui/QGuiApplication>
-#include <QtWidgets/QAction>
-#include <QtCore/QStandardPaths>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
 #include <QtCore/QMimeData>
 #include <QtCore/QPointer>
 #include <QtCore/QUrl>
 #include <QtGui/QClipboard>
 #include <QtGui/QIcon>
 #include <QQuickView>
 #include <QQuickItem>
 #include <QQmlApplicationEngine>
 
 //KDE
-#include <KColorScheme>
 #include <klocalizedstring.h>
 #include <KMessageBox>
 
-
 //Ring
 #include <person.h>
 #include <contactmethod.h>
 #include <presencestatusmodel.h>
 #include <phonedirectorymodel.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)
-      return QIcon::fromTheme("document-save");*/
    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();
 }
 
-// void KDEPresenceSerializationDelegate::save() {
-//    PresenceStatusModel& m = PresenceStatusModel::instance();
-//    QStringList list;
-//    for (int i=0;i<m.rowCount();i++) {
-//       QString line = QStringLiteral("%1///%2///%3///%4///%5")
-//          .arg(m.data(m.index(i,(int)PresenceStatusModel::Columns::Name),Qt::DisplayRole).toString())
-//          .arg(m.data(m.index(i,(int)PresenceStatusModel::Columns::Message),Qt::DisplayRole).toString())
-//          .arg(qvariant_cast<QColor>(m.data(m.index(i,(int)PresenceStatusModel::Columns::Message),Qt::BackgroundColorRole)).name())    //Color
-//          .arg(m.data(m.index(i,(int)PresenceStatusModel::Columns::Status),Qt::CheckStateRole) == Qt::Checked)    //Status
-//          .arg(m.data(m.index(i,(int)PresenceStatusModel::Columns::Default),Qt::CheckStateRole) == Qt::Checked);   //Default
-//
-//       list << line;
-//    }
-//    ConfigurationSkeleton::setPresenceStatusList(list);
-// }
-
-// void KDEPresenceSerializationDelegate::load() {
-//    QStringList list = ConfigurationSkeleton::presenceStatusList();
-//    PresenceStatusModel& m = PresenceStatusModel::instance();
-//
-//    //Load the default one
-//    if (!list.size()) {
-//       PresenceStatusModel::StatusData* data = new PresenceStatusModel::StatusData();
-//       data->name       = i18n("Online")    ;
-//       data->message    = i18n("I am available");
-//       data->status     = true      ;
-//       data->defaultStatus = true;
-//       m.addStatus(data);
-//       data = new PresenceStatusModel::StatusData();
-//       data->name       = i18n("Away")    ;
-//       data->message    = i18n("I am away");
-//       data->status     = false      ;
-//       m.addStatus(data);
-//       data = new PresenceStatusModel::StatusData();
-//       data->name       = i18n("Busy")    ;
-//       data->message    = i18n("I am busy");
-//       data->status     = false      ;
-//       m.addStatus(data);
-//       data = new PresenceStatusModel::StatusData();
-//       data->name       = i18n("DND")    ;
-//       data->message    = i18n("Please do not disturb me");
-//       data->status     = false      ;
-//       m.addStatus(data);
-//    }
-//    else {
-//       foreach(const QString& line, list) {
-//          QStringList fields = line.split(QStringLiteral("///"));
-//          PresenceStatusModel::StatusData* data = new PresenceStatusModel::StatusData();
-//          data->name          = fields[(int)PresenceStatusModel::Columns::Name   ];
-//          data->message       = fields[(int)PresenceStatusModel::Columns::Message];
-//          data->color         = QColor(fields[(int)PresenceStatusModel::Columns::Color]);
-//          data->status        = fields[(int)PresenceStatusModel::Columns::Status] == QLatin1String("1");
-//          data->defaultStatus = fields[(int)PresenceStatusModel::Columns::Default] == QLatin1String("1");
-//          m.addStatus(data);
-//       }
-//    }
-// }
-
-// KDEPresenceSerializationDelegate::~KDEPresenceSerializationDelegate()
-// {
-//
-// }
-
-// bool KDEPresenceSerializationDelegate::isTracked(CollectionInterface* backend) const
-// {
-//    Q_UNUSED(backend)
-//    if (!m_isLoaded) {
-//       foreach(const QString& str, ConfigurationSkeleton::presenceAutoTrackedCollections()) {
-//          m_hTracked[str] = true;
-//       }
-//       m_isLoaded = true;
-//    }
-//    return m_hTracked.value(backend->name());
-// }
-
-// void KDEPresenceSerializationDelegate::setTracked(CollectionInterface* backend, bool tracked)
-// {
-//    if (!m_isLoaded) {
-//       foreach(const QString& str,ConfigurationSkeleton::presenceAutoTrackedCollections()) {
-//          m_hTracked[str] = true;
-//       }
-//       m_isLoaded = true;
-//    }
-//    m_hTracked[backend->name()] = tracked;
-//    QStringList ret;
-//    for (QHash<QString,bool>::const_iterator i = m_hTracked.constBegin(); i != m_hTracked.constEnd(); ++i) {
-//       if (i.value())
-//          ret << i.key();
-//    }
-//    ConfigurationSkeleton::setPresenceAutoTrackedCollections(ret);
-// }
-
 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 = PhoneDirectoryModel::instance().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)
-
-//    ContactMethod* cm = nullptr;
-
-//    if (hintVar.canConvert<ContactMethod*>())
-//       cm = qvariant_cast<ContactMethod*>(hintVar);
-
-//FIXME DROP QTWIDGET
-//    auto selector = new PersonSelector(PhoneWindow::app(), cm);
-
-//    selector->exec();
-
-//    selector->deleteLater();
-
    return nullptr;
 }
 
 ContactMethod* KDEActionExtender::selectContactMethod(FlagPack<ActionExtenderI::SelectContactMethodHint> hints, const QVariant& hintVar) const
 {
    Q_UNUSED(hints)
    Q_UNUSED(hintVar)
 
-//FIXME DROP QTWIDGET
-//    auto selector = new ContactMethodSelector(PhoneWindow::app());
-
-//    selector->exec();
-
-//    selector->deleteLater();
-
    return nullptr;
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/implementation.h b/src/implementation.h
index 971de4b1..246ca6c3 100644
--- a/src/implementation.h
+++ b/src/implementation.h
@@ -1,101 +1,83 @@
 /***************************************************************************
  *   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/presenceserializeri.h>
 #include <interfaces/shortcutcreatori.h>
 #include <interfaces/actionextenderi.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 KDEPresenceSerializationDelegate final : public Interfaces::PresenceSerializerI
-// {
-// public:
-//    KDEPresenceSerializationDelegate():m_isLoaded(false){}
-//    KDEPresenceSerializationDelegate(const KDEPresenceSerializationDelegate&) = delete;
-//    KDEPresenceSerializationDelegate& operator=(const KDEPresenceSerializationDelegate&) = delete;
-//
-//    virtual void save() override;
-//    virtual void load() override;
-//    virtual ~KDEPresenceSerializationDelegate();
-//    virtual bool isTracked(CollectionInterface* backend) const override;
-//    virtual void setTracked(CollectionInterface* backend, bool tracked) override;
-// private:
-//    mutable QHash<QString,bool> m_hTracked;
-//    mutable bool m_isLoaded;
-// };
-
 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;
 };
 
 #endif
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/matrixutils.h b/src/matrixutils.h
deleted file mode 100644
index 90c49990..00000000
--- a/src/matrixutils.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2012-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 MATRIXUTILS_H
-#define MATRIXUTILS_H
-
-//libSTDC++
-#include <initializer_list>
-#include <type_traits>
-
-template<class T, class E>
-struct TypedStateMachine
-{
-   // no ctor/dtor and one public member variable for easy initialization
-   T _data[size_t(E::COUNT__)];
-
-   T& operator[](E v) {
-   if (size_t(v) >= size_t(E::COUNT__)) {
-      Q_ASSERT(false);
-      qDebug() << "State Machine Out of Bound" << size_t(v);
-      throw v;
-   }
-   return _data[size_t(v)];
-   }
-
-   const T& operator[](E v) const {
-   if (size_t(v) >= size_t(E::COUNT__)) {
-      Q_ASSERT(false);
-      qDebug() << "State Machine Out of Bound" << size_t(v);
-      throw v;
-   }
-   return _data[size_t(v)];
-   }
-
-   T *begin() {
-   return _data;
-   }
-
-   T *end() {
-   return _data + size_t(E::COUNT__);
-   }
-};
-
-
-/**
- * This generic class represents a multidimensional enum class array.
- * It safely converts them to integers. Each enum class needs a "COUNT__" item
- * at the end."
- *
- * This struct enforces:
- * * That the rows are indexed using enum_classes
- * * That the size of the matrix matches the enum_class size
- * * That the operators are within the matrix boundary
- */
-template<class Row, typename Value, typename A = Value>
-struct Matrix1D
-{
-
-   Matrix1D(std::initializer_list< std::initializer_list<Value> > s);
-   explicit Matrix1D();
-
-   // Row is a built-in type ("int" by default)
-   Value operator[](Row v);
-
-   const Value operator[](Row v) const;
-
-   /**
-   * An Iterator for enum classes
-   */
-   class Matrix1DEnumClassIter
-   {
-   public:
-      Matrix1DEnumClassIter (Matrix1D<Row, Value, A>* p_vec, int pos)
-         : pos_( pos ), p_vec_( p_vec ) {}
-
-      bool operator!= (const Matrix1DEnumClassIter& other) const;
-      bool operator== (const Matrix1DEnumClassIter& other) const;
-      void operator=  (Value& other              )      ;
-      void operator=  (Value& other              ) const;
-      //Row operator* () const;
-      //const Matrix1DEnumClassIter& operator++ ();
-
-   private:
-      int pos_;
-      Matrix1D<Row, Value, A> *p_vec_;
-   };
-
-   //Iterators
-   Matrix1DEnumClassIter begin();
-   Matrix1DEnumClassIter end();
-
-   // Only use for single reverse mappable arrays, will ASSERT otherwise
-   Row fromValue(const Value& value) const;
-
-   static void setReverseMapping(Matrix1D<Row,const char *> names);
-
-   //Setter
-   void setAt(Row,Value);
-
-private:
-   QVector<Value> m_lData;
-   static QMap<A, Row> m_hReverseMapping;
-};
-
-/**
- * Create a matrix type with 2 enum class dimensions M[I,J] = V
- *                                                     ^ ^    ^
- *                                                     | |    |
- *                                          Rows    <--- |    |
- *                                          Columns <-----    |
- *                                          Value   <----------
- */
-template<class Row, class Column, typename Value>
-using Matrix2D = Matrix1D<Row, Matrix1D<Column, Value>>;
-
-
-/**
- * A matrix with no value
- *
- * This is useful to use enum class in C++11 foreach loops
- *
- * @usage
- *   for (const MyEnum& value : EnumIterator<MyEnum>()) {
- *       std::cout << "Name: " << MyEnumNames[value] << std::endl;
- *   }
- */
-template<
-   class EnumClass,
-   EnumClass from = (EnumClass) 0,
-   EnumClass to = EnumClass::COUNT__
->
-struct EnumIterator
-{
-   /**
-   * An Iterator for enum classes
-   */
-   class EnumClassIter
-   {
-   public:
-      EnumClassIter (const EnumIterator<EnumClass>* p_vec, int pos)
-         : pos_( pos ), p_vec_( p_vec ) {}
-
-      bool operator!= (const EnumClassIter& other) const;
-      EnumClass operator* () const;
-      const EnumClassIter& operator++ ();
-
-   private:
-      int pos_;
-      const EnumIterator<EnumClass> *p_vec_;
-   };
-
-   EnumIterator();
-
-   //Iterators
-   EnumClassIter begin();
-   EnumClassIter end();
-};
-
-#include "matrixutils.hpp"
-
-#endif
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/matrixutils.hpp b/src/matrixutils.hpp
deleted file mode 100644
index c1e2412a..00000000
--- a/src/matrixutils.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
- *   Copyright (C) 2012-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/>.  *
- ***************************************************************************/
-
-template<
-   class EnumClass,
-   EnumClass from,
-   EnumClass to
->
-EnumIterator<EnumClass, from, to>::EnumIterator() {
-   static_assert(std::is_enum<EnumClass>(),"The first template parameter has to be an enum class\n");
-}
-
-template<
-   class EnumClass,
-   EnumClass from,
-   EnumClass to
->
-EnumClass EnumIterator<EnumClass, from, to>::EnumClassIter::operator* () const
-{
-   const int size = enum_class_size<EnumClass, from, to>();
-   Q_ASSERT(pos_ < size);
-   return static_cast<EnumClass>(pos_);
-}
-
-template<
-   class EnumClass,
-   EnumClass from,
-   EnumClass to
->
-const typename EnumIterator<EnumClass, from, to>::EnumClassIter& EnumIterator<EnumClass, from, to>::EnumClassIter::operator++ ()
-{
-   ++pos_;
-   return *this;
-}
-
-template<
-   class EnumClass,
-   EnumClass from,
-   EnumClass to
->
-bool EnumIterator<EnumClass, from, to>::EnumClassIter::operator!= (const EnumClassIter& other) const
-{
-   return pos_ != other.pos_;
-}
-
-template<
-   class EnumClass,
-   EnumClass from,
-   EnumClass to
->
-typename EnumIterator<EnumClass, from, to>::EnumClassIter EnumIterator<EnumClass, from, to>::begin()
-{
-   return EnumIterator<EnumClass, from, to>::EnumClassIter( this, static_cast<int>(from) );
-}
-
-template<
-   class EnumClass,
-   EnumClass from,
-   EnumClass to
->
-typename EnumIterator<EnumClass, from, to>::EnumClassIter EnumIterator<EnumClass, from, to>::end()
-{
-   return EnumIterator<EnumClass, from, to>::EnumClassIter( this, enum_class_size<EnumClass, from, to>() );
-}
-
-template<class Row, typename Value, typename Accessor>
-Matrix1D<Row,Value,Accessor>::Matrix1D()
-{
-   m_lData.resize(enum_class_size<Row>());
-}
-
-template<class Row, typename Value, typename Accessor>
-Matrix1D<Row,Value,Accessor>::Matrix1D(std::initializer_list< std::initializer_list<Value>> s)
-: m_lData(*std::begin(s)) {
-   static_assert(std::is_enum<Row>(),"Row has to be an enum class");
-   static_assert(static_cast<int>(Row::COUNT__) > 0,"Row need a COUNT__ element");
-
-   // FIXME C++14, use static_assert and make the ctor constexpr
-   Q_ASSERT(std::begin(s)->size() == enum_class_size<Row>());//,"Matrix row have to match the enum class size");
-}
-
-template<class Row, typename Value, typename Accessor>
-Value Matrix1D<Row,Value,Accessor>::operator[](Row v) {
-   //ASSERT(size_t(v) >= size_t(Row::COUNT__),"State Machine Out of Bounds\n");
-   if (size_t(v) >= enum_class_size<Row>() || static_cast<int>(v) < 0) {
-      qWarning() << "State Machine Out of Bounds" << size_t(v);
-      Q_ASSERT(false);
-      throw v;
-   }
-   return m_lData[static_cast<int>(v)];
-}
-
-template<class Row, typename Value, typename Accessor>
-const Value Matrix1D<Row,Value,Accessor>::operator[](Row v) const {
-   Q_ASSERT(size_t(v) <= enum_class_size<Row>()+1 && size_t(v)>=0); //COUNT__ is also valid
-   if (size_t(v) >= enum_class_size<Row>()) {
-      qWarning() << "State Machine Out of Bounds" << size_t(v);
-      Q_ASSERT(false);
-      throw v;
-   }
-   return m_lData[static_cast<int>(v)];
-}
-
-template <class E, class T, class A> QMap<A,E> Matrix1D<E,T,A>::m_hReverseMapping;
-
-template<class Row, typename Value, typename Accessor>
-void Matrix1D<Row,Value,Accessor>::setReverseMapping(Matrix1D<Row,const char*> names)
-{
-   for ( const Row row : EnumIterator<Row>() )
-      m_hReverseMapping[names[row]] = row;
-}
-
-template<class Row, typename Value, typename Accessor>
-Row Matrix1D<Row,Value,Accessor>::fromValue(const Value& value) const {
-    if (!m_hReverseMapping.empty()) {
-         for (int i = 0; i < enum_class_size<Row>();i++) {
-            const_cast<Matrix1D*>(this)->m_hReverseMapping[(*const_cast<Matrix1D*>(this))[(Row)i]]
-               = static_cast<Row>(i);
-         }
-         Q_ASSERT(m_hReverseMapping.empty() == enum_class_size<Row>());
-    }
-    if (m_hReverseMapping.count(value) == 0) {
-      throw value;
-    }
-    return m_hReverseMapping[value];
-}
-
-template<class Row, typename Value, typename Accessor>
-bool Matrix1D<Row,Value,Accessor>::Matrix1DEnumClassIter::operator!= (const Matrix1DEnumClassIter& other) const
-{
-   return pos_ != other.pos_;
-}
-
-template<class Row, typename Value, typename Accessor>
-bool Matrix1D<Row,Value,Accessor>::Matrix1DEnumClassIter::operator== (const Matrix1DEnumClassIter& other) const
-{
-   return pos_ == other.pos_;
-}
-
-template<class Row, typename Value, typename Accessor>
-void Matrix1D<Row,Value,Accessor>::Matrix1DEnumClassIter::operator= (Value& other) const
-{
-   p_vec_->m_lData[pos_] = other;
-}
-
-template<class Row, typename Value, typename Accessor>
-void Matrix1D<Row,Value,Accessor>::Matrix1DEnumClassIter::operator= (Value& other)
-{
-   p_vec_->m_lData[pos_] = other;
-}
-
-template<class Row, typename Value, typename Accessor>
-void Matrix1D<Row,Value,Accessor>::setAt(Row row,Value value)
-{
-   m_lData[(int)row] = value;
-}
-
-// kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/ringapplication.cpp b/src/ringapplication.cpp
index fa19604d..6a7625d4 100644
--- a/src/ringapplication.cpp
+++ b/src/ringapplication.cpp
@@ -1,717 +1,658 @@
 /***************************************************************************
  *   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/QDir>
 #include <QtCore/QTimer>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QDebug>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QItemSelectionModel>
 #include <QtWidgets/QAction>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQuickItem>
 #include <QQuickWindow>
 #include <QQmlComponent>
 
 //KDE
 #include <KIconLoader>
 #include <KActionCollection>
 #include <kmessagebox.h>
 #include <KDeclarative/KDeclarative>
 
 //LRC
 #include <itemdataroles.h>
 #include <callmodel.h>
 #include <eventmodel.h>
 #include <accountmodel.h>
 #include <account.h>
 #include <individual.h>
 #include <contactmethod.h>
 #include <phonedirectorymodel.h>
 #include <categorizedhistorymodel.h>
 #include <categorizedcontactmodel.h>
 #include <ringdevicemodel.h>
 #include <namedirectory.h>
 #include <categorizedbookmarkmodel.h>
 #include <numbercompletionmodel.h>
 #include <useractionmodel.h>
 #include <protocolmodel.h>
 #include <pendingcontactrequestmodel.h>
 #include <video/configurationproxy.h>
 #include <video/sourcemodel.h>
 #include <contactmethod.h>
 #include <media/recordingmodel.h>
 #include <peerstimelinemodel.h>
 #include <individualtimelinemodel.h>
 #include <ringtonemodel.h>
 #include <video/previewmanager.h>
 #include <media/recording.h>
 #include <media/avrecording.h>
 #include <media/textrecording.h>
 #include <media/availabilitytracker.h>
 #include <media/media.h>
 #include <video/renderer.h>
 #include <libcard/historyimporter.h>
 #include <troubleshoot/dispatcher.h>
 
 //Ring
 #include "klib/kcfg_settings.h"
 #include "cmd.h"
 #include "errormessage.h"
 #include "callmodel.h"
 #include "implementation.h"
 #include "wizard/welcome.h"
 #include "callview/videowidget.h"
 #include "notification.h"
 #include "actioncollection.h"
 
 //Models
 #include <profilemodel.h>
 #include <certificatemodel.h>
 #include <availableaccountmodel.h>
 #include <numbercategorymodel.h>
 #include <codecmodel.h>
 #include <credentialmodel.h>
 #include <presencestatusmodel.h>
 #include <personmodel.h>
 #include <infotemplatemanager.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>
 
 //Configurators
 #include "configurator/localhistoryconfigurator.h"
 #include "configurator/audiorecordingconfigurator.h"
 #include "configurator/fallbackpersonconfigurator.h"
 #include "configurator/peerprofileconfigurator.h"
 #include "configurator/bookmarkconfigurator.h"
 
 //Delegates
 #include <delegates/kdepixmapmanipulation.h>
-// #include <delegates/accountinfodelegate.h>
 #include <interfaces/itemmodelstateserializeri.h>
 #include "klib/itemmodelserialization.h"
 #include "extensions/presencecollectionextension.h"
 
 //QML
 #include <KQuickItemViews/plugin.h>
 #include "qmlwidgets/plugin.h"
 #include "qmlwidgets/recentfilemodel.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"
 
 //Other
 #include <unistd.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::WindowStateChange) {
-//FIXME DROP QTWIDGET
-//          QWindowStateChangeEvent* e = static_cast<QWindowStateChangeEvent*>(event);
-//          switch (PhoneWindow::app()->windowState()) {
-//             case Qt::WindowMinimized:
-//                emit minimized(true);
-//                break;
-//             case Qt::WindowActive:
-//                qDebug() << "The window is now active";
-//                [[clang::fallthrough]];
-//             case Qt::WindowNoState:
-//             default:
-//                if (e->oldState() == Qt::WindowMinimized)
-//                   emit minimized(false);
-//                break;
-//          };
-      }
-      else if (event->type() == QEvent::KeyPress) {
-//FIXME DROP QTWIDGET
-//          m_pParent->viewKeyEvent(static_cast<QKeyEvent*>(event));
-      }
-      else if (event->type() == QEvent::WindowDeactivate) {
+      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 ((!CallModel::instance().isConnected()) || (!CallModel::instance().isValid())) {
       QTimer::singleShot(5000,this,&RingApplication::daemonTimeout);
    }
 
    initCollections();
-
-   connect(&CallModel::instance(), &CallModel::callAdded, this, &RingApplication::callAdded);
-   connect(&CallModel::instance(), &CallModel::callStateChanged, this, &RingApplication::callAdded);
-
 }
 
 /**
  * Destructor
  */
 RingApplication::~RingApplication()
 {
    delete m_pDeclarative;
    delete engine();
    delete m_pCanvasIndicator;
    delete m_pPhotoSelector;
    delete m_pQmlWidget;
 
    delete &PeersTimelineModel::instance();
    delete &Media::RecordingModel::instance();
    delete &PersonModel::instance();
    delete &CallModel::instance();
    delete &ProfileModel::instance();
    delete &AccountModel::instance();
    delete &PhoneDirectoryModel::instance();
    delete &NumberCategoryModel::instance();
    m_spInstance = nullptr;
 }
 
 RingApplication* RingApplication::instance()
 {
    Q_ASSERT(m_spInstance);
    return m_spInstance;
 }
 
 static void loadNumberCategories()
 {
    auto& model = NumberCategoryModel::instance();
    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();
 
    CallModel::instance().setAudoCleanDelay(5000);
 
    InfoTemplateManager::instance();
 
    /*******************************************
       *           Set the configurator          *
       ******************************************/
 
    PersonModel::instance()             .registerConfigarator<PeerProfileCollection2  >    (new PeerProfileConfigurator   (this));
    PersonModel::instance()             .registerConfigarator<FallbackPersonCollection>    (new FallbackPersonConfigurator(this));
    CategorizedHistoryModel::instance() .registerConfigarator<LocalHistoryCollection  >    (new LocalHistoryConfigurator  (this));
    CategorizedBookmarkModel::instance().registerConfigarator<LocalBookmarkCollection >    (new BookmarkConfigurator      (this));
    Media::RecordingModel::instance()   .registerConfigarator<LocalRecordingCollection>    (new AudioRecordingConfigurator(this,
       AudioRecordingConfigurator::Mode::AUDIO
    ));
    Media::RecordingModel::instance()   .registerConfigarator<LocalTextRecordingCollection>(new AudioRecordingConfigurator(this,
       AudioRecordingConfigurator::Mode::TEXT
    ));
 
    /*******************************************
       *           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 = CategorizedHistoryModel::instance().addCollection<LocalHistoryCollection>(LoadOptions::FORCE_ENABLED);
       HistoryImporter::importHistory(histo);
       histo->clear();
    }
 
    //HACK load the Calendar now to speedup everything else
    const int accountCount = AccountModel::instance().size();
    for (int i=0; i < accountCount; i++)
       AccountModel::instance()[i]->calendar();
 
    ProfileModel::instance().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
 
    CategorizedBookmarkModel::instance().addCollection<LocalBookmarkCollection>();
    CategorizedBookmarkModel::instance().setDisplayPopular(
       ConfigurationSkeleton::displayPopularAsBookmark()
    );
 
    PersonModel::instance().addCollection<FallbackPersonCollection>(LoadOptions::FORCE_ENABLED);
    auto ppc = PersonModel::instance().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);
 //       PersonModel::instance().backendModel()->addExtension(ext); //FIXME
 
    ProfileModel::instance();
 
    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();
-
-//FIXME DROP QTWIDGET
-//       if (m_StartPhone) {
-//          mw = RingApplication::phoneWindow();
-//
-//          if (displayOnStart)
-//             mw->show();
-//          else
-//             mw->hide();
-//       }
-//       else
-         desktopWindow();
-         new SysTray(QIcon(QStringLiteral(":appicon/icons/64-apps-ring-kde.png")));
+      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 (!AccountModel::instance().size())
          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;
 }
 
 void RingApplication::setStartTimeline(bool value)
 {
    m_StartTimeLine = value;
 }
 
 void RingApplication::setStartPhone(bool value)
 {
    m_StartPhone = value;
 }
 
 #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_SINGLETON(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), &name::instance());
 #define QML_SINGLETON2(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), name::instance());
 #define QML_ADD_OBJECT(name, obj) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), obj);
 
 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");
 
-//       qRegisterMetaType<IndividualPointer>("IndividualPointer");
-
       QML_TYPE( Account                    )
       QML_TYPE( const Account              )
       QML_TYPE( Call                       )
       QML_TYPE( Person                     )
       QML_TYPE( Individual                 )
       QML_TYPE( ContactMethod              )
       QML_TYPE( UserActionModel            )
       QML_TYPE( IndividualTimelineModel    )
       QML_TYPE( PendingContactRequestModel )
       QML_TYPE( SecurityEvaluationModel    )
       QML_TYPE( RingDeviceModel            )
       QML_TYPE( CodecModel                 )
       QML_TYPE( CredentialModel            )
       QML_TYPE( Event                      )
       QML_TYPE( ProtocolModel              )
 
       QML_TYPE( QAction)
 
       QML_CRTYPE( NumberCompletionModel )
       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);
       m_pDeclarative->setupBindings();
 
       try {
          QML_SINGLETON( CallModel                );
          QML_SINGLETON( CategorizedHistoryModel  );
          QML_SINGLETON( AccountModel             );
          QML_SINGLETON( AvailableAccountModel    );
          QML_SINGLETON( CategorizedContactModel  );
          QML_SINGLETON( CategorizedBookmarkModel );
          QML_SINGLETON( NameDirectory            );
          QML_SINGLETON( PeersTimelineModel       );
          QML_SINGLETON( NumberCategoryModel      );
          QML_SINGLETON( PhoneDirectoryModel      );
          QML_SINGLETON( RecentFileModel          );
          QML_SINGLETON( ProfileModel             );
          QML_SINGLETON( PresenceStatusModel      );
          QML_SINGLETON( EventModel               );
          QML_SINGLETON( RingtoneModel            );
 
          QML_SINGLETON2( ActionCollection        );
 
          QML_ADD_OBJECT(VideoRateSelectionModel      , &Video::ConfigurationProxy::rateSelectionModel      ());
          QML_ADD_OBJECT(VideoResolutionSelectionModel, &Video::ConfigurationProxy::resolutionSelectionModel());
          QML_ADD_OBJECT(VideoChannelSelectionModel   , &Video::ConfigurationProxy::channelSelectionModel   ());
          QML_ADD_OBJECT(VideoDeviceSelectionModel    , &Video::ConfigurationProxy::deviceSelectionModel    ());
          { using namespace Media;
             QML_SINGLETON( RecordingModel        );
             QML_TYPE     ( Recording             );
             QML_TYPE     ( TextRecording         );
             QML_TYPE     ( AVRecording           );
             QML_CRTYPE   ( AvailabilityTracker   );
          }
 
          { using namespace Video;
             QML_SINGLETON( PreviewManager        );
             QML_TYPE     ( SourceModel           );
             QML_TYPE     ( Renderer              );
          }
 
          { using namespace Troubleshoot;
             QML_CRTYPE( Dispatcher )
             QML_TYPE  ( Base       )
          }
 
          qmlRegisterUncreatableType<::Media::Media>(
             AppName, 1,0, "Media", QStringLiteral("cannot be instantiated")
          );
 
          RingApplication::engine()->rootContext()->setContextProperty(
             QStringLiteral("SortedContactModel"),
             CategorizedContactModel::SortedProxy::instance().model()
          );
 
          RingApplication::engine()->rootContext()->setContextProperty(
             QStringLiteral("ContactCategoryModel"),
             CategorizedContactModel::SortedProxy::instance().categoryModel()
          );
 
          RingApplication::engine()->rootContext()->setContextProperty(
             QStringLiteral("ContactCategorySelectionModel"),
             CategorizedContactModel::SortedProxy::instance().categorySelectionModel()
          );
 
          auto completionModel = new NumberCompletionModel();
 
          RingApplication::engine()->rootContext()->setContextProperty(
             QStringLiteral("CompletionModel"), completionModel
          );
          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_SINGLETON
 #undef QML_ADD_OBJECT
 #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 ((!CallModel::instance().isConnected()) || (!CallModel::instance().isValid())) {
       KMessageBox::error(nullptr, ErrorMessage::NO_DAEMON_ERROR);
       exit(1);
    }
 }
 
-void RingApplication::callAdded(Call* c)
-{
-   if (c && ConfigurationSkeleton::displayOnNewCalls() && (
-    c->state() == Call::State::CURRENT   ||
-    c->state() == Call::State::INCOMING  ||
-    c->state() == Call::State::CONNECTED ||
-    c->state() == Call::State::RINGING   ||
-    c->state() == Call::State::INITIALIZATION)) {
-//       if (isPhoneVisible()) {
-//FIXME DROP QTWIDGET
-//          RingApplication::instance()->phoneWindow()->show ();
-//          RingApplication::instance()->phoneWindow()->raise();
-//       }
-//       else {
-         //timelineWindow()->viewContact(c->peerContactMethod());
-         //timelineWindow()->setCurrentPage(ViewContactDock::Pages::MEDIA);
-//       }
-   }
-}
-
 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 d7ae39f7..d54d8e9d 100644
--- a/src/ringapplication.h
+++ b/src/ringapplication.h
@@ -1,118 +1,117 @@
 /***************************************************************************
  *   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);
    void setStartTimeline(bool value);
    void setStartPhone(bool value);
 
    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();
-   void callAdded(Call* c);
 
 public Q_SLOTS:
    void showWizard();
    void configureAccounts();
 };
 
 #endif // RINGAPPLICATION_H
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/wizard/welcome.cpp b/src/wizard/welcome.cpp
index 035bfb7e..5a3c21ee 100644
--- a/src/wizard/welcome.cpp
+++ b/src/wizard/welcome.cpp
@@ -1,59 +1,56 @@
 /***************************************************************************
  *   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
    );
 
-//    RingApplication::engine()->load(QUrl(QStringLiteral("qrc:/Wizard.qml")));
-
-
    QMetaObject::invokeMethod(RingApplication::instance()->desktopWindow(), "showWizard");
 }
 
 QString WelcomeDialog::defaultUserName() const
 {
    return qgetenv("USER");
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;