diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfdbf29e..d1736fbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,126 +1,127 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(KF5_VERSION "5.56.0") # handled by release scripts
 set(KF5_DEP_VERSION "5.55.0") # handled by release scripts
 project(KTextEditor VERSION ${KF5_VERSION})
 
 # ECM setup
 include(FeatureSummary)
 find_package(ECM 5.55.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
 # add own modules to search path, too
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(CheckFunctionExists)
 include(CheckSymbolExists)
 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(KDEPackageAppTemplates)
 include(GenerateExportHeader)
 include(ECMAddQch)
 include(ECMQtDeclareLoggingCategory)
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
 add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
 
 ecm_setup_version(
   PROJECT
   VARIABLE_PREFIX KTEXTEDITOR
   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ktexteditor_version.h"
   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5TextEditorConfigVersion.cmake"
   SOVERSION 5
 )
 
 # Dependencies
 set(REQUIRED_QT_VERSION 5.10.0)
 
 # Required Qt5 components to build this framework
 find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Qml
   PrintSupport Xml)
 
 find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5Parts ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5Sonnet ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
 find_package(KF5SyntaxHighlighting ${KF5_DEP_VERSION} REQUIRED)
+find_package(KF5Auth ${KF5_DEP_VERSION} REQUIRED)
 
 # libgit2 integration, at least 0.22 with proper git_libgit2_init()
 find_package(LibGit2 "0.22.0")
 
 # EditorConfig integration
 find_package(EditorConfig)
 
 # vi mode on per default
 option (BUILD_VIMODE "Build vimode in" ON)
 
 # Subdirectories
 add_definitions(-DTRANSLATION_DOMAIN=\"ktexteditor5\")
 if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
     ki18n_install(po)
 endif()
 
 add_subdirectory(src)
 if (BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
 add_subdirectory(templates)
 
 # Create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5TextEditor")
 
 if (BUILD_QCH)
     ecm_install_qch_export(
         TARGETS KF5TextEditor_QCH
         FILE KF5TextEditorQchTargets.cmake
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         COMPONENT Devel
     )
     set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5TextEditorQchTargets.cmake\")")
 endif()
 
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/KF5TextEditorConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5TextEditorConfig.cmake"
   INSTALL_DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
 )
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/KF5TextEditorConfig.cmake"
   "${CMAKE_CURRENT_BINARY_DIR}/KF5TextEditorConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 install(EXPORT
   KF5TextEditorTargets
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   FILE KF5TextEditorTargets.cmake
   NAMESPACE KF5::
 )
 
 install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/ktexteditor_version.h"
   DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}"
   COMPONENT Devel
 )
 
 # config.h
 check_symbol_exists (fdatasync unistd.h HAVE_FDATASYNC)
 configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 # let our config.h be found first in any case
 include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
 install(FILES ktexteditor.categories DESTINATION ${KDE_INSTALL_CONFDIR})
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 495dae91..373aca28 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,376 +1,377 @@
 # handle data files, .desktop & .cmake
 add_subdirectory(data)
 
 # jscripts for the part
 add_subdirectory( script/data )
 
 # set right defines for libgit2 usage
 if(LIBGIT2_FOUND)
     SET (CMAKE_REQUIRED_LIBRARIES LibGit2::LibGit2)
     set (KTEXTEDITOR_OPTIONAL_LIBS ${KTEXTEDITOR_OPTIONAL_LIBS} LibGit2::LibGit2)
 endif()
 
 if(EditorConfig_FOUND)
     SET (CMAKE_REQUIRED_LIBRARIES ${EditorConfig_LIBRARIES})
     set (KTEXTEDITOR_OPTIONAL_LIBS ${KTEXTEDITOR_OPTIONAL_LIBS} ${EditorConfig_LIBRARIES})
 endif()
 
 # handle include files, both normal ones and generated ones
 add_subdirectory(include)
 
 # includes
 include_directories(
   # for config.h
   ${CMAKE_BINARY_DIR}
 
   # for generated ktexteditor headers
   ${CMAKE_CURRENT_BINARY_DIR}/include
 
   # for normal sources
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/include/ktexteditor
   ${CMAKE_CURRENT_SOURCE_DIR}/buffer
   ${CMAKE_CURRENT_SOURCE_DIR}/completion
   ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
   ${CMAKE_CURRENT_SOURCE_DIR}/document
   ${CMAKE_CURRENT_SOURCE_DIR}/script
   ${CMAKE_CURRENT_SOURCE_DIR}/mode
   ${CMAKE_CURRENT_SOURCE_DIR}/render
   ${CMAKE_CURRENT_SOURCE_DIR}/search
   ${CMAKE_CURRENT_SOURCE_DIR}/syntax
   ${CMAKE_CURRENT_SOURCE_DIR}/schema
   ${CMAKE_CURRENT_SOURCE_DIR}/undo
   ${CMAKE_CURRENT_SOURCE_DIR}/utils
   ${CMAKE_CURRENT_SOURCE_DIR}/inputmode
   ${CMAKE_CURRENT_SOURCE_DIR}/view
   ${CMAKE_CURRENT_SOURCE_DIR}/swapfile
   ${CMAKE_CURRENT_SOURCE_DIR}/variableeditor)
 
 # KTextEditor interface sources
 set(ktexteditor_LIB_SRCS
 # text buffer & buffer helpers
 buffer/katesecuretextbuffer.cpp
 buffer/katetextbuffer.cpp
 buffer/katetextblock.cpp
 buffer/katetextline.cpp
 buffer/katetextcursor.cpp
 buffer/katetextrange.cpp
 buffer/katetexthistory.cpp
 buffer/katetextfolding.cpp
 
 # completion (widget, model, delegate, ...)
 completion/katecompletionwidget.cpp
 completion/katecompletionmodel.cpp
 completion/katecompletiontree.cpp
 completion/katecompletionconfig.cpp
 completion/kateargumenthinttree.cpp
 completion/kateargumenthintmodel.cpp
 completion/katecompletiondelegate.cpp
 completion/expandingtree/expandingwidgetmodel.cpp
 completion/expandingtree/expandingdelegate.cpp
 completion/expandingtree/expandingtree.cpp
 
 # simple internal word completion
 completion/katewordcompletion.cpp
 
 # internal syntax-file based keyword completion
 completion/katekeywordcompletion.cpp
 
 # dialogs
 dialogs/kateconfigpage.cpp
 dialogs/katedialogs.cpp
 dialogs/kateconfigpage.cpp
 
 # document (THE document, buffer, lines/cursors/..., CORE STUFF)
 document/katedocument.cpp
 document/katebuffer.cpp
 
 # undo
 undo/kateundo.cpp
 undo/katemodifiedundo.cpp
 undo/kateundomanager.cpp
 
 # scripting
 script/katescript.cpp
 script/kateindentscript.cpp
 script/katecommandlinescript.cpp
 script/katescriptmanager.cpp
 script/katescriptaction.cpp
 
 # scripting wrappers
 script/katescripteditor.cpp
 script/katescriptdocument.cpp
 script/katescriptview.cpp
 script/katescripthelpers.cpp
 
 # mode (modemanager and co)
 mode/katemodemanager.cpp
 mode/katemodeconfigpage.cpp
 mode/katemodemenu.cpp
 mode/katewildcardmatcher.cpp
 
 # modeline variable editor
 variableeditor/variablelineedit.cpp
 variableeditor/variablelistview.cpp
 variableeditor/variableeditor.cpp
 variableeditor/variableitem.cpp
 variableeditor/katehelpbutton.cpp
 
 # printing classes
 printing/kateprinter.cpp
 printing/printpainter.cpp
 printing/printconfigwidgets.cpp
 
 # rendering stuff (katerenderer  and helpers)
 render/katerenderer.cpp
 render/katerenderrange.cpp
 render/katelayoutcache.cpp
 render/katetextlayout.cpp
 render/katelinelayout.cpp
 
 # search stuff
 search/kateregexp.cpp
 search/kateplaintextsearch.cpp
 search/kateregexpsearch.cpp
 search/katematch.cpp
 search/katesearchbar.cpp
 
 # syntax related stuff (highlighting, xml file parsing, ...)
 syntax/katesyntaxmanager.cpp
 syntax/katehighlight.cpp
 syntax/katehighlightmenu.cpp
 syntax/katehighlightingcmds.cpp
 
 # view stuff (THE view and its helpers)
 view/kateview.cpp
 view/kateviewinternal.cpp
 view/kateviewhelpers.cpp
 view/kateannotationitemdelegate.cpp
 view/katemessagewidget.cpp
 view/katefadeeffect.cpp
 view/kateanimation.cpp
 view/katetextanimation.cpp
 view/katetextpreview.cpp
 view/katestatusbar.cpp
 view/wordcounter.cpp
 
 # spell checking
 spellcheck/prefixstore.h
 spellcheck/prefixstore.cpp
 spellcheck/ontheflycheck.h
 spellcheck/ontheflycheck.cpp
 spellcheck/spellcheck.h
 spellcheck/spellcheck.cpp
 spellcheck/spellcheckdialog.h
 spellcheck/spellcheckdialog.cpp
 spellcheck/spellcheckbar.cpp
 spellcheck/spellingmenu.h
 spellcheck/spellingmenu.cpp
 
 # generic stuff, unsorted...
 utils/katecmds.cpp
 utils/kateconfig.cpp
 utils/katebookmarks.cpp
 utils/kateautoindent.cpp
 utils/katetemplatehandler.cpp
 utils/kateglobal.cpp
 utils/katecmd.cpp
 utils/ktexteditor.cpp
 utils/document.cpp
 utils/range.cpp
 utils/documentcursor.cpp
 utils/attribute.cpp
 utils/codecompletioninterface.cpp
 utils/codecompletionmodel.cpp
 utils/codecompletionmodelcontrollerinterface.cpp
 utils/configinterface.cpp
 utils/movinginterface.cpp
 utils/movingcursor.cpp
 utils/movingrange.cpp
 utils/movingrangefeedback.cpp
 utils/messageinterface.cpp
 utils/application.cpp
 utils/mainwindow.cpp
 utils/katedefaultcolors.cpp
 utils/katecommandrangeexpressionparser.cpp
 utils/katesedcmd.cpp
 
 # schema
 schema/kateschema.cpp
 schema/kateschemaconfig.cpp
 schema/katestyletreewidget.cpp
 schema/katecolortreewidget.cpp
 schema/katecategorydrawer.cpp
 
 # swapfile
 swapfile/kateswapdiffcreator.cpp
 swapfile/kateswapfile.cpp
 
 # export as HTML
 export/exporter.cpp
 export/htmlexporter.cpp
 
 # input modes
 inputmode/kateabstractinputmode.cpp
 inputmode/kateabstractinputmodefactory.cpp
 inputmode/katenormalinputmode.cpp
 inputmode/katenormalinputmodefactory.cpp
 )
 
 # optionally compile with EditorConfig support
 if(EditorConfig_FOUND)
     set(ktexteditor_LIB_SRCS ${ktexteditor_LIB_SRCS} document/editorconfig.cpp)
 endif()
 
 ecm_qt_declare_logging_category(ktexteditor_LIB_SRCS HEADER katepartdebug.h IDENTIFIER LOG_KTE CATEGORY_NAME org.kde.ktexteditor DEFAULT_SEVERITY Warning)
 
 
 ki18n_wrap_ui(ktexteditor_LIB_SRCS
 dialogs/textareaappearanceconfigwidget.ui
 dialogs/bordersappearanceconfigwidget.ui
 dialogs/commandmenuconfigwidget.ui
 dialogs/commandmenueditwidget.ui
 dialogs/completionconfigtab.ui
 dialogs/navigationconfigwidget.ui
 dialogs/editconfigwidget.ui
 dialogs/filetypeconfigwidget.ui
 dialogs/indentationconfigwidget.ui
 dialogs/opensaveconfigwidget.ui
 dialogs/opensaveconfigadvwidget.ui
 dialogs/completionconfigwidget.ui
 search/searchbarincremental.ui
 search/searchbarpower.ui
 spellcheck/spellcheckbar.ui
 dialogs/spellcheckconfigwidget.ui
 schema/howtoimportschema.ui )
 
 # add the resource files, the one with mascot + ui file and the generated ones
 qt5_add_resources( ktexteditor_LIB_SRCS data/ktexteditor.qrc "${CMAKE_CURRENT_BINARY_DIR}/script/data/script.qrc")
 
 if (BUILD_VIMODE)
   ki18n_wrap_ui(ktexteditor_LIB_SRCS vimode/config/configwidget.ui)
   set(ktexteditor_LIB_SRCS ${ktexteditor_LIB_SRCS}
     inputmode/kateviinputmode.cpp
     inputmode/kateviinputmodefactory.cpp
 
     # vi input mode
     vimode/config/configtab.cpp
 
     vimode/modes/insertvimode.cpp
     vimode/modes/modebase.cpp
     vimode/modes/normalvimode.cpp
     vimode/modes/replacevimode.cpp
     vimode/modes/visualvimode.cpp
 
     vimode/appcommands.cpp
     vimode/cmds.cpp
     vimode/inputmodemanager.cpp
     vimode/command.cpp
     vimode/motion.cpp
     vimode/range.cpp
     vimode/keyparser.cpp
     vimode/globalstate.cpp
     vimode/emulatedcommandbar/emulatedcommandbar.cpp
     vimode/emulatedcommandbar/matchhighlighter.cpp
     vimode/emulatedcommandbar/completer.cpp
     vimode/emulatedcommandbar/activemode.cpp
     vimode/emulatedcommandbar/interactivesedreplacemode.cpp
     vimode/emulatedcommandbar/searchmode.cpp
     vimode/emulatedcommandbar/commandmode.cpp
     vimode/commandrangeexpressionparser.cpp
     vimode/keymapper.cpp
     vimode/marks.cpp
     vimode/jumps.cpp
     vimode/history.cpp
     vimode/macros.cpp
     vimode/mappings.cpp
     vimode/registers.cpp
     vimode/searcher.cpp
     vimode/completion.cpp
     vimode/completionrecorder.cpp
     vimode/completionreplayer.cpp
     vimode/macrorecorder.cpp
     vimode/lastchangerecorder.cpp
   )
 endif()
 
 add_library(KF5TextEditor ${ktexteditor_LIB_SRCS} ${KTEXTEDITOR_PUBLIC_HEADERS})
 generate_export_header(KF5TextEditor BASE_NAME KTextEditor)
 add_library(KF5::TextEditor ALIAS KF5TextEditor)
 
 target_include_directories(KF5TextEditor INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KTextEditor>")
 
 # API is more or less KParts++, other stuff is used only internally
 target_link_libraries(KF5TextEditor
 PUBLIC
   KF5::Parts
 PRIVATE
   Qt5::Qml
   Qt5::PrintSupport
   KF5::I18n
   KF5::Archive
   KF5::GuiAddons
   KF5::IconThemes
   KF5::ItemViews
   KF5::SonnetCore
   KF5::SyntaxHighlighting
+  KF5::AuthCore
   ${KTEXTEDITOR_OPTIONAL_LIBS}
 )
 
 set_target_properties(KF5TextEditor
    PROPERTIES VERSION ${KTEXTEDITOR_VERSION_STRING}
    SOVERSION ${KTEXTEDITOR_SOVERSION}
    EXPORT_NAME "TextEditor"
 )
 
 install(TARGETS KF5TextEditor EXPORT KF5TextEditorTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/ktexteditor_export.h
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KTextEditor
   COMPONENT Devel
 )
 
 if(BUILD_QCH)
     ecm_add_qch(
         KF5TextEditor_QCH
         NAME KTextEditor
         BASE_NAME KF5TextEditor
         VERSION ${KF5_VERSION}
         ORG_DOMAIN org.kde
         SOURCES # using only public headers, to cover only public API
             ${KTEXTEDITOR_PUBLIC_HEADERS}
              "${CMAKE_SOURCE_DIR}/docs/apidocs-groups.dox"
              "${CMAKE_SOURCE_DIR}/docs/coding-guidelines.dox"
              "${CMAKE_SOURCE_DIR}/docs/design.dox"
              "${CMAKE_SOURCE_DIR}/docs/porting.dox"
         MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
         IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics"
         LINK_QCHS
             KF5Parts_QCH
         BLANK_MACROS
             KTEXTEDITOR_EXPORT
             KTEXTEDITOR_DEPRECATED
             KTEXTEDITOR_DEPRECATED_EXPORT
         TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
         QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
         COMPONENT Devel
     )
 endif()
 
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KTextEditor LIB_NAME KF5TextEditor DEPS "KParts" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KTextEditor)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
 
 
 add_executable(kauth_ktexteditor_helper buffer/katesecuretextbuffer.cpp)
 target_link_libraries(kauth_ktexteditor_helper
   KF5::Auth
 )
 install(TARGETS kauth_ktexteditor_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR} )
 kauth_install_helper_files(kauth_ktexteditor_helper org.kde.ktexteditor.katetextbuffer root)
 kauth_install_actions(org.kde.ktexteditor.katetextbuffer buffer/org.kde.ktexteditor.katetextbuffer.actions)
 
 # add part
 add_subdirectory(part)