diff --git a/skrooge/main.cpp b/skrooge/main.cpp
index 458e011f6..f5be7b1da 100644
--- a/skrooge/main.cpp
+++ b/skrooge/main.cpp
@@ -1,218 +1,216 @@
 /***************************************************************************
  *   Copyright (C) 2008 by S. MANKOWSKI / G. DE BURE support@mankowski.fr  *
  *                                                                         *
  *   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, see <https://www.gnu.org/licenses/>  *
  ***************************************************************************/
 /** @file
 * This file defines the main of skrooge.
 *
 * @author Stephane MANKOWSKI / Guillaume DE BURE
  */
 #include "skgmainpanel.h"
 #include "skgdocumentbank.h"
 #include "skgtraces.h"
 
 #include <kaboutdata.h>
 #include <kdbusservice.h>
 #include <kdelibs4configmigrator.h>
 #include <klocalizedstring.h>
 
 #include <qbitmap.h>
 #include <qcommandlineoption.h>
 #include <qcommandlineparser.h>
 #include <qsplashscreen.h>
 
 /**
  * To compute the version
  */
 #define VER1_(x) #x
 /**
  * To compute the version
  */
 #define VER_(x) VER1_(x)
 /**
  * To compute the version
  */
 #define VER VER_(SKGVERSION)
 
 void SKGMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
 {
     Q_UNUSED(context)
     switch (type) {
     case QtDebugMsg:
         SKGTRACEL(1) << "DEBUG: " << msg << endl;
         break;
     case QtWarningMsg:
         SKGTRACE << "WARNING: " << msg << endl;
         break;
     case QtCriticalMsg:
         SKGTRACE << "CRITICAL: " << msg << endl;
         break;
     case QtFatalMsg:
         SKGTRACE << "FATAL: " << msg << endl;
         abort();
     default:
         SKGTRACE << "INFO: " << msg << endl;
         break;
     }
 }
 
 /**
  * The main of the application
  * @param argc number of arguments
  * @param argv arguments
  * @return return code
  */
 int main(int argc, char** argv)
 {
     qInstallMessageHandler(SKGMessageOutput);
     if (!SKGServices::getEnvVariable(QStringLiteral("SKGHIGHDPI")).isEmpty()) {
         QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
         QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     }
     QApplication app(argc, argv);
     QIcon appIcon = SKGServices::fromTheme(QStringLiteral("skrooge"));
     if (!appIcon.isNull()) {
         app.setWindowIcon(appIcon);
     }
 
     // Migration kf4 => kf5
     Kdelibs4ConfigMigrator migrate(QStringLiteral("skrooge"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("skroogerc"));
     migrate.migrate();
 
     // To use CPU instead CPU for QML (needed for printing)
     qputenv("QMLSCENE_DEVICE", "softwarecontext");
 
 #ifdef SKG_WEBENGINE
     // DrKonqi
     // https://www.dvratil.cz/2018/10/drkonqi-and-qtwebengine/
     const auto chromiumFlags = qgetenv("QTWEBENGINE_CHROMIUM_FLAGS");
     if (!chromiumFlags.contains("disable-in-process-stack-traces")) {
         qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromiumFlags + " --disable-in-process-stack-traces");
     }
 #endif
     KLocalizedString::setApplicationDomain("skrooge");
 
     KAboutData about(QStringLiteral("skrooge"),
                      i18nc("The name of the application", "Skrooge"),
                      QStringLiteral(VER),
                      i18nc("The description of the application", "Personal finances management made simple"),
                      KAboutLicense::GPL_V3,
                      i18nc("Fullname", "(c) 2007-%1 Stephane MANKOWSKI & Guillaume DE BURE", QDate::currentDate().toString(QStringLiteral("yyyy"))),
                      QLatin1String(""),
                      QStringLiteral("https://skrooge.org"));
 
     about.addAuthor(i18nc("Fullname", "Stephane MANKOWSKI"), i18nc("A job description", "Architect & Developer"), QStringLiteral("stephane@mankowski.fr"), QLatin1String("")
                     , QStringLiteral("miraks")
                    );
     about.addAuthor(i18nc("Fullname", "Guillaume DE BURE"), i18nc("A job description", "Developer"), QStringLiteral("guillaume.debure@gmail.com"), QLatin1String("")
                     , QStringLiteral("willy9")
                    );
     about.addAuthor(i18nc("Fullname", "Siddharth SHARMA"), i18nc("A job description", "Developer - Google Summer Of Code 2010"), QStringLiteral("siddharth.kde@gmail.com"), QLatin1String("")
                     , QStringLiteral("h4xordood")
                    );
     about.setOtherText(i18nc("The description of the application", "The application name is inspired by Charles Dicken's tale <i>A Christmas Carol</i>, where the main character, Ebenezer Scrooge, a grumpy old narrow man, gets visited by three ghosts who change the way he sees the world, in a good way."));
     about.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails"));
     about.setOrganizationDomain("kde.org");
 
     about.addCredit(QStringLiteral("vicnet, noidea, rbruce, JesusM, schunka, SylvaiNN, Wolf, Hizoka, neutron68, blep0, BigaAl, steffie, skierpage ..."), i18nc("Reason of the about/credit", "Users helping us to improve this application"));
 
     KAboutData::setApplicationData(about);
 
     QApplication::setApplicationName(about.componentName());
     QApplication::setOrganizationDomain(about.organizationDomain());
     QApplication::setApplicationVersion(about.version());
 
     QCommandLineParser parser;
-    parser.addVersionOption();
-    parser.addHelpOption();
     parser.addPositionalArgument(QStringLiteral("URL"), i18nc("Application argument", "Document to open"));
     QCommandLineOption envOption(QStringList() << QStringLiteral("e") << QStringLiteral("env"), i18nc("Application argument", "Display environment variables used by this application."));
     parser.addOption(envOption);
 
     about.setupCommandLine(&parser);
     parser.process(app);
     about.processCommandLine(&parser);
 
     if (parser.isSet(envOption)) {
         SKGTRACESUITE << parser.helpText() << endl;
         SKGTRACESUITE << i18nc("Help", "Environment variables:") << endl;
         SKGTRACESUITE << i18nc("Help, do not translate x", "  %1: To enable traces. x is the level of traces expected. This enables the debug mode too.", "export SKGTRACE=x") << endl;
         SKGTRACESUITE << i18nc("Help", "  %1: To enable the profiling. This enables the debug mode too.", "export SKGTRACEPERFO=1") << endl;
         SKGTRACESUITE << i18nc("Help do not translate x", "  %1: To dump sql order taking more than x ms.", "export SKGTRACESQL=x") << endl;
         SKGTRACESUITE << i18nc("Help", "  %1: To enable the high DPI mode.", "export SKGHIGHDPI=1") << endl;
         return 0;
     }
 
     // Manage unicity
     KDBusService service(SKGServices::getEnvVariable(QStringLiteral("SKGNOTUNIQUE")).isEmpty() ? KDBusService::Unique : KDBusService::Multiple);
     QObject::connect(&service, &KDBusService::activateRequested, &service, [ = ](const QStringList & arguments, const QString & workingDirectory) {
         Q_UNUSED(workingDirectory)
         SKGMainPanel::getMainPanel()->processArguments(arguments);
     });
 
     // Creating a main panel on a bank document
     SKGDocumentBank doc;
     if (!SKGServices::getEnvVariable(QStringLiteral("SKGTEST")).isEmpty()) {
         QTimer::singleShot(5000, Qt::CoarseTimer, &app, &QApplication::quit);
     }
 
     // Build list of arguments
     QStringList argument = parser.positionalArguments();
 
     // Creation splash screen
     QSplashScreen* m_splash = nullptr;
     KConfigGroup pref = SKGMainPanel::getMainConfigGroup();
     if (pref.readEntry("show_splash_screen", true)) {
         QString splashPathRelativePath = KAboutData::applicationData().componentName() % "/images/splash.png";
         QString splashPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, splashPathRelativePath.toLatin1());
         if (!splashPath.isEmpty()) {
             QPixmap pix(splashPath);
 
             m_splash = new QSplashScreen(pix);
             if (m_splash != nullptr) {
                 m_splash->setMask(pix.createMaskFromColor(Qt::blue));
                 m_splash->show();
                 m_splash->showMessage(i18nc("Splash screen message", "Loading ..."), Qt::AlignLeft, QColor(221, 130, 8));  // krazy:exclude=qmethods
             }
         } else {
             SKGTRACE << "WARNING: Splash screen (" << splashPathRelativePath << ") not found !" << endl;
         }
     }
 
     // First instance
     QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true);
 #ifdef SKG_WEBENGINE
     QApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
 #endif
     auto m_widget = new SKGMainPanel(m_splash, &doc);
     m_widget->processArguments(argument);
     m_widget->setUnifiedTitleAndToolBarOnMac(true);
     m_widget->show();
 
     if (m_splash != nullptr) {
         SKGTRACEINFUNC(1)
 
         m_splash->clearMessage();
         m_splash->finish(m_widget);
     }
 
     int rc = QApplication::exec();  // krazy:exclude=crashy
 
     delete m_splash;
 
     SKGTraces::dumpProfilingStatistics();
     return rc;
 }
diff --git a/skroogeconvert/main.cpp b/skroogeconvert/main.cpp
index bc2bf4c5c..f107c8489 100644
--- a/skroogeconvert/main.cpp
+++ b/skroogeconvert/main.cpp
@@ -1,202 +1,199 @@
 /***************************************************************************
  *   Copyright (C) 2008 by S. MANKOWSKI / G. DE BURE support@mankowski.fr  *
  *                                                                         *
  *   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, see <https://www.gnu.org/licenses/>  *
  ***************************************************************************/
 /** @file
 * This file defines the main of skroogeconvert.
 *
 * @author Stephane MANKOWSKI / Guillaume DE BURE
  */
 #include "skgdocumentbank.h"
 #include "skgimportexportmanager.h"
 #include "skgtraces.h"
 #include "skgtransactionmng.h"
 
 #include <kaboutdata.h>
 
 #include <qapplication.h>
 #include <qcommandlineoption.h>
 #include <qcommandlineparser.h>
 #include <qcoreapplication.h>
 #include <qfileinfo.h>
 #include <qurl.h>
 
 /**
  * To compute the version
  */
 #define VER1_(x) #x
 /**
  * To compute the version
  */
 #define VER_(x) VER1_(x)
 /**
  * To compute the version
  */
 #define VER VER_(SKGVERSION)
 
 
 /**
  * The main of the application
  * @param argc number of arguments
  * @param argv arguments
  * @return return code
  */
 int main(int argc, char** argv)
 {
     KLocalizedString::setApplicationDomain("skrooge");
 
     KAboutData about(QStringLiteral("skroogeconvert"),
                      i18nc("The name of the application", "Skrooge Convert"),
                      QStringLiteral(VER),
                      i18nc("The description of the application", "A conversion tool for financial files (KMyMoney, GnuCash, Skrooge, ...)"),
                      KAboutLicense::GPL_V3,
                      i18nc("Fullname", "(c) 2007-%1 Stephane MANKOWSKI & Guillaume DE BURE", QDate::currentDate().toString(QStringLiteral("yyyy"))),
                      QString(),
                      QStringLiteral("https://skrooge.org"));
 
     about.addAuthor(i18nc("Fullname", "Stephane MANKOWSKI"), i18nc("A job description", "Architect & Developer"), QStringLiteral("stephane@mankowski.fr"), QString()
                     , QStringLiteral("miraks")
                    );
     about.addAuthor(i18nc("Fullname", "Guillaume DE BURE"), i18nc("A job description", "Developer"), QStringLiteral("guillaume.debure@gmail.com"), QString()
                     , QStringLiteral("willy9")
                    );
     about.setOtherText(i18nc("The description of the application", "The application name is inspired by Charles Dicken's tale <i>A Christmas Carol</i>, where the main character, Ebenezer Scrooge, a grumpy old narrow man, gets visited by three ghosts who change the way he sees the world, in a good way."));
     about.setTranslator(i18nc("NAME OF TRANSLATORS", "Your names"), i18nc("EMAIL OF TRANSLATORS", "Your emails"));
     KAboutData::setApplicationData(about);
 
     QCoreApplication app(argc, argv);
     QCoreApplication::setApplicationName(about.componentName());
     QCoreApplication::setOrganizationDomain(about.organizationDomain());
     QCoreApplication::setApplicationVersion(about.version());
 
     QCommandLineParser parser;
-    parser.addVersionOption();
-    parser.addHelpOption();
-
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("in"), i18nc("Application argument", "Input file. Supported formats:\n%1", SKGImportExportManager::getImportMimeTypeFilter(false)), QStringLiteral("file")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("out"), i18nc("Application argument", "Output file. Supported formats:\n%1", SKGImportExportManager::getExportMimeTypeFilter(false)), QStringLiteral("file")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("param"), i18nc("Application argument", "Name of a parameter"), QStringLiteral("name")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("value"), i18nc("Application argument", "Value of a parameter"), QStringLiteral("value")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("param_export"), i18nc("Application argument", "Name of a parameter for export"), QStringLiteral("name_export")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("value_export"), i18nc("Application argument", "Value of a parameter for export"), QStringLiteral("value_export")));
 
     about.setupCommandLine(&parser);
     parser.process(app);
     about.processCommandLine(&parser);
 
 
     // Build list of arguments
     SKGError err;
     if (!parser.isSet(QStringLiteral("in"))) {
         err = SKGError(ERR_INVALIDARG, i18nc("Error message", "Missing -in option"));
     } else if (!parser.isSet(QStringLiteral("out"))) {
         err = SKGError(ERR_INVALIDARG, i18nc("Error message", "Missing -out option"));
     }
 
     // Initialisation of a bank document
     SKGDocumentBank document;
     document.setComputeBalances(false);
     IFOKDO(err, document.initialize())
     IFOK(err) {
         // Import
         QString file = parser.value(QStringLiteral("in"));
         QFileInfo fi(file);
         if (fi.exists()) {
             file = fi.absoluteFilePath();
         }
         SKGImportExportManager imp(&document, QUrl::fromLocalFile(file));
         QMap<QString, QString>  parameters = imp.getImportParameters();
         QStringList params = parser.values(QStringLiteral("param"));
         QStringList values = parser.values(QStringLiteral("value"));
         int nb = qMin(params.count(), values.count());
         for (int i = 0; i < nb; ++i) {
             parameters[params.at(i)] = values.at(i);
         }
         imp.setImportParameters(parameters);
 
         SKGTRACESEPARATOR;
         SKGTRACE << i18nc("Title of a console trace section", " Import parameters") << endl;
         QMapIterator<QString, QString> i(imp.getImportParameters());
         while (i.hasNext()) {
             i.next();
             SKGTRACE << " " << i.key() << "=" << i.value() << endl;
         }
         SKGTRACESEPARATOR;
         SKGTRACE << i18nc("Title of a console trace section", " Imported file:") << imp.getFileName().toDisplayString()  << endl;
         if (fi.suffix().toUpper() == QStringLiteral("SKG") || fi.suffix().toUpper() == QStringLiteral("SQLITE") || fi.suffix().toUpper() == QStringLiteral("SQLCIPHER")) {
             err = document.load(file, parameters[QStringLiteral("password")]);
         } else {
             SKGBEGINTRANSACTION(document, QStringLiteral("IMPORT"), err)
             IFOKDO(err, imp.importFile())
         }
     }
     IFOK(err) {
         // Export
         QString file = parser.value(QStringLiteral("out"));
         QFileInfo fi(file);
         if (fi.exists()) {
             file = fi.absoluteFilePath();
         }
         SKGImportExportManager exp(&document, QUrl::fromLocalFile(file));
         QMap<QString, QString>  parameters = exp.getExportParameters();
         QStringList params = parser.values(QStringLiteral("param_export"));
         QStringList values = parser.values(QStringLiteral("value_export"));
         int nb = qMin(params.count(), values.count());
         for (int i = 0; i < nb; ++i) {
             parameters[params.at(i)] = values.at(i);
         }
         exp.setExportParameters(parameters);
 
         SKGTRACESEPARATOR;
         SKGTRACE << i18nc("Title of a console trace section", " Export parameters") << endl;
         QMapIterator<QString, QString> i(exp.getExportParameters());
         while (i.hasNext()) {
             i.next();
             SKGTRACE << " " << i.key() << "=" << i.value() << endl;
         }
         SKGTRACESEPARATOR;
         SKGTRACE << i18nc("Title of a console trace section", " Exported file:") << exp.getFileName().toDisplayString()  << endl;
         if (fi.suffix().toUpper() == QStringLiteral("SKG")) {
             err = document.saveAs(file, true);
         } else {
             err = exp.exportFile();
         }
     }
 
     // Dump getMessages
     SKGDocument::SKGMessageList oMessages;
     IFOKDO(err, document.getMessages(document.getCurrentTransaction(), oMessages))
     int nb = oMessages.count();
     if (nb > 0) {
         SKGTRACESEPARATOR;
         for (int i = 0; i < nb; ++i) {
             SKGTRACE << oMessages.at(i).Text << endl;
         }
     }
 
     IFKO(err) {
         SKGTRACESUITE << err.getFullMessageWithHistorical() << endl;
         SKGTRACESEPARATOR;
         SKGTRACE << i18nc("Title of a console trace section", " FAILED") << endl;
         SKGTRACESEPARATOR;
     } else {
         SKGTRACESEPARATOR;
         SKGTRACE << i18nc("Title of a console trace section", " SUCCESSFUL") << endl;
         SKGTRACESEPARATOR;
     }
 
     SKGTraces::dumpProfilingStatistics();
     return err.getReturnCode();
 }