diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e9b3b5..b2cfbcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,131 +1,121 @@
 cmake_minimum_required(VERSION 3.5)
 set(PIM_VERSION "5.12.41")
 
 project(KPimTextEdit VERSION ${PIM_VERSION})
 
 # ECM setup
-set(KF5_MIN_VERSION "5.61.0")
+set(KF5_MIN_VERSION "5.62.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 if (POLICY CMP0053)
     cmake_policy(SET CMP0053 NEW)
 endif()
 
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
 
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(ECMAddTests)
 include(ECMQtDeclareLoggingCategory)
 
 
 
 set(KPIMTEXTEDIT_LIB_VERSION ${PIM_VERSION})
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KPIMTEXTEDIT
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_version.h"
     PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PimTextEditConfigVersion.cmake"
     SOVERSION 5
 )
 
 set(QT_REQUIRED_VERSION "5.11.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets)
 find_package(Grantlee5 "5.1" CONFIG REQUIRED)
 set_package_properties(Grantlee5 PROPERTIES
     DESCRIPTION "A plug-in based String Template system for Qt"
     URL "https://github.com/steveire/grantlee"
     PURPOSE "Required for the RichText composer"
     TYPE REQUIRED
     )
 
-find_package(KF5DesignerPlugin ${KF5_MIN_VERSION} CONFIG)
-set_package_properties(KF5DesignerPlugin PROPERTIES DESCRIPTION "KF5 designer plugin" TYPE OPTIONAL)
-
 ########### Find packages ###########
 find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5Sonnet ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5SyntaxHighlighting ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
-set(USE_NEW_DESIGNERPLUGIN_MACRO false)
-if (ECM_VERSION VERSION_GREATER "5.61.0")
-	option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
-	add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
-	set(USE_NEW_DESIGNERPLUGIN_MACRO true)
-else()
-	find_package(KF5DesignerPlugin ${KF5_MIN_VERSION} CONFIG)
-	set_package_properties(KF5DesignerPlugin PROPERTIES DESCRIPTION "KF5 designer plugin" TYPE OPTIONAL)
-endif()
+option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
 
 add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\")
 
 if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
    add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 endif()
 
 add_definitions(-DQT_NO_FOREACH)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech)
 
 if(BUILD_TESTING)
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test)
    add_definitions(-DBUILD_TESTING)
 endif()
 
 ########### Targets ###########
 add_subdirectory(src)
 
 if(BUILD_TESTING)
     find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
     add_subdirectory(autotests)
     add_subdirectory(tests)
 endif()
 
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5PimTextEdit")
 
 configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/KF5PimTextEditConfig.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/KF5PimTextEditConfig.cmake"
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
     )
 
 install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/KF5PimTextEditConfig.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/KF5PimTextEditConfigVersion.cmake"
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     COMPONENT Devel
     )
 
 install(EXPORT KF5PimTextEditTargets
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
     FILE KF5PimTextEditTargets.cmake
     NAMESPACE KF5::
     )
 
 install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_version.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}
     COMPONENT Devel
     )
 
 install(FILES kpimtextedit.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt
index 4875183..aa92047 100644
--- a/src/designer/CMakeLists.txt
+++ b/src/designer/CMakeLists.txt
@@ -1,68 +1,43 @@
-if (USE_NEW_DESIGNERPLUGIN_MACRO)
-    include(ECMAddQtDesignerPlugin)
-    ecm_qtdesignerplugin_widget(KPIMTextEdit::RichTextEditorWidget
-        INCLUDE_FILE "kpimtextedit/richtexteditorwidget.h"
-        TOOLTIP "A RichTextEditor (KDE-PIM)"
-        WHATSTHIS "A RichTextEditor."
-        GROUP "Input (KDE-PIM)"
-        )
+include(ECMAddQtDesignerPlugin)
+ecm_qtdesignerplugin_widget(KPIMTextEdit::RichTextEditorWidget
+    INCLUDE_FILE "kpimtextedit/richtexteditorwidget.h"
+    TOOLTIP "A RichTextEditor (KDE-PIM)"
+    WHATSTHIS "A RichTextEditor."
+    GROUP "Input (KDE-PIM)"
+    )
 
-    ecm_qtdesignerplugin_widget(KPIMTextEdit::PlainTextEditorWidget
-        INCLUDE_FILE "kpimtextedit/plaintexteditorwidget.h"
-        TOOLTIP "A PlainTextEditor (KDE-PIM)"
-        WHATSTHIS "A PlainTextEditor."
-        GROUP "Input (KDE-PIM)"
-        )
+ecm_qtdesignerplugin_widget(KPIMTextEdit::PlainTextEditorWidget
+    INCLUDE_FILE "kpimtextedit/plaintexteditorwidget.h"
+    TOOLTIP "A PlainTextEditor (KDE-PIM)"
+    WHATSTHIS "A PlainTextEditor."
+    GROUP "Input (KDE-PIM)"
+    )
 
-    ecm_qtdesignerplugin_widget(KPIMTextEdit::RichTextComposer
-        INCLUDE_FILE "kpimtextedit/richtextcomposer.h"
-        TOOLTIP "A RichText Composer (KDE-PIM)"
-        WHATSTHIS "A RichText Composer."
-        GROUP "Input (KDE-PIM)"
-        )
+ecm_qtdesignerplugin_widget(KPIMTextEdit::RichTextComposer
+    INCLUDE_FILE "kpimtextedit/richtextcomposer.h"
+    TOOLTIP "A RichText Composer (KDE-PIM)"
+    WHATSTHIS "A RichText Composer."
+    GROUP "Input (KDE-PIM)"
+    )
 
-    ecm_qtdesignerplugin_widget(KPIMTextEdit::RichTextComposerWidget
-        INCLUDE_FILE "kpimtextedit/richtextcomposerwidget.h"
-        TOOLTIP "A RichText Composer Widget(KDE-PIM)"
-        WHATSTHIS "A RichText Composer Widget."
-        GROUP "Input (KDE-PIM)"
-        )
+ecm_qtdesignerplugin_widget(KPIMTextEdit::RichTextComposerWidget
+    INCLUDE_FILE "kpimtextedit/richtextcomposerwidget.h"
+    TOOLTIP "A RichText Composer Widget(KDE-PIM)"
+    WHATSTHIS "A RichText Composer Widget."
+    GROUP "Input (KDE-PIM)"
+    )
 
-    ecm_add_qtdesignerplugin(kpimtexteditwidgets
-        NAME KPimTextEditWidgets
-        OUTPUT_NAME kpimtexteditwidgets
-        WIDGETS
-        KPIMTextEdit::RichTextEditorWidget
-        KPIMTextEdit::PlainTextEditorWidget
-        KPIMTextEdit::RichTextComposer
-        KPIMTextEdit::RichTextComposerWidget
-        LINK_LIBRARIES
-        KF5::PimTextEdit
-        Qt5::Widgets
-        INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer"
-        COMPONENT Devel
-        )
-
-else()	
-    if (KF5DesignerPlugin_FOUND)
-        kf5designerplugin_add_plugin(kpimtexteditwidgets kpimtexteditwidgets.widgets)
-        target_link_libraries(kpimtexteditwidgets
-            KF5::PimTextEdit Qt5::Widgets
-            )
-        set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kpimtexteditwidgetswidgets.cpp PROPERTY SKIP_AUTOMOC ON)
-        if(NOT WIN32)
-            # Since there are no libraries provided by this module,
-            # there is no point including the build tree in RPath,
-            # and then having to edit it at install time.
-            set_target_properties(kpimtexteditwidgets PROPERTIES
-                SKIP_BUILD_RPATH TRUE
-                BUILD_WITH_INSTALL_RPATH TRUE
-                )
-        endif()
-
-        install(TARGETS
-            kpimtexteditwidgets
-            DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer
-            )
-    endif()
-endif()
+ecm_add_qtdesignerplugin(kpimtexteditwidgets
+    NAME KPimTextEditWidgets
+    OUTPUT_NAME kpimtexteditwidgets
+    WIDGETS
+    KPIMTextEdit::RichTextEditorWidget
+    KPIMTextEdit::PlainTextEditorWidget
+    KPIMTextEdit::RichTextComposer
+    KPIMTextEdit::RichTextComposerWidget
+    LINK_LIBRARIES
+    KF5::PimTextEdit
+    Qt5::Widgets
+    INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer"
+    COMPONENT Devel
+    )
diff --git a/src/designer/kpimtexteditwidgets.widgets b/src/designer/kpimtexteditwidgets.widgets
deleted file mode 100644
index 5e8bd81..0000000
--- a/src/designer/kpimtexteditwidgets.widgets
+++ /dev/null
@@ -1,27 +0,0 @@
-[Global]
-PluginName=KPimTextEditWidgets
-
-[KPIMTextEdit::RichTextEditorWidget]
-ToolTip=A RichTextEditor (KDE-PIM)
-WhatsThis=A RichTextEditor.
-IncludeFile=kpimtextedit/richtexteditorwidget.h
-Group=Input (KDE-PIM)
-
-[KPIMTextEdit::PlainTextEditorWidget]
-ToolTip=A PlainTextEditor (KDE-PIM)
-WhatsThis=A PlainTextEditor.
-IncludeFile=kpimtextedit/plaintexteditorwidget.h
-Group=Input (KDE-PIM)
-
-[KPIMTextEdit::RichTextComposer]
-ToolTip=A RichText Composer (KDE-PIM)
-WhatsThis=A RichText Composer.
-IncludeFile=kpimtextedit/richtextcomposer.h
-Group=Input (KDE-PIM)
-
-[KPIMTextEdit::RichTextComposerWidget]
-ToolTip=A RichText Composer Widget(KDE-PIM)
-WhatsThis=A RichText Composer Widget.
-IncludeFile=kpimtextedit/richtextcomposerwidget.h
-Group=Input (KDE-PIM)
-