diff --git a/CMakeLists.txt b/CMakeLists.txt
index 764cf5f..f8df0fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,100 +1,101 @@
 project(kjumpingcube)
 
 cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
 set (QT_MIN_VERSION "5.7.0")
 set (KF5_MIN_VERSION "5.30.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     CoreAddons
     Config
     ConfigWidgets
     Crash
     DBusAddons
     DocTools
     KIO
     I18n
     XmlGui
     WidgetsAddons
 )
 
 find_package(KF5KDEGames 4.9.0 REQUIRED)
 
 include(FeatureSummary)
 include(ECMAddAppIcon)
 include(ECMInstallIcons)
 include(KDEInstallDirs)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(ECMQtDeclareLoggingCategory)
 
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
 
 add_subdirectory(pics)
 add_subdirectory(doc)
 
 ########### next target ###############
 
 set(kjumpingcube_SRCS 
    kjumpingcube.cpp 
    kcubeboxwidget.cpp 
    main.cpp 
    kcubewidget.cpp 
    game.cpp
    ai_main.cpp
    ai_kepler.cpp
    ai_newton.cpp
    ai_box.cpp
 )
 
 ecm_qt_declare_logging_category(kjumpingcube_SRCS HEADER kjumpingcube_debug.h IDENTIFIER KJUMPINGCUBE_LOG CATEGORY_NAME org.kde.kjumpingcube)
 
 qt5_add_resources(kjumpingcube_SRCS kjumpingcube.qrc)
 ki18n_wrap_ui(kjumpingcube_SRCS settings.ui)
 
 kconfig_add_kcfg_files(kjumpingcube_SRCS prefs.kcfgc)
 
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*-apps-kjumpingcube.png")
 ecm_add_app_icon(kjumpingcube_SRCS ICONS ${ICONS_SRCS})
 add_executable(kjumpingcube ${kjumpingcube_SRCS})
 
 target_link_libraries(kjumpingcube
     KF5KDEGames
     KF5::CoreAddons
     KF5::Crash
     KF5::DBusAddons
     KF5::KIOWidgets
     KF5::XmlGui
     Qt5::Svg
 )
 
 install(TARGETS kjumpingcube  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ########### install files ###############
 
 install(PROGRAMS org.kde.kjumpingcube.desktop  DESTINATION  ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.kjumpingcube.appdata.xml DESTINATION  ${KDE_INSTALL_METAINFODIR})
 install(FILES kjumpingcube.kcfg  DESTINATION  ${KDE_INSTALL_KCFGDIR})
 
 ecm_install_icons(ICONS
     128-apps-kjumpingcube.png
     16-apps-kjumpingcube.png
     22-apps-kjumpingcube.png
     32-apps-kjumpingcube.png
     48-apps-kjumpingcube.png
     64-apps-kjumpingcube.png
     DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor
 )
 
 if (${ECM_VERSION} STRGREATER "5.58.0")
     install(FILES kjumpingcube.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 else()
     install(FILES kjumpingcube.categories  DESTINATION ${KDE_INSTALL_CONFDIR})
 endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/main.cpp b/main.cpp
index de609da..30b5ce5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,82 +1,82 @@
 /* ****************************************************************************
   This file is part of the game 'KJumpingCube'
 
   Copyright (C) 1998-2000 by Matthias Kiefer
                             <matthias.kiefer@gmx.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 **************************************************************************** */
 #include "version.h"
 #include "kjumpingcube.h"
 
 
 #include <KAboutData>
 #include <KCrash>
 #include <QApplication>
 #include <KLocalizedString>
 #include <KDBusService>
 #include <QCommandLineParser>
 #include <kdelibs4configmigrator.h>
 
 
 static const char description[] =
 	I18N_NOOP("Tactical one or two player game");
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
 
     Kdelibs4ConfigMigrator migrate(QStringLiteral("kjumpingcube"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("kjumpingcuberc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("kjumpingcubeui.rc"));
     migrate.migrate();
     KLocalizedString::setApplicationDomain("kjumpingcube");
 
     KAboutData aboutData( QStringLiteral("kjumpingcube"), i18n("KJumpingCube"),
                           KJC_VERSION, i18n(description), KAboutLicense::GPL,
                           i18n("(c) 1998-2000, Matthias Kiefer"));
     aboutData.setOrganizationDomain(QByteArray("kde.org"));
     aboutData.addAuthor(i18n("Matthias Kiefer"),QString(), QStringLiteral("matthias.kiefer@gmx.de"));
     aboutData.addAuthor(i18n("Benjamin Meyer"),i18n("Various improvements"), QStringLiteral("ben+kjumpingcube@meyerhome.net"));
     aboutData.addCredit(i18n("Ian Wadham"),
                       i18n("Upgrade to KDE4 and SVG artwork support."),
                       QStringLiteral("iandw.au@gmail.com"));
     aboutData.addCredit(i18n("Eugene Trounev"),
                       i18n("Graphics for KDE 4.0 version."),
                       QStringLiteral("irs_me@hotmail.com"));
     aboutData.setHomepage(QStringLiteral("http://games.kde.org/kjumpingcube"));
 
     QCommandLineParser parser;
     KAboutData::setApplicationData(aboutData);
     KCrash::initialize();
     aboutData.setupCommandLine(&parser);
     parser.process(app);
     aboutData.processCommandLine(&parser);
     KDBusService service;
 
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kjumpingcube")));
 
     // All session management is handled in the RESTORE macro
     if (app.isSessionRestored()) {
-        RESTORE(KJumpingCube)
+        kRestoreMainWindows<KJumpingCube>();
     }
     else {
         KJumpingCube *kjumpingcube = new KJumpingCube;
         kjumpingcube->show();
     }
     return app.exec();
 }