diff --git a/src/Application.cpp b/src/Application.cpp
index 9663d1b5..f0149988 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -1,605 +1,612 @@
 /*
     Copyright 2006-2008 by Robert Knight <robertknight@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 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.
 */
 
 // Own
 #include "Application.h"
 
 // Qt
 #include <QApplication>
 #include <QHashIterator>
 #include <QFileInfo>
 #include <QDir>
 #include <QCommandLineParser>
 #include <QStandardPaths>
 
 // KDE
 #include <KActionCollection>
 #include <KGlobalAccel>
 #include <KLocalizedString>
 
 // Konsole
 #include "SessionManager.h"
 #include "ProfileManager.h"
 #include "MainWindow.h"
 #include "Session.h"
 #include "ShellCommand.h"
 #include "KonsoleSettings.h"
 #include "ViewManager.h"
 #include "WindowSystemInfo.h"
 #include "ViewContainer.h"
 #include "TerminalDisplay.h"
 
 using namespace Konsole;
 
 Application::Application(QSharedPointer<QCommandLineParser> parser,
                          const QStringList &customCommand) :
     _backgroundInstance(nullptr),
     m_parser(parser),
     m_customCommand(customCommand)
 {
 }
 
 void Application::populateCommandLineParser(QCommandLineParser *parser)
 {
     const auto options = QVector<QCommandLineOption> {
         { { QStringLiteral("profile") },
             i18nc("@info:shell", "Name of profile to use for new Konsole instance"),
             QStringLiteral("name")
         },
         { { QStringLiteral("fallback-profile") },
             i18nc("@info:shell", "Use the internal FALLBACK profile")
         },
         { { QStringLiteral("workdir") },
             i18nc("@info:shell", "Set the initial working directory of the new tab or window to 'dir'"),
             QStringLiteral("dir")
         },
         { { QStringLiteral("hold"), QStringLiteral("noclose") },
            i18nc("@info:shell", "Do not close the initial session automatically when it ends.")
         },
         {  {QStringLiteral("new-tab") },
             i18nc("@info:shell", "Create a new tab in an existing window rather than creating a new window")
         },
         { { QStringLiteral("tabs-from-file") },
             i18nc("@info:shell","Create tabs as specified in given tabs configuration"" file"),
             QStringLiteral("file")
         },
         { { QStringLiteral("background-mode") },
             i18nc("@info:shell", "Start Konsole in the background and bring to the front when Ctrl+Shift+F12 (by default) is pressed")
         },
         { { QStringLiteral("separate"), QStringLiteral("nofork") },
             i18nc("@info:shell", "Run in a separate process")
         },
         { { QStringLiteral("show-menubar") },
             i18nc("@info:shell", "Show the menubar, overriding the default setting")
         },
         { { QStringLiteral("hide-menubar") },
             i18nc("@info:shell", "Hide the menubar, overriding the default setting")
         },
         { { QStringLiteral("show-tabbar") },
             i18nc("@info:shell", "Show the tabbar, overriding the default setting")
         },
         { { QStringLiteral("hide-tabbar") },
             i18nc("@info:shell", "Hide the tabbar, overriding the default setting")
         },
         { { QStringLiteral("fullscreen") },
             i18nc("@info:shell", "Start Konsole in fullscreen mode")
         },
         { { QStringLiteral("notransparency") },
             i18nc("@info:shell", "Disable transparent backgrounds, even if the system supports them.")
         },
         { { QStringLiteral("list-profiles") },
             i18nc("@info:shell", "List the available profiles")
         },
         { { QStringLiteral("list-profile-properties") },
             i18nc("@info:shell", "List all the profile properties names and their type (for use with -p)")
         },
         { { QStringLiteral("p") },
             i18nc("@info:shell", "Change the value of a profile property."),
             QStringLiteral("property=value")
         },
         { { QStringLiteral("e") },
             i18nc("@info:shell", "Command to execute. This option will catch all following arguments, so use it as the last option."),
             QStringLiteral("cmd")
         }
     };
     for (const auto &option : options) {
         parser->addOption(option);
     }
 
     parser->addPositionalArgument(QStringLiteral("[args]"),
                                   i18nc("@info:shell", "Arguments passed to command"));
 
     // Add a no-op compatibility option to make Konsole compatible with
     // Debian's policy on X terminal emulators.
     // -T is technically meant to set a title, that is not really meaningful
     // for Konsole as we have multiple user-facing options controlling
     // the title and overriding whatever is set elsewhere.
     // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532029
     // https://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.3
     auto titleOption = QCommandLineOption({ QStringLiteral("T") },
                                           QStringLiteral("Debian policy compatibility, not used"),
                                           QStringLiteral("value"));
     titleOption.setFlags(QCommandLineOption::HiddenFromHelp);
     parser->addOption(titleOption);
 }
 
 QStringList Application::getCustomCommand(QStringList &args)
 {
     int i = args.indexOf(QStringLiteral("-e"));
     QStringList customCommand;
     if ((0 < i) && (i < (args.size() - 1))) {
         // -e was specified with at least one extra argument
         // if -e was specified without arguments, QCommandLineParser will deal
         // with that
         args.removeAt(i);
         while (args.size() > i) {
             customCommand << args.takeAt(i);
         }
     }
     return customCommand;
 }
 
 Application::~Application()
 {
     SessionManager::instance()->closeAllSessions();
     ProfileManager::instance()->saveSettings();
 }
 
 MainWindow *Application::newMainWindow()
 {
     WindowSystemInfo::HAVE_TRANSPARENCY = !m_parser->isSet(QStringLiteral("notransparency"));
 
     auto window = new MainWindow();
 
     connect(window, &Konsole::MainWindow::newWindowRequest, this,
             &Konsole::Application::createWindow);
     connect(window, &Konsole::MainWindow::terminalsDetached, this, &Konsole::Application::detachTerminals);
 
     return window;
 }
 
 void Application::createWindow(const Profile::Ptr &profile, const QString &directory)
 {
     MainWindow *window = newMainWindow();
     window->createSession(profile, directory);
     finalizeNewMainWindow(window);
 }
 
 void Application::detachTerminals(ViewSplitter *splitter,const QHash<TerminalDisplay*, Session*>& sessionsMap)
 {
     auto *currentWindow = qobject_cast<MainWindow*>(sender());
     MainWindow *window = newMainWindow();
     ViewManager *manager = window->viewManager();
 
     const QList<TerminalDisplay *> displays = splitter->findChildren<TerminalDisplay *>();
     for (TerminalDisplay* terminal : displays) {
         manager->attachView(terminal, sessionsMap[terminal]);
     }
     manager->activeContainer()->addSplitter(splitter);
 
     window->show();
     window->resize(currentWindow->width(), currentWindow->height());
     window->move(QCursor::pos());
 }
 
 int Application::newInstance()
 {
     // handle session management
 
     // returns from processWindowArgs(args, createdNewMainWindow)
     // if a new window was created
     bool createdNewMainWindow = false;
 
     // check for arguments to print help or other information to the
     // terminal, quit if such an argument was found
     if (processHelpArgs()) {
         return 0;
     }
 
     // create a new window or use an existing one
     MainWindow *window = processWindowArgs(createdNewMainWindow);
 
     if (m_parser->isSet(QStringLiteral("tabs-from-file"))) {
         // create new session(s) as described in file
         if (!processTabsFromFileArgs(window)) {
             return 0;
         }
     }
 
     // select profile to use
     Profile::Ptr baseProfile = processProfileSelectArgs();
 
     // process various command-line options which cause a property of the
     // selected profile to be changed
     Profile::Ptr newProfile = processProfileChangeArgs(baseProfile);
 
     // create new session
     Session *session = window->createSession(newProfile, QString());
 
     if (m_parser->isSet(QStringLiteral("noclose"))) {
         session->setAutoClose(false);
     }
 
     // if the background-mode argument is supplied, start the background
     // session ( or bring to the front if it already exists )
     if (m_parser->isSet(QStringLiteral("background-mode"))) {
         startBackgroundMode(window);
     } else {
         // Qt constrains top-level windows which have not been manually
         // resized (via QWidget::resize()) to a maximum of 2/3rds of the
         //  screen size.
         //
         // This means that the terminal display might not get the width/
         // height it asks for.  To work around this, the widget must be
         // manually resized to its sizeHint().
         //
         // This problem only affects the first time the application is run.
         // run. After that KMainWindow will have manually resized the
         // window to its saved size at this point (so the Qt::WA_Resized
         // attribute will be set)
 
         // If not restoring size from last time or only adding new tab,
         // resize window to chosen profile size (see Bug:345403)
         if (createdNewMainWindow) {
             finalizeNewMainWindow(window);
         } else {
             window->show();
         }
     }
 
     return 1;
 }
 
 /* Documentation for tab file:
  *
  * ;; is the token separator
  * # at the beginning of line results in line being ignored.
  * supported tokens: title, command, profile and workdir
  *
  * Note that the title is static and the tab will close when the
  * command is complete (do not use --noclose).  You can start new tabs.
  *
  * Example below will create 6 tabs as listed and a 7th default tab
 title: This is the title;; command: ssh localhost
 title: This is the title;; command: ssh localhost;; profile: Shell
 title: Top this!;; command: top
 title: mc this!;; command: mc;; workdir: /tmp
 #this line is comment
 command: ssh localhost
 profile: Shell
 */
 bool Application::processTabsFromFileArgs(MainWindow *window)
 {
     // Open tab configuration file
     const QString tabsFileName(m_parser->value(QStringLiteral("tabs-from-file")));
     QFile tabsFile(tabsFileName);
     if (!tabsFile.open(QFile::ReadOnly)) {
         qWarning() << "ERROR: Cannot open tabs file "
                    << tabsFileName.toLocal8Bit().data();
         return false;
     }
 
     unsigned int sessions = 0;
     while (!tabsFile.atEnd()) {
         QString lineString(QString::fromUtf8(tabsFile.readLine()).trimmed());
         if ((lineString.isEmpty()) || (lineString[0] == QLatin1Char('#'))) {
             continue;
         }
 
         QHash<QString, QString> lineTokens;
         QStringList lineParts = lineString.split(QStringLiteral(";;"), QString::SkipEmptyParts);
 
         for (int i = 0; i < lineParts.size(); ++i) {
             QString key = lineParts.at(i).section(QLatin1Char(':'), 0, 0).trimmed().toLower();
             QString value = lineParts.at(i).section(QLatin1Char(':'), 1, -1).trimmed();
             lineTokens[key] = value;
         }
         // should contain at least one of 'command' and 'profile'
         if (lineTokens.contains(QStringLiteral("command"))
             || lineTokens.contains(QStringLiteral("profile"))) {
             createTabFromArgs(window, lineTokens);
             sessions++;
         } else {
             qWarning() << "Each line should contain at least one of 'command' and 'profile'.";
         }
     }
     tabsFile.close();
 
     if (sessions < 1) {
         qWarning() << "No valid lines found in "
                    << tabsFileName.toLocal8Bit().data();
         return false;
     }
 
     return true;
 }
 
 void Application::createTabFromArgs(MainWindow *window, const QHash<QString, QString> &tokens)
 {
     const QString &title = tokens[QStringLiteral("title")];
     const QString &command = tokens[QStringLiteral("command")];
     const QString &profile = tokens[QStringLiteral("profile")];
     const QString &workdir = tokens[QStringLiteral("workdir")];
+    const QColor &color = tokens[QStringLiteral("tabcolor")];
 
     Profile::Ptr baseProfile;
     if (!profile.isEmpty()) {
         baseProfile = ProfileManager::instance()->loadProfile(profile);
     }
     if (!baseProfile) {
         // fallback to default profile
         baseProfile = ProfileManager::instance()->defaultProfile();
     }
 
     Profile::Ptr newProfile = Profile::Ptr(new Profile(baseProfile));
     newProfile->setHidden(true);
 
     // FIXME: the method of determining whether to use newProfile does not
     // scale well when we support more fields in the future
     bool shouldUseNewProfile = false;
 
     if (!command.isEmpty()) {
         newProfile->setProperty(Profile::Command, command);
         newProfile->setProperty(Profile::Arguments, command.split(QLatin1Char(' ')));
         shouldUseNewProfile = true;
     }
 
     if (!title.isEmpty()) {
         newProfile->setProperty(Profile::LocalTabTitleFormat, title);
         newProfile->setProperty(Profile::RemoteTabTitleFormat, title);
         shouldUseNewProfile = true;
     }
 
+    // For tab color support
+    if (color.isValid()) {
+        newProfile->setProperty(Profile::TabColor, color);
+        shouldUseNewProfile = true;
+    }
+
     if (m_parser->isSet(QStringLiteral("workdir"))) {
         newProfile->setProperty(Profile::Directory, m_parser->value(QStringLiteral("workdir")));
         shouldUseNewProfile = true;
     }
 
     if (!workdir.isEmpty()) {
         newProfile->setProperty(Profile::Directory, workdir);
         shouldUseNewProfile = true;
     }
 
     // Create the new session
     Profile::Ptr theProfile = shouldUseNewProfile ? newProfile : baseProfile;
     Session *session = window->createSession(theProfile, QString());
 
     if (m_parser->isSet(QStringLiteral("noclose"))) {
         session->setAutoClose(false);
     }
 
     if (!window->testAttribute(Qt::WA_Resized)) {
         window->resize(window->sizeHint());
     }
 
     // FIXME: this ugly hack here is to make the session start running, so that
     // its tab title is displayed as expected.
     //
     // This is another side effect of the commit fixing BKO 176902.
     window->show();
     window->hide();
 }
 
 // Creates a new Konsole window.
 // If --new-tab is given, use existing window.
 MainWindow *Application::processWindowArgs(bool &createdNewMainWindow)
 {
     MainWindow *window = nullptr;
     if (m_parser->isSet(QStringLiteral("new-tab"))) {
         QListIterator<QWidget *> iter(QApplication::topLevelWidgets());
         iter.toBack();
         while (iter.hasPrevious()) {
             window = qobject_cast<MainWindow *>(iter.previous());
             if (window != nullptr) {
                 break;
             }
         }
     }
 
     if (window == nullptr) {
         createdNewMainWindow = true;
         window = newMainWindow();
 
         // override default menubar visibility
         if (m_parser->isSet(QStringLiteral("show-menubar"))) {
             window->setMenuBarInitialVisibility(true);
         }
         if (m_parser->isSet(QStringLiteral("hide-menubar"))) {
             window->setMenuBarInitialVisibility(false);
         }
         if (m_parser->isSet(QStringLiteral("fullscreen"))) {
             window->viewFullScreen(true);
         }
         if (m_parser->isSet(QStringLiteral("show-tabbar"))) {
             window->viewManager()->setNavigationVisibility(ViewManager::AlwaysShowNavigation);
         }
         else if (m_parser->isSet(QStringLiteral("hide-tabbar"))) {
             window->viewManager()->setNavigationVisibility(ViewManager::AlwaysHideNavigation);
         }
     }
     return window;
 }
 
 // Loads a profile.
 // If --profile <name> is given, loads profile <name>.
 // If --fallback-profile is given, loads profile FALLBACK/.
 // Else loads the default profile.
 Profile::Ptr Application::processProfileSelectArgs()
 {
     Profile::Ptr defaultProfile = ProfileManager::instance()->defaultProfile();
 
     if (m_parser->isSet(QStringLiteral("profile"))) {
         Profile::Ptr profile = ProfileManager::instance()->loadProfile(
             m_parser->value(QStringLiteral("profile")));
         if (profile) {
             return profile;
         }
     } else if (m_parser->isSet(QStringLiteral("fallback-profile"))) {
         Profile::Ptr profile = ProfileManager::instance()->loadProfile(QStringLiteral("FALLBACK/"));
         if (profile) {
             return profile;
         }
     }
 
     return defaultProfile;
 }
 
 bool Application::processHelpArgs()
 {
     if (m_parser->isSet(QStringLiteral("list-profiles"))) {
         listAvailableProfiles();
         return true;
     } else if (m_parser->isSet(QStringLiteral("list-profile-properties"))) {
         listProfilePropertyInfo();
         return true;
     }
     return false;
 }
 
 void Application::listAvailableProfiles()
 {
     const QStringList paths = ProfileManager::instance()->availableProfilePaths();
 
     for (const QString &path : paths) {
         QFileInfo info(path);
         printf("%s\n", info.completeBaseName().toLocal8Bit().constData());
     }
 }
 
 void Application::listProfilePropertyInfo()
 {
     Profile::Ptr tempProfile = ProfileManager::instance()->defaultProfile();
     const QStringList names = tempProfile->propertiesInfoList();
 
     for (const QString &name : names) {
         printf("%s\n", name.toLocal8Bit().constData());
     }
 }
 
 Profile::Ptr Application::processProfileChangeArgs(Profile::Ptr baseProfile)
 {
     bool shouldUseNewProfile = false;
 
     Profile::Ptr newProfile = Profile::Ptr(new Profile(baseProfile));
     newProfile->setHidden(true);
 
     // change the initial working directory
     if (m_parser->isSet(QStringLiteral("workdir"))) {
         newProfile->setProperty(Profile::Directory, m_parser->value(QStringLiteral("workdir")));
         shouldUseNewProfile = true;
     }
 
     // temporary changes to profile options specified on the command line
     const QStringList profileProperties = m_parser->values(QStringLiteral("p"));
     for (const QString &value : profileProperties) {
         ProfileCommandParser parser;
 
         QHashIterator<Profile::Property, QVariant> iter(parser.parse(value));
         while (iter.hasNext()) {
             iter.next();
             newProfile->setProperty(iter.key(), iter.value());
         }
 
         shouldUseNewProfile = true;
     }
 
     // run a custom command
     if (!m_customCommand.isEmpty()) {
         // Example: konsole -e man ls
         QString commandExec = m_customCommand[0];
         QStringList commandArguments(m_customCommand);
         if ((m_customCommand.size() == 1)
             && (QStandardPaths::findExecutable(commandExec).isEmpty())) {
             // Example: konsole -e "man ls"
             ShellCommand shellCommand(commandExec);
             commandExec = shellCommand.command();
             commandArguments = shellCommand.arguments();
         }
 
         if (commandExec.startsWith(QLatin1String("./"))) {
             commandExec = QDir::currentPath() + commandExec.mid(1);
         }
 
         newProfile->setProperty(Profile::Command, commandExec);
         newProfile->setProperty(Profile::Arguments, commandArguments);
 
         shouldUseNewProfile = true;
     }
 
     if (shouldUseNewProfile) {
         return newProfile;
     } else {
         return baseProfile;
     }
 }
 
 void Application::startBackgroundMode(MainWindow *window)
 {
     if (_backgroundInstance != nullptr) {
         return;
     }
 
     KActionCollection* collection = window->actionCollection();
     QAction* action = collection->addAction(QStringLiteral("toggle-background-window"));
     action->setObjectName(QStringLiteral("Konsole Background Mode"));
     action->setText(i18nc("@item", "Toggle Background Window"));
     KGlobalAccel::self()->setGlobalShortcut(action, QKeySequence(Konsole::ACCEL + Qt::SHIFT + Qt::Key_F12));
     connect(action, &QAction::triggered, this, &Application::toggleBackgroundInstance);
 
     _backgroundInstance = window;
 }
 
 void Application::toggleBackgroundInstance()
 {
     Q_ASSERT(_backgroundInstance);
 
     if (!_backgroundInstance->isVisible()) {
         _backgroundInstance->show();
         // ensure that the active terminal display has the focus. Without
         // this, an odd problem occurred where the focus widget would change
         // each time the background instance was shown
         _backgroundInstance->setFocus();
     } else {
         _backgroundInstance->hide();
     }
 }
 
 void Application::slotActivateRequested(QStringList args, const QString & /*workingDir*/)
 {
     // QCommandLineParser expects the first argument to be the executable name
     // In the current version it just strips it away
     args.prepend(qApp->applicationFilePath());
 
     m_customCommand = getCustomCommand(args);
 
     // We can't re-use QCommandLineParser instances, it preserves earlier parsed values
     auto parser = new QCommandLineParser;
     populateCommandLineParser(parser);
     parser->parse(args);
     m_parser.reset(parser);
 
     newInstance();
 }
 
 void Application::finalizeNewMainWindow(MainWindow *window)
 {
     if (!KonsoleSettings::saveGeometryOnExit()) {
         window->resize(window->sizeHint());
     }
     window->show();
 }
diff --git a/src/DetachableTabBar.cpp b/src/DetachableTabBar.cpp
index f690fdb2..3f3b2a37 100644
--- a/src/DetachableTabBar.cpp
+++ b/src/DetachableTabBar.cpp
@@ -1,143 +1,176 @@
 /*
     Copyright 2018 by Tomaz Canabrava <tcanabrava@kde.org>
 
     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 "DetachableTabBar.h"
 #include "KonsoleSettings.h"
 #include "ViewContainer.h"
 
 #include <QMouseEvent>
 #include <QApplication>
 #include <QMimeData>
 
 #include <KAcceleratorManager>
 
+#include <QPainter>
+#include <QColor>
+
 namespace Konsole {
 
 DetachableTabBar::DetachableTabBar(QWidget *parent) :
     QTabBar(parent),
     dragType(DragType::NONE),
     _originalCursor(cursor()),
     tabId(-1)
 {
     setAcceptDrops(true);
     setElideMode(Qt::TextElideMode::ElideMiddle);
     KAcceleratorManager::setNoAccel(this);
 }
 
+void DetachableTabBar::setColor(int idx, const QColor &color)
+{
+    setTabData(idx, QColor(color));
+}
+
+void DetachableTabBar::removeColor(int idx)
+{
+    setTabData(idx, QVariant());
+}
+
 void DetachableTabBar::middleMouseButtonClickAt(const QPoint& pos)
 {
     tabId = tabAt(pos);
 
     if (tabId != -1) {
         emit closeTab(tabId);
     }
 }
 
 void DetachableTabBar::mousePressEvent(QMouseEvent *event)
 {
     QTabBar::mousePressEvent(event);
     _containers = window()->findChildren<Konsole::TabbedViewContainer*>();
 }
 
 void DetachableTabBar::mouseMoveEvent(QMouseEvent *event)
 {
     QTabBar::mouseMoveEvent(event);
     auto widgetAtPos = qApp->topLevelAt(event->globalPos());
     if (widgetAtPos != nullptr) {
         if (window() == widgetAtPos->window()) {
             if (dragType != DragType::NONE) {
                 dragType = DragType::NONE;
                 setCursor(_originalCursor);
             }
         } else {
             if (dragType != DragType::WINDOW) {
                 dragType = DragType::WINDOW;
                 setCursor(QCursor(Qt::DragMoveCursor));
             }
         }
     } else if (!contentsRect().adjusted(-30,-30,30,30).contains(event->pos())) {
         // Don't let it detach the last tab.
         if (count() == 1) {
             return;
         }
         if (dragType != DragType::OUTSIDE) {
             dragType = DragType::OUTSIDE;
             setCursor(QCursor(Qt::DragCopyCursor));
         }
     }
 }
 
 void DetachableTabBar::mouseReleaseEvent(QMouseEvent *event)
 {
     QTabBar::mouseReleaseEvent(event);
 
     switch(event->button()) {
         case Qt::MiddleButton : if (KonsoleSettings::closeTabOnMiddleMouseButton()) {
                                     middleMouseButtonClickAt(event->pos());
                                 }
 
                                 tabId = tabAt(event->pos());
                                 if (tabId == -1) {
                                     emit newTabRequest();
                                 }
                                 break;
         case Qt::LeftButton: _containers = window()->findChildren<Konsole::TabbedViewContainer*>(); break;
         default: break;
     }
 
     setCursor(_originalCursor);
 
     if (contentsRect().adjusted(-30,-30,30,30).contains(event->pos())) {
         return;
     }
 
     auto widgetAtPos = qApp->topLevelAt(event->globalPos());
     if (widgetAtPos == nullptr) {
         if (count() != 1) {
             emit detachTab(currentIndex());
         }
     } else if (window() != widgetAtPos->window()) {
         if (_containers.size() == 1 || count() > 1) {
             emit moveTabToWindow(currentIndex(), widgetAtPos);
         }
     }
 }
 
 void DetachableTabBar::dragEnterEvent(QDragEnterEvent* event)
 {
     const auto dragId = QStringLiteral("konsole/terminal_display");
     if (event->mimeData()->hasFormat(dragId)) {
         auto other_pid = event->mimeData()->data(dragId).toInt();
         // don't accept the drop if it's another instance of konsole
         if (qApp->applicationPid() != other_pid) {
             return;
         }
         event->accept();
     }
 }
 
 void DetachableTabBar::dragMoveEvent(QDragMoveEvent* event)
 {
     int tabIdx = tabAt(event->pos());
     if (tabIdx != -1) {
         setCurrentIndex(tabIdx);
     }
 }
 
+void DetachableTabBar::paintEvent(QPaintEvent *event)
+{
+    QTabBar::paintEvent(event);
+
+    if (!event->isAccepted()) return;       // Reduces repainting
+
+    QPainter painter(this);
+    painter.setPen(Qt::NoPen);
+
+    for (int tabIndex = 0; tabIndex <= count(); tabIndex++) {
+        QColor varColor = tabData(tabIndex).value<QColor>();
+        if (!varColor.isValid()) {
+            continue;
+        }
+        varColor.setAlpha(tabIndex == currentIndex() ? 180 : 125);
+        painter.setBrush(varColor);
+        painter.drawRect(tabRect(tabIndex));
+    }
+}
+
 }
diff --git a/src/DetachableTabBar.h b/src/DetachableTabBar.h
index 2d490795..b36c166d 100644
--- a/src/DetachableTabBar.h
+++ b/src/DetachableTabBar.h
@@ -1,55 +1,62 @@
 /*
     Copyright 2018 by Tomaz Canabrava <tcanabrava@kde.org>
 
     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.
 */
 
 #ifndef DETACHABLETABBAR_H
 #define DETACHABLETABBAR_H
 
 #include <QTabBar>
 #include <QCursor>
 
+class QColor;
+class QPaintEvent;
+
 namespace Konsole {
 class TabbedViewContainer;
 class DetachableTabBar : public QTabBar {
     Q_OBJECT
 public:
     enum class DragType : unsigned char {NONE, OUTSIDE, WINDOW};
 
     explicit DetachableTabBar(QWidget *parent = nullptr);
+
+    void setColor(int idx, const QColor &color);
+    void removeColor(int idx);
 Q_SIGNALS:
     void detachTab(int index);
     void moveTabToWindow(int tabIndex, QWidget *otherWindow);
     void closeTab(int index);
     void newTabRequest();
 protected:
     void middleMouseButtonClickAt(const QPoint& pos);
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent*event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
     void dragEnterEvent(QDragEnterEvent *event) override;
     void dragMoveEvent(QDragMoveEvent * event) override;
+    void paintEvent(QPaintEvent *event) override;
 
 private:
     DragType dragType;
     QCursor _originalCursor;
     QList<TabbedViewContainer*> _containers;
     int tabId;
 };
 }
 
 #endif
diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
index 7485f350..a6413693 100644
--- a/src/EditProfileDialog.cpp
+++ b/src/EditProfileDialog.cpp
@@ -1,1953 +1,1961 @@
 /*
     Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
     Copyright 2018 by Harald Sitter <sitter@kde.org>
 
     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.
 */
 
 // Own
 #include "EditProfileDialog.h"
 
 // Qt
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QInputDialog>
 #include <QIcon>
 #include <QPainter>
 #include <QPushButton>
 #include <QStandardItem>
 #include <QTextCodec>
 #include <QTimer>
 #include <QUrl>
 #include <QStandardPaths>
 
 // KDE
 #include <KCodecAction>
 #include <KIconDialog>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KNSCore/DownloadManager>
 #include <KWindowSystem>
 
 // Konsole
 #include "ui_EditProfileGeneralPage.h"
 #include "ui_EditProfileTabsPage.h"
 #include "ui_EditProfileAppearancePage.h"
 #include "ui_EditProfileScrollingPage.h"
 #include "ui_EditProfileKeyboardPage.h"
 #include "ui_EditProfileMousePage.h"
 #include "ui_EditProfileAdvancedPage.h"
 #include "ColorSchemeManager.h"
 #include "KeyBindingEditor.h"
 #include "KeyboardTranslator.h"
 #include "KeyboardTranslatorManager.h"
 #include "ProfileManager.h"
 #include "ShellCommand.h"
 #include "WindowSystemInfo.h"
 #include "FontDialog.h"
 
 using namespace Konsole;
 
 EditProfileDialog::EditProfileDialog(QWidget *parent)
     : KPageDialog(parent)
     , _generalUi(nullptr)
     , _tabsUi(nullptr)
     , _appearanceUi(nullptr)
     , _scrollingUi(nullptr)
     , _keyboardUi(nullptr)
     , _mouseUi(nullptr)
     , _advancedUi(nullptr)
     , _tempProfile(nullptr)
     , _profile(nullptr)
     , _previewedProperties(QHash<int, QVariant>())
     , _delayedPreviewProperties(QHash<int, QVariant>())
     , _delayedPreviewTimer(new QTimer(this))
     , _colorDialog(nullptr)
     , _buttonBox(nullptr)
     , _fontDialog(nullptr)
 {
     setWindowTitle(i18n("Edit Profile"));
     setFaceType(KPageDialog::List);
 
     _buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply);
     setButtonBox(_buttonBox);
 
     QPushButton *okButton = _buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);
     connect(_buttonBox, &QDialogButtonBox::accepted, this, &Konsole::EditProfileDialog::accept);
     connect(_buttonBox, &QDialogButtonBox::rejected, this, &Konsole::EditProfileDialog::reject);
 
     // disable the apply button , since no modification has been made
     _buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
 
     connect(_buttonBox->button(QDialogButtonBox::Apply),
             &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::apply);
 
     connect(_delayedPreviewTimer, &QTimer::timeout, this,
             &Konsole::EditProfileDialog::delayedPreviewActivate);
 
     // Set a fallback icon for non-plasma desktops as this dialog looks
     // terrible without all the icons on the left sidebar.  On GTK related
     // desktops, this dialog look good enough without installing
     // oxygen-icon-theme, qt5ct and setting export QT_QPA_PLATFORMTHEME=qt5ct
     // Plain Xorg desktops still look terrible as there are no icons
     // visible.
     const auto defaultIcon = QIcon::fromTheme(QStringLiteral("utilities-terminal"));
 
     // General page
 
     const QString generalPageName = i18nc("@title:tab Generic, common options", "General");
     auto *generalPageWidget = new QWidget(this);
     _generalUi = new Ui::EditProfileGeneralPage();
     _generalUi->setupUi(generalPageWidget);
     auto *generalPageItem = addPage(generalPageWidget, generalPageName);
     generalPageItem->setHeader(generalPageName);
     generalPageItem->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
     _pages[generalPageItem] = Page(&EditProfileDialog::setupGeneralPage);
 
     // Tabs page
 
     const QString tabsPageName = i18n("Tabs");
     auto *tabsPageWidget = new QWidget(this);
     _tabsUi = new Ui::EditProfileTabsPage();
     _tabsUi->setupUi(tabsPageWidget);
     auto *tabsPageItem = addPage(tabsPageWidget, tabsPageName);
     tabsPageItem->setHeader(tabsPageName);
     tabsPageItem->setIcon(QIcon::fromTheme(QStringLiteral("tab-duplicate"),
                           defaultIcon));
     _pages[tabsPageItem] = Page(&EditProfileDialog::setupTabsPage);
 
     LabelsAligner tabsAligner(tabsPageWidget);
     tabsAligner.addLayout(dynamic_cast<QGridLayout *>(_tabsUi->tabMonitoringGroup->layout()));
     tabsAligner.addLayout(dynamic_cast<QGridLayout *>(_tabsUi->renameTabWidget->layout()));
     tabsAligner.updateLayouts();
     tabsAligner.align();
 
     // Appearance page
 
     const QString appearancePageName = i18n("Appearance");
     auto *appearancePageWidget = new QWidget(this);
     _appearanceUi = new Ui::EditProfileAppearancePage();
     _appearanceUi->setupUi(appearancePageWidget);
     auto *appearancePageItem = addPage(appearancePageWidget, appearancePageName);
     appearancePageItem->setHeader(appearancePageName);
     appearancePageItem->setIcon(QIcon::fromTheme(QStringLiteral("kcolorchooser"),
                                 defaultIcon));
     _pages[appearancePageItem] = Page(&EditProfileDialog::setupAppearancePage);
 
     LabelsAligner appearanceAligner(appearancePageWidget);
     appearanceAligner.addLayout(dynamic_cast<QGridLayout *>(_appearanceUi->miscTabLayout));
     appearanceAligner.addLayout(dynamic_cast<QGridLayout *>(_appearanceUi->contentsGroup->layout()));
     appearanceAligner.updateLayouts();
     appearanceAligner.align();
 
     // Scrolling page
 
     const QString scrollingPageName = i18n("Scrolling");
     auto *scrollingPageWidget = new QWidget(this);
     _scrollingUi = new Ui::EditProfileScrollingPage();
     _scrollingUi->setupUi(scrollingPageWidget);
     auto *scrollingPageItem = addPage(scrollingPageWidget, scrollingPageName);
     scrollingPageItem->setHeader(scrollingPageName);
     scrollingPageItem->setIcon(QIcon::fromTheme(QStringLiteral("transform-move-vertical"),
                                defaultIcon));
     _pages[scrollingPageItem] = Page(&EditProfileDialog::setupScrollingPage);
 
     // adjust "history size" label height to match history size widget's first radio button
     _scrollingUi->historySizeLabel->setFixedHeight(_scrollingUi->historySizeWidget->preferredLabelHeight());
 
     // Keyboard page
 
     const QString keyboardPageName = i18n("Keyboard");
     const QString keyboardPageTitle = i18n("Key bindings");
     auto *keyboardPageWidget = new QWidget(this);
     _keyboardUi = new Ui::EditProfileKeyboardPage();
     _keyboardUi->setupUi(keyboardPageWidget);
     auto *keyboardPageItem = addPage(keyboardPageWidget, keyboardPageName);
     keyboardPageItem->setHeader(keyboardPageTitle);
     keyboardPageItem->setIcon(QIcon::fromTheme(QStringLiteral("input-keyboard"),
                               defaultIcon));
     _pages[keyboardPageItem] = Page(&EditProfileDialog::setupKeyboardPage);
 
     // Mouse page
 
     const QString mousePageName = i18n("Mouse");
     auto *mousePageWidget = new QWidget(this);
     _mouseUi = new Ui::EditProfileMousePage();
     _mouseUi->setupUi(mousePageWidget);
     auto *mousePageItem = addPage(mousePageWidget, mousePageName);
     mousePageItem->setHeader(mousePageName);
     mousePageItem->setIcon(QIcon::fromTheme(QStringLiteral("input-mouse"),
                            defaultIcon));
     _pages[mousePageItem] = Page(&EditProfileDialog::setupMousePage);
 
     // Advanced page
 
     const QString advancedPageName = i18nc("@title:tab Complex options", "Advanced");
     auto *advancedPageWidget = new QWidget(this);
     _advancedUi = new Ui::EditProfileAdvancedPage();
     _advancedUi->setupUi(advancedPageWidget);
     auto *advancedPageItem = addPage(advancedPageWidget, advancedPageName);
     advancedPageItem->setHeader(advancedPageName);
     advancedPageItem->setIcon(QIcon::fromTheme(QStringLiteral("configure"),
                               defaultIcon));
     _pages[advancedPageItem] = Page(&EditProfileDialog::setupAdvancedPage);
 
     // there are various setupXYZPage() methods to load the items
     // for each page and update their states to match the profile
     // being edited.
     //
     // these are only called when needed ( ie. when the user clicks
     // the tab to move to that page ).
     //
     // the _pageNeedsUpdate vector keeps track of the pages that have
     // not been updated since the last profile change and will need
     // to be refreshed when the user switches to them
     connect(this, &KPageDialog::currentPageChanged,
             this, &Konsole::EditProfileDialog::preparePage);
 
     createTempProfile();
 }
 
 EditProfileDialog::~EditProfileDialog()
 {
     delete _generalUi;
     delete _tabsUi;
     delete _appearanceUi;
     delete _scrollingUi;
     delete _keyboardUi;
     delete _mouseUi;
     delete _advancedUi;
 }
 
 void EditProfileDialog::save()
 {
     if (_tempProfile->isEmpty()) {
         return;
     }
 
     ProfileManager::instance()->changeProfile(_profile, _tempProfile->setProperties());
 
     // ensure that these settings are not undone by a call
     // to unpreview()
     QHashIterator<Profile::Property, QVariant> iter(_tempProfile->setProperties());
     while (iter.hasNext()) {
         iter.next();
         _previewedProperties.remove(iter.key());
     }
 
     createTempProfile();
 
     _buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
 }
 
 void EditProfileDialog::reject()
 {
     unpreviewAll();
     QDialog::reject();
 }
 
 void EditProfileDialog::accept()
 {
     // if the Apply button is disabled then no settings were changed
     // or the changes have already been saved by apply()
     if (_buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) {
         if (!isValidProfileName()) {
             return;
         }
         save();
     }
 
     unpreviewAll();
     QDialog::accept();
 }
 
 void EditProfileDialog::apply()
 {
     if (!isValidProfileName()) {
         return;
     }
     save();
 }
 
 bool EditProfileDialog::isValidProfileName()
 {
     Q_ASSERT(_profile);
     Q_ASSERT(_tempProfile);
 
     // check whether the user has enough permissions to save the profile
     QFileInfo fileInfo(_profile->path());
     if (fileInfo.exists() && !fileInfo.isWritable()) {
         if (!_tempProfile->isPropertySet(Profile::Name)
             || (_tempProfile->name() == _profile->name())) {
                 KMessageBox::sorry(this,
                                    i18n("<p>Konsole does not have permission to save this profile to:<br /> \"%1\"</p>"
                                         "<p>To be able to save settings you can either change the permissions "
                                         "of the profile configuration file or change the profile name to save "
                                         "the settings to a new profile.</p>", _profile->path()));
                 return false;
         }
     }
 
     const QList<Profile::Ptr> existingProfiles = ProfileManager::instance()->allProfiles();
     QStringList otherExistingProfileNames;
 
     for (const Profile::Ptr &existingProfile : existingProfiles) {
         if (existingProfile->name() != _profile->name()) {
             otherExistingProfileNames.append(existingProfile->name());
         }
     }
 
     if ((_tempProfile->isPropertySet(Profile::Name)
          && _tempProfile->name().isEmpty())
         || (_profile->name().isEmpty() && _tempProfile->name().isEmpty())) {
         KMessageBox::sorry(this,
                            i18n("<p>Each profile must have a name before it can be saved "
                                 "into disk.</p>"));
         // revert the name in the dialog
         _generalUi->profileNameEdit->setText(_profile->name());
         selectProfileName();
         return false;
     } else if (!_tempProfile->name().isEmpty() && otherExistingProfileNames.contains(_tempProfile->name())) {
         KMessageBox::sorry(this,
                             i18n("<p>A profile with this name already exists.</p>"));
         // revert the name in the dialog
         _generalUi->profileNameEdit->setText(_profile->name());
         selectProfileName();
         return false;
     } else {
         return true;
     }
 }
 
 QString EditProfileDialog::groupProfileNames(const ProfileGroup::Ptr &group, int maxLength)
 {
     QString caption;
     int count = group->profiles().count();
     for (int i = 0; i < count; i++) {
         caption += group->profiles()[i]->name();
         if (i < (count - 1)) {
             caption += QLatin1Char(',');
             // limit caption length to prevent very long window titles
             if (maxLength > 0 && caption.length() > maxLength) {
                 caption += QLatin1String("...");
                 break;
             }
         }
     }
     return caption;
 }
 
 void EditProfileDialog::updateCaption(const Profile::Ptr &profile)
 {
     const int MAX_GROUP_CAPTION_LENGTH = 25;
     ProfileGroup::Ptr group = profile->asGroup();
     if (group && group->profiles().count() > 1) {
         QString caption = groupProfileNames(group, MAX_GROUP_CAPTION_LENGTH);
         setWindowTitle(i18np("Editing profile: %2",
                              "Editing %1 profiles: %2",
                              group->profiles().count(),
                              caption));
     } else {
         setWindowTitle(i18n("Edit Profile \"%1\"", profile->name()));
     }
 }
 
 void EditProfileDialog::setProfile(const Konsole::Profile::Ptr &profile)
 {
     Q_ASSERT(profile);
 
     _profile = profile;
 
     // update caption
     updateCaption(profile);
 
     // mark each page of the dialog as out of date
     // and force an update of the currently visible page
     //
     // the other pages will be updated as necessary
     for (Page &page: _pages) {
         page.needsUpdate = true;
     }
     preparePage(currentPage());
 
     if (_tempProfile) {
         createTempProfile();
     }
 }
 
 const Profile::Ptr EditProfileDialog::lookupProfile() const
 {
     return _profile;
 }
 
 const QString EditProfileDialog::currentColorSchemeName() const
 {
     const QString &currentColorSchemeName = lookupProfile()->colorScheme();
     return currentColorSchemeName;
 }
 
 void EditProfileDialog::preparePage(KPageWidgetItem *current, KPageWidgetItem *before)
 {
     Q_UNUSED(before)
     Q_ASSERT(current);
     Q_ASSERT(_pages.contains(current));
 
     const Profile::Ptr profile = lookupProfile();
     auto setupPage = _pages[current].setupPage;
     Q_ASSERT(profile);
     Q_ASSERT(setupPage);
 
     if (_pages[current].needsUpdate) {
         (*this.*setupPage)(profile);
         _pages[current].needsUpdate = false;
     }
 }
 
 void Konsole::EditProfileDialog::selectProfileName()
 {
     _generalUi->profileNameEdit->setFocus();
     _generalUi->profileNameEdit->selectAll();
 }
 
 void EditProfileDialog::setupGeneralPage(const Profile::Ptr &profile)
 {
     // basic profile options
     {
         ProfileGroup::Ptr group = profile->asGroup();
         if (!group || group->profiles().count() < 2) {
             _generalUi->profileNameEdit->setText(profile->name());
             _generalUi->profileNameEdit->setClearButtonEnabled(true);
         } else {
             _generalUi->profileNameEdit->setText(groupProfileNames(group, -1));
             _generalUi->profileNameEdit->setEnabled(false);
         }
     }
 
     ShellCommand command(profile->command(), profile->arguments());
     _generalUi->commandEdit->setText(command.fullCommand());
     // If a "completion" is requested, consider changing this to KLineEdit
     // and using KCompletion.
     _generalUi->initialDirEdit->setText(profile->defaultWorkingDirectory());
     _generalUi->initialDirEdit->setClearButtonEnabled(true);
     _generalUi->initialDirEdit->setPlaceholderText(QStandardPaths::standardLocations(QStandardPaths::HomeLocation).value(0));
 
     _generalUi->dirSelectButton->setIcon(QIcon::fromTheme(QStringLiteral("folder-open")));
     _generalUi->iconSelectButton->setIcon(QIcon::fromTheme(profile->icon()));
     _generalUi->startInSameDirButton->setChecked(profile->startInCurrentSessionDir());
 
     // initial terminal size
     const auto colsSuffix = ki18ncp("Suffix of the number of columns (N columns)", " column", " columns");
     const auto rowsSuffix = ki18ncp("Suffix of the number of rows (N rows)", " row", " rows");
     _generalUi->terminalColumnsEntry->setValue(profile->terminalColumns());
     _generalUi->terminalRowsEntry->setValue(profile->terminalRows());
     _generalUi->terminalColumnsEntry->setSuffix(colsSuffix);
     _generalUi->terminalRowsEntry->setSuffix(rowsSuffix);
     // make width of initial terminal size spinboxes equal
     const int sizeEntryWidth = qMax(maxSpinBoxWidth(_generalUi->terminalColumnsEntry, colsSuffix),
                                     maxSpinBoxWidth(_generalUi->terminalRowsEntry, rowsSuffix));
     _generalUi->terminalColumnsEntry->setFixedWidth(sizeEntryWidth);
     _generalUi->terminalRowsEntry->setFixedWidth(sizeEntryWidth);
 
     // signals and slots
     connect(_generalUi->dirSelectButton, &QToolButton::clicked, this,
             &Konsole::EditProfileDialog::selectInitialDir);
     connect(_generalUi->iconSelectButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::selectIcon);
     connect(_generalUi->startInSameDirButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::startInSameDir);
     connect(_generalUi->profileNameEdit, &QLineEdit::textChanged, this,
             &Konsole::EditProfileDialog::profileNameChanged);
     connect(_generalUi->initialDirEdit, &QLineEdit::textChanged, this,
             &Konsole::EditProfileDialog::initialDirChanged);
     connect(_generalUi->commandEdit, &QLineEdit::textChanged, this,
             &Konsole::EditProfileDialog::commandChanged);
     connect(_generalUi->environmentEditButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::showEnvironmentEditor);
 
     connect(_generalUi->terminalColumnsEntry,
             QOverload<int>::of(&QSpinBox::valueChanged), this,
             &Konsole::EditProfileDialog::terminalColumnsEntryChanged);
     connect(_generalUi->terminalRowsEntry,
             QOverload<int>::of(&QSpinBox::valueChanged), this,
             &Konsole::EditProfileDialog::terminalRowsEntryChanged);
 }
 
 void EditProfileDialog::showEnvironmentEditor()
 {
     bool ok;
     const Profile::Ptr profile = lookupProfile();
 
     QStringList currentEnvironment;
 
     // The user could re-open the environment editor before clicking
     // OK/Apply in the parent edit profile dialog, so we make sure
     // to show the new environment vars
     if (_tempProfile->isPropertySet(Profile::Environment)) {
             currentEnvironment  = _tempProfile->environment();
     } else {
         currentEnvironment = profile->environment();
     }
 
     QString text = QInputDialog::getMultiLineText(this,
                                                   i18n("Edit Environment"),
                                                   i18n("One environment variable per line"),
                                                   currentEnvironment.join(QStringLiteral("\n")),
                                                   &ok);
 
     QStringList newEnvironment;
 
     if (ok) {
         if(!text.isEmpty()) {
             newEnvironment = text.split(QLatin1Char('\n'));
             updateTempProfileProperty(Profile::Environment, newEnvironment);
         } else {
             // the user could have removed all entries so we return an empty list
             updateTempProfileProperty(Profile::Environment, newEnvironment);
         }
     }
 }
 
 void EditProfileDialog::setupTabsPage(const Profile::Ptr &profile)
 {
     // tab title format
     _tabsUi->renameTabWidget->setTabTitleText(profile->localTabTitleFormat());
     _tabsUi->renameTabWidget->setRemoteTabTitleText(profile->remoteTabTitleFormat());
+    _tabsUi->renameTabWidget->setColor(profile->tabColor());
 
     connect(_tabsUi->renameTabWidget, &Konsole::RenameTabWidget::tabTitleFormatChanged, this,
             &Konsole::EditProfileDialog::tabTitleFormatChanged);
     connect(_tabsUi->renameTabWidget, &Konsole::RenameTabWidget::remoteTabTitleFormatChanged, this,
             &Konsole::EditProfileDialog::remoteTabTitleFormatChanged);
+    connect(_tabsUi->renameTabWidget, &Konsole::RenameTabWidget::tabColorChanged, this,
+            &Konsole::EditProfileDialog::tabColorChanged);
 
     // tab monitoring
     const int silenceSeconds = profile->silenceSeconds();
     _tabsUi->silenceSecondsSpinner->setValue(silenceSeconds);
     auto suffix = ki18ncp("Unit of time", " second", " seconds");
     _tabsUi->silenceSecondsSpinner->setSuffix(suffix);
     int silenceCheckBoxWidth = maxSpinBoxWidth(_generalUi->terminalColumnsEntry, suffix);
     _tabsUi->silenceSecondsSpinner->setFixedWidth(silenceCheckBoxWidth);
 
     connect(_tabsUi->silenceSecondsSpinner,
             QOverload<int>::of(&QSpinBox::valueChanged), this,
             &Konsole::EditProfileDialog::silenceSecondsChanged);
 }
 
 void EditProfileDialog::terminalColumnsEntryChanged(int value)
 {
     updateTempProfileProperty(Profile::TerminalColumns, value);
 }
 
 void EditProfileDialog::terminalRowsEntryChanged(int value)
 {
     updateTempProfileProperty(Profile::TerminalRows, value);
 }
 
 void EditProfileDialog::showTerminalSizeHint(bool value)
 {
     updateTempProfileProperty(Profile::ShowTerminalSizeHint, value);
 }
 
 void EditProfileDialog::setDimWhenInactive(bool value)
 {
     updateTempProfileProperty(Profile::DimWhenInactive, value);
 }
 
 void EditProfileDialog::tabTitleFormatChanged(const QString &format)
 {
     updateTempProfileProperty(Profile::LocalTabTitleFormat, format);
 }
 
 void EditProfileDialog::remoteTabTitleFormatChanged(const QString &format)
 {
     updateTempProfileProperty(Profile::RemoteTabTitleFormat, format);
 }
 
+void EditProfileDialog::tabColorChanged(const QColor &color)
+{
+    updateTempProfileProperty(Profile::TabColor, color);
+}
+
 void EditProfileDialog::silenceSecondsChanged(int seconds)
 {
     updateTempProfileProperty(Profile::SilenceSeconds, seconds);
 }
 
 void EditProfileDialog::selectIcon()
 {
     const QString &icon = KIconDialog::getIcon(KIconLoader::Desktop, KIconLoader::Application,
                                                false, 0, false, this);
     if (!icon.isEmpty()) {
         _generalUi->iconSelectButton->setIcon(QIcon::fromTheme(icon));
         updateTempProfileProperty(Profile::Icon, icon);
     }
 }
 
 void EditProfileDialog::profileNameChanged(const QString &name)
 {
     updateTempProfileProperty(Profile::Name, name);
     updateTempProfileProperty(Profile::UntranslatedName, name);
     updateCaption(_tempProfile);
 }
 
 void EditProfileDialog::startInSameDir(bool sameDir)
 {
     updateTempProfileProperty(Profile::StartInCurrentSessionDir, sameDir);
 }
 
 void EditProfileDialog::initialDirChanged(const QString &dir)
 {
     updateTempProfileProperty(Profile::Directory, dir);
 }
 
 void EditProfileDialog::commandChanged(const QString &command)
 {
     ShellCommand shellCommand(command);
 
     updateTempProfileProperty(Profile::Command, shellCommand.command());
     updateTempProfileProperty(Profile::Arguments, shellCommand.arguments());
 }
 
 void EditProfileDialog::selectInitialDir()
 {
     const QUrl url = QFileDialog::getExistingDirectoryUrl(this,
                                                           i18n("Select Initial Directory"),
                                                           QUrl::fromUserInput(_generalUi->initialDirEdit->text()));
 
     if (!url.isEmpty()) {
         _generalUi->initialDirEdit->setText(url.path());
     }
 }
 
 void EditProfileDialog::setupAppearancePage(const Profile::Ptr &profile)
 {
     auto delegate = new ColorSchemeViewDelegate(this);
     _appearanceUi->colorSchemeList->setItemDelegate(delegate);
 
     _appearanceUi->transparencyWarningWidget->setVisible(false);
     _appearanceUi->transparencyWarningWidget->setWordWrap(true);
     _appearanceUi->transparencyWarningWidget->setCloseButtonVisible(false);
     _appearanceUi->transparencyWarningWidget->setMessageType(KMessageWidget::Warning);
 
     _appearanceUi->colorSchemeMessageWidget->setVisible(false);
     _appearanceUi->colorSchemeMessageWidget->setWordWrap(true);
     _appearanceUi->colorSchemeMessageWidget->setCloseButtonVisible(false);
     _appearanceUi->colorSchemeMessageWidget->setMessageType(KMessageWidget::Warning);
 
     _appearanceUi->editColorSchemeButton->setEnabled(false);
     _appearanceUi->removeColorSchemeButton->setEnabled(false);
     _appearanceUi->resetColorSchemeButton->setEnabled(false);
 
     _appearanceUi->downloadColorSchemeButton->setConfigFile(QStringLiteral("konsole.knsrc"));
 
     // setup color list
     // select the colorScheme used in the current profile
     updateColorSchemeList(currentColorSchemeName());
 
     _appearanceUi->colorSchemeList->setMouseTracking(true);
     _appearanceUi->colorSchemeList->installEventFilter(this);
     _appearanceUi->colorSchemeList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
     connect(_appearanceUi->colorSchemeList->selectionModel(),
             &QItemSelectionModel::selectionChanged, this,
             &Konsole::EditProfileDialog::colorSchemeSelected);
     connect(_appearanceUi->colorSchemeList, &QListView::entered, this,
             &Konsole::EditProfileDialog::previewColorScheme);
 
     updateColorSchemeButtons();
 
     connect(_appearanceUi->editColorSchemeButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::editColorScheme);
     connect(_appearanceUi->removeColorSchemeButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::removeColorScheme);
     connect(_appearanceUi->newColorSchemeButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::newColorScheme);
     connect(_appearanceUi->downloadColorSchemeButton, &KNS3::Button::dialogFinished, this,
             &Konsole::EditProfileDialog::gotNewColorSchemes);
 
     connect(_appearanceUi->resetColorSchemeButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::resetColorScheme);
 
     connect(_appearanceUi->chooseFontButton, &QAbstractButton::clicked, this,
             &EditProfileDialog::showFontDialog);
 
     // setup font preview
     const bool antialias = profile->antiAliasFonts();
 
     QFont profileFont = profile->font();
     profileFont.setStyleStrategy(antialias ? QFont::PreferAntialias : QFont::NoAntialias);
 
     _appearanceUi->fontPreview->setFont(profileFont);
     _appearanceUi->fontPreview->setText(QStringLiteral("%1 %2pt").arg(profileFont.family()).arg(profileFont.pointSize()));
 
     // setup font smoothing
     _appearanceUi->antialiasTextButton->setChecked(antialias);
     connect(_appearanceUi->antialiasTextButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::setAntialiasText);
 
     _appearanceUi->boldIntenseButton->setChecked(profile->boldIntense());
     connect(_appearanceUi->boldIntenseButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::setBoldIntense);
 
     _appearanceUi->useFontLineCharactersButton->setChecked(profile->useFontLineCharacters());
     connect(_appearanceUi->useFontLineCharactersButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::useFontLineCharacters);
 
     _mouseUi->enableMouseWheelZoomButton->setChecked(profile->mouseWheelZoomEnabled());
     connect(_mouseUi->enableMouseWheelZoomButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::toggleMouseWheelZoom);
 
     // cursor options
     const auto options = QVector<BooleanOption>{
         {
             _appearanceUi->enableBlinkingCursorButton, Profile::BlinkingCursorEnabled,
             SLOT(toggleBlinkingCursor(bool))
         },
     };
     setupCheckBoxes(options, profile);
 
     if (profile->useCustomCursorColor()) {
         _appearanceUi->customCursorColorButton->setChecked(true);
     } else {
         _appearanceUi->autoCursorColorButton->setChecked(true);
     }
 
     _appearanceUi->customColorSelectButton->setColor(profile->customCursorColor());
     _appearanceUi->customTextColorSelectButton->setColor(profile->customCursorTextColor());
 
     connect(_appearanceUi->customCursorColorButton, &QRadioButton::clicked, this, &Konsole::EditProfileDialog::customCursorColor);
     connect(_appearanceUi->autoCursorColorButton, &QRadioButton::clicked, this, &Konsole::EditProfileDialog::autoCursorColor);
     connect(_appearanceUi->customColorSelectButton, &KColorButton::changed, this, &Konsole::EditProfileDialog::customCursorColorChanged);
     connect(_appearanceUi->customTextColorSelectButton, &KColorButton::changed, this, &Konsole::EditProfileDialog::customCursorTextColorChanged);
 
     const ButtonGroupOptions cursorShapeOptions = {
         _appearanceUi->cursorShape, // group
         Profile::CursorShape,       // profileProperty
         true,                       // preview
         {                           // buttons
             {_appearanceUi->cursorShapeBlock,       Enum::BlockCursor},
             {_appearanceUi->cursorShapeIBeam,       Enum::IBeamCursor},
             {_appearanceUi->cursorShapeUnderline,   Enum::UnderlineCursor},
         },
     };
     setupButtonGroup(cursorShapeOptions, profile);
 
     _appearanceUi->marginsSpinner->setValue(profile->terminalMargin());
     connect(_appearanceUi->marginsSpinner,
             QOverload<int>::of(&QSpinBox::valueChanged), this,
             &Konsole::EditProfileDialog::terminalMarginChanged);
 
     _appearanceUi->lineSpacingSpinner->setValue(profile->lineSpacing());
     connect(_appearanceUi->lineSpacingSpinner,
             QOverload<int>::of(&QSpinBox::valueChanged), this,
             &Konsole::EditProfileDialog::lineSpacingChanged);
 
     _appearanceUi->alignToCenterButton->setChecked(profile->terminalCenter());
     connect(_appearanceUi->alignToCenterButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::setTerminalCenter);
 
     _appearanceUi->showTerminalSizeHintButton->setChecked(profile->showTerminalSizeHint());
     connect(_appearanceUi->showTerminalSizeHintButton, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::showTerminalSizeHint);
 
     _appearanceUi->dimWhenInactiveCheckbox->setChecked(profile->dimWhenInactive());
     connect(_appearanceUi->dimWhenInactiveCheckbox, &QCheckBox::toggled, this,
             &Konsole::EditProfileDialog::setDimWhenInactive);
 }
 
 void EditProfileDialog::setAntialiasText(bool enable)
 {
     preview(Profile::AntiAliasFonts, enable);
     updateTempProfileProperty(Profile::AntiAliasFonts, enable);
 
     const QFont font = _profile->font();
     updateFontPreview(font);
 }
 
 void EditProfileDialog::setBoldIntense(bool enable)
 {
     preview(Profile::BoldIntense, enable);
     updateTempProfileProperty(Profile::BoldIntense, enable);
 }
 
 void EditProfileDialog::useFontLineCharacters(bool enable)
 {
     preview(Profile::UseFontLineCharacters, enable);
     updateTempProfileProperty(Profile::UseFontLineCharacters, enable);
 }
 
 void EditProfileDialog::toggleBlinkingCursor(bool enable)
 {
     preview(Profile::BlinkingCursorEnabled, enable);
     updateTempProfileProperty(Profile::BlinkingCursorEnabled, enable);
 }
 
 void EditProfileDialog::setCursorShape(int index)
 {
     preview(Profile::CursorShape, index);
     updateTempProfileProperty(Profile::CursorShape, index);
 }
 
 void EditProfileDialog::autoCursorColor()
 {
     preview(Profile::UseCustomCursorColor, false);
     updateTempProfileProperty(Profile::UseCustomCursorColor, false);
 }
 
 void EditProfileDialog::customCursorColor()
 {
     preview(Profile::UseCustomCursorColor, true);
     updateTempProfileProperty(Profile::UseCustomCursorColor, true);
 }
 
 void EditProfileDialog::customCursorColorChanged(const QColor &color)
 {
     preview(Profile::CustomCursorColor, color);
     updateTempProfileProperty(Profile::CustomCursorColor, color);
 
     // ensure that custom cursor colors are enabled
     _appearanceUi->customCursorColorButton->click();
 }
 
 void EditProfileDialog::customCursorTextColorChanged(const QColor &color)
 {
     preview(Profile::CustomCursorTextColor, color);
     updateTempProfileProperty(Profile::CustomCursorTextColor, color);
 
     // ensure that custom cursor colors are enabled
     _appearanceUi->customCursorColorButton->click();
 }
 
 void EditProfileDialog::terminalMarginChanged(int margin)
 {
     preview(Profile::TerminalMargin, margin);
     updateTempProfileProperty(Profile::TerminalMargin, margin);
 }
 
 void EditProfileDialog::lineSpacingChanged(int spacing)
 {
     preview(Profile::LineSpacing, spacing);
     updateTempProfileProperty(Profile::LineSpacing, spacing);
 }
 
 void EditProfileDialog::setTerminalCenter(bool enable)
 {
     preview(Profile::TerminalCenter, enable);
     updateTempProfileProperty(Profile::TerminalCenter, enable);
 }
 
 void EditProfileDialog::toggleMouseWheelZoom(bool enable)
 {
     updateTempProfileProperty(Profile::MouseWheelZoomEnabled, enable);
 }
 
 void EditProfileDialog::toggleAlternateScrolling(bool enable)
 {
     updateTempProfileProperty(Profile::AlternateScrolling, enable);
 }
 
 void EditProfileDialog::updateColorSchemeList(const QString &selectedColorSchemeName)
 {
     if (_appearanceUi->colorSchemeList->model() == nullptr) {
         _appearanceUi->colorSchemeList->setModel(new QStandardItemModel(this));
     }
 
     const ColorScheme *selectedColorScheme = ColorSchemeManager::instance()->findColorScheme(selectedColorSchemeName);
 
     auto *model = qobject_cast<QStandardItemModel *>(_appearanceUi->colorSchemeList->model());
 
     Q_ASSERT(model);
 
     model->clear();
 
     QStandardItem *selectedItem = nullptr;
 
    const QList<const ColorScheme *> schemeList = ColorSchemeManager::instance()->allColorSchemes();
 
     for (const ColorScheme *scheme : schemeList) {
         QStandardItem *item = new QStandardItem(scheme->description());
         item->setData(QVariant::fromValue(scheme), Qt::UserRole + 1);
         item->setData(QVariant::fromValue(_profile->font()), Qt::UserRole + 2);
         item->setFlags(item->flags());
 
         // if selectedColorSchemeName is not empty then select that scheme
         // after saving the changes in the colorScheme editor
         if (selectedColorScheme == scheme) {
             selectedItem = item;
         }
 
         model->appendRow(item);
     }
 
     model->sort(0);
 
     if (selectedItem != nullptr) {
         _appearanceUi->colorSchemeList->updateGeometry();
         _appearanceUi->colorSchemeList->selectionModel()->setCurrentIndex(selectedItem->index(),
                                                                 QItemSelectionModel::Select);
 
         // update transparency warning label
         updateTransparencyWarning();
     }
 }
 
 void EditProfileDialog::updateKeyBindingsList(const QString &selectKeyBindingsName)
 {
     if (_keyboardUi->keyBindingList->model() == nullptr) {
         _keyboardUi->keyBindingList->setModel(new QStandardItemModel(this));
     }
 
     auto *model = qobject_cast<QStandardItemModel *>(_keyboardUi->keyBindingList->model());
 
     Q_ASSERT(model);
 
     model->clear();
 
     QStandardItem *selectedItem = nullptr;
 
     const QStringList &translatorNames = _keyManager->allTranslators();
     for (const QString &translatorName : translatorNames) {
         const KeyboardTranslator *translator = _keyManager->findTranslator(translatorName);
         if (translator == nullptr) {
             continue;
         }
 
         QStandardItem *item = new QStandardItem(translator->description());
         item->setEditable(false);
         item->setData(QVariant::fromValue(translator), Qt::UserRole + 1);
         item->setData(QVariant::fromValue(_keyManager->findTranslatorPath(translatorName)), Qt::ToolTipRole);
         item->setData(QVariant::fromValue(_profile->font()), Qt::UserRole + 2);
         item->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-keyboard")));
 
         if (selectKeyBindingsName == translatorName) {
             selectedItem = item;
         }
 
         model->appendRow(item);
     }
 
     model->sort(0);
 
     if (selectedItem != nullptr) {
         _keyboardUi->keyBindingList->selectionModel()->setCurrentIndex(selectedItem->index(),
                                                                QItemSelectionModel::Select);
     }
 }
 
 bool EditProfileDialog::eventFilter(QObject *watched, QEvent *event)
 {
     if (watched == _appearanceUi->colorSchemeList && event->type() == QEvent::Leave) {
         if (_tempProfile->isPropertySet(Profile::ColorScheme)) {
             preview(Profile::ColorScheme, _tempProfile->colorScheme());
         } else {
             unpreview(Profile::ColorScheme);
         }
     }
 
     return QDialog::eventFilter(watched, event);
 }
 
 QSize EditProfileDialog::sizeHint() const
 {
     QFontMetrics fm(font());
     const int ch = fm.boundingRect(QLatin1Char('0')).width();
 
     // By default minimum size is used. Increase it to make text inputs
     // on "tabs" page wider and to add some whitespace on right side
     // of other pages. The window will not be wider than 2/3 of
     // the screen width (unless necessary to fit everything)
     return QDialog::sizeHint() + QSize(10*ch, 0);
 }
 
 void EditProfileDialog::unpreviewAll()
 {
     _delayedPreviewTimer->stop();
     _delayedPreviewProperties.clear();
 
     QHash<Profile::Property, QVariant> map;
     QHashIterator<int, QVariant> iter(_previewedProperties);
     while (iter.hasNext()) {
         iter.next();
         map.insert(static_cast<Profile::Property>(iter.key()), iter.value());
     }
 
     // undo any preview changes
     if (!map.isEmpty()) {
         ProfileManager::instance()->changeProfile(_profile, map, false);
     }
 }
 
 void EditProfileDialog::unpreview(int property)
 {
     _delayedPreviewProperties.remove(property);
 
     if (!_previewedProperties.contains(property)) {
         return;
     }
 
     QHash<Profile::Property, QVariant> map;
     map.insert(static_cast<Profile::Property>(property), _previewedProperties[property]);
     ProfileManager::instance()->changeProfile(_profile, map, false);
 
     _previewedProperties.remove(property);
 }
 
 void EditProfileDialog::delayedPreview(int property, const QVariant &value)
 {
     _delayedPreviewProperties.insert(property, value);
 
     _delayedPreviewTimer->stop();
     _delayedPreviewTimer->start(300);
 }
 
 void EditProfileDialog::delayedPreviewActivate()
 {
     Q_ASSERT(qobject_cast<QTimer *>(sender()));
 
     QMutableHashIterator<int, QVariant> iter(_delayedPreviewProperties);
     if (iter.hasNext()) {
         iter.next();
         preview(iter.key(), iter.value());
     }
 }
 
 void EditProfileDialog::preview(int property, const QVariant &value)
 {
     QHash<Profile::Property, QVariant> map;
     map.insert(static_cast<Profile::Property>(property), value);
 
     _delayedPreviewProperties.remove(property);
 
     const Profile::Ptr original = lookupProfile();
 
     // skip previews for profile groups if the profiles in the group
     // have conflicting original values for the property
     //
     // TODO - Save the original values for each profile and use to unpreview properties
     ProfileGroup::Ptr group = original->asGroup();
     if (group && group->profiles().count() > 1
         && original->property<QVariant>(static_cast<Profile::Property>(property)).isNull()) {
         return;
     }
 
     if (!_previewedProperties.contains(property)) {
         _previewedProperties.insert(property,
                                     original->property<QVariant>(static_cast<Profile::Property>(property)));
     }
 
     // temporary change to color scheme
     ProfileManager::instance()->changeProfile(_profile, map, false);
 }
 
 void EditProfileDialog::previewColorScheme(const QModelIndex &index)
 {
     const QString &name = index.data(Qt::UserRole + 1).value<const ColorScheme *>()->name();
     delayedPreview(Profile::ColorScheme, name);
 }
 
 void EditProfileDialog::showFontDialog()
 {
     if (_fontDialog == nullptr) {
         _fontDialog = new FontDialog(this);
         connect(_fontDialog, &FontDialog::fontChanged, this, [this](const QFont &font) {
             preview(Profile::Font, font);
             updateFontPreview(font);
         });
         connect(_fontDialog, &FontDialog::accepted, this, [this]() {
             const QFont font = _fontDialog->font();
             preview(Profile::Font, font);
             updateTempProfileProperty(Profile::Font, font);
             updateFontPreview(font);
         });
         connect(_fontDialog, &FontDialog::rejected, this, [this]() {
             unpreview(Profile::Font);
             const QFont font = _profile->font();
             updateFontPreview(font);
         });
     }
     const QFont font = _profile->font();
     _fontDialog->setFont(font);
     _fontDialog->exec();
 }
 
 void EditProfileDialog::updateFontPreview(QFont font)
 {
     bool aa = _profile->antiAliasFonts();
     font.setStyleStrategy(aa ? QFont::PreferAntialias : QFont::NoAntialias);
 
     _appearanceUi->fontPreview->setFont(font);
     _appearanceUi->fontPreview->setText(QStringLiteral("%1 %2pt").arg(font.family()).arg(font.pointSize()));
 }
 
 void EditProfileDialog::removeColorScheme()
 {
     QModelIndexList selected = _appearanceUi->colorSchemeList->selectionModel()->selectedIndexes();
     if (selected.isEmpty()) {
         return;
     }
 
     // The actual delete runs async because we need to on-demand query
     // files managed by KNS. Deleting files managed by KNS screws up the
     // KNS states (entry gets shown as installed when in fact we deleted it).
     auto *manager = new KNSCore::DownloadManager(QStringLiteral("konsole.knsrc"), this);
     connect(manager, &KNSCore::DownloadManager::searchResult,
             this, [=](const KNSCore::EntryInternal::List &entries) {
         const QString &name = selected.first().data(Qt::UserRole + 1).value<const ColorScheme *>()->name();
         Q_ASSERT(!name.isEmpty());
         bool uninstalled = false;
         // Check if the theme was installed by KNS, if so uninstall it through
         // there and unload it.
         for (auto &entry : entries) {
             for (const auto &file : entry.installedFiles()) {
                 if (ColorSchemeManager::colorSchemeNameFromPath(file) != name) {
                     continue;
                 }
                 // Make sure the manager can unload it before uninstalling it.
                 if (ColorSchemeManager::instance()->unloadColorScheme(file)) {
                     manager->uninstallEntry(entry);
                     uninstalled = true;
                 }
             }
             if (uninstalled) {
                 break;
             }
         }
 
         // If KNS wasn't able to remove it is a custom theme and we'll drop
         // it manually.
         if (!uninstalled) {
             uninstalled = ColorSchemeManager::instance()->deleteColorScheme(name);
         }
 
         if (uninstalled) {
             _appearanceUi->colorSchemeList->model()->removeRow(selected.first().row());
         }
 
         manager->deleteLater();
     });
     manager->checkForInstalled();
 }
 
 void EditProfileDialog::gotNewColorSchemes(const KNS3::Entry::List &changedEntries)
 {
     int failures = 0;
     for (auto &entry : qAsConst(changedEntries)) {
         switch (entry.status()) {
         case KNS3::Entry::Installed:
             for (const auto &file : entry.installedFiles()) {
                 if (ColorSchemeManager::instance()->loadColorScheme(file)) {
                     continue;
                 }
                 qWarning() << "Failed to load file" << file;
                 ++failures;
             }
             if (failures == entry.installedFiles().size()) {
                 _appearanceUi->colorSchemeMessageWidget->setText(
                             xi18nc("@info",
                                    "Scheme <resource>%1</resource> failed to load.",
                                    entry.name()));
                 _appearanceUi->colorSchemeMessageWidget->animatedShow();
                 QTimer::singleShot(8000,
                                    _appearanceUi->colorSchemeMessageWidget,
                                    &KMessageWidget::animatedHide);
             }
             break;
         case KNS3::Entry::Deleted:
             for (const auto &file : entry.uninstalledFiles()) {
                 if (ColorSchemeManager::instance()->unloadColorScheme(file)) {
                     continue;
                 }
                 qWarning() << "Failed to unload file" << file;
                 // If unloading fails we do not care. Iff the scheme failed here
                 // it either wasn't loaded or was invalid to begin with.
             }
             break;
         case KNS3::Entry::Invalid:
         case KNS3::Entry::Installing:
         case KNS3::Entry::Downloadable:
         case KNS3::Entry::Updateable:
         case KNS3::Entry::Updating:
             // Not interesting.
             break;
         }
     }
     updateColorSchemeList(currentColorSchemeName());
 }
 
 void EditProfileDialog::resetColorScheme()
 {
 
     QModelIndexList selected = _appearanceUi->colorSchemeList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         const QString &name = selected.first().data(Qt::UserRole + 1).value<const ColorScheme *>()->name();
 
         ColorSchemeManager::instance()->deleteColorScheme(name);
 
         // select the colorScheme used in the current profile
         updateColorSchemeList(currentColorSchemeName());
     }
 }
 
 void EditProfileDialog::showColorSchemeEditor(bool isNewScheme)
 {
     // Finding selected ColorScheme
     QModelIndexList selected = _appearanceUi->colorSchemeList->selectionModel()->selectedIndexes();
     QAbstractItemModel *model = _appearanceUi->colorSchemeList->model();
     const ColorScheme *colors = nullptr;
     if (!selected.isEmpty()) {
         colors = model->data(selected.first(), Qt::UserRole + 1).value<const ColorScheme *>();
     } else {
         colors = ColorSchemeManager::instance()->defaultColorScheme();
     }
 
     Q_ASSERT(colors);
 
     // Setting up ColorSchemeEditor ui
     // close any running ColorSchemeEditor
     if (_colorDialog != nullptr) {
         closeColorSchemeEditor();
     }
     _colorDialog = new ColorSchemeEditor(this);
 
     connect(_colorDialog, &Konsole::ColorSchemeEditor::colorSchemeSaveRequested, this,
             &Konsole::EditProfileDialog::saveColorScheme);
     _colorDialog->setup(colors, isNewScheme);
 
     _colorDialog->show();
 }
 
 void EditProfileDialog::closeColorSchemeEditor()
 {
     if (_colorDialog != nullptr) {
         _colorDialog->close();
         delete _colorDialog;
     }
 }
 
 void EditProfileDialog::newColorScheme()
 {
     showColorSchemeEditor(true);
 }
 
 void EditProfileDialog::editColorScheme()
 {
     showColorSchemeEditor(false);
 }
 
 void EditProfileDialog::saveColorScheme(const ColorScheme &scheme, bool isNewScheme)
 {
     auto newScheme = new ColorScheme(scheme);
 
     // if this is a new color scheme, pick a name based on the description
     if (isNewScheme) {
         newScheme->setName(newScheme->description());
     }
 
     ColorSchemeManager::instance()->addColorScheme(newScheme);
 
     const QString &selectedColorSchemeName = newScheme->name();
 
     // select the edited or the new colorScheme after saving the changes
     updateColorSchemeList(selectedColorSchemeName);
 
     preview(Profile::ColorScheme, newScheme->name());
 }
 
 void EditProfileDialog::colorSchemeSelected()
 {
     QModelIndexList selected = _appearanceUi->colorSchemeList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         QAbstractItemModel *model = _appearanceUi->colorSchemeList->model();
         const auto *colors = model->data(selected.first(), Qt::UserRole + 1).value<const ColorScheme *>();
         if (colors != nullptr) {
             updateTempProfileProperty(Profile::ColorScheme, colors->name());
             previewColorScheme(selected.first());
 
             updateTransparencyWarning();
         }
     }
 
     updateColorSchemeButtons();
 }
 
 void EditProfileDialog::updateColorSchemeButtons()
 {
     enableIfNonEmptySelection(_appearanceUi->editColorSchemeButton, _appearanceUi->colorSchemeList->selectionModel());
 
     QModelIndexList selected = _appearanceUi->colorSchemeList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         const QString &name = selected.first().data(Qt::UserRole + 1).value<const ColorScheme *>()->name();
 
         bool isResettable = ColorSchemeManager::instance()->canResetColorScheme(name);
         _appearanceUi->resetColorSchemeButton->setEnabled(isResettable);
 
         bool isDeletable = ColorSchemeManager::instance()->isColorSchemeDeletable(name);
         // if a colorScheme can be restored then it can't be deleted
         _appearanceUi->removeColorSchemeButton->setEnabled(isDeletable && !isResettable);
     } else {
         _appearanceUi->removeColorSchemeButton->setEnabled(false);
         _appearanceUi->resetColorSchemeButton->setEnabled(false);
     }
 
 }
 
 void EditProfileDialog::updateKeyBindingsButtons()
 {
     QModelIndexList selected = _keyboardUi->keyBindingList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         _keyboardUi->editKeyBindingsButton->setEnabled(true);
 
         const QString &name = selected.first().data(Qt::UserRole + 1).value<const KeyboardTranslator *>()->name();
 
         bool isResettable = _keyManager->isTranslatorResettable(name);
         _keyboardUi->resetKeyBindingsButton->setEnabled(isResettable);
 
         bool isDeletable = _keyManager->isTranslatorDeletable(name);
 
         // if a key bindings scheme can be reset then it can't be deleted
         _keyboardUi->removeKeyBindingsButton->setEnabled(isDeletable && !isResettable);
     }
 }
 
 void EditProfileDialog::enableIfNonEmptySelection(QWidget *widget, QItemSelectionModel *selectionModel)
 {
     widget->setEnabled(selectionModel->hasSelection());
 }
 
 void EditProfileDialog::updateTransparencyWarning()
 {
     // zero or one indexes can be selected
     const QModelIndexList selected = _appearanceUi->colorSchemeList->selectionModel()->selectedIndexes();
     for (const QModelIndex &index : selected) {
         bool needTransparency = index.data(Qt::UserRole + 1).value<const ColorScheme *>()->opacity() < 1.0;
 
         if (!needTransparency) {
             _appearanceUi->transparencyWarningWidget->setHidden(true);
         } else if (!KWindowSystem::compositingActive()) {
             _appearanceUi->transparencyWarningWidget->setText(i18n(
                                                         "This color scheme uses a transparent background"
                                                         " which does not appear to be supported on your"
                                                         " desktop"));
             _appearanceUi->transparencyWarningWidget->setHidden(false);
         } else if (!WindowSystemInfo::HAVE_TRANSPARENCY) {
             _appearanceUi->transparencyWarningWidget->setText(i18n(
                                                         "Konsole was started before desktop effects were enabled."
                                                         " You need to restart Konsole to see transparent background."));
             _appearanceUi->transparencyWarningWidget->setHidden(false);
         }
     }
 }
 
 void EditProfileDialog::createTempProfile()
 {
     _tempProfile = Profile::Ptr(new Profile);
     _tempProfile->setHidden(true);
 }
 
 void EditProfileDialog::updateTempProfileProperty(Profile::Property property, const QVariant &value)
 {
     _tempProfile->setProperty(property, value);
     updateButtonApply();
 }
 
 void EditProfileDialog::updateButtonApply()
 {
     bool userModified = false;
 
     QHashIterator<Profile::Property, QVariant> iter(_tempProfile->setProperties());
     while (iter.hasNext()) {
         iter.next();
 
         Profile::Property property = iter.key();
         QVariant value = iter.value();
 
         // for previewed property
         if (_previewedProperties.contains(static_cast<int>(property))) {
             if (value != _previewedProperties.value(static_cast<int>(property))) {
                 userModified = true;
                 break;
             }
         // for not-previewed property
         //
         // for the Profile::KeyBindings property, if it's set in the _tempProfile
         // then the user opened the edit key bindings dialog and clicked
         // OK, and could have add/removed a key bindings rule
         } else if (property == Profile::KeyBindings || (value != _profile->property<QVariant>(property))) {
             userModified = true;
             break;
         }
     }
 
     _buttonBox->button(QDialogButtonBox::Apply)->setEnabled(userModified);
 }
 
 void EditProfileDialog::setupKeyboardPage(const Profile::Ptr &/* profile */)
 {
     // setup translator list
     updateKeyBindingsList(lookupProfile()->keyBindings());
 
     connect(_keyboardUi->keyBindingList->selectionModel(),
             &QItemSelectionModel::selectionChanged, this,
             &Konsole::EditProfileDialog::keyBindingSelected);
     connect(_keyboardUi->newKeyBindingsButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::newKeyBinding);
 
     _keyboardUi->editKeyBindingsButton->setEnabled(false);
     _keyboardUi->removeKeyBindingsButton->setEnabled(false);
     _keyboardUi->resetKeyBindingsButton->setEnabled(false);
 
     updateKeyBindingsButtons();
 
     connect(_keyboardUi->editKeyBindingsButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::editKeyBinding);
     connect(_keyboardUi->removeKeyBindingsButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::removeKeyBinding);
     connect(_keyboardUi->resetKeyBindingsButton, &QPushButton::clicked, this,
             &Konsole::EditProfileDialog::resetKeyBindings);
 }
 
 void EditProfileDialog::keyBindingSelected()
 {
     QModelIndexList selected = _keyboardUi->keyBindingList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         QAbstractItemModel *model = _keyboardUi->keyBindingList->model();
         const auto *translator = model->data(selected.first(), Qt::UserRole + 1)
                                                .value<const KeyboardTranslator *>();
         if (translator != nullptr) {
             updateTempProfileProperty(Profile::KeyBindings, translator->name());
         }
     }
 
     updateKeyBindingsButtons();
 }
 
 void EditProfileDialog::removeKeyBinding()
 {
     QModelIndexList selected = _keyboardUi->keyBindingList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         const QString &name = selected.first().data(Qt::UserRole + 1).value<const KeyboardTranslator *>()->name();
         if (KeyboardTranslatorManager::instance()->deleteTranslator(name)) {
             _keyboardUi->keyBindingList->model()->removeRow(selected.first().row());
         }
     }
 }
 
 void EditProfileDialog::showKeyBindingEditor(bool isNewTranslator)
 {
     QModelIndexList selected = _keyboardUi->keyBindingList->selectionModel()->selectedIndexes();
     QAbstractItemModel *model = _keyboardUi->keyBindingList->model();
 
     const KeyboardTranslator *translator = nullptr;
     if (!selected.isEmpty()) {
         translator = model->data(selected.first(), Qt::UserRole + 1).value<const KeyboardTranslator *>();
     } else {
         translator = _keyManager->defaultTranslator();
     }
 
     Q_ASSERT(translator);
 
     auto editor = new KeyBindingEditor(this);
 
     if (translator != nullptr) {
         editor->setup(translator, lookupProfile()->keyBindings(), isNewTranslator);
     }
 
     connect(editor, &Konsole::KeyBindingEditor::updateKeyBindingsListRequest,
             this, &Konsole::EditProfileDialog::updateKeyBindingsList);
 
     connect(editor, &Konsole::KeyBindingEditor::updateTempProfileKeyBindingsRequest,
             this, &Konsole::EditProfileDialog::updateTempProfileProperty);
 
     editor->exec();
 }
 
 void EditProfileDialog::newKeyBinding()
 {
     showKeyBindingEditor(true);
 }
 
 void EditProfileDialog::editKeyBinding()
 {
     showKeyBindingEditor(false);
 }
 
 void EditProfileDialog::resetKeyBindings()
 {
     QModelIndexList selected = _keyboardUi->keyBindingList->selectionModel()->selectedIndexes();
 
     if (!selected.isEmpty()) {
         const QString &name = selected.first().data(Qt::UserRole + 1).value<const KeyboardTranslator *>()->name();
 
         _keyManager->deleteTranslator(name);
         // find and load the translator
         _keyManager->findTranslator(name);
 
         updateKeyBindingsList(name);
     }
 }
 
 void EditProfileDialog::setupCheckBoxes(const QVector<BooleanOption>& options, const Profile::Ptr &profile)
 {
     for(const auto& option : options) {
         option.button->setChecked(profile->property<bool>(option.property));
         connect(option.button, SIGNAL(toggled(bool)), this, option.slot);
     }
 }
 
 void EditProfileDialog::setupRadio(const QVector<RadioOption>& possibilities, int actual)
 {
     for(const auto& possibility : possibilities) {
         possibility.button->setChecked(possibility.value == actual);
         connect(possibility.button, SIGNAL(clicked()), this, possibility.slot);
     }
 }
 
 void EditProfileDialog::setupButtonGroup(const ButtonGroupOptions &options, const Profile::Ptr &profile)
 {
     auto currentValue = profile->property<int>(options.profileProperty);
 
     for (auto option: options.buttons) {
         options.group->setId(option.button, option.value);
     }
 
     Q_ASSERT(options.buttons.count() > 0);
     auto *activeButton = options.group->button(currentValue);
     if (activeButton == nullptr) {
         activeButton = options.buttons[0].button;
     }
     activeButton->setChecked(true);
 
     connect(options.group, QOverload<int>::of(&QButtonGroup::buttonClicked),
             this, [this, options](int value) {
         if (options.preview) {
             preview(options.profileProperty, value);
         }
         updateTempProfileProperty(options.profileProperty, value);
     });
 }
 
 void EditProfileDialog::setupScrollingPage(const Profile::Ptr &profile)
 {
     // setup scrollbar radio
     const ButtonGroupOptions scrollBarPositionOptions = {
         _scrollingUi->scrollBarPosition,    // group
         Profile::ScrollBarPosition,         // profileProperty
         false,                              // preview
         {                                   // buttons
             {_scrollingUi->scrollBarRightButton,    Enum::ScrollBarRight},
             {_scrollingUi->scrollBarLeftButton,     Enum::ScrollBarLeft},
             {_scrollingUi->scrollBarHiddenButton,   Enum::ScrollBarHidden},
         },
     };
     setupButtonGroup(scrollBarPositionOptions, profile);
 
     // setup scrollback type radio
     auto scrollBackType = profile->property<int>(Profile::HistoryMode);
     _scrollingUi->historySizeWidget->setMode(Enum::HistoryModeEnum(scrollBackType));
     connect(_scrollingUi->historySizeWidget, &Konsole::HistorySizeWidget::historyModeChanged, this,
             &Konsole::EditProfileDialog::historyModeChanged);
 
     // setup scrollback line count spinner
     const int historySize = profile->historySize();
     _scrollingUi->historySizeWidget->setLineCount(historySize);
 
     // setup scrollpageamount type radio
     auto scrollFullPage = profile->property<int>(Profile::ScrollFullPage);
 
     const auto pageamounts = QVector<RadioOption>{
         {_scrollingUi->scrollHalfPage, Enum::ScrollPageHalf, SLOT(scrollHalfPage())},
         {_scrollingUi->scrollFullPage, Enum::ScrollPageFull, SLOT(scrollFullPage())}
     };
 
     setupRadio(pageamounts, scrollFullPage);
 
     // signals and slots
     connect(_scrollingUi->historySizeWidget, &Konsole::HistorySizeWidget::historySizeChanged, this,
             &Konsole::EditProfileDialog::historySizeChanged);
 }
 
 void EditProfileDialog::historySizeChanged(int lineCount)
 {
     updateTempProfileProperty(Profile::HistorySize, lineCount);
 }
 
 void EditProfileDialog::historyModeChanged(Enum::HistoryModeEnum mode)
 {
     updateTempProfileProperty(Profile::HistoryMode, mode);
 }
 
 void EditProfileDialog::scrollFullPage()
 {
     updateTempProfileProperty(Profile::ScrollFullPage, Enum::ScrollPageFull);
 }
 
 void EditProfileDialog::scrollHalfPage()
 {
     updateTempProfileProperty(Profile::ScrollFullPage, Enum::ScrollPageHalf);
 }
 
 void EditProfileDialog::setupMousePage(const Profile::Ptr &profile)
 {
     const auto options = QVector<BooleanOption>{
         {
             _mouseUi->underlineLinksButton, Profile::UnderlineLinksEnabled,
             SLOT(toggleUnderlineLinks(bool))
         },
         {
             _mouseUi->underlineFilesButton, Profile::UnderlineFilesEnabled,
             SLOT(toggleUnderlineFiles(bool))
         },
         {
             _mouseUi->ctrlRequiredForDragButton, Profile::CtrlRequiredForDrag,
             SLOT(toggleCtrlRequiredForDrag(bool))
         },
         {
             _mouseUi->copyTextAsHTMLButton, Profile::CopyTextAsHTML,
             SLOT(toggleCopyTextAsHTML(bool))
         },
         {
             _mouseUi->copyTextToClipboardButton, Profile::AutoCopySelectedText,
             SLOT(toggleCopyTextToClipboard(bool))
         },
         {
             _mouseUi->trimLeadingSpacesButton, Profile::TrimLeadingSpacesInSelectedText,
             SLOT(toggleTrimLeadingSpacesInSelectedText(bool))
         },
         {
             _mouseUi->trimTrailingSpacesButton, Profile::TrimTrailingSpacesInSelectedText,
             SLOT(toggleTrimTrailingSpacesInSelectedText(bool))
         },
         {
             _mouseUi->openLinksByDirectClickButton, Profile::OpenLinksByDirectClickEnabled,
             SLOT(toggleOpenLinksByDirectClick(bool))
         },
         {
             _mouseUi->dropUrlsAsText, Profile::DropUrlsAsText,
             SLOT(toggleDropUrlsAsText(bool))
         },
         {
             _mouseUi->enableAlternateScrollingButton, Profile::AlternateScrolling,
             SLOT(toggleAlternateScrolling(bool))
         }
     };
     setupCheckBoxes(options, profile);
 
     // setup middle click paste mode
     const auto middleClickPasteMode = profile->property<int>(Profile::MiddleClickPasteMode);
     const auto pasteModes = QVector<RadioOption> {
         {_mouseUi->pasteFromX11SelectionButton, Enum::PasteFromX11Selection, SLOT(pasteFromX11Selection())},
         {_mouseUi->pasteFromClipboardButton, Enum::PasteFromClipboard, SLOT(pasteFromClipboard())}    };
     setupRadio(pasteModes, middleClickPasteMode);
 
     // interaction options
     _mouseUi->wordCharacterEdit->setText(profile->wordCharacters());
 
     connect(_mouseUi->wordCharacterEdit, &QLineEdit::textChanged, this, &Konsole::EditProfileDialog::wordCharactersChanged);
 
     const ButtonGroupOptions tripleClickModeOptions = {
         _mouseUi->tripleClickMode,  // group
         Profile::TripleClickMode,   // profileProperty
         false,                      // preview
         {                           // buttons
             {_mouseUi->tripleClickSelectsTheWholeLine,      Enum::SelectWholeLine},
             {_mouseUi->tripleClickSelectsFromMousePosition, Enum::SelectForwardsFromCursor},
         },
     };
     setupButtonGroup(tripleClickModeOptions, profile);
 
     _mouseUi->openLinksByDirectClickButton->setEnabled(_mouseUi->underlineLinksButton->isChecked() || _mouseUi->underlineFilesButton->isChecked());
 
     _mouseUi->enableMouseWheelZoomButton->setChecked(profile->mouseWheelZoomEnabled());
     connect(_mouseUi->enableMouseWheelZoomButton, &QCheckBox::toggled, this, &Konsole::EditProfileDialog::toggleMouseWheelZoom);
 }
 
 void EditProfileDialog::setupAdvancedPage(const Profile::Ptr &profile)
 {
     const auto options = QVector<BooleanOption>{
         {
             _advancedUi->enableBlinkingTextButton, Profile::BlinkingTextEnabled,
             SLOT(toggleBlinkingText(bool))
         },
         {
             _advancedUi->enableFlowControlButton, Profile::FlowControlEnabled,
             SLOT(toggleFlowControl(bool))
         },
         {
             _appearanceUi->enableBlinkingCursorButton, Profile::BlinkingCursorEnabled,
             SLOT(toggleBlinkingCursor(bool))
         },
         {
             _advancedUi->enableBidiRenderingButton, Profile::BidiRenderingEnabled,
             SLOT(togglebidiRendering(bool))
         },
         {
             _advancedUi->enableReverseUrlHints, Profile::ReverseUrlHints,
             SLOT(toggleReverseUrlHints(bool))
         }
     };
     setupCheckBoxes(options, profile);
 
     // Setup the URL hints modifier checkboxes
     {
         auto modifiers = profile->property<int>(Profile::UrlHintsModifiers);
         _advancedUi->urlHintsModifierShift->setChecked((modifiers &Qt::ShiftModifier) != 0u);
         _advancedUi->urlHintsModifierCtrl->setChecked((modifiers &Qt::ControlModifier) != 0u);
         _advancedUi->urlHintsModifierAlt->setChecked((modifiers &Qt::AltModifier) != 0u);
         _advancedUi->urlHintsModifierMeta->setChecked((modifiers &Qt::MetaModifier) != 0u);
         connect(_advancedUi->urlHintsModifierShift, &QCheckBox::toggled, this, &EditProfileDialog::updateUrlHintsModifier);
         connect(_advancedUi->urlHintsModifierCtrl, &QCheckBox::toggled, this, &EditProfileDialog::updateUrlHintsModifier);
         connect(_advancedUi->urlHintsModifierAlt, &QCheckBox::toggled, this, &EditProfileDialog::updateUrlHintsModifier);
         connect(_advancedUi->urlHintsModifierMeta, &QCheckBox::toggled, this, &EditProfileDialog::updateUrlHintsModifier);
     }
 
     // encoding options
     auto codecAction = new KCodecAction(this);
     _advancedUi->selectEncodingButton->setMenu(codecAction->menu());
     connect(codecAction,
             QOverload<QTextCodec *>::of(&KCodecAction::triggered), this,
             &Konsole::EditProfileDialog::setDefaultCodec);
 
     _advancedUi->selectEncodingButton->setText(profile->defaultEncoding());
 }
 
 int EditProfileDialog::maxSpinBoxWidth(const KPluralHandlingSpinBox *spinBox, const KLocalizedString &suffix)
 {
     static const int cursorWidth = 2;
 
     const QFontMetrics fm(spinBox->fontMetrics());
     const QString plural    = suffix.subs(2).toString();
     const QString singular  = suffix.subs(1).toString();
     const QString min       = QString::number(spinBox->minimum());
     const QString max       = QString::number(spinBox->maximum());
     const int pluralWidth   = fm.boundingRect(plural).width();
     const int singularWidth = fm.boundingRect(singular).width();
     const int minWidth      = fm.boundingRect(min).width();
     const int maxWidth      = fm.boundingRect(max).width();
     const int width         = qMax(pluralWidth, singularWidth) + qMax(minWidth, maxWidth) + cursorWidth;
 
     // Based on QAbstractSpinBox::initStyleOption() from Qt
     QStyleOptionSpinBox opt;
     opt.initFrom(spinBox);
     opt.activeSubControls   = QStyle::SC_None;
     opt.buttonSymbols       = spinBox->buttonSymbols();
     // Assume all spinboxes have buttons
     opt.subControls         = QStyle::SC_SpinBoxFrame | QStyle::SC_SpinBoxEditField
                             | QStyle::SC_SpinBoxUp | QStyle::SC_SpinBoxDown;
     opt.frame               = spinBox->hasFrame();
 
     const QSize hint(width, spinBox->sizeHint().height());
     const QSize spinBoxSize = style()->sizeFromContents(QStyle::CT_SpinBox, &opt, hint, spinBox)
                               .expandedTo(QApplication::globalStrut());
 
     return spinBoxSize.width();
 }
 
 void EditProfileDialog::setDefaultCodec(QTextCodec *codec)
 {
     QString name = QString::fromLocal8Bit(codec->name());
 
     updateTempProfileProperty(Profile::DefaultEncoding, name);
     _advancedUi->selectEncodingButton->setText(name);
 }
 
 void EditProfileDialog::wordCharactersChanged(const QString &text)
 {
     updateTempProfileProperty(Profile::WordCharacters, text);
 }
 
 void EditProfileDialog::togglebidiRendering(bool enable)
 {
     updateTempProfileProperty(Profile::BidiRenderingEnabled, enable);
 }
 
 void EditProfileDialog::toggleUnderlineLinks(bool enable)
 {
     updateTempProfileProperty(Profile::UnderlineLinksEnabled, enable);
 
     bool enableClick = _mouseUi->underlineFilesButton->isChecked() || enable;
     _mouseUi->openLinksByDirectClickButton->setEnabled(enableClick);
 }
 
 void EditProfileDialog::toggleUnderlineFiles(bool enable)
 {
     updateTempProfileProperty(Profile::UnderlineFilesEnabled, enable);
 
     bool enableClick = _mouseUi->underlineLinksButton->isChecked() || enable;
     _mouseUi->openLinksByDirectClickButton->setEnabled(enableClick);
 }
 
 void EditProfileDialog::toggleCtrlRequiredForDrag(bool enable)
 {
     updateTempProfileProperty(Profile::CtrlRequiredForDrag, enable);
 }
 
 void EditProfileDialog::toggleDropUrlsAsText(bool enable)
 {
     updateTempProfileProperty(Profile::DropUrlsAsText, enable);
 }
 
 void EditProfileDialog::toggleOpenLinksByDirectClick(bool enable)
 {
     updateTempProfileProperty(Profile::OpenLinksByDirectClickEnabled, enable);
 }
 
 void EditProfileDialog::toggleCopyTextAsHTML(bool enable)
 {
     updateTempProfileProperty(Profile::CopyTextAsHTML, enable);
 }
 
 void EditProfileDialog::toggleCopyTextToClipboard(bool enable)
 {
     updateTempProfileProperty(Profile::AutoCopySelectedText, enable);
 }
 
 void EditProfileDialog::toggleTrimLeadingSpacesInSelectedText(bool enable)
 {
     updateTempProfileProperty(Profile::TrimLeadingSpacesInSelectedText, enable);
 }
 
 void EditProfileDialog::toggleTrimTrailingSpacesInSelectedText(bool enable)
 {
     updateTempProfileProperty(Profile::TrimTrailingSpacesInSelectedText, enable);
 }
 
 void EditProfileDialog::pasteFromX11Selection()
 {
     updateTempProfileProperty(Profile::MiddleClickPasteMode, Enum::PasteFromX11Selection);
 }
 
 void EditProfileDialog::pasteFromClipboard()
 {
     updateTempProfileProperty(Profile::MiddleClickPasteMode, Enum::PasteFromClipboard);
 }
 
 void EditProfileDialog::TripleClickModeChanged(int newValue)
 {
     updateTempProfileProperty(Profile::TripleClickMode, newValue);
 }
 
 void EditProfileDialog::updateUrlHintsModifier(bool)
 {
     Qt::KeyboardModifiers modifiers;
     if (_advancedUi->urlHintsModifierShift->isChecked()) {
         modifiers |= Qt::ShiftModifier;
     }
     if (_advancedUi->urlHintsModifierCtrl->isChecked()) {
         modifiers |= Qt::ControlModifier;
     }
     if (_advancedUi->urlHintsModifierAlt->isChecked()) {
         modifiers |= Qt::AltModifier;
     }
     if (_advancedUi->urlHintsModifierMeta->isChecked()) {
         modifiers |= Qt::MetaModifier;
     }
     updateTempProfileProperty(Profile::UrlHintsModifiers, int(modifiers));
 }
 
 void EditProfileDialog::toggleReverseUrlHints(bool enable)
 {
     updateTempProfileProperty(Profile::ReverseUrlHints, enable);
 }
 
 void EditProfileDialog::toggleBlinkingText(bool enable)
 {
     updateTempProfileProperty(Profile::BlinkingTextEnabled, enable);
 }
 
 void EditProfileDialog::toggleFlowControl(bool enable)
 {
     updateTempProfileProperty(Profile::FlowControlEnabled, enable);
 }
 
 ColorSchemeViewDelegate::ColorSchemeViewDelegate(QObject *parent) :
     QAbstractItemDelegate(parent)
 {
 }
 
 void ColorSchemeViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     const auto *scheme = index.data(Qt::UserRole + 1).value<const ColorScheme *>();
     QFont profileFont = index.data(Qt::UserRole + 2).value<QFont>();
     Q_ASSERT(scheme);
     if (scheme == nullptr) {
         return;
     }
 
     painter->setRenderHint(QPainter::Antialiasing);
 
     // Draw background
     QStyle *style = option.widget != nullptr ? option.widget->style() : QApplication::style();
     style->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter, option.widget);
 
     // Draw name
     QPalette::ColorRole textColor = ((option.state & QStyle::State_Selected) != 0)
                                     ? QPalette::HighlightedText : QPalette::Text;
     painter->setPen(option.palette.color(textColor));
     painter->setFont(option.font);
 
     // Determine width of sample text using profile's font
     const QString sampleText = i18n("AaZz09...");
     QFontMetrics profileFontMetrics(profileFont);
     const int sampleTextWidth = profileFontMetrics.boundingRect(sampleText).width();
 
     painter->drawText(option.rect.adjusted(sampleTextWidth + 15, 0, 0, 0),
                       Qt::AlignLeft | Qt::AlignVCenter,
                       index.data(Qt::DisplayRole).toString());
 
     // Draw the preview
     const int x = option.rect.left();
     const int y = option.rect.top();
 
     QRect previewRect(x + 4, y + 4, sampleTextWidth + 8, option.rect.height() - 8);
 
     bool transparencyAvailable = KWindowSystem::compositingActive();
 
     if (transparencyAvailable) {
         painter->save();
         QColor color = scheme->backgroundColor();
         color.setAlphaF(scheme->opacity());
         painter->setPen(Qt::NoPen);
         painter->setCompositionMode(QPainter::CompositionMode_Source);
         painter->setBrush(color);
         painter->drawRect(previewRect);
         painter->restore();
     } else {
         painter->setPen(Qt::NoPen);
         painter->setBrush(scheme->backgroundColor());
         painter->drawRect(previewRect);
     }
 
     // draw color scheme name using scheme's foreground color
     QPen pen(scheme->foregroundColor());
     painter->setPen(pen);
 
     // TODO: respect antialias setting
     painter->setFont(profileFont);
     painter->drawText(previewRect, Qt::AlignCenter, sampleText);
 }
 
 QSize ColorSchemeViewDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const
 {
     const int width = 200;
     const int margin = 5;
     const int colorWidth = width / TABLE_COLORS;
     const int heightForWidth = (colorWidth * 2) + option.fontMetrics.height() + margin;
 
     // temporary
     return {width, heightForWidth};
 }
diff --git a/src/EditProfileDialog.h b/src/EditProfileDialog.h
index 959ddb77..7c7e24b4 100644
--- a/src/EditProfileDialog.h
+++ b/src/EditProfileDialog.h
@@ -1,472 +1,475 @@
 /*
     Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
     Copyright 2018 by Harald Sitter <sitter@kde.org>
 
     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.
 */
 
 #ifndef EDITPROFILEDIALOG_H
 #define EDITPROFILEDIALOG_H
 
 // Qt
 #include <QAbstractItemDelegate>
 #include <QHash>
 #include <QButtonGroup>
 #include <QWidget>
 #include <QGridLayout>
 
 // KDE
 #include <KPageDialog>
 #include <KNS3/Entry>
 
 // Konsole
 #include "Profile.h"
 #include "Enumeration.h"
 #include "ColorScheme.h"
 #include "ColorSchemeEditor.h"
 #include "KeyboardTranslatorManager.h"
 #include "FontDialog.h"
 
 class KPluralHandlingSpinBox;
 class KLocalizedString;
 class QItemSelectionModel;
 namespace Ui {
     class EditProfileGeneralPage;
     class EditProfileTabsPage;
     class EditProfileAppearancePage;
     class EditProfileScrollingPage;
     class EditProfileKeyboardPage;
     class EditProfileMousePage;
     class EditProfileAdvancedPage;
 }
 
 namespace Konsole {
 /**
  * A dialog which allows the user to edit a profile.
  * After the dialog is created, it can be initialized with the settings
  * for a profile using setProfile().  When the user makes changes to the
  * dialog and accepts the changes, the dialog will update the
  * profile in the SessionManager by calling the SessionManager's
  * changeProfile() method.
  *
  * Some changes made in the dialog are preview-only changes which cause
  * the SessionManager's changeProfile() method to be called with
  * the persistent argument set to false.  These changes are then
  * un-done when the dialog is closed.
  */
 class KONSOLEPRIVATE_EXPORT EditProfileDialog: public KPageDialog
 {
     Q_OBJECT
 
 public:
     /** Constructs a new dialog with the specified parent. */
     explicit EditProfileDialog(QWidget *parent = nullptr);
     ~EditProfileDialog() override;
 
     /**
      * Initializes the dialog with the settings for the specified session
      * type.
      *
      * When the dialog closes, the profile will be updated in the SessionManager
      * with the altered settings.
      *
      * @param profile The profile to be edited
      */
     void setProfile(const Profile::Ptr &profile);
 
     /**
      * Selects the text in the profile name edit area.
      * When the dialog is being used to create a new profile,
      * this can be used to draw the user's attention to the profile name
      * and make it easy for them to change it.
      */
     void selectProfileName();
     const Profile::Ptr lookupProfile() const;
 
 public Q_SLOTS:
     // reimplemented
     void accept() override;
     // reimplemented
     void reject() override;
 
     void apply();
 
 protected:
     bool eventFilter(QObject *watched, QEvent *event) override;
 
 private Q_SLOTS:
     QSize sizeHint() const override;
 
     // sets up the specified tab page if necessary
     void preparePage(KPageWidgetItem *current, KPageWidgetItem *before = nullptr);
 
     // saves changes to profile
     void save();
 
     // general page
     void selectInitialDir();
     void selectIcon();
 
     void profileNameChanged(const QString &name);
     void initialDirChanged(const QString &dir);
     void startInSameDir(bool);
     void commandChanged(const QString &command);
+
+    // tab page
     void tabTitleFormatChanged(const QString &format);
     void remoteTabTitleFormatChanged(const QString &format);
+    void tabColorChanged(const QColor &color);
+    void silenceSecondsChanged(int);
 
     void terminalColumnsEntryChanged(int);
     void terminalRowsEntryChanged(int);
     void showTerminalSizeHint(bool);
     void setDimWhenInactive(bool);
     void showEnvironmentEditor();
-    void silenceSecondsChanged(int);
 
     // appearance page
     void setAntialiasText(bool enable);
     void setBoldIntense(bool enable);
     void useFontLineCharacters(bool enable);
     void newColorScheme();
     void editColorScheme();
     void saveColorScheme(const ColorScheme &scheme, bool isNewScheme);
     void removeColorScheme();
     void gotNewColorSchemes(const KNS3::Entry::List &changedEntries);
 
     void toggleBlinkingCursor(bool);
     void setCursorShape(int);
     void autoCursorColor();
     void customCursorColor();
     void customCursorColorChanged(const QColor &);
     void customCursorTextColorChanged(const QColor &);
     void terminalMarginChanged(int margin);
     void lineSpacingChanged(int);
     void setTerminalCenter(bool enable);
 
     /**
      * Deletes the selected colorscheme from the user's home dir location
      * so that the original one from the system-wide location can be used
      * instead
      */
     void resetColorScheme();
 
     void colorSchemeSelected();
     void previewColorScheme(const QModelIndex &index);
     void showFontDialog();
     void toggleMouseWheelZoom(bool enable);
 
     // scrolling page
     void historyModeChanged(Enum::HistoryModeEnum mode);
 
     void historySizeChanged(int);
 
     void scrollFullPage();
     void scrollHalfPage();
 
     // keyboard page
     void editKeyBinding();
     void newKeyBinding();
     void keyBindingSelected();
     void removeKeyBinding();
     void resetKeyBindings();
 
     // mouse page
     void toggleUnderlineFiles(bool enable);
     void toggleUnderlineLinks(bool);
     void toggleOpenLinksByDirectClick(bool);
     void toggleCtrlRequiredForDrag(bool);
     void toggleDropUrlsAsText(bool);
     void toggleCopyTextToClipboard(bool);
     void toggleCopyTextAsHTML(bool);
     void toggleTrimLeadingSpacesInSelectedText(bool);
     void toggleTrimTrailingSpacesInSelectedText(bool);
     void pasteFromX11Selection();
     void pasteFromClipboard();
     void toggleAlternateScrolling(bool enable);
 
     void TripleClickModeChanged(int);
     void wordCharactersChanged(const QString &);
 
     // advanced page
     void toggleBlinkingText(bool);
     void toggleFlowControl(bool);
     void togglebidiRendering(bool);
     void updateUrlHintsModifier(bool);
     void toggleReverseUrlHints(bool);
 
     void setDefaultCodec(QTextCodec *);
 
     // apply the first previewed changes stored up by delayedPreview()
     void delayedPreviewActivate();
 
 private:
     Q_DISABLE_COPY(EditProfileDialog)
 
     enum PageID {
         GeneralPage = 0,
         TabsPage,
         AppearancePage,
         ScrollingPage,
         KeyboardPage,
         MousePage,
         AdvancedPage,
         PagesCount
     };
 
     // initialize various pages of the dialog
     void setupGeneralPage(const Profile::Ptr &profile);
     void setupTabsPage(const Profile::Ptr &profile);
     void setupAppearancePage(const Profile::Ptr &profile);
     void setupKeyboardPage(const Profile::Ptr &profile);
     void setupScrollingPage(const Profile::Ptr &profile);
     void setupAdvancedPage(const Profile::Ptr &profile);
     void setupMousePage(const Profile::Ptr &profile);
 
     int maxSpinBoxWidth(const KPluralHandlingSpinBox *spinBox, const KLocalizedString &suffix);
 
     // Returns the name of the colorScheme used in the current profile
     const QString currentColorSchemeName() const;
 
     // select @p selectedColorSchemeName after the changes are saved
     // in the colorScheme editor
     void updateColorSchemeList(const QString &selectedColorSchemeName = QString());
 
     void updateColorSchemeButtons();
 
     // Convenience method
     KeyboardTranslatorManager *_keyManager = KeyboardTranslatorManager::instance();
 
     // Updates the key bindings list widget on the Keyboard tab and selects
     // @p selectKeyBindingsName
     void updateKeyBindingsList(const QString &selectKeyBindingsName = QString());
     void updateKeyBindingsButtons();
     void showKeyBindingEditor(bool isNewTranslator);
 
     void showColorSchemeEditor(bool isNewScheme);
     void closeColorSchemeEditor();
 
     void preview(int property, const QVariant &value);
     void delayedPreview(int property, const QVariant &value);
     void unpreview(int property);
     void unpreviewAll();
     void enableIfNonEmptySelection(QWidget *widget, QItemSelectionModel *selectionModel);
 
     void updateCaption(const Profile::Ptr &profile);
     void updateTransparencyWarning();
 
     void updateFontPreview(QFont font);
 
     // Update _tempProfile in a way of respecting the apply button.
     // When used with some previewed property, this method should
     // always come after the preview operation.
     void updateTempProfileProperty(Profile::Property, const QVariant &value);
 
     // helper method for creating an empty & hidden profile and assigning
     // it to _tempProfile.
     void createTempProfile();
 
     // Enable or disable apply button, used only within
     // updateTempProfileProperty().
     void updateButtonApply();
 
     static QString groupProfileNames(const ProfileGroup::Ptr &group, int maxLength = -1);
 
     struct RadioOption {
         QAbstractButton *button;
         int value;
         const char *slot;
     };
     void setupRadio(const QVector<RadioOption>& possibilities, int actual);
     struct BooleanOption {
         QAbstractButton *button;
         Profile::Property property;
         const char *slot;
     };
     void setupCheckBoxes(const QVector<BooleanOption>& options, const Profile::Ptr &profile);
 
     struct ButtonGroupOption {
         QAbstractButton *button;
         int value;
     };
     struct ButtonGroupOptions {
         QButtonGroup *group;
         Profile::Property profileProperty;
         bool preview;
         QVector<ButtonGroupOption> buttons;
     };
     void setupButtonGroup(const ButtonGroupOptions &options, const Profile::Ptr &profile);
 
     // returns false if:
     // - the profile name is empty
     // - the name matches the name of an already existing profile
     // - the existing profile config file is read-only
     // otherwise returns true.
     bool isValidProfileName();
 
     Ui::EditProfileGeneralPage      *_generalUi;
     Ui::EditProfileTabsPage         *_tabsUi;
     Ui::EditProfileAppearancePage   *_appearanceUi;
     Ui::EditProfileScrollingPage    *_scrollingUi;
     Ui::EditProfileKeyboardPage     *_keyboardUi;
     Ui::EditProfileMousePage        *_mouseUi;
     Ui::EditProfileAdvancedPage     *_advancedUi;
 
     using PageSetupMethod = void (EditProfileDialog::*)(const Profile::Ptr &);
     struct Page {
         Page(PageSetupMethod page = nullptr, bool update = false)
             : setupPage(page)
             , needsUpdate(update)
         {}
 
         PageSetupMethod setupPage;
         bool needsUpdate;
     };
 
     QMap<KPageWidgetItem *, Page> _pages;
 
     Profile::Ptr _tempProfile;
     Profile::Ptr _profile;
 
     QHash<int, QVariant> _previewedProperties;
 
     QHash<int, QVariant> _delayedPreviewProperties;
     QTimer *_delayedPreviewTimer;
 
     ColorSchemeEditor *_colorDialog;
     QDialogButtonBox *_buttonBox;
     FontDialog *_fontDialog;
 };
 
 /**
  * A delegate which can display and edit color schemes in a view.
  */
 class ColorSchemeViewDelegate : public QAbstractItemDelegate
 {
     Q_OBJECT
 
 public:
     explicit ColorSchemeViewDelegate(QObject *parent = nullptr);
 
     // reimplemented
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
                const QModelIndex &index) const override;
     QSize sizeHint(const QStyleOptionViewItem &option,
                    const QModelIndex &index) const override;
 };
 
 /**
  * An utility class for aligning 0th column in multiple QGridLayouts.
  *
  * Limitations:
  * - a layout can't be nested in another layout
  * - reference widget must be an ancestor of all added layouts
  * - only 0th column is processed (widgets spanning multiple columns
  *   are ignored)
  */
 class LabelsAligner: public QObject {
     Q_OBJECT
 
 public:
     explicit LabelsAligner(QWidget *refWidget): _refWidget(refWidget) {}
 
     void addLayout(QGridLayout *layout) { _layouts.append(layout); }
     void addLayouts(const QVector<QGridLayout *> &layouts) { _layouts.append(layouts); }
     void setReferenceWidget(QWidget *refWidget) { _refWidget = refWidget; }
 
 public Q_SLOTS:
     void updateLayouts() {
         for (const auto *layout: qAsConst(_layouts)) {
             QWidget *widget = layout->parentWidget();
             Q_ASSERT(widget);
             do {
                 QLayout *widgetLayout = widget->layout();
                 if (widgetLayout != nullptr) {
                     widgetLayout->update();
                     widgetLayout->activate();
                 }
                 widget = widget->parentWidget();
             } while (widget != _refWidget && widget != nullptr);
         }
     }
 
     void align() {
         Q_ASSERT(_refWidget);
 
         if (_layouts.count() <= 1) {
             return;
         }
 
         int maxRight = 0;
         for (const auto *layout: qAsConst(_layouts)) {
             int left = getLeftMargin(layout);
             for (int row = 0; row < layout->rowCount(); ++row) {
                 QLayoutItem *layoutItem = layout->itemAtPosition(row, LABELS_COLUMN);
                 if (layoutItem == nullptr) {
                     continue;
                 }
                 QWidget *widget = layoutItem->widget();
                 if (widget == nullptr) {
                     continue;
                 }
                 const int idx = layout->indexOf(widget);
                 int rows, cols, rowSpan, colSpan;
                 layout->getItemPosition(idx, &rows, &cols, &rowSpan, &colSpan);
                 if (colSpan > 1) {
                     continue;
                 }
 
                 const int right = left + widget->sizeHint().width();
                 if (maxRight < right) {
                     maxRight = right;
                 }
             }
         }
 
         for (auto *l: qAsConst(_layouts)) {
             int left = getLeftMargin(l);
             l->setColumnMinimumWidth(LABELS_COLUMN, maxRight - left);
         }
     }
 
 private:
     int getLeftMargin(const QGridLayout *layout) {
         int left = layout->contentsMargins().left();
 
         if (layout->parent()->isWidgetType()) {
             auto *parentWidget = layout->parentWidget();
             Q_ASSERT(parentWidget);
             left += parentWidget->contentsMargins().left();
         } else {
             auto *parentLayout = qobject_cast<QLayout *>(layout->parent());
             Q_ASSERT(parentLayout);
             left += parentLayout->contentsMargins().left();
         }
 
         QWidget *parent = layout->parentWidget();
         while (parent != _refWidget && parent != nullptr) {
             left = parent->mapToParent(QPoint(left, 0)).x();
             parent = parent->parentWidget();
         }
         return left;
     }
 
     static constexpr int LABELS_COLUMN = 0;
 
     QWidget *_refWidget;
     QVector<QGridLayout *> _layouts;
 };
 
 }
 
 #endif // EDITPROFILEDIALOG_H
diff --git a/src/Profile.cpp b/src/Profile.cpp
index 1cf3eb78..4d8af3ff 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -1,397 +1,405 @@
 /*
     This source file is part of Konsole, a terminal emulator.
 
     Copyright 2006-2008 by Robert Knight <robertknight@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 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.
 */
 
 // Own
 #include "Profile.h"
 
 // Qt
 #include <QTextCodec>
 #include <QRegularExpression>
 
 // KDE
 #include <KLocalizedString>
 #include <QFontDatabase>
 
 // Konsole
 #include "Enumeration.h"
 
 using namespace Konsole;
 
 // mappings between property enum values and names
 //
 // multiple names are defined for some property values,
 // in these cases, the "proper" string name comes first,
 // as that is used when reading/writing profiles from/to disk
 //
 // the other names are usually shorter versions for convenience
 // when parsing konsoleprofile commands
 static const char GENERAL_GROUP[]     = "General";
 static const char KEYBOARD_GROUP[]    = "Keyboard";
 static const char APPEARANCE_GROUP[]  = "Appearance";
 static const char SCROLLING_GROUP[]   = "Scrolling";
 static const char TERMINAL_GROUP[]    = "Terminal Features";
 static const char CURSOR_GROUP[]      = "Cursor Options";
 static const char INTERACTION_GROUP[] = "Interaction Options";
 static const char ENCODING_GROUP[]    = "Encoding Options";
 
 const Profile::PropertyInfo Profile::DefaultPropertyNames[] = {
     // General
     { Path , "Path" , nullptr , QVariant::String }
     , { Name , "Name" , GENERAL_GROUP , QVariant::String }
     , { UntranslatedName, "UntranslatedName" , nullptr , QVariant::String }
     , { Icon , "Icon" , GENERAL_GROUP , QVariant::String }
     , { Command , "Command" , nullptr , QVariant::String }
     , { Arguments , "Arguments" , nullptr , QVariant::StringList }
     , { MenuIndex, "MenuIndex" , nullptr, QVariant::String }
     , { Environment , "Environment" , GENERAL_GROUP , QVariant::StringList }
     , { Directory , "Directory" , GENERAL_GROUP , QVariant::String }
     , { LocalTabTitleFormat , "LocalTabTitleFormat" , GENERAL_GROUP , QVariant::String }
     , { LocalTabTitleFormat , "tabtitle" , nullptr , QVariant::String }
     , { RemoteTabTitleFormat , "RemoteTabTitleFormat" , GENERAL_GROUP , QVariant::String }
     , { ShowTerminalSizeHint , "ShowTerminalSizeHint" , GENERAL_GROUP , QVariant::Bool }
     , { DimWhenInactive , "DimWhenInactive" , GENERAL_GROUP , QVariant::Bool }
     , { StartInCurrentSessionDir , "StartInCurrentSessionDir" , GENERAL_GROUP , QVariant::Bool }
     , { SilenceSeconds, "SilenceSeconds" , GENERAL_GROUP , QVariant::Int }
     , { TerminalColumns, "TerminalColumns" , GENERAL_GROUP , QVariant::Int }
     , { TerminalRows, "TerminalRows" , GENERAL_GROUP , QVariant::Int }
     , { TerminalMargin, "TerminalMargin" , GENERAL_GROUP , QVariant::Int }
     , { TerminalCenter, "TerminalCenter" , GENERAL_GROUP , QVariant::Bool }
 
     // Appearance
     , { Font , "Font" , APPEARANCE_GROUP , QVariant::Font }
     , { ColorScheme , "ColorScheme" , APPEARANCE_GROUP , QVariant::String }
     , { ColorScheme , "colors" , nullptr , QVariant::String }
     , { AntiAliasFonts, "AntiAliasFonts" , APPEARANCE_GROUP , QVariant::Bool }
     , { BoldIntense, "BoldIntense", APPEARANCE_GROUP, QVariant::Bool }
     , { UseFontLineCharacters, "UseFontLineChararacters", APPEARANCE_GROUP, QVariant::Bool }
     , { LineSpacing , "LineSpacing" , APPEARANCE_GROUP , QVariant::Int }
+    , { TabColor, "TabColor", APPEARANCE_GROUP, QVariant::Color }
 
     // Keyboard
     , { KeyBindings , "KeyBindings" , KEYBOARD_GROUP , QVariant::String }
 
     // Scrolling
     , { HistoryMode , "HistoryMode" , SCROLLING_GROUP , QVariant::Int }
     , { HistorySize , "HistorySize" , SCROLLING_GROUP , QVariant::Int }
     , { ScrollBarPosition , "ScrollBarPosition" , SCROLLING_GROUP , QVariant::Int }
     , { ScrollFullPage , "ScrollFullPage" , SCROLLING_GROUP , QVariant::Bool }
 
     // Terminal Features
     , { UrlHintsModifiers , "UrlHintsModifiers" , TERMINAL_GROUP , QVariant::Int }
     , { ReverseUrlHints , "ReverseUrlHints" , TERMINAL_GROUP , QVariant::Bool }
     , { BlinkingTextEnabled , "BlinkingTextEnabled" , TERMINAL_GROUP , QVariant::Bool }
     , { FlowControlEnabled , "FlowControlEnabled" , TERMINAL_GROUP , QVariant::Bool }
     , { BidiRenderingEnabled , "BidiRenderingEnabled" , TERMINAL_GROUP , QVariant::Bool }
     , { BlinkingCursorEnabled , "BlinkingCursorEnabled" , TERMINAL_GROUP , QVariant::Bool }
     , { BellMode , "BellMode" , TERMINAL_GROUP , QVariant::Int }
 
     // Cursor
     , { UseCustomCursorColor , "UseCustomCursorColor" , CURSOR_GROUP , QVariant::Bool}
     , { CursorShape , "CursorShape" , CURSOR_GROUP , QVariant::Int}
     , { CustomCursorColor , "CustomCursorColor" , CURSOR_GROUP , QVariant::Color }
     , { CustomCursorTextColor , "CustomCursorTextColor" , CURSOR_GROUP , QVariant::Color }
 
     // Interaction
     , { WordCharacters , "WordCharacters" , INTERACTION_GROUP , QVariant::String }
     , { TripleClickMode , "TripleClickMode" , INTERACTION_GROUP , QVariant::Int }
     , { UnderlineLinksEnabled , "UnderlineLinksEnabled" , INTERACTION_GROUP , QVariant::Bool }
     , { UnderlineFilesEnabled , "UnderlineFilesEnabled" , INTERACTION_GROUP , QVariant::Bool }
     , { OpenLinksByDirectClickEnabled , "OpenLinksByDirectClickEnabled" , INTERACTION_GROUP , QVariant::Bool }
     , { CtrlRequiredForDrag, "CtrlRequiredForDrag" , INTERACTION_GROUP , QVariant::Bool }
     , { DropUrlsAsText , "DropUrlsAsText" , INTERACTION_GROUP , QVariant::Bool }
     , { AutoCopySelectedText , "AutoCopySelectedText" , INTERACTION_GROUP , QVariant::Bool }
     , { CopyTextAsHTML , "CopyTextAsHTML" , INTERACTION_GROUP , QVariant::Bool }
     , { TrimLeadingSpacesInSelectedText , "TrimLeadingSpacesInSelectedText" , INTERACTION_GROUP , QVariant::Bool }
     , { TrimTrailingSpacesInSelectedText , "TrimTrailingSpacesInSelectedText" , INTERACTION_GROUP , QVariant::Bool }
     , { PasteFromSelectionEnabled , "PasteFromSelectionEnabled" , INTERACTION_GROUP , QVariant::Bool }
     , { PasteFromClipboardEnabled , "PasteFromClipboardEnabled" , INTERACTION_GROUP , QVariant::Bool }
     , { MiddleClickPasteMode, "MiddleClickPasteMode" , INTERACTION_GROUP , QVariant::Int }
     , { MouseWheelZoomEnabled, "MouseWheelZoomEnabled", INTERACTION_GROUP, QVariant::Bool }
     , { AlternateScrolling, "AlternateScrolling", INTERACTION_GROUP, QVariant::Bool }
 
     // Encoding
     , { DefaultEncoding , "DefaultEncoding" , ENCODING_GROUP , QVariant::String }
 
     , { static_cast<Profile::Property>(0) , nullptr , nullptr, QVariant::Invalid }
 };
 
 QHash<QString, Profile::PropertyInfo> Profile::PropertyInfoByName;
 QHash<Profile::Property, Profile::PropertyInfo> Profile::PropertyInfoByProperty;
 
 void Profile::fillTableWithDefaultNames()
 {
     static bool filledDefaults = false;
 
     if (filledDefaults) {
         return;
     }
 
     const PropertyInfo* iter = DefaultPropertyNames;
     while (iter->name != nullptr) {
         registerProperty(*iter);
         iter++;
     }
 
     filledDefaults = true;
 }
 
 void Profile::useFallback()
 {
     // Fallback settings
     setProperty(Name, i18nc("Name of the default/builtin profile", "Default"));
     setProperty(UntranslatedName, QStringLiteral("Default"));
     // magic path for the fallback profile which is not a valid
     // non-directory file name
     setProperty(Path, QStringLiteral("FALLBACK/"));
     setProperty(Command, QString::fromUtf8(qgetenv("SHELL")));
     // See Pty.cpp on why Arguments is populated
     setProperty(Arguments, QStringList() << QString::fromUtf8(qgetenv("SHELL")));
     setProperty(Icon, QStringLiteral("utilities-terminal"));
     setProperty(Environment, QStringList() << QStringLiteral("TERM=xterm-256color") << QStringLiteral("COLORTERM=truecolor"));
     setProperty(LocalTabTitleFormat, QStringLiteral("%d : %n"));
     setProperty(RemoteTabTitleFormat, QStringLiteral("(%u) %H"));
     setProperty(ShowTerminalSizeHint, true);
     setProperty(DimWhenInactive, false);
     setProperty(StartInCurrentSessionDir, true);
     setProperty(MenuIndex, QStringLiteral("0"));
     setProperty(SilenceSeconds, 10);
     setProperty(TerminalColumns, 80);
     setProperty(TerminalRows, 24);
     setProperty(TerminalMargin, 1);
     setProperty(TerminalCenter, false);
     setProperty(MouseWheelZoomEnabled, true);
     setProperty(AlternateScrolling, true);
 
     setProperty(KeyBindings, QStringLiteral("default"));
     setProperty(ColorScheme, QStringLiteral("Breeze"));
     setProperty(Font, QFontDatabase::systemFont(QFontDatabase::FixedFont));
 
     setProperty(HistoryMode, Enum::FixedSizeHistory);
     setProperty(HistorySize, 1000);
     setProperty(ScrollBarPosition, Enum::ScrollBarRight);
     setProperty(ScrollFullPage, false);
 
     setProperty(FlowControlEnabled, true);
     setProperty(UrlHintsModifiers, 0);
     setProperty(ReverseUrlHints, false);
     setProperty(BlinkingTextEnabled, true);
     setProperty(UnderlineLinksEnabled, true);
     setProperty(UnderlineFilesEnabled, false);
     setProperty(OpenLinksByDirectClickEnabled, false);
     setProperty(CtrlRequiredForDrag, true);
     setProperty(AutoCopySelectedText, false);
     setProperty(CopyTextAsHTML, true);
     setProperty(TrimLeadingSpacesInSelectedText, false);
     setProperty(TrimTrailingSpacesInSelectedText, false);
     setProperty(DropUrlsAsText, true);
     setProperty(PasteFromSelectionEnabled, true);
     setProperty(PasteFromClipboardEnabled, false);
     setProperty(MiddleClickPasteMode, Enum::PasteFromX11Selection);
     setProperty(TripleClickMode, Enum::SelectWholeLine);
 
     setProperty(BlinkingCursorEnabled, false);
     setProperty(BidiRenderingEnabled, true);
     setProperty(LineSpacing, 0);
     setProperty(CursorShape, Enum::BlockCursor);
     setProperty(UseCustomCursorColor, false);
     setProperty(CustomCursorColor, QColor(Qt::white));
     setProperty(CustomCursorTextColor, QColor(Qt::black));
     setProperty(BellMode, Enum::NotifyBell);
 
     setProperty(DefaultEncoding, QLatin1String(QTextCodec::codecForLocale()->name()));
     setProperty(AntiAliasFonts, true);
     setProperty(BoldIntense, true);
     setProperty(UseFontLineCharacters, false);
 
     setProperty(WordCharacters, QStringLiteral(":@-./_~?&=%+#"));
 
+    setProperty(TabColor, QColor(QColor::Invalid));
+
     // Fallback should not be shown in menus
     setHidden(true);
 }
+
 Profile::Profile(const Profile::Ptr &parent)
     : _propertyValues(QHash<Property, QVariant>())
     , _parent(parent)
     , _hidden(false)
 {
 }
+
 void Profile::clone(Profile::Ptr profile, bool differentOnly)
 {
     const PropertyInfo* properties = DefaultPropertyNames;
     while (properties->name != nullptr) {
         Property current = properties->property;
         QVariant otherValue = profile->property<QVariant>(current);
         switch (current) {
         case Name:
         case Path:
             break;
         default:
             if (!differentOnly ||
                     property<QVariant>(current) != otherValue) {
                 setProperty(current, otherValue);
             }
         }
         properties++;
     }
 }
 
 Profile::~Profile() = default;
 
 bool Profile::isHidden() const
 {
     return _hidden;
 }
 void Profile::setHidden(bool hidden)
 {
     _hidden = hidden;
 }
 
 void Profile::setParent(const Profile::Ptr &parent)
 {
     _parent = parent;
 }
 const Profile::Ptr Profile::parent() const
 {
     return _parent;
 }
 
 bool Profile::isEmpty() const
 {
     return _propertyValues.isEmpty();
 }
+
 QHash<Profile::Property, QVariant> Profile::setProperties() const
 {
     return _propertyValues;
 }
+
 void Profile::setProperty(Property p, const QVariant& value)
 {
     _propertyValues.insert(p, value);
 }
+
 bool Profile::isPropertySet(Property p) const
 {
     return _propertyValues.contains(p);
 }
 
 Profile::Property Profile::lookupByName(const QString& name)
 {
     // insert default names into table the first time this is called
     fillTableWithDefaultNames();
 
     return PropertyInfoByName[name.toLower()].property;
 }
 
 void Profile::registerProperty(const PropertyInfo& info)
 {
     QString name = QLatin1String(info.name);
     PropertyInfoByName.insert(name.toLower(), info);
 
     // only allow one property -> name map
     // (multiple name -> property mappings are allowed though)
     if (!PropertyInfoByProperty.contains(info.property)) {
         PropertyInfoByProperty.insert(info.property, info);
     }
 }
 
 int Profile::menuIndexAsInt() const
 {
     bool ok;
     int index = menuIndex().toInt(&ok, 10);
     if (ok) {
         return index;
     }
     return 0;
 }
 
 const QStringList Profile::propertiesInfoList() const
 {
     QStringList info;
     const PropertyInfo* iter = DefaultPropertyNames;
     while (iter->name != nullptr) {
         info << QLatin1String(iter->name) + QStringLiteral(" : ") + QLatin1String(QVariant(iter->type).typeName());
         iter++;
     }
 
     return info;
 }
 
 QHash<Profile::Property, QVariant> ProfileCommandParser::parse(const QString& input)
 {
     QHash<Profile::Property, QVariant> changes;
 
     // regular expression to parse profile change requests.
     //
     // format: property=value;property=value ...
     //
     // where 'property' is a word consisting only of characters from A-Z
     // where 'value' is any sequence of characters other than a semi-colon
     //
     static const QRegularExpression regExp(QStringLiteral("([a-zA-Z]+)=([^;]+)"));
 
     QRegularExpressionMatchIterator iterator(regExp.globalMatch(input));
     while (iterator.hasNext()) {
         QRegularExpressionMatch match(iterator.next());
         Profile::Property property = Profile::lookupByName(match.captured(1));
         const QString value = match.captured(2);
         changes.insert(property, value);
     }
 
     return changes;
 }
 
 void ProfileGroup::updateValues()
 {
     const PropertyInfo* properties = Profile::DefaultPropertyNames;
     while (properties->name != nullptr) {
         // the profile group does not store a value for some properties
         // (eg. name, path) if even they are equal between profiles -
         //
         // the exception is when the group has only one profile in which
         // case it behaves like a standard Profile
         if (_profiles.count() > 1 &&
                 !canInheritProperty(properties->property)) {
             properties++;
             continue;
         }
 
         QVariant value;
         for (int i = 0; i < _profiles.count(); i++) {
             QVariant profileValue = _profiles[i]->property<QVariant>(properties->property);
             if (value.isNull()) {
                 value = profileValue;
             } else if (value != profileValue) {
                 value = QVariant();
                 break;
             }
         }
         Profile::setProperty(properties->property, value);
         properties++;
     }
 }
+
 void ProfileGroup::setProperty(Property p, const QVariant& value)
 {
     if (_profiles.count() > 1 && !canInheritProperty(p)) {
         return;
     }
 
     Profile::setProperty(p, value);
     for (const Profile::Ptr &profile : qAsConst(_profiles)) {
         profile->setProperty(p, value);
     }
 }
-
diff --git a/src/Profile.h b/src/Profile.h
index 9edea010..61af9f37 100644
--- a/src/Profile.h
+++ b/src/Profile.h
@@ -1,821 +1,829 @@
 /*
     This source file is part of Konsole, a terminal emulator.
 
     Copyright 2007-2008 by Robert Knight <robertknight@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 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.
 */
 
 #ifndef PROFILE_H
 #define PROFILE_H
 
 // Qt
 #include <QHash>
 #include <QStringList>
 #include <QVariant>
 #include <QFont>
 #include <QColor>
 
 // Konsole
 #include "konsoleprivate_export.h"
 
 namespace Konsole {
 class ProfileGroup;
 
 /**
  * Represents a terminal set-up which can be used to
  * set the initial state of new terminal sessions or applied
  * to existing sessions.  Profiles consist of a number of named
  * properties, which can be retrieved using property() and
  * set using setProperty().  isPropertySet() can be used to check
  * whether a particular property has been set in a profile.
  *
  * Profiles support a simple form of inheritance.  When a new Profile
  * is constructed, a pointer to a parent profile can be passed to
  * the constructor.  When querying a particular property of a profile
  * using property(), the profile will return its own value for that
  * property if one has been set or otherwise it will return the
  * parent's value for that property.
  *
  * Profiles can be loaded from disk using ProfileReader instances
  * and saved to disk using ProfileWriter instances.
  */
 class KONSOLEPRIVATE_EXPORT Profile : public QSharedData
 {
     Q_GADGET
 
     friend class ProfileReader;
     friend class ProfileWriter;
     friend class ProfileGroup;
 
 public:
     using Ptr = QExplicitlySharedDataPointer<Profile>;
     using GroupPtr = QExplicitlySharedDataPointer<ProfileGroup>;
 
     /**
      * This enum describes the available properties
      * which a Profile may consist of.
      *
      * Properties can be set using setProperty() and read
      * using property()
      */
     enum Property {
         /** (QString) Path to the profile's configuration file on-disk. */
         Path,
         /** (QString) The descriptive name of this profile. */
         Name,
         /** (QString) The untranslated name of this profile.
          * Warning: this is an internal property. Do not touch it.
          */
         UntranslatedName,
         /** (QString) The name of the icon associated with this profile.
          * This is used in menus and tabs to represent the profile.
          */
         Icon,
         /** (QString) The command to execute ( excluding arguments ) when
          * creating a new terminal session using this profile.
          */
         Command,
         /** (QStringList) The arguments which are passed to the program
          * specified by the Command property when creating a new terminal
          * session using this profile.
          */
         Arguments,
         /** (QStringList) Additional environment variables (in the form of
          * NAME=VALUE pairs) which are passed to the program specified by
          * the Command property when creating a new terminal session using
          * this profile.
          */
         Environment,
         /** (QString) The initial working directory for sessions created
          * using this profile.
          */
         Directory,
         /** (QString) The format used for tab titles when running normal
           * commands.
           */
         LocalTabTitleFormat,
         /** (QString) The format used for tab titles when the session is
          * running a remote command (eg. SSH)
          */
         RemoteTabTitleFormat,
         /** (bool) Specifies whether show hint for terminal size after
          * resizing the application window.
          */
         ShowTerminalSizeHint,
         /** (bool) If the background color should change to indicate if the window is active
          */
         DimWhenInactive,
         /** (QFont) The font to use in terminal displays using this profile. */
         Font,
         /** (QString) The name of the color scheme to use in terminal
          * displays using this profile.
          * Color schemes are managed by the ColorSchemeManager class.
          */
         ColorScheme,
         /** (QString) The name of the key bindings.
          * Key bindings are managed by the KeyboardTranslatorManager class.
          */
         KeyBindings,
         /** (HistoryModeEnum) Specifies the storage type used for keeping
          * the output produced by terminal sessions using this profile.
          *
          * See Enum::HistoryModeEnum
          */
         HistoryMode,
         /** (int) Specifies the number of lines of output to remember in
          * terminal sessions using this profile.  Once the limit is reached,
          * the oldest lines are lost if the HistoryMode property is
          * FixedSizeHistory
          */
         HistorySize,
         /** (ScrollBarPositionEnum) Specifies the position of the scroll bar
          * in terminal displays using this profile.
          *
          * See Enum::ScrollBarPositionEnum
          */
         ScrollBarPosition,
         /** (bool) Specifies whether the PageUp/Down will scroll the full
          * height or half height.
              */
         ScrollFullPage,
         /** (bool) Specifies whether the terminal will enable Bidirectional
          * text display
          */
         BidiRenderingEnabled,
         /** (bool) Specifies whether text in terminal displays is allowed
          * to blink.
          */
         BlinkingTextEnabled,
         /** (bool) Specifies whether the flow control keys (typically Ctrl+S,
          * Ctrl+Q) have any effect.  Also known as Xon/Xoff
          */
         FlowControlEnabled,
         /** (int) Specifies the pixels between the terminal lines.
          */
         LineSpacing,
         /** (bool) Specifies whether the cursor blinks ( in a manner similar
          * to text editing applications )
          */
         BlinkingCursorEnabled,
         /** (bool) If true, terminal displays use a fixed color to draw the
          * cursor, specified by the CustomCursorColor property.  Otherwise
          * the cursor changes color to match the character underneath it.
          */
         UseCustomCursorColor,
         /** (CursorShapeEnum) The shape used by terminal displays to
          * represent the cursor.
          *
          * See Enum::CursorShapeEnum
          */
         CursorShape,
         /** (QColor) The color used by terminal displays to draw the cursor.
          * Only applicable if the UseCustomCursorColor property is true.
          */
         CustomCursorColor,
         /** (QColor) The color used by terminal displays to draw the character
          * underneath the cursor. Only applicable if the UseCustomCursorColor
          * property is true and CursorShape property is Enum::BlockCursor.
          */
         CustomCursorTextColor,
         /** (QString) A string consisting of the characters used to delimit
          * words when selecting text in the terminal display.
          */
         WordCharacters,
         /** (TripleClickModeEnum) Specifies which part of current line should
          * be selected with triple click action.
          *
          * See Enum::TripleClickModeEnum
          */
         TripleClickMode,
         /** (bool) If true, text that matches a link or an email address is
          * underlined when hovered by the mouse pointer.
          */
         UnderlineLinksEnabled,
         /** (bool) If true, text that matches a file is
          * underlined when hovered by the mouse pointer.
          */
         UnderlineFilesEnabled,
         /** (bool) If true, links can be opened by direct mouse click.*/
         OpenLinksByDirectClickEnabled,
         /** (bool) If true, control key must be pressed to click and drag selected text. */
         CtrlRequiredForDrag,
         /** (bool) If true, automatically copy selected text into the clipboard */
         AutoCopySelectedText,
         /** (bool) The QMimeData object used when copying text always
          * has the plain/text MIME set and if this is @c true then the
          * text/html MIME is set too in that object i.e. the copied
          * text will include formatting, font faces, colors... etc; users
          * can paste the text as HTML (default) or as plain/text by using
          * e.g. the "Paste Special" functionality in LibreOffice.
          */
         CopyTextAsHTML,
         /** (bool) If true, leading spaces are trimmed in selected text */
         TrimLeadingSpacesInSelectedText,
         /** (bool) If true, trailing spaces are trimmed in selected text */
         TrimTrailingSpacesInSelectedText,
         /** (bool) If true, then dropped URLs will be pasted as text without asking */
         DropUrlsAsText,
         /** (bool) If true, middle mouse button pastes from X Selection */
         PasteFromSelectionEnabled,
         /** (bool) If true, middle mouse button pastes from Clipboard */
         PasteFromClipboardEnabled,
         /** (MiddleClickPasteModeEnum) Specifies the source from which mouse
          * middle click pastes data.
          *
          * See Enum::MiddleClickPasteModeEnum
          */
         MiddleClickPasteMode,
         /** (String) Default text codec */
         DefaultEncoding,
         /** (bool) Whether fonts should be aliased or not */
         AntiAliasFonts,
         /** (bool) Whether character with intense colors should be rendered
          * in bold font or just in bright color. */
         BoldIntense,
         /** (bool) Whether to use font's line characters instead of the
          * builtin code. */
         UseFontLineCharacters,
         /** (bool) Whether new sessions should be started in the same
          * directory as the currently active session.
          */
         StartInCurrentSessionDir,
         /** (int) Specifies the threshold of detected silence in seconds. */
         SilenceSeconds,
         /** (BellModeEnum) Specifies the behavior of bell.
          *
          * See Enum::BellModeEnum
          */
         BellMode,
         /** (int) Specifies the preferred columns. */
         TerminalColumns,
         /** (int) Specifies the preferred rows. */
         TerminalRows,
         /** Index of profile in the File Menu
          * WARNING: this is currently an internal field, which is
          * expected to be zero on disk. Do not modify it manually.
          *
          * In future, the format might be #.#.# to account for levels
          */
         MenuIndex,
         /** (int) Margin width in pixels */
         TerminalMargin,
         /** (bool) Center terminal when there is a margin */
         TerminalCenter,
         /** (bool) If true, mouse wheel scroll with Ctrl key pressed
          * increases/decreases the terminal font size.
          */
         MouseWheelZoomEnabled,
         /** (bool) Specifies whether emulated up/down key press events are
          * sent, for mouse scroll wheel events, to programs using the
          * Alternate Screen buffer; this is mainly for the benefit of
          * programs that don't natively support mouse scroll events, e.g.
          * less.
          *
          * This also works for scrolling in applications that support Mouse
          * Tracking events but don't indicate they're interested in those
          * events; for example, when vim doesn't indicate it's interested
          * in Mouse Tracking events (i.e. when the mouse is in Normal
          * (not Visual) mode): https://vimhelp.org/intro.txt.html#vim-modes-intro
          * mouse wheel scroll events will send up/down key press events.
          *
          * Default value is true.
          * See also, MODE_Mouse1007 in the Emulation header, which toggles
          * Alternate Scrolling with escape sequences.
         */
         AlternateScrolling,
         /** (int) Keyboard modifiers to show URL hints */
         UrlHintsModifiers,
         /** (bool) Reverse the order of URL hints */
-        ReverseUrlHints
+        ReverseUrlHints,
+        /** (QColor) used in tab color */
+        TabColor
     };
 
     Q_ENUM(Property)
 
     /**
      * Constructs a new profile
      *
      * @param parent The parent profile.  When querying the value of a
      * property using property(), if the property has not been set in this
      * profile then the parent's value for the property will be returned.
      */
     explicit Profile(const Ptr &parent = Ptr());
     virtual ~Profile();
 
     /**
      * Copies all properties except Name and Path from the specified @p
      * profile into this profile
      *
      * @param profile The profile to copy properties from
      * @param differentOnly If true, only properties in @p profile which have
      * a different value from this profile's current value (either set via
      * setProperty() or inherited from the parent profile) will be set.
      */
     void clone(Ptr profile, bool differentOnly = true);
 
     /**
      * A profile which contains a number of default settings for various
      * properties.  This can be used as a parent for other profiles or a
      * fallback in case a profile cannot be loaded from disk.
      */
     void useFallback();
 
     /**
      * Changes the parent profile.  When calling the property() method,
      * if the specified property has not been set for this profile,
      * the parent's value for the property will be returned instead.
      */
     void setParent(const Ptr &parent);
 
     /** Returns the parent profile. */
     const Ptr parent() const;
 
     /** Returns this profile as a group or null if this profile is not a
      * group.
      */
     const GroupPtr asGroup() const;
     GroupPtr asGroup();
 
     /**
      * Returns the current value of the specified @p property, cast to type T.
      * Internally properties are stored using the QVariant type and cast to T
      * using QVariant::value<T>();
      *
      * If the specified @p property has not been set in this profile,
      * and a non-null parent was specified in the Profile's constructor,
      * the parent's value for @p property will be returned.
      */
     template<class T>
     T property(Property p) const;
 
     /** Sets the value of the specified @p property to @p value. */
     virtual void setProperty(Property p, const QVariant &value);
     /** Returns true if the specified property has been set in this Profile
      * instance.
      */
     virtual bool isPropertySet(Property p) const;
 
     /** Returns a map of the properties set in this Profile instance. */
     virtual QHash<Property, QVariant> setProperties() const;
 
     /** Returns true if no properties have been set in this Profile instance. */
     bool isEmpty() const;
 
     /**
      * Returns true if this is a 'hidden' profile which should not be
      * displayed in menus or saved to disk.
      *
      * This is used for the fallback profile, in case there are no profiles on
      * disk which can be loaded, or for overlay profiles created to handle
      * command-line arguments which change profile properties.
      */
     bool isHidden() const;
 
     /** Specifies whether this is a hidden profile.  See isHidden() */
     void setHidden(bool hidden);
 
     //
     // Convenience methods for property() and setProperty() go here
     //
 
     /** Convenience method for property<QString>(Profile::Path) */
     QString path() const
     {
         return property<QString>(Profile::Path);
     }
 
     /** Convenience method for property<QString>(Profile::Name) */
     QString name() const
     {
         return property<QString>(Profile::Name);
     }
 
     /** Convenience method for property<QString>(Profile::UntranslatedName) */
     QString untranslatedName() const
     {
         return property<QString>(Profile::UntranslatedName);
     }
 
     /** Convenience method for property<QString>(Profile::Directory) */
     QString defaultWorkingDirectory() const
     {
         return property<QString>(Profile::Directory);
     }
 
     /** Convenience method for property<QString>(Profile::Icon) */
     QString icon() const
     {
         return property<QString>(Profile::Icon);
     }
 
     /** Convenience method for property<QString>(Profile::Command) */
     QString command() const
     {
         return property<QString>(Profile::Command);
     }
 
     /** Convenience method for property<QStringList>(Profile::Arguments) */
     QStringList arguments() const
     {
         return property<QStringList>(Profile::Arguments);
     }
 
     /** Convenience method for property<QString>(Profile::LocalTabTitleFormat) */
     QString localTabTitleFormat() const
     {
         return property<QString>(Profile::LocalTabTitleFormat);
     }
 
     /** Convenience method for property<QString>(Profile::RemoteTabTitleFormat) */
     QString remoteTabTitleFormat() const
     {
         return property<QString>(Profile::RemoteTabTitleFormat);
     }
 
+    /** Convenience method for property<QColor>(Profile::TabColor) */
+    QColor tabColor() const
+    {
+        return property<QColor>(Profile::TabColor);
+    }
+
     /** Convenience method for property<bool>(Profile::ShowTerminalSizeHint) */
     bool showTerminalSizeHint() const
     {
         return property<bool>(Profile::ShowTerminalSizeHint);
     }
 
     /** Convenience method for property<bool>(Profile::DimWhenInactive) */
     bool dimWhenInactive() const
     {
         return property<bool>(Profile::DimWhenInactive);
     }
 
     /** Convenience method for property<QFont>(Profile::Font) */
     QFont font() const
     {
         return property<QFont>(Profile::Font);
     }
 
     /** Convenience method for property<QString>(Profile::ColorScheme) */
     QString colorScheme() const
     {
         return property<QString>(Profile::ColorScheme);
     }
 
     /** Convenience method for property<QStringList>(Profile::Environment) */
     QStringList environment() const
     {
         return property<QStringList>(Profile::Environment);
     }
 
     /** Convenience method for property<QString>(Profile::KeyBindings) */
     QString keyBindings() const
     {
         return property<QString>(Profile::KeyBindings);
     }
 
     /** Convenience method for property<QString>(Profile::HistorySize) */
     int historySize() const
     {
         return property<int>(Profile::HistorySize);
     }
 
     /** Convenience method for property<bool>(Profile::BidiRenderingEnabled) */
     bool bidiRenderingEnabled() const
     {
         return property<bool>(Profile::BidiRenderingEnabled);
     }
 
     /** Convenience method for property<bool>(Profile::LineSpacing) */
     int lineSpacing() const
     {
         return property<int>(Profile::LineSpacing);
     }
 
     /** Convenience method for property<bool>(Profile::BlinkingTextEnabled) */
     bool blinkingTextEnabled() const
     {
         return property<bool>(Profile::BlinkingTextEnabled);
     }
 
     /** Convenience method for property<bool>(Profile::MouseWheelZoomEnabled) */
     bool mouseWheelZoomEnabled() const
     {
         return property<bool>(Profile::MouseWheelZoomEnabled);
     }
 
     /** Convenience method for property<bool>(Profile::BlinkingCursorEnabled) */
     bool blinkingCursorEnabled() const
     {
         return property<bool>(Profile::BlinkingCursorEnabled);
     }
 
     /** Convenience method for property<bool>(Profile::FlowControlEnabled) */
     bool flowControlEnabled() const
     {
         return property<bool>(Profile::FlowControlEnabled);
     }
 
     /** Convenience method for property<bool>(Profile::UseCustomCursorColor) */
     bool useCustomCursorColor() const
     {
         return property<bool>(Profile::UseCustomCursorColor);
     }
 
     /** Convenience method for property<QColor>(Profile::CustomCursorColor) */
     QColor customCursorColor() const
     {
         return property<QColor>(Profile::CustomCursorColor);
     }
 
     /** Convenience method for property<QColor>(Profile::CustomCursorTextColor) */
     QColor customCursorTextColor() const
     {
         return property<QColor>(Profile::CustomCursorTextColor);
     }
 
     /** Convenience method for property<QString>(Profile::WordCharacters) */
     QString wordCharacters() const
     {
         return property<QString>(Profile::WordCharacters);
     }
 
     /** Convenience method for property<bool>(Profile::UnderlineLinksEnabled) */
     bool underlineLinksEnabled() const
     {
         return property<bool>(Profile::UnderlineLinksEnabled);
     }
 
     /** Convenience method for property<bool>(Profile::UnderlineFilesEnabled) */
     bool underlineFilesEnabled() const
     {
         return property<bool>(Profile::UnderlineFilesEnabled);
     }
 
     bool autoCopySelectedText() const
     {
         return property<bool>(Profile::AutoCopySelectedText);
     }
 
     /** Convenience method for property<QString>(Profile::DefaultEncoding) */
     QString defaultEncoding() const
     {
         return property<QString>(Profile::DefaultEncoding);
     }
 
     /** Convenience method for property<bool>(Profile::AntiAliasFonts) */
     bool antiAliasFonts() const
     {
         return property<bool>(Profile::AntiAliasFonts);
     }
 
     /** Convenience method for property<bool>(Profile::BoldIntense) */
     bool boldIntense() const
     {
         return property<bool>(Profile::BoldIntense);
     }
 
     /** Convenience method for property<bool>(Profile::UseFontLineCharacters)*/
     bool useFontLineCharacters() const
     {
         return property<bool>(Profile::UseFontLineCharacters);
     }
 
     /** Convenience method for property<bool>(Profile::StartInCurrentSessionDir) */
     bool startInCurrentSessionDir() const
     {
         return property<bool>(Profile::StartInCurrentSessionDir);
     }
 
     /** Convenience method for property<QString>(Profile::SilenceSeconds) */
     int silenceSeconds() const
     {
         return property<int>(Profile::SilenceSeconds);
     }
 
     /** Convenience method for property<QString>(Profile::TerminalColumns) */
     int terminalColumns() const
     {
         return property<int>(Profile::TerminalColumns);
     }
 
     /** Convenience method for property<QString>(Profile::TerminalRows) */
     int terminalRows() const
     {
         return property<int>(Profile::TerminalRows);
     }
 
     /** Convenience method for property<int>(Profile::TerminalMargin) */
     int terminalMargin() const
     {
         return property<int>(Profile::TerminalMargin);
     }
 
     /** Convenience method for property<bool>(Profile::TerminalCenter) */
     bool terminalCenter() const
     {
         return property<bool>(Profile::TerminalCenter);
     }
 
     /** Convenience method for property<QString>(Profile::MenuIndex) */
     QString menuIndex() const
     {
         return property<QString>(Profile::MenuIndex);
     }
 
     int menuIndexAsInt() const;
 
     /** Return a list of all properties names and their type
      *  (for use with -p option).
      */
     const QStringList propertiesInfoList() const;
 
     /**
      * Returns the element from the Property enum associated with the
      * specified @p name.
      *
      * @param name The name of the property to look for, this is case
      * insensitive.
      */
     static Property lookupByName(const QString &name);
 
 private:
     struct PropertyInfo;
     // Defines a new property, this property is then available
     // to all Profile instances.
     static void registerProperty(const PropertyInfo &info);
 
     // fills the table with default names for profile properties
     // the first time it is called.
     // subsequent calls return immediately
     static void fillTableWithDefaultNames();
 
     // returns true if the property can be inherited
     static bool canInheritProperty(Property p);
 
     QHash<Property, QVariant> _propertyValues;
     Ptr _parent;
 
     bool _hidden;
 
     static QHash<QString, PropertyInfo> PropertyInfoByName;
     static QHash<Property, PropertyInfo> PropertyInfoByProperty;
 
     // Describes a property.  Each property has a name and group
     // which is used when saving/loading the profile.
     struct PropertyInfo {
         Property property;
         const char *name;
         const char *group;
         QVariant::Type type;
     };
     static const PropertyInfo DefaultPropertyNames[];
 };
 
 inline bool Profile::canInheritProperty(Property p)
 {
     return p != Name && p != Path;
 }
 
 template<class T>
 inline T Profile::property(Property p) const
 {
     return property<QVariant>(p).value<T>();
 }
 
 template<>
 inline QVariant Profile::property(Property p) const
 {
     if (_propertyValues.contains(p)) {
         return _propertyValues[p];
     } else if (_parent && canInheritProperty(p)) {
         return _parent->property<QVariant>(p);
     } else {
         return QVariant();
     }
 }
 
 /**
  * A composite profile which allows a group of profiles to be treated as one.
  * When setting a property, the new value is applied to all profiles in the
  * group.  When reading a property, if all profiles in the group have the same
  * value then that value is returned, otherwise the result is null.
  *
  * Profiles can be added to the group using addProfile().  When all profiles
  * have been added updateValues() must be called
  * to sync the group's property values with those of the group's profiles.
  *
  * The Profile::Name and Profile::Path properties are unique to individual
  * profiles, setting these properties on a ProfileGroup has no effect.
  */
 class KONSOLEPRIVATE_EXPORT ProfileGroup : public Profile
 {
 public:
     using Ptr = QExplicitlySharedDataPointer<ProfileGroup>;
 
     /** Construct a new profile group, which is hidden by default. */
     explicit ProfileGroup(const Profile::Ptr &profileParent = Profile::Ptr());
 
     /** Add a profile to the group.  Calling setProperty() will update this
      * profile.  When creating a group, add the profiles to the group then
      * call updateValues() to make the group's property values reflect the
      * profiles currently in the group.
      */
     void addProfile(const Profile::Ptr &profile)
     {
         _profiles.append(profile);
     }
 
     /** Remove a profile from the group.  Calling setProperty() will no longer
      * affect this profile. */
     void removeProfile(const Profile::Ptr &profile)
     {
         _profiles.removeAll(profile);
     }
 
     /** Returns the profiles in this group .*/
     QList<Profile::Ptr> profiles() const
     {
         return _profiles;
     }
 
     /**
      * Updates the property values in this ProfileGroup to match those from
      * the group's profiles()
      *
      * For each available property, if each profile in the group has the same
      * value then the ProfileGroup will use that value for the property.
      * Otherwise the value for the property will be set to a null QVariant
      *
      * Some properties such as the name and the path of the profile
      * will always be set to null if the group has more than one profile.
      */
     void updateValues();
 
     /** Sets the value of @p property in each of the group's profiles to
      * @p value.
      */
     void setProperty(Property p, const QVariant &value) override;
 
 private:
     Q_DISABLE_COPY(ProfileGroup)
 
     QList<Profile::Ptr> _profiles;
 };
 inline ProfileGroup::ProfileGroup(const Profile::Ptr &profileParent) :
     Profile(profileParent),
     _profiles(QList<Profile::Ptr>())
 {
     setHidden(true);
 }
 
 inline const Profile::GroupPtr Profile::asGroup() const
 {
     const Profile::GroupPtr ptr(dynamic_cast<ProfileGroup *>(
                                     const_cast<Profile *>(this)));
     return ptr;
 }
 
 inline Profile::GroupPtr Profile::asGroup()
 {
     return Profile::GroupPtr(dynamic_cast<ProfileGroup *>(this));
 }
 
 /**
  * Parses an input string consisting of property names
  * and assigned values and returns a table of properties
  * and values.
  *
  * The input string will typically look like this:
  *
  * @code
  *   PropertyName=Value;PropertyName=Value ...
  * @endcode
  *
  * For example:
  *
  * @code
  *   Icon=konsole;Directory=/home/bob
  * @endcode
  */
 class KONSOLEPRIVATE_EXPORT ProfileCommandParser
 {
 public:
     /**
      * Parses an input string consisting of property names
      * and assigned values and returns a table of
      * properties and values.
      */
     QHash<Profile::Property, QVariant> parse(const QString &input);
 };
 }
 Q_DECLARE_METATYPE(Konsole::Profile::Ptr)
 
 #endif // PROFILE_H
diff --git a/src/RenameTabDialog.cpp b/src/RenameTabDialog.cpp
index 728ba86d..7974ce65 100644
--- a/src/RenameTabDialog.cpp
+++ b/src/RenameTabDialog.cpp
@@ -1,89 +1,99 @@
 /*
     Copyright 2010 by Kurt Hindenburg <kurt.hindenburg@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 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.
 */
 
 // Own
 #include "RenameTabDialog.h"
 
 // Konsole
 #include "ui_RenameTabDialog.h"
 #include "Shortcut_p.h"
 
 #include <KLocalizedString>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 
 using Konsole::RenameTabDialog;
 
 RenameTabDialog::RenameTabDialog(QWidget *parent) :
     QDialog(parent),
     _ui(nullptr)
 {
     setWindowTitle(i18n("Rename Tab"));
     auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
     auto mainWidget = new QWidget(this);
     auto mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     mainLayout->addWidget(mainWidget);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setAutoDefault(true);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &RenameTabDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &RenameTabDialog::reject);
     mainLayout->addWidget(buttonBox);
 
     setWindowModality(Qt::WindowModal);
 
     _ui = new Ui::RenameTabDialog();
     _ui->setupUi(mainWidget);
 }
 
 RenameTabDialog::~RenameTabDialog()
 {
     delete _ui;
 }
 
 void RenameTabDialog::focusTabTitleText()
 {
     _ui->renameTabWidget->focusTabTitleText();
 }
 
 void RenameTabDialog::focusRemoteTabTitleText()
 {
     _ui->renameTabWidget->focusRemoteTabTitleText();
 }
 
 void RenameTabDialog::setTabTitleText(const QString &text)
 {
     _ui->renameTabWidget->setTabTitleText(text);
 }
 
 void RenameTabDialog::setRemoteTabTitleText(const QString &text)
 {
     _ui->renameTabWidget->setRemoteTabTitleText(text);
 }
 
+void RenameTabDialog::setColor(const QColor &color)
+{
+    _ui->renameTabWidget->setColor(color);
+}
+
 QString RenameTabDialog::tabTitleText() const
 {
     return _ui->renameTabWidget->tabTitleText();
 }
 
 QString RenameTabDialog::remoteTabTitleText() const
 {
     return _ui->renameTabWidget->remoteTabTitleText();
 }
+
+QColor RenameTabDialog::color() const
+{
+    return _ui->renameTabWidget->color();
+}
diff --git a/src/RenameTabDialog.h b/src/RenameTabDialog.h
index c8922c11..f3ffda54 100644
--- a/src/RenameTabDialog.h
+++ b/src/RenameTabDialog.h
@@ -1,54 +1,56 @@
 /*
     Copyright 2010 by Kurt Hindenburg <kurt.hindenburg@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 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.
 */
 
 #ifndef RENAMETABDIALOG_H
 #define RENAMETABDIALOG_H
 
 // KDE
 #include <QDialog>
 
 namespace Ui {
 class RenameTabDialog;
 }
 
 namespace Konsole {
 class RenameTabDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     explicit RenameTabDialog(QWidget *parent = nullptr);
     ~RenameTabDialog() override;
 
     QString tabTitleText() const;
     QString remoteTabTitleText() const;
+    QColor color() const;
     void setTabTitleText(const QString &);
     void setRemoteTabTitleText(const QString &);
+    void setColor(const QColor &);
 
     void focusTabTitleText();
     void focusRemoteTabTitleText();
 
 private:
     Q_DISABLE_COPY(RenameTabDialog)
 
     Ui::RenameTabDialog *_ui;
 };
 }
 
 #endif
diff --git a/src/RenameTabWidget.cpp b/src/RenameTabWidget.cpp
index 190fb0b7..0573dd4d 100644
--- a/src/RenameTabWidget.cpp
+++ b/src/RenameTabWidget.cpp
@@ -1,97 +1,120 @@
 /*
     Copyright 2010 by Kurt Hindenburg <kurt.hindenburg@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 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.
 */
 
 // Own
 #include "RenameTabWidget.h"
 
 // Konsole
 #include "ui_RenameTabWidget.h"
 
+// KDE
+#include <KColorCombo>
+
+// Qt
+#include <QColor>
+
 using Konsole::RenameTabWidget;
 
 RenameTabWidget::RenameTabWidget(QWidget *parent) :
     QWidget(parent),
     _ui(nullptr)
 {
     _ui = new Ui::RenameTabWidget();
     _ui->setupUi(this);
 
     _ui->tabTitleEdit->setClearButtonEnabled(true);
     _ui->remoteTabTitleEdit->setClearButtonEnabled(true);
 
+    QList<QColor> listColors(_ui->tabColorCombo->colors());
+    listColors.insert(0, QColor(QColor::Invalid));
+    _ui->tabColorCombo->setColors(listColors);
+    _ui->tabColorCombo->setItemText(1, i18n("Color from theme"));
+
     connect(_ui->tabTitleEdit, &QLineEdit::textChanged, this,
             &Konsole::RenameTabWidget::tabTitleFormatChanged);
     connect(_ui->remoteTabTitleEdit, &QLineEdit::textChanged, this,
             &Konsole::RenameTabWidget::remoteTabTitleFormatChanged);
+    connect(_ui->tabColorCombo, &KColorCombo::activated, this,
+            &Konsole::RenameTabWidget::tabColorChanged);
 
     _ui->tabTitleFormatButton->setContext(Session::LocalTabTitle);
     connect(_ui->tabTitleFormatButton, &Konsole::TabTitleFormatButton::dynamicElementSelected, this,
             &Konsole::RenameTabWidget::insertTabTitleText);
 
     _ui->remoteTabTitleFormatButton->setContext(Session::RemoteTabTitle);
     connect(_ui->remoteTabTitleFormatButton, &Konsole::TabTitleFormatButton::dynamicElementSelected,
             this, &Konsole::RenameTabWidget::insertRemoteTabTitleText);
 }
 
 RenameTabWidget::~RenameTabWidget()
 {
     delete _ui;
 }
 
 void RenameTabWidget::focusTabTitleText()
 {
     _ui->tabTitleEdit->setFocus();
 }
 
 void RenameTabWidget::focusRemoteTabTitleText()
 {
     _ui->remoteTabTitleEdit->setFocus();
 }
 
 void RenameTabWidget::setTabTitleText(const QString &text)
 {
     _ui->tabTitleEdit->setText(text);
 }
 
 void RenameTabWidget::setRemoteTabTitleText(const QString &text)
 {
     _ui->remoteTabTitleEdit->setText(text);
 }
 
+void RenameTabWidget::setColor(const QColor &color)
+{
+    _ui->tabColorCombo->setColor(color);
+}
+
 QString RenameTabWidget::tabTitleText() const
 {
     return _ui->tabTitleEdit->text();
 }
 
 QString RenameTabWidget::remoteTabTitleText() const
 {
     return _ui->remoteTabTitleEdit->text();
 }
 
+QColor RenameTabWidget::color() const
+{
+    return _ui->tabColorCombo->color();
+}
+
 void RenameTabWidget::insertTabTitleText(const QString &text)
 {
     _ui->tabTitleEdit->insert(text);
     focusTabTitleText();
 }
 
 void RenameTabWidget::insertRemoteTabTitleText(const QString &text)
 {
     _ui->remoteTabTitleEdit->insert(text);
     focusRemoteTabTitleText();
 }
diff --git a/src/RenameTabWidget.h b/src/RenameTabWidget.h
index 60cd3981..bd574a55 100644
--- a/src/RenameTabWidget.h
+++ b/src/RenameTabWidget.h
@@ -1,60 +1,65 @@
 /*
     Copyright 2010 by Kurt Hindenburg <kurt.hindenburg@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 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.
 */
 
 #ifndef RENAMETABWIDGET_H
 #define RENAMETABWIDGET_H
 
 // Qt
 #include <QWidget>
 
+class QColor;
+
 namespace Ui {
 class RenameTabWidget;
 }
 
 namespace Konsole {
 class RenameTabWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     explicit RenameTabWidget(QWidget *parent = nullptr);
     ~RenameTabWidget() override;
 
     QString tabTitleText() const;
     QString remoteTabTitleText() const;
+    QColor color() const;
     void setTabTitleText(const QString &);
     void setRemoteTabTitleText(const QString &);
+    void setColor(const QColor &);
 
     void focusTabTitleText();
     void focusRemoteTabTitleText();
 
 Q_SIGNALS:
     void tabTitleFormatChanged(const QString &);
     void remoteTabTitleFormatChanged(const QString &);
+    void tabColorChanged(const QColor &);
 
 public Q_SLOTS:
     void insertTabTitleText(const QString &text);
     void insertRemoteTabTitleText(const QString &text);
 
 private:
     Ui::RenameTabWidget *_ui;
 };
 }
 
 #endif
diff --git a/src/RenameTabWidget.ui b/src/RenameTabWidget.ui
index ff18ea77..2de16634 100644
--- a/src/RenameTabWidget.ui
+++ b/src/RenameTabWidget.ui
@@ -1,119 +1,147 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>RenameTabWidget</class>
  <widget class="QWidget" name="RenameTabWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>70</height>
+    <height>119</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <layout class="QGridLayout" columnstretch="0,1,0">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="remoteTabTitleEdit">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip">
+      <string>Tab title format used when a remote command (e.g. connection to another computer via SSH) is being executed</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="Konsole::TabTitleFormatButton" name="remoteTabTitleFormatButton"/>
+   </item>
+   <item row="0" column="2">
+    <widget class="Konsole::TabTitleFormatButton" name="tabTitleFormatButton"/>
+   </item>
+   <item row="1" column="0" alignment="Qt::AlignRight">
+    <widget class="QLabel" name="label_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Remote tab title format:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="buddy">
+      <cstring>remoteTabTitleEdit</cstring>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" alignment="Qt::AlignRight">
     <widget class="QLabel" name="label">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="text">
       <string>Tab title format:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>tabTitleEdit</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QLineEdit" name="tabTitleEdit">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="toolTip">
       <string>Normal tab title format</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
-    <widget class="Konsole::TabTitleFormatButton" name="tabTitleFormatButton"/>
-   </item>
-   <item row="1" column="0" alignment="Qt::AlignRight">
-    <widget class="QLabel" name="label_2">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>Remote tab title format:</string>
+      <string>Tab Color:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
-      <cstring>remoteTabTitleEdit</cstring>
+      <cstring>tabColorCombo</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="remoteTabTitleEdit">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="2" column="1">
+    <widget class="KColorCombo" name="tabColorCombo">
+     <property name="editable">
+      <bool>false</bool>
      </property>
-     <property name="toolTip">
-      <string>Tab title format used when a remote command (e.g. connection to another computer via SSH) is being executed</string>
+     <property name="currentIndex">
+      <number>0</number>
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="Konsole::TabTitleFormatButton" name="remoteTabTitleFormatButton"/>
-   </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>KColorCombo</class>
+   <extends>QComboBox</extends>
+   <header>kcolorcombo.h</header>
+  </customwidget>
   <customwidget>
    <class>Konsole::TabTitleFormatButton</class>
    <extends>QPushButton</extends>
    <header>TabTitleFormatButton.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tabTitleEdit</tabstop>
   <tabstop>tabTitleFormatButton</tabstop>
   <tabstop>remoteTabTitleEdit</tabstop>
   <tabstop>remoteTabTitleFormatButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Session.cpp b/src/Session.cpp
index 2d9ecb62..3aa83b5a 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -1,1819 +1,1848 @@
 /*
     This file is part of Konsole
 
     Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
     Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
     Copyright 2009 by Thomas Dreibholz <dreibh@iem.uni-due.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.
 */
 
 // Own
 #include "Session.h"
 
 // Standard
 #include <cstdlib>
 #include <csignal>
 #include <unistd.h>
 
 // Qt
 #include <QApplication>
 #include <QColor>
 #include <QDir>
 #include <QFile>
 #include <QStringList>
 #include <QKeyEvent>
 
 // KDE
 #include <KLocalizedString>
 #include <KNotification>
 #include <KRun>
 #include <KShell>
 #include <KProcess>
 #include <KConfigGroup>
 #include <KIO/DesktopExecParser>
 
 // Konsole
 #include <sessionadaptor.h>
 
 #include "ProcessInfo.h"
 #include "Pty.h"
 #include "TerminalDisplay.h"
 #include "ShellCommand.h"
 #include "Vt102Emulation.h"
 #include "ZModemDialog.h"
 #include "History.h"
 #include "konsoledebug.h"
 #include "SessionManager.h"
 #include "ProfileManager.h"
 #include "Profile.h"
 
 using namespace Konsole;
 
 int Session::lastSessionId = 0;
 static bool show_disallow_certain_dbus_methods_message = true;
 
 static const int ZMODEM_BUFFER_SIZE = 1048576; // 1 Mb
 
 Session::Session(QObject* parent) :
     QObject(parent)
     , _uniqueIdentifier(QUuid())
     , _shellProcess(nullptr)
     , _emulation(nullptr)
     , _views(QList<TerminalDisplay *>())
     , _monitorActivity(false)
     , _monitorSilence(false)
     , _notifiedActivity(false)
     , _silenceSeconds(10)
     , _silenceTimer(nullptr)
     , _activityTimer(nullptr)
     , _autoClose(true)
     , _closePerUserRequest(false)
     , _nameTitle(QString())
     , _displayTitle(QString())
     , _userTitle(QString())
     , _localTabTitleFormat(QString())
     , _remoteTabTitleFormat(QString())
     , _tabTitleSetByUser(false)
+    , _tabColorSetByUser(false)
     , _iconName(QString())
     , _iconText(QString())
     , _addToUtmp(true)
     , _flowControlEnabled(true)
     , _program(QString())
     , _arguments(QStringList())
     , _environment(QStringList())
     , _sessionId(0)
     , _initialWorkingDir(QString())
     , _currentWorkingDir(QString())
     , _reportedWorkingUrl(QUrl())
     , _sessionProcessInfo(nullptr)
     , _foregroundProcessInfo(nullptr)
     , _foregroundPid(0)
     , _zmodemBusy(false)
     , _zmodemProc(nullptr)
     , _zmodemProgress(nullptr)
     , _hasDarkBackground(false)
     , _preferredSize(QSize())
     , _readOnly(false)
     , _isPrimaryScreen(true)
 {
     _uniqueIdentifier = QUuid::createUuid();
 
     //prepare DBus communication
     new SessionAdaptor(this);
     _sessionId = ++lastSessionId;
     QDBusConnection::sessionBus().registerObject(QLatin1String("/Sessions/") + QString::number(_sessionId), this);
 
     //create emulation backend
     _emulation = new Vt102Emulation();
     _emulation->reset();
 
     connect(_emulation, &Konsole::Emulation::sessionAttributeChanged, this, &Konsole::Session::setSessionAttribute);
     connect(_emulation, &Konsole::Emulation::bell, this, [this]() {
         emit bellRequest(i18n("Bell in session '%1'", _nameTitle));
         this->setPendingNotification(Notification::Bell);
     });
     connect(_emulation, &Konsole::Emulation::zmodemDownloadDetected, this, &Konsole::Session::fireZModemDownloadDetected);
     connect(_emulation, &Konsole::Emulation::zmodemUploadDetected, this, &Konsole::Session::fireZModemUploadDetected);
     connect(_emulation, &Konsole::Emulation::changeTabTextColorRequest, this, &Konsole::Session::changeTabTextColor);
     connect(_emulation, &Konsole::Emulation::profileChangeCommandReceived, this, &Konsole::Session::profileChangeCommandReceived);
     connect(_emulation, &Konsole::Emulation::flowControlKeyPressed, this, &Konsole::Session::updateFlowControlState);
     connect(_emulation, &Konsole::Emulation::primaryScreenInUse, this, &Konsole::Session::onPrimaryScreenInUse);
     connect(_emulation, &Konsole::Emulation::selectionChanged, this, &Konsole::Session::selectionChanged);
     connect(_emulation, &Konsole::Emulation::imageResizeRequest, this, &Konsole::Session::resizeRequest);
     connect(_emulation, &Konsole::Emulation::sessionAttributeRequest, this, &Konsole::Session::sessionAttributeRequest);
 
     //create new teletype for I/O with shell process
     openTeletype(-1, true);
 
     //setup timer for monitoring session activity & silence
     _silenceTimer = new QTimer(this);
     _silenceTimer->setSingleShot(true);
     connect(_silenceTimer, &QTimer::timeout, this, &Konsole::Session::silenceTimerDone);
 
     _activityTimer = new QTimer(this);
     _activityTimer->setSingleShot(true);
     connect(_activityTimer, &QTimer::timeout, this, &Konsole::Session::activityTimerDone);
 }
 
 Session::~Session()
 {
     delete _foregroundProcessInfo;
     delete _sessionProcessInfo;
     delete _emulation;
     delete _shellProcess;
     delete _zmodemProc;
 }
 
 void Session::openTeletype(int fd, bool runShell)
 {
     if (isRunning()) {
         qWarning() << "Attempted to open teletype in a running session.";
         return;
     }
 
     delete _shellProcess;
 
     if (fd < 0) {
         _shellProcess = new Pty();
     } else {
         _shellProcess = new Pty(fd);
     }
 
     _shellProcess->setUtf8Mode(_emulation->utf8());
 
     // connect the I/O between emulator and pty process
     connect(_shellProcess, &Konsole::Pty::receivedData, this, &Konsole::Session::onReceiveBlock);
     connect(_emulation, &Konsole::Emulation::sendData, _shellProcess, &Konsole::Pty::sendData);
 
     // UTF8 mode
     connect(_emulation, &Konsole::Emulation::useUtf8Request, _shellProcess, &Konsole::Pty::setUtf8Mode);
 
     // get notified when the pty process is finished
     connect(_shellProcess,
             QOverload<int,QProcess::ExitStatus>::of(&Konsole::Pty::finished),
             this, &Konsole::Session::done);
 
     // emulator size
     // Use a direct connection to ensure that the window size is set before it runs
     connect(_emulation, &Konsole::Emulation::imageSizeChanged, this, &Konsole::Session::updateWindowSize, Qt::DirectConnection);
     if (fd < 0 || runShell) {
         connect(_emulation, &Konsole::Emulation::imageSizeInitialized, this, &Konsole::Session::run);
     } else {
         // run needs to be disconnected, as it may be already connected by the constructor
         disconnect(_emulation, &Konsole::Emulation::imageSizeInitialized, this, &Konsole::Session::run);
     }
 }
 
 WId Session::windowId() const
 {
     // Returns a window ID for this session which is used
     // to set the WINDOWID environment variable in the shell
     // process.
     //
     // Sessions can have multiple views or no views, which means
     // that a single ID is not always going to be accurate.
     //
     // If there are no views, the window ID is just 0.  If
     // there are multiple views, then the window ID for the
     // top-level window which contains the first view is
     // returned
 
     if (_views.count() == 0) {
         return 0;
     } else {
         /**
          * compute the windows id to use
          * doesn't call winId on some widget, as this might lead
          * to rendering artifacts as this will trigger the
          * creation of a native window, see https://doc.qt.io/qt-5/qwidget.html#winId
          * instead, use https://doc.qt.io/qt-5/qwidget.html#effectiveWinId
          */
         QWidget* widget = _views.first();
         Q_ASSERT(widget);
         return widget->effectiveWinId();
     }
 }
 
 void Session::setDarkBackground(bool darkBackground)
 {
     _hasDarkBackground = darkBackground;
 }
 
 bool Session::isRunning() const
 {
     return (_shellProcess != nullptr) && (_shellProcess->state() == QProcess::Running);
 }
 
 void Session::setCodec(QTextCodec* codec)
 {
     if (isReadOnly()) {
         return;
     }
 
     emulation()->setCodec(codec);
 }
 
 bool Session::setCodec(const QByteArray& name)
 {
     QTextCodec* codec = QTextCodec::codecForName(name);
 
     if (codec != nullptr) {
         setCodec(codec);
         return true;
     } else {
         return false;
     }
 }
 
 QByteArray Session::codec()
 {
     return _emulation->codec()->name();
 }
 
 void Session::setProgram(const QString& program)
 {
     _program = ShellCommand::expand(program);
 }
 
 void Session::setArguments(const QStringList& arguments)
 {
     _arguments = ShellCommand::expand(arguments);
 }
 
 void Session::setInitialWorkingDirectory(const QString& dir)
 {
     _initialWorkingDir = validDirectory(KShell::tildeExpand(ShellCommand::expand(dir)));
 }
 
 QString Session::currentWorkingDirectory()
 {
     if (_reportedWorkingUrl.isValid() && _reportedWorkingUrl.isLocalFile()) {
         return _reportedWorkingUrl.path();
     }
 
     // only returned cached value
     if (_currentWorkingDir.isEmpty()) {
         updateWorkingDirectory();
     }
 
     return _currentWorkingDir;
 }
 void Session::updateWorkingDirectory()
 {
     updateSessionProcessInfo();
 
     const QString currentDir = _sessionProcessInfo->validCurrentDir();
     if (currentDir != _currentWorkingDir) {
         _currentWorkingDir = currentDir;
         emit currentDirectoryChanged(_currentWorkingDir);
     }
 }
 
 QList<TerminalDisplay*> Session::views() const
 {
     return _views;
 }
 
 void Session::addView(TerminalDisplay* widget)
 {
     Q_ASSERT(!_views.contains(widget));
 
     _views.append(widget);
 
     // connect emulation - view signals and slots
     connect(widget, &Konsole::TerminalDisplay::keyPressedSignal, _emulation, &Konsole::Emulation::sendKeyEvent);
     connect(widget, &Konsole::TerminalDisplay::mouseSignal, _emulation, &Konsole::Emulation::sendMouseEvent);
     connect(widget, &Konsole::TerminalDisplay::sendStringToEmu, _emulation, &Konsole::Emulation::sendString);
 
     // allow emulation to notify the view when the foreground process
     // indicates whether or not it is interested in Mouse Tracking events
     connect(_emulation, &Konsole::Emulation::programRequestsMouseTracking, widget, &Konsole::TerminalDisplay::setUsesMouseTracking);
 
     widget->setUsesMouseTracking(_emulation->programUsesMouseTracking());
 
     connect(_emulation, &Konsole::Emulation::enableAlternateScrolling, widget, &Konsole::TerminalDisplay::setAlternateScrolling);
 
     connect(_emulation, &Konsole::Emulation::programBracketedPasteModeChanged, widget, &Konsole::TerminalDisplay::setBracketedPasteMode);
 
     widget->setBracketedPasteMode(_emulation->programBracketedPasteMode());
 
     widget->setScreenWindow(_emulation->createWindow());
 
     //connect view signals and slots
     connect(widget, &Konsole::TerminalDisplay::changedContentSizeSignal, this, &Konsole::Session::onViewSizeChange);
 
     connect(widget, &Konsole::TerminalDisplay::destroyed, this, &Konsole::Session::viewDestroyed);
 
     connect(widget, &Konsole::TerminalDisplay::compositeFocusChanged, _emulation, &Konsole::Emulation::focusChanged);
 
     connect(_emulation, &Konsole::Emulation::setCursorStyleRequest, widget, &Konsole::TerminalDisplay::setCursorStyle);
     connect(_emulation, &Konsole::Emulation::resetCursorStyleRequest, widget, &Konsole::TerminalDisplay::resetCursorStyle);
 
     connect(widget, &Konsole::TerminalDisplay::keyPressedSignal, this, &Konsole::Session::resetNotifications);
 }
 
 void Session::viewDestroyed(QObject* view)
 {
     auto* display = reinterpret_cast<TerminalDisplay*>(view);
 
     Q_ASSERT(_views.contains(display));
 
     removeView(display);
 }
 
 void Session::removeView(TerminalDisplay* widget)
 {
     _views.removeAll(widget);
 
     disconnect(widget, nullptr, this, nullptr);
 
     // disconnect
     //  - key presses signals from widget
     //  - mouse activity signals from widget
     //  - string sending signals from widget
     //
     //  ... and any other signals connected in addView()
     disconnect(widget, nullptr, _emulation, nullptr);
 
     // disconnect state change signals emitted by emulation
     disconnect(_emulation, nullptr, widget, nullptr);
 
     // close the session automatically when the last view is removed
     if (_views.count() == 0) {
         close();
     }
 }
 
 // Upon a KPty error, there is no description on what that error was...
 // Check to see if the given program is executable.
 QString Session::checkProgram(const QString& program)
 {
     QString exec = program;
 
     if (exec.isEmpty()) {
         return QString();
     }
 
     QFileInfo info(exec);
     if (info.isAbsolute() && info.exists() && info.isExecutable()) {
         return exec;
     }
 
     exec = KIO::DesktopExecParser::executablePath(exec);
     exec = KShell::tildeExpand(exec);
     const QString pexec = QStandardPaths::findExecutable(exec);
     if (pexec.isEmpty()) {
         qCritical() << i18n("Could not find binary: ") << exec;
         return QString();
     }
 
     return exec;
 }
 
 void Session::terminalWarning(const QString& message)
 {
     static const QByteArray warningText = i18nc("@info:shell Alert the user with red color text", "Warning: ").toLocal8Bit();
     QByteArray messageText = message.toLocal8Bit();
 
     static const char redPenOn[] = "\033[1m\033[31m";
     static const char redPenOff[] = "\033[0m";
 
     _emulation->receiveData(redPenOn, qstrlen(redPenOn));
     _emulation->receiveData("\n\r\n\r", 4);
     _emulation->receiveData(warningText.constData(), qstrlen(warningText.constData()));
     _emulation->receiveData(messageText.constData(), qstrlen(messageText.constData()));
     _emulation->receiveData("\n\r\n\r", 4);
     _emulation->receiveData(redPenOff, qstrlen(redPenOff));
 }
 
 QString Session::shellSessionId() const
 {
     QString friendlyUuid(_uniqueIdentifier.toString());
     friendlyUuid.remove(QLatin1Char('-')).remove(QLatin1Char('{')).remove(QLatin1Char('}'));
 
     return friendlyUuid;
 }
 
 void Session::run()
 {
     // FIXME: run() is called twice in some instances
     if (isRunning()) {
         qCDebug(KonsoleDebug) << "Attempted to re-run an already running session (" << _shellProcess->pid() << ")";
         return;
     }
 
     //check that everything is in place to run the session
     if (_program.isEmpty()) {
         qWarning() << "Program to run not set.";
     }
     if (_arguments.isEmpty()) {
         qWarning() << "No command line arguments specified.";
     }
     if (_uniqueIdentifier.isNull()) {
         _uniqueIdentifier = QUuid::createUuid();
     }
 
     const int CHOICE_COUNT = 3;
     // if '_program' is empty , fall back to default shell. If that is not set
     // then fall back to /bin/sh
     QString programs[CHOICE_COUNT] = {_program, QString::fromUtf8(qgetenv("SHELL")), QStringLiteral("/bin/sh")};
     QString exec;
     int choice = 0;
     while (choice < CHOICE_COUNT) {
         exec = checkProgram(programs[choice]);
         if (exec.isEmpty()) {
             choice++;
         } else {
             break;
         }
     }
 
     // if a program was specified via setProgram(), but it couldn't be found, print a warning
     if (choice != 0 && choice < CHOICE_COUNT && !_program.isEmpty()) {
         terminalWarning(i18n("Could not find '%1', starting '%2' instead.  Please check your profile settings.", _program, exec));
         // if none of the choices are available, print a warning
     } else if (choice == CHOICE_COUNT) {
         terminalWarning(i18n("Could not find an interactive shell to start."));
         return;
     }
 
     // if no arguments are specified, fall back to program name
     QStringList arguments = _arguments.join(QLatin1Char(' ')).isEmpty() ?
                             QStringList() << exec :
                             _arguments;
 
     if (!_initialWorkingDir.isEmpty()) {
         _shellProcess->setInitialWorkingDirectory(_initialWorkingDir);
     } else {
         _shellProcess->setInitialWorkingDirectory(QDir::currentPath());
     }
 
     _shellProcess->setFlowControlEnabled(_flowControlEnabled);
     _shellProcess->setEraseChar(_emulation->eraseChar());
     _shellProcess->setUseUtmp(_addToUtmp);
 
     // this is not strictly accurate use of the COLORFGBG variable.  This does not
     // tell the terminal exactly which colors are being used, but instead approximates
     // the color scheme as "black on white" or "white on black" depending on whether
     // the background color is deemed dark or not
     const QString backgroundColorHint = _hasDarkBackground ? QStringLiteral("COLORFGBG=15;0") : QStringLiteral("COLORFGBG=0;15");
     addEnvironmentEntry(backgroundColorHint);
 
     addEnvironmentEntry(QStringLiteral("SHELL_SESSION_ID=%1").arg(shellSessionId()));
 
     addEnvironmentEntry(QStringLiteral("WINDOWID=%1").arg(QString::number(windowId())));
 
     const QString dbusService = QDBusConnection::sessionBus().baseService();
     addEnvironmentEntry(QStringLiteral("KONSOLE_DBUS_SERVICE=%1").arg(dbusService));
 
     const QString dbusObject = QStringLiteral("/Sessions/%1").arg(QString::number(_sessionId));
     addEnvironmentEntry(QStringLiteral("KONSOLE_DBUS_SESSION=%1").arg(dbusObject));
 
     int result = _shellProcess->start(exec, arguments, _environment);
     if (result < 0) {
         terminalWarning(i18n("Could not start program '%1' with arguments '%2'.", exec, arguments.join(QLatin1String(" "))));
         terminalWarning(_shellProcess->errorString());
         return;
     }
 
     _shellProcess->setWriteable(false);  // We are reachable via kwrited.
 
     emit started();
 }
 
 void Session::setSessionAttribute(int what, const QString& caption)
 {
     // set to true if anything has actually changed
     // eg. old _nameTitle != new _nameTitle
     bool modified = false;
 
     if ((what == IconNameAndWindowTitle) || (what == WindowTitle)) {
         if (_userTitle != caption) {
             _userTitle = caption;
             modified = true;
         }
     }
 
     if ((what == IconNameAndWindowTitle) || (what == IconName)) {
         if (_iconText != caption) {
             _iconText = caption;
             modified = true;
         }
     }
 
     if (what == TextColor || what == BackgroundColor) {
         QString colorString = caption.section(QLatin1Char(';'), 0, 0);
         QColor color = QColor(colorString);
         if (color.isValid()) {
             if (what == TextColor) {
                 emit changeForegroundColorRequest(color);
             } else {
                 emit changeBackgroundColorRequest(color);
             }
         }
     }
 
     if (what == SessionName) {
         if (_localTabTitleFormat != caption) {
             _localTabTitleFormat = caption;
             setTitle(Session::DisplayedTitleRole, caption);
             modified = true;
         }
     }
 
     /* The below use of 32 works but appears to non-standard.
        It is from a commit from 2004 c20973eca8776f9b4f15bee5fdcb5a3205aa69de
      */
     // change icon via \033]32;Icon\007
     if (what == SessionIcon) {
         if (_iconName != caption) {
             _iconName = caption;
 
             modified = true;
         }
     }
 
     if (what == CurrentDirectory) {
         _reportedWorkingUrl = QUrl::fromUserInput(caption);
         emit currentDirectoryChanged(currentWorkingDirectory());
         modified = true;
     }
 
     if (what == ProfileChange) {
         emit profileChangeCommandReceived(caption);
         return;
     }
 
     if (modified) {
         emit sessionAttributeChanged();
     }
 }
 
 QString Session::userTitle() const
 {
     return _userTitle;
 }
+
 void Session::setTabTitleFormat(TabTitleContext context , const QString& format)
 {
     if (context == LocalTabTitle) {
         _localTabTitleFormat = format;
         ProcessInfo* process = getProcessInfo();
         process->setUserNameRequired(format.contains(QLatin1String("%u")));
     } else if (context == RemoteTabTitle) {
         _remoteTabTitleFormat = format;
     }
 }
+
 QString Session::tabTitleFormat(TabTitleContext context) const
 {
     if (context == LocalTabTitle) {
         return _localTabTitleFormat;
     } else if (context == RemoteTabTitle) {
         return _remoteTabTitleFormat;
     }
 
     return QString();
 }
 
 void Session::tabTitleSetByUser(bool set)
 {
     _tabTitleSetByUser = set;
 }
 
 bool Session::isTabTitleSetByUser() const
 {
     return _tabTitleSetByUser;
 }
 
+void Session::tabColorSetByUser(bool set)
+{
+    _tabColorSetByUser = set;
+}
+
+bool Session::isTabColorSetByUser() const
+{
+    return _tabColorSetByUser;
+}
+
 void Session::silenceTimerDone()
 {
     //FIXME: The idea here is that the notification popup will appear to tell the user than output from
     //the terminal has stopped and the popup will disappear when the user activates the session.
     //
     //This breaks with the addition of multiple views of a session.  The popup should disappear
     //when any of the views of the session becomes active
 
     //FIXME: Make message text for this notification and the activity notification more descriptive.
     if (!_monitorSilence) {
         setPendingNotification(Notification::Silence, false);
         return;
     }
 
     bool hasFocus = false;
     for (const TerminalDisplay *display : qAsConst(_views)) {
         if (display->hasFocus()) {
             hasFocus = true;
             break;
         }
     }
 
     KNotification::event(hasFocus ? QStringLiteral("Silence") : QStringLiteral("SilenceHidden"),
             i18n("Silence in session '%1'", _nameTitle), QPixmap(),
             QApplication::activeWindow(),
             KNotification::CloseWhenWidgetActivated);
     setPendingNotification(Notification::Silence);
 }
 
 void Session::activityTimerDone()
 {
     _notifiedActivity = false;
 }
 
 void Session::resetNotifications()
 {
     static const Notification availableNotifications[] = {Activity, Silence, Bell};
     for (auto notification: availableNotifications) {
         setPendingNotification(notification, false);
     }
 }
 
 void Session::updateFlowControlState(bool suspended)
 {
     if (suspended) {
         if (flowControlEnabled()) {
             for (TerminalDisplay *display : qAsConst(_views)) {
                 if (display->flowControlWarningEnabled()) {
                     display->outputSuspended(true);
                 }
             }
         }
     } else {
         for (TerminalDisplay *display : qAsConst(_views)) {
             display->outputSuspended(false);
         }
     }
 }
 
 void Session::changeTabTextColor(int i)
 {
     qCDebug(KonsoleDebug) << "Changing tab text color is not implemented "<<i;
 }
 
 void Session::onPrimaryScreenInUse(bool use)
 {
-
     _isPrimaryScreen = use;
     emit primaryScreenInUse(use);
 }
+
 bool Session::isPrimaryScreen()
 {
     return _isPrimaryScreen;
 }
 
 void Session::sessionAttributeRequest(int id)
 {
     switch (id) {
         case TextColor:
             // Get 'TerminalDisplay' (_view) foreground color
             emit getForegroundColor();
             break;
         case BackgroundColor:
             // Get 'TerminalDisplay' (_view) background color
             emit getBackgroundColor();
             break;
     }
 }
 
 void Session::onViewSizeChange(int /*height*/, int /*width*/)
 {
     updateTerminalSize();
 }
 
 void Session::updateTerminalSize()
 {
     int minLines = -1;
     int minColumns = -1;
 
     // minimum number of lines and columns that views require for
     // their size to be taken into consideration ( to avoid problems
     // with new view widgets which haven't yet been set to their correct size )
     const int VIEW_LINES_THRESHOLD = 2;
     const int VIEW_COLUMNS_THRESHOLD = 2;
 
     //select largest number of lines and columns that will fit in all visible views
     for (TerminalDisplay *view : qAsConst(_views)) {
         if (!view->isHidden() &&
                 view->lines() >= VIEW_LINES_THRESHOLD &&
                 view->columns() >= VIEW_COLUMNS_THRESHOLD) {
             minLines = (minLines == -1) ? view->lines() : qMin(minLines , view->lines());
             minColumns = (minColumns == -1) ? view->columns() : qMin(minColumns , view->columns());
             view->processFilters();
         }
     }
 
     // backend emulation must have a _terminal of at least 1 column x 1 line in size
     if (minLines > 0 && minColumns > 0) {
         _emulation->setImageSize(minLines , minColumns);
     }
 }
 void Session::updateWindowSize(int lines, int columns)
 {
     Q_ASSERT(lines > 0 && columns > 0);
     _shellProcess->setWindowSize(columns, lines);
 }
 void Session::refresh()
 {
     // attempt to get the shell process to redraw the display
     //
     // this requires the program running in the shell
     // to cooperate by sending an update in response to
     // a window size change
     //
     // the window size is changed twice, first made slightly larger and then
     // resized back to its normal size so that there is actually a change
     // in the window size (some shells do nothing if the
     // new and old sizes are the same)
     //
     // if there is a more 'correct' way to do this, please
     // send an email with method or patches to konsole-devel@kde.org
 
     const QSize existingSize = _shellProcess->windowSize();
     _shellProcess->setWindowSize(existingSize.width() + 1, existingSize.height());
     // introduce small delay to avoid changing size too quickly
     QThread::usleep(500);
     _shellProcess->setWindowSize(existingSize.width(), existingSize.height());
 }
 
 void Session::sendSignal(int signal)
 {
     const ProcessInfo* process = getProcessInfo();
     bool ok = false;
     int pid;
     pid = process->foregroundPid(&ok);
 
     if (ok) {
         ::kill(pid, signal);
     }
 }
 
 void Session::reportColor(SessionAttributes r, const QColor& c)
 {
     #define to65k(a) (QStringLiteral("%1").arg(int(((a)*0xFFFF)), 4, 16, QLatin1Char('0')))
     QString msg = QStringLiteral("\033]%1;rgb:").arg(r)
                 + to65k(c.redF())   + QLatin1Char('/')
                 + to65k(c.greenF()) + QLatin1Char('/')
                 + to65k(c.blueF())  + QLatin1Char('\a');
     _emulation->sendString(msg.toUtf8());
     #undef to65k
 }
 
 void Session::reportForegroundColor(const QColor& c)
 {
     reportColor(SessionAttributes::TextColor, c);
 }
 
 void Session::reportBackgroundColor(const QColor& c)
 {
     reportColor(SessionAttributes::BackgroundColor, c);
 }
 
 bool Session::kill(int signal)
 {
     if (_shellProcess->pid() <= 0) {
         return false;
     }
 
     int result = ::kill(_shellProcess->pid(), signal);
 
     if (result == 0) {
         return _shellProcess->waitForFinished(1000);
     } else {
         return false;
     }
 }
 
 void Session::close()
 {
     if (isRunning()) {
         if (!closeInNormalWay()) {
             closeInForceWay();
         }
     } else {
         // terminal process has finished, just close the session
         QTimer::singleShot(1, this, &Konsole::Session::finished);
     }
 }
 
 bool Session::closeInNormalWay()
 {
     _autoClose    = true;
     _closePerUserRequest = true;
 
     // for the possible case where following events happen in sequence:
     //
     // 1). the terminal process crashes
     // 2). the tab stays open and displays warning message
     // 3). the user closes the tab explicitly
     //
     if (!isRunning()) {
         emit finished();
         return true;
     }
 
     static QSet<QString> knownShells({QStringLiteral("ash"), QStringLiteral("bash"), QStringLiteral("csh"), QStringLiteral("dash"), QStringLiteral("fish"), QStringLiteral("hush"), QStringLiteral("ksh"), QStringLiteral("mksh"), QStringLiteral("pdksh"), QStringLiteral("tcsh"), QStringLiteral("zsh")});
 
     // If only the session's shell is running, try sending an EOF for a clean exit
     if (!isForegroundProcessActive() && knownShells.contains(QFileInfo(_program).fileName())) {
         _shellProcess->sendEof();
 
         if (_shellProcess->waitForFinished(1000)) {
             return true;
         }
         qWarning() << "shell did not close, sending SIGHUP";
     }
 
 
     // We tried asking nicely, ask a bit less nicely
     if (kill(SIGHUP)) {
         return true;
     } else {
         qWarning() << "Process " << _shellProcess->pid() << " did not die with SIGHUP";
         _shellProcess->closePty();
         return (_shellProcess->waitForFinished(1000));
     }
 }
 
 bool Session::closeInForceWay()
 {
     _autoClose    = true;
     _closePerUserRequest = true;
 
     if (kill(SIGKILL)) {
         return true;
     } else {
         qWarning() << "Process " << _shellProcess->pid() << " did not die with SIGKILL";
         return false;
     }
 }
 
 void Session::sendTextToTerminal(const QString& text, const QChar& eol) const
 {
     if (isReadOnly()) {
         return;
     }
 
     if (eol.isNull()) {
         _emulation->sendText(text);
     } else {
         _emulation->sendText(text + eol);
     }
 }
 
 // Only D-Bus calls this function (via SendText or runCommand)
 void Session::sendText(const QString& text) const
 {
     if (isReadOnly()) {
         return;
     }
 
 #if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
     if (show_disallow_certain_dbus_methods_message) {
 
         KNotification::event(KNotification::Warning, QStringLiteral("Konsole D-Bus Warning"),
             i18n("The D-Bus methods sendText/runCommand were just used.  There are security concerns about allowing these methods to be public.  If desired, these methods can be changed to internal use only by re-compiling Konsole. <p>This warning will only show once for this Konsole instance.</p>"));
 
         show_disallow_certain_dbus_methods_message = false;
     }
 #endif
 
     _emulation->sendText(text);
 }
 
 // Only D-Bus calls this function
 void Session::runCommand(const QString& command) const
 {
     sendText(command + QLatin1Char('\n'));
 }
 
 void Session::sendMouseEvent(int buttons, int column, int line, int eventType)
 {
     _emulation->sendMouseEvent(buttons, column, line, eventType);
 }
 
 void Session::done(int exitCode, QProcess::ExitStatus exitStatus)
 {
     // This slot should be triggered only one time
     disconnect(_shellProcess,
                QOverload<int,QProcess::ExitStatus>::of(&Konsole::Pty::finished),
                this, &Konsole::Session::done);
 
     if (!_autoClose) {
         _userTitle = i18nc("@info:shell This session is done", "Finished");
         emit sessionAttributeChanged();
         return;
     }
 
     if (_closePerUserRequest) {
         emit finished();
         return;
     }
 
     QString message;
 
     if (exitCode != 0) {
         if (exitStatus != QProcess::NormalExit) {
             message = i18n("Program '%1' crashed.", _program);
         } else {
             message = i18n("Program '%1' exited with status %2.", _program, exitCode);
         }
 
         //FIXME: See comments in Session::silenceTimerDone()
         KNotification::event(QStringLiteral("Finished"), message , QPixmap(),
                              QApplication::activeWindow(),
                              KNotification::CloseWhenWidgetActivated);
     }
 
     if (exitStatus != QProcess::NormalExit) {
         // this seeming duplicated line is for the case when exitCode is 0
         message = i18n("Program '%1' crashed.", _program);
         terminalWarning(message);
     } else {
         emit finished();
     }
 }
 
 Emulation* Session::emulation() const
 {
     return _emulation;
 }
 
 QString Session::keyBindings() const
 {
     return _emulation->keyBindings();
 }
 
 QStringList Session::environment() const
 {
     return _environment;
 }
 
 void Session::setEnvironment(const QStringList& environment)
 {
     if (isReadOnly()) {
         return;
     }
 
     _environment = environment;
 }
 
 void Session::addEnvironmentEntry(const QString& entry)
 {
     _environment << entry;
 }
 
 int Session::sessionId() const
 {
     return _sessionId;
 }
 
 void Session::setKeyBindings(const QString& name)
 {
     _emulation->setKeyBindings(name);
 }
 
 void Session::setTitle(TitleRole role , const QString& newTitle)
 {
     if (title(role) != newTitle) {
         if (role == NameRole) {
             _nameTitle = newTitle;
         } else if (role == DisplayedTitleRole) {
             _displayTitle = newTitle;
         }
 
         emit sessionAttributeChanged();
     }
 }
 
 QString Session::title(TitleRole role) const
 {
     if (role == NameRole) {
         return _nameTitle;
     } else if (role == DisplayedTitleRole) {
         return _displayTitle;
     } else {
         return QString();
     }
 }
 
 ProcessInfo* Session::getProcessInfo()
 {
     ProcessInfo* process = nullptr;
 
     if (isForegroundProcessActive() && updateForegroundProcessInfo()) {
         process = _foregroundProcessInfo;
     } else {
         updateSessionProcessInfo();
         process = _sessionProcessInfo;
     }
 
     return process;
 }
 
 void Session::updateSessionProcessInfo()
 {
     Q_ASSERT(_shellProcess);
 
     bool ok;
     // The checking for pid changing looks stupid, but it is needed
     // at the moment to workaround the problem that processId() might
     // return 0
     if ((_sessionProcessInfo == nullptr) ||
             (processId() != 0 && processId() != _sessionProcessInfo->pid(&ok))) {
         delete _sessionProcessInfo;
         _sessionProcessInfo = ProcessInfo::newInstance(processId());
         _sessionProcessInfo->setUserHomeDir();
     }
     _sessionProcessInfo->update();
 }
 
 bool Session::updateForegroundProcessInfo()
 {
     Q_ASSERT(_shellProcess);
 
     const int foregroundPid = _shellProcess->foregroundProcessGroup();
     if (foregroundPid != _foregroundPid) {
         delete _foregroundProcessInfo;
         _foregroundProcessInfo = ProcessInfo::newInstance(foregroundPid);
         _foregroundPid = foregroundPid;
     }
 
     if (_foregroundProcessInfo != nullptr) {
         _foregroundProcessInfo->update();
         return _foregroundProcessInfo->isValid();
     } else {
         return false;
     }
 }
 
 bool Session::isRemote()
 {
     ProcessInfo* process = getProcessInfo();
 
     bool ok = false;
     return (process->name(&ok) == QLatin1String("ssh") && ok);
 }
 
 QString Session::getDynamicTitle()
 {
 
     ProcessInfo* process = getProcessInfo();
 
     // format tab titles using process info
     bool ok = false;
     if (process->name(&ok) == QLatin1String("ssh") && ok) {
         SSHProcessInfo sshInfo(*process);
         return sshInfo.format(tabTitleFormat(Session::RemoteTabTitle));
     }
 
     /*
      * Parses an input string, looking for markers beginning with a '%'
      * character and returns a string with the markers replaced
      * with information from this process description.
      * <br>
      * The markers recognized are:
      * <ul>
      * <li> %B - User's Bourne prompt sigil ($, or # for superuser). </li>
      * <li> %u - Name of the user which owns the process. </li>
      * <li> %n - Replaced with the name of the process.   </li>
      * <li> %d - Replaced with the last part of the path name of the
      *      process' current working directory.
      *
      *      (eg. if the current directory is '/home/bob' then
      *      'bob' would be returned)
      * </li>
      * <li> %D - Replaced with the current working directory of the process. </li>
      * </ul>
      */
     QString title = tabTitleFormat(Session::LocalTabTitle);
     // search for and replace known marker
 
     int UID = process->userId(&ok);
     if(!ok) {
         title.replace(QLatin1String("%B"), QStringLiteral("-"));
     } else {
         //title.replace(QLatin1String("%I"), QString::number(UID));
         if (UID == 0) {
             title.replace(QLatin1String("%B"), QStringLiteral("#"));
         } else {
             title.replace(QLatin1String("%B"), QStringLiteral("$"));
         }
     }
 
 
     title.replace(QLatin1String("%u"), process->userName());
     title.replace(QLatin1String("%h"), Konsole::ProcessInfo::localHost());
     title.replace(QLatin1String("%n"), process->name(&ok));
 
     QString dir = _reportedWorkingUrl.toLocalFile();
     ok = true;
     if (dir.isEmpty()) {
         // update current directory from process
         updateWorkingDirectory();
         // Previous process may have been freed in updateSessionProcessInfo()
         process = getProcessInfo();
         dir = process->currentDir(&ok);
     }
     if(!ok) {
         title.replace(QLatin1String("%d"), QStringLiteral("-"));
         title.replace(QLatin1String("%D"), QStringLiteral("-"));
     } else {
         // allow for shortname to have the ~ as homeDir
         const QString homeDir = process->userHomeDir();
         if (!homeDir.isEmpty()) {
             if (dir.startsWith(homeDir)) {
                 dir.remove(0, homeDir.length());
                 dir.prepend(QLatin1Char('~'));
             }
         }
         title.replace(QLatin1String("%D"), dir);
         title.replace(QLatin1String("%d"), process->formatShortDir(dir));
     }
 
     return title;
 }
 
 QUrl Session::getUrl()
 {
     if (_reportedWorkingUrl.isValid()) {
         return _reportedWorkingUrl;
     }
 
     QString path;
 
     updateSessionProcessInfo();
     if (_sessionProcessInfo->isValid()) {
         bool ok = false;
 
         // check if foreground process is bookmark-able
         if (isForegroundProcessActive() && _foregroundProcessInfo->isValid()) {
             // for remote connections, save the user and host
             // bright ideas to get the directory at the other end are welcome :)
             if (_foregroundProcessInfo->name(&ok) == QLatin1String("ssh") && ok) {
                 SSHProcessInfo sshInfo(*_foregroundProcessInfo);
 
                 QUrl url;
                 url.setScheme(QStringLiteral("ssh"));
                 url.setUserName(sshInfo.userName());
                 url.setHost(sshInfo.host());
 
                 const QString port = sshInfo.port();
                 if (!port.isEmpty() && port != QLatin1String("22")) {
                     url.setPort(port.toInt());
                 }
                 return url;
             } else {
                 path = _foregroundProcessInfo->currentDir(&ok);
                 if (!ok) {
                     path.clear();
                 }
             }
         } else { // otherwise use the current working directory of the shell process
             path = _sessionProcessInfo->currentDir(&ok);
             if (!ok) {
                 path.clear();
             }
         }
     }
 
     return QUrl::fromLocalFile(path);
 }
 
 void Session::setIconName(const QString& iconName)
 {
     if (iconName != _iconName) {
         _iconName = iconName;
         emit sessionAttributeChanged();
     }
 }
 
 void Session::setIconText(const QString& iconText)
 {
     _iconText = iconText;
 }
 
 QString Session::iconName() const
 {
     return _iconName;
 }
 
 QString Session::iconText() const
 {
     return _iconText;
 }
 
 void Session::setHistoryType(const HistoryType& hType)
 {
     _emulation->setHistory(hType);
 }
 
 const HistoryType& Session::historyType() const
 {
     return _emulation->history();
 }
 
 void Session::clearHistory()
 {
     _emulation->clearHistory();
 }
 
 QStringList Session::arguments() const
 {
     return _arguments;
 }
 
 QString Session::program() const
 {
     return _program;
 }
 
 bool Session::isMonitorActivity() const
 {
     return _monitorActivity;
 }
 bool Session::isMonitorSilence()  const
 {
     return _monitorSilence;
 }
 
 void Session::setMonitorActivity(bool monitor)
 {
     if (_monitorActivity == monitor) {
         return;
     }
 
     _monitorActivity  = monitor;
     _notifiedActivity = false;
 
     // This timer is meaningful only after activity has been notified
     _activityTimer->stop();
 
     setPendingNotification(Notification::Activity, false);
 }
 
 void Session::setMonitorSilence(bool monitor)
 {
     if (_monitorSilence == monitor) {
         return;
     }
 
     _monitorSilence = monitor;
     if (_monitorSilence) {
         _silenceTimer->start(_silenceSeconds * 1000);
     } else {
         _silenceTimer->stop();
     }
 
     setPendingNotification(Notification::Silence, false);
 }
 
 void Session::setMonitorSilenceSeconds(int seconds)
 {
     _silenceSeconds = seconds;
     if (_monitorSilence) {
         _silenceTimer->start(_silenceSeconds * 1000);
     }
 }
 
 void Session::setAddToUtmp(bool add)
 {
     _addToUtmp = add;
 }
 
 void Session::setAutoClose(bool close)
 {
     _autoClose = close;
 }
 
 bool Session::autoClose() const
 {
     return _autoClose;
 }
 
 void Session::setFlowControlEnabled(bool enabled)
 {
     if (isReadOnly()) {
         return;
     }
 
     _flowControlEnabled = enabled;
 
     if (_shellProcess != nullptr) {
         _shellProcess->setFlowControlEnabled(_flowControlEnabled);
     }
 
     emit flowControlEnabledChanged(enabled);
 }
 bool Session::flowControlEnabled() const
 {
     if (_shellProcess != nullptr) {
         return _shellProcess->flowControlEnabled();
     } else {
         return _flowControlEnabled;
     }
 }
 void Session::fireZModemDownloadDetected()
 {
     if (!_zmodemBusy) {
         QTimer::singleShot(10, this, &Konsole::Session::zmodemDownloadDetected);
         _zmodemBusy = true;
     }
 }
 
 void Session::fireZModemUploadDetected()
 {
     if (!_zmodemBusy) {
         QTimer::singleShot(10, this, &Konsole::Session::zmodemUploadDetected);
     }
 }
 
 void Session::cancelZModem()
 {
     _shellProcess->sendData(QByteArrayLiteral("\030\030\030\030")); // Abort
     _zmodemBusy = false;
 }
 
 void Session::startZModem(const QString& zmodem, const QString& dir, const QStringList& list)
 {
     _zmodemBusy = true;
     _zmodemProc = new KProcess();
     _zmodemProc->setOutputChannelMode(KProcess::SeparateChannels);
 
     *_zmodemProc << zmodem << QStringLiteral("-v") << QStringLiteral("-e") << list;
 
     if (!dir.isEmpty()) {
         _zmodemProc->setWorkingDirectory(dir);
     }
 
     connect(_zmodemProc, &KProcess::readyReadStandardOutput, this, &Konsole::Session::zmodemReadAndSendBlock);
     connect(_zmodemProc, &KProcess::readyReadStandardError, this, &Konsole::Session::zmodemReadStatus);
     connect(_zmodemProc,
             QOverload<int,QProcess::ExitStatus>::of(&KProcess::finished),
             this, &Konsole::Session::zmodemFinished);
 
     _zmodemProc->start();
 
     disconnect(_shellProcess, &Konsole::Pty::receivedData,
                this, &Konsole::Session::onReceiveBlock);
     connect(_shellProcess, &Konsole::Pty::receivedData, this, &Konsole::Session::zmodemReceiveBlock);
 
     _zmodemProgress = new ZModemDialog(QApplication::activeWindow(), false,
                                        i18n("ZModem Progress"));
 
     connect(_zmodemProgress, &Konsole::ZModemDialog::zmodemCancel, this, &Konsole::Session::zmodemFinished);
 
     _zmodemProgress->show();
 }
 
 void Session::zmodemReadAndSendBlock()
 {
     _zmodemProc->setReadChannel(QProcess::StandardOutput);
     QByteArray data = _zmodemProc->read(ZMODEM_BUFFER_SIZE);
 
     while (data.count() != 0) {
         _shellProcess->sendData(data);
         data = _zmodemProc->read(ZMODEM_BUFFER_SIZE);
     }
 }
 
 void Session::zmodemReadStatus()
 {
     _zmodemProc->setReadChannel(QProcess::StandardError);
     QByteArray msg = _zmodemProc->readAll();
     while (!msg.isEmpty()) {
         int i = msg.indexOf('\015');
         int j = msg.indexOf('\012');
         QByteArray txt;
         if ((i != -1) && ((j == -1) || (i < j))) {
             msg = msg.mid(i + 1);
         } else if (j != -1) {
             txt = msg.left(j);
             msg = msg.mid(j + 1);
         } else {
             txt = msg;
             msg.truncate(0);
         }
         if (!txt.isEmpty()) {
             _zmodemProgress->addText(QString::fromLocal8Bit(txt));
         }
     }
 }
 
 void Session::zmodemReceiveBlock(const char* data, int len)
 {
     static int steps = 0;
     QByteArray bytes(data, len);
 
     _zmodemProc->write(bytes);
 
     // Provide some feedback to dialog
     if (steps > 100) {
         _zmodemProgress->addProgressText(QStringLiteral("."));
         steps = 0;
     }
     steps++;
 }
 
 void Session::zmodemFinished()
 {
     /* zmodemFinished() is called by QProcess's finished() and
        ZModemDialog's user1Clicked(). Therefore, an invocation by
        user1Clicked() will recursively invoke this function again
        when the KProcess is deleted! */
     if (_zmodemProc != nullptr) {
         KProcess* process = _zmodemProc;
         _zmodemProc = nullptr;   // Set _zmodemProc to 0 avoid recursive invocations!
         _zmodemBusy = false;
         delete process;    // Now, the KProcess may be disposed safely.
 
         disconnect(_shellProcess, &Konsole::Pty::receivedData,
                    this , &Konsole::Session::zmodemReceiveBlock);
         connect(_shellProcess, &Konsole::Pty::receivedData, this, &Konsole::Session::onReceiveBlock);
 
         _shellProcess->sendData(QByteArrayLiteral("\030\030\030\030")); // Abort
         _shellProcess->sendData(QByteArrayLiteral("\001\013\n")); // Try to get prompt back
         _zmodemProgress->transferDone();
     }
 }
 
 void Session::onReceiveBlock(const char* buf, int len)
 {
     handleActivity();
     _emulation->receiveData(buf, len);
 }
 
 QSize Session::size()
 {
     return _emulation->imageSize();
 }
 
 void Session::setSize(const QSize& size)
 {
     if ((size.width() <= 1) || (size.height() <= 1)) {
         return;
     }
 
     emit resizeRequest(size);
 }
 
 QSize Session::preferredSize() const
 {
     return _preferredSize;
 }
 
 void Session::setPreferredSize(const QSize& size)
 {
     _preferredSize = size;
 }
 
 int Session::processId() const
 {
     return _shellProcess->pid();
 }
 
 void Session::setTitle(int role , const QString& title)
 {
     switch (role) {
     case 0:
         setTitle(Session::NameRole, title);
         break;
     case 1:
         setTitle(Session::DisplayedTitleRole, title);
 
         // without these, that title will be overridden by the expansion of
         // title format shortly after, which will confuses users.
         _localTabTitleFormat = title;
         _remoteTabTitleFormat = title;
 
         break;
     }
 }
 
 QString Session::title(int role) const
 {
     switch (role) {
     case 0:
         return title(Session::NameRole);
     case 1:
         return title(Session::DisplayedTitleRole);
     default:
         return QString();
     }
 }
 
 void Session::setTabTitleFormat(int context , const QString& format)
 {
     switch (context) {
     case 0:
         setTabTitleFormat(Session::LocalTabTitle, format);
         break;
     case 1:
         setTabTitleFormat(Session::RemoteTabTitle, format);
         break;
     }
 }
 
 QString Session::tabTitleFormat(int context) const
 {
     switch (context) {
     case 0:
         return tabTitleFormat(Session::LocalTabTitle);
     case 1:
         return tabTitleFormat(Session::RemoteTabTitle);
     default:
         return QString();
     }
 }
 
 void Session::setHistorySize(int lines)
 {
     if (isReadOnly()) {
         return;
     }
 
     if (lines < 0) {
         setHistoryType(HistoryTypeFile());
     } else if (lines == 0) {
         setHistoryType(HistoryTypeNone());
     } else {
         setHistoryType(CompactHistoryType(lines));
     }
 }
 
 int Session::historySize() const
 {
     const HistoryType& currentHistory = historyType();
 
     if (currentHistory.isEnabled()) {
         if (currentHistory.isUnlimited()) {
             return -1;
         } else {
             return currentHistory.maximumLineCount();
         }
     } else {
         return 0;
     }
 }
 
 QString Session::profile()
 {
     return SessionManager::instance()->sessionProfile(this)->name();
 }
 
 void Session::setProfile(const QString &profileName)
 {
   const QList<Profile::Ptr> profiles = ProfileManager::instance()->allProfiles();
   for (const Profile::Ptr &profile : profiles) {
     if (profile->name() == profileName) {
       SessionManager::instance()->setSessionProfile(this, profile);
     }
   }
 }
 
 int Session::foregroundProcessId()
 {
     int pid;
 
     bool ok = false;
     pid = getProcessInfo()->pid(&ok);
     if (!ok) {
         pid = -1;
     }
 
     return pid;
 }
 
 bool Session::isForegroundProcessActive()
 {
     // foreground process info is always updated after this
     return (_shellProcess->pid() != _shellProcess->foregroundProcessGroup());
 }
 
 QString Session::foregroundProcessName()
 {
     QString name;
 
     if (updateForegroundProcessInfo()) {
         bool ok = false;
         name = _foregroundProcessInfo->name(&ok);
         if (!ok) {
             name.clear();
         }
     }
 
     return name;
 }
 
 void Session::saveSession(KConfigGroup& group)
 {
     group.writePathEntry("WorkingDir", currentWorkingDirectory());
     group.writeEntry("LocalTab",       tabTitleFormat(LocalTabTitle));
     group.writeEntry("RemoteTab",      tabTitleFormat(RemoteTabTitle));
+    group.writeEntry("TabColor",       QString(color().name(QColor::HexArgb)));
     group.writeEntry("SessionGuid",    _uniqueIdentifier.toString());
     group.writeEntry("Encoding",       QString::fromUtf8(codec()));
 }
 
 void Session::restoreSession(KConfigGroup& group)
 {
     QString value;
 
     value = group.readPathEntry("WorkingDir", QString());
     if (!value.isEmpty()) {
         setInitialWorkingDirectory(value);
     }
     value = group.readEntry("LocalTab");
     if (!value.isEmpty()) {
         setTabTitleFormat(LocalTabTitle, value);
     }
     value = group.readEntry("RemoteTab");
     if (!value.isEmpty()) {
         setTabTitleFormat(RemoteTabTitle, value);
     }
+    value = group.readEntry("TabColor");
+    if (!value.isEmpty()) {
+        setColor(QColor(value));
+    }
     value = group.readEntry("SessionGuid");
     if (!value.isEmpty()) {
         _uniqueIdentifier = QUuid(value);
     }
     value = group.readEntry("Encoding");
     if (!value.isEmpty()) {
         setCodec(value.toUtf8());
     }
 }
 
 QString Session::validDirectory(const QString& dir) const
 {
     QString validDir = dir;
     if (validDir.isEmpty()) {
         validDir = QDir::currentPath();
     }
 
     const QFileInfo fi(validDir);
     if (!fi.exists() || !fi.isDir()) {
         validDir = QDir::homePath();
     }
 
     return validDir;
 }
 
 void Session::setPendingNotification(Session::Notification notification, bool enable)
 {
     if(enable != _activeNotifications.testFlag(notification)) {
         _activeNotifications.setFlag(notification, enable);
         emit notificationsChanged(notification, enable);
     }
 }
 
 void Session::handleActivity()
 {
     // TODO: should this hardcoded interval be user configurable?
     const int activityMaskInSeconds = 15;
 
     bool hasFocus = false;
     // Don't notify if the terminal is active
     const auto &displays = _views;
     for (const TerminalDisplay *display: displays) {
         if (display->hasFocus()) {
             hasFocus = true;
             break;
         }
     }
 
     if (_monitorActivity && !_notifiedActivity) {
         KNotification::event(hasFocus ? QStringLiteral("Activity") : QStringLiteral("ActivityHidden"),
                              i18n("Activity in session '%1'", _nameTitle), QPixmap(),
                              QApplication::activeWindow(),
                              KNotification::CloseWhenWidgetActivated);
 
         // mask activity notification for a while to avoid flooding
         _notifiedActivity = true;
         _activityTimer->start(activityMaskInSeconds * 1000);
     }
 
     // reset the counter for monitoring continuous silence since there is activity
     if (_monitorSilence) {
         _silenceTimer->start(_silenceSeconds * 1000);
     }
 
     if (_monitorActivity) {
         setPendingNotification(Notification::Activity);
     }
 }
 
 bool Session::isReadOnly() const
 {
     return _readOnly;
 }
 
 void Session::setReadOnly(bool readOnly)
 {
     if (_readOnly != readOnly) {
         _readOnly = readOnly;
 
         // Needed to update the tab icons and all
         // attached views.
         emit readOnlyChanged();
     }
 }
 
+void Session::setColor(const QColor &color)
+{
+    _tabColor = color;
+    emit sessionAttributeChanged();
+}
+
+QColor Session::color() const
+{
+    return _tabColor;
+}
+
 SessionGroup::SessionGroup(QObject* parent)
     : QObject(parent), _masterMode(0)
 {
 }
 SessionGroup::~SessionGroup() = default;
 
 QList<Session*> SessionGroup::sessions() const
 {
     return _sessions.keys();
 }
 
 void SessionGroup::addSession(Session* session)
 {
     connect(session, &Konsole::Session::finished, this, &Konsole::SessionGroup::sessionFinished);
     _sessions.insert(session, false);
 }
 void SessionGroup::removeSession(Session* session)
 {
     disconnect(session, &Konsole::Session::finished, this, &Konsole::SessionGroup::sessionFinished);
     setMasterStatus(session, false);
     _sessions.remove(session);
 }
 void SessionGroup::sessionFinished()
 {
     auto* session = qobject_cast<Session*>(sender());
     Q_ASSERT(session);
     removeSession(session);
 }
 void SessionGroup::setMasterMode(int mode)
 {
     _masterMode = mode;
 }
  
 void SessionGroup::setMasterStatus(Session* session , bool master)
 {
     const bool wasMaster = _sessions[session];
 
     if (wasMaster == master) {
         // No status change -> nothing to do.
         return;
     }
     _sessions[session] = master;
 
     if (master) {
         connect(session->emulation(), &Konsole::Emulation::sendData, this, &Konsole::SessionGroup::forwardData);
     } else {
         disconnect(session->emulation(), &Konsole::Emulation::sendData,
                    this, &Konsole::SessionGroup::forwardData);
     }
 }
 void SessionGroup::forwardData(const QByteArray& data)
 {
     static bool _inForwardData = false;
     if (_inForwardData) {  // Avoid recursive calls among session groups!
         // A recursive call happens when a master in group A calls forwardData()
         // in group B. If one of the destination sessions in group B is also a
         // master of a group including the master session of group A, this would
         // again call forwardData() in group A, and so on.
         return;
     }
 
     _inForwardData = true;
     const QList<Session*> sessionsKeys = _sessions.keys();
     for (Session *other : sessionsKeys) {
         if (!_sessions[other]) {
             other->emulation()->sendString(data);
         }
     }
     _inForwardData = false;
 }
 
diff --git a/src/Session.h b/src/Session.h
index 6f9dcd5c..a05b5f01 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -1,914 +1,932 @@
 /*
     This file is part of Konsole, an X terminal.
 
     Copyright 2007-2008 by Robert Knight <robertknight@gmail.com>
     Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
     Copyright 2009 by Thomas Dreibholz <dreibh@iem.uni-due.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.
 */
 
 #ifndef SESSION_H
 #define SESSION_H
 
 // Qt
 #include <QStringList>
 #include <QHash>
 #include <QUuid>
 #include <QSize>
 #include <QProcess>
 #include <QWidget>
 #include <QUrl>
 
 // Konsole
 #include "konsoleprivate_export.h"
 #include "config-konsole.h"
 #include "Shortcut_p.h"
 
 class QColor;
 
 class KConfigGroup;
 class KProcess;
 
 namespace Konsole {
 class Emulation;
 class Pty;
 class ProcessInfo;
 class TerminalDisplay;
 class ZModemDialog;
 class HistoryType;
 
 /**
  * Represents a terminal session consisting of a pseudo-teletype and a terminal emulation.
  * The pseudo-teletype (or PTY) handles I/O between the terminal process and Konsole.
  * The terminal emulation ( Emulation and subclasses ) processes the output stream from the
  * PTY and produces a character image which is then shown on views connected to the session.
  *
  * Each Session can be connected to one or more views by using the addView() method.
  * The attached views can then display output from the program running in the terminal
  * or send input to the program in the terminal in the form of keypresses and mouse
  * activity.
  */
 class KONSOLEPRIVATE_EXPORT Session : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.Session")
 
 public:
     Q_PROPERTY(QString name READ nameTitle)
     Q_PROPERTY(int processId READ processId)
     Q_PROPERTY(QString keyBindings READ keyBindings WRITE setKeyBindings)
     Q_PROPERTY(QSize size READ size WRITE setSize)
 
     /**
      * Constructs a new session.
      *
      * To start the terminal process, call the run() method,
      * after specifying the program and arguments
      * using setProgram() and setArguments()
      *
      * If no program or arguments are specified explicitly, the Session
      * falls back to using the program specified in the SHELL environment
      * variable.
      */
     explicit Session(QObject *parent = nullptr);
     ~Session() override;
 
     /**
      * Connect to an existing terminal.  When a new Session() is constructed it
      * automatically searches for and opens a new teletype.  If you want to
      * use an existing teletype (given its file descriptor) call this after
      * constructing the session.
      *
      * Calling openTeletype() while a session is running has no effect.
      *
      * @param fd The file descriptor of the pseudo-teletype master (See KPtyProcess::KPtyProcess())
      * @param runShell When true, runs the teletype in a shell session environment.
      * When false, the session is not run, so that the KPtyProcess can be standalone.
      */
     void openTeletype(int fd, bool runShell);
 
     /**
      * Returns true if the session is currently running.  This will be true
      * after run() has been called successfully.
      */
     bool isRunning() const;
 
     /**
      * Adds a new view for this session.
      *
      * The viewing widget will display the output from the terminal and
      * input from the viewing widget (key presses, mouse activity etc.)
      * will be sent to the terminal.
      *
      * Views can be removed using removeView().  The session is automatically
      * closed when the last view is removed.
      */
     void addView(TerminalDisplay *widget);
     /**
      * Removes a view from this session.  When the last view is removed,
      * the session will be closed automatically.
      *
      * @p widget will no longer display output from or send input
      * to the terminal
      */
     void removeView(TerminalDisplay *widget);
 
     /**
      * Returns the views connected to this session
      */
     QList<TerminalDisplay *> views() const;
 
     /**
      * Returns the terminal emulation instance being used to encode / decode
      * characters to / from the process.
      */
     Emulation *emulation() const;
 
     /** Returns the unique ID for this session. */
     int sessionId() const;
 
     /**
      * This enum describes the contexts for which separate
      * tab title formats may be specified.
      */
     enum TabTitleContext {
         /** Default tab title format */
         LocalTabTitle,
         /**
          * Tab title format used session currently contains
          * a connection to a remote computer (via SSH)
          */
         RemoteTabTitle
     };
 
     /**
      * Returns true if the session currently contains a connection to a
      * remote computer.  It currently supports ssh.
      */
     bool isRemote();
 
     /**
      * Sets the format used by this session for tab titles.
      *
      * @param context The context whose format should be set.
      * @param format The tab title format.  This may be a mixture
      * of plain text and dynamic elements denoted by a '%' character
      * followed by a letter.  (eg. %d for directory).  The dynamic
      * elements available depend on the @p context
      */
     void setTabTitleFormat(TabTitleContext context, const QString &format);
     /** Returns the format used by this session for tab titles. */
     QString tabTitleFormat(TabTitleContext context) const;
 
+    /**
+     * Sets the color user by this session for tab.
+     * 
+     * @param color The background color for the tab.
+     */
+    void setColor(const QColor &color);
+    /** Returns the color used by this session for tab. */
+    QColor color() const;
+
     /**
      * Returns true if the tab title has been changed by the user via the
      * rename-tab dialog.
      */
     bool isTabTitleSetByUser() const;
 
+    /**
+     * Returns true if the tab color has been changed by the user via the
+     * rename-tab dialog.
+     */
+    bool isTabColorSetByUser() const;
+
     /** Returns the arguments passed to the shell process when run() is called. */
     QStringList arguments() const;
     /** Returns the program name of the shell process started when run() is called. */
     QString program() const;
 
     /**
      * Sets the command line arguments which the session's program will be passed when
      * run() is called.
      */
     void setArguments(const QStringList &arguments);
     /** Sets the program to be executed when run() is called. */
     void setProgram(const QString &program);
 
     /** Returns the session's current working directory. */
     QString initialWorkingDirectory()
     {
         return _initialWorkingDir;
     }
 
     /**
      * Sets the initial working directory for the session when it is run
      * This has no effect once the session has been started.
      */
     void setInitialWorkingDirectory(const QString &dir);
 
     /**
      * Returns the current directory of the foreground process in the session
      */
     QString currentWorkingDirectory();
 
     /**
      * Sets the type of history store used by this session.
      * Lines of output produced by the terminal are added
      * to the history store.  The type of history store
      * used affects the number of lines which can be
      * remembered before they are lost and the storage
      * (in memory, on-disk etc.) used.
      */
     void setHistoryType(const HistoryType &hType);
     /**
      * Returns the type of history store used by this session.
      */
     const HistoryType &historyType() const;
     /**
      * Clears the history store used by this session.
      */
     void clearHistory();
 
     /**
      * Sets the key bindings used by this session.  The bindings
      * specify how input key sequences are translated into
      * the character stream which is sent to the terminal.
      *
      * @param name The name of the key bindings to use.  The
      * names of available key bindings can be determined using the
      * KeyboardTranslatorManager class.
      */
     void setKeyBindings(const QString &name);
     /** Returns the name of the key bindings used by this session. */
     QString keyBindings() const;
 
     /**
      * This enum describes the available title roles.
      */
     enum TitleRole {
         /** The name of the session. */
         NameRole,
         /** The title of the session which is displayed in tabs etc. */
         DisplayedTitleRole
     };
 
     /**
      * Return the session title set by the user (ie. the program running
      * in the terminal), or an empty string if the user has not set a custom title
      */
     QString userTitle() const;
 
     /** Convenience method used to read the name property.  Returns title(Session::NameRole). */
     QString nameTitle() const
     {
         return title(Session::NameRole);
     }
 
     /** Returns a title generated from tab format and process information. */
     QString getDynamicTitle();
 
     /** Sets the name of the icon associated with this session. */
     void setIconName(const QString &iconName);
     /** Returns the name of the icon associated with this session. */
     QString iconName() const;
 
     /** Return URL for the session. */
     QUrl getUrl();
 
     /** Sets the text of the icon associated with this session. */
     void setIconText(const QString &iconText);
     /** Returns the text of the icon associated with this session. */
     QString iconText() const;
 
     /** Sets the session's title for the specified @p role to @p title. */
     void setTitle(TitleRole role, const QString &newTitle);
 
     /** Returns the session's title for the specified @p role. */
     QString title(TitleRole role) const;
 
     /**
      * Specifies whether a utmp entry should be created for the pty used by this session.
      * If true, KPty::login() is called when the session is started.
      */
     void setAddToUtmp(bool);
 
     /**
      * Specifies whether to close the session automatically when the terminal
      * process terminates.
      */
     void setAutoClose(bool close);
 
     /** See setAutoClose() */
     bool autoClose() const;
 
     /** Returns true if the user has started a program in the session. */
     bool isForegroundProcessActive();
 
     /** Returns the name of the current foreground process. */
     QString foregroundProcessName();
 
     /** Returns the terminal session's window size in lines and columns. */
     QSize size();
     /**
      * Emits a request to resize the session to accommodate
      * the specified window size.
      *
      * @param size The size in lines and columns to request.
      */
     void setSize(const QSize &size);
 
     QSize preferredSize() const;
 
     void setPreferredSize(const QSize &size);
 
     /**
      * Sets whether the session has a dark background or not.  The session
      * uses this information to set the COLORFGBG variable in the process's
      * environment, which allows the programs running in the terminal to determine
      * whether the background is light or dark and use appropriate colors by default.
      *
      * This has no effect once the session is running.
      */
     void setDarkBackground(bool darkBackground);
 
     /**
      * Attempts to get the shell program to redraw the current display area.
      * This can be used after clearing the screen, for example, to get the
      * shell to redraw the prompt line.
      */
     void refresh();
 
     void startZModem(const QString &zmodem, const QString &dir, const QStringList &list);
     void cancelZModem();
     bool isZModemBusy()
     {
         return _zmodemBusy;
     }
     void setZModemBusy(bool busy)
     {
         _zmodemBusy = busy;
     }
 
     /**
       * Possible values of the @p what parameter for setSessionAttribute().
       * See the "Operating System Commands" section at:
       * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h3-Operating-System-Commands
       */
     enum SessionAttributes {
         IconNameAndWindowTitle = 0,
         IconName = 1,
         WindowTitle = 2,
         CurrentDirectory = 7,         // From VTE (supposedly 6 was for dir, 7 for file, but whatever)
         TextColor = 10,
         BackgroundColor = 11,
         SessionName = 30,             // Non-standard
         SessionIcon = 32,             // Non-standard
         ProfileChange = 50            // this clashes with Xterm's font change command
     };
 
     // Sets the text codec used by this sessions terminal emulation.
     void setCodec(QTextCodec *codec);
 
     // session management
     void saveSession(KConfigGroup &group);
     void restoreSession(KConfigGroup &group);
 
     void sendSignal(int signal);
 
     void reportColor(SessionAttributes r, const QColor &c);
     void reportForegroundColor(const QColor &c);
     void reportBackgroundColor(const QColor &c);
 
     bool isReadOnly() const;
     void setReadOnly(bool readOnly);
 
     // Returns true if the current screen is the secondary/alternate one
     // or false if it's the primary/normal buffer
     bool isPrimaryScreen();
     void tabTitleSetByUser(bool set);
+    void tabColorSetByUser(bool set);
 
     enum Notification {
         NoNotification = 0,
         Activity = 1,
         Silence = 2,
         Bell = 4,
     };
     Q_DECLARE_FLAGS(Notifications, Notification)
 
     /** Returns active notifications. */
     Notifications activeNotifications() const { return _activeNotifications; }
 
 public Q_SLOTS:
 
     /**
      * Starts the terminal session.
      *
      * This creates the terminal process and connects the teletype to it.
      */
     void run();
 
     /**
      * Returns the environment of this session as a list of strings like
      * VARIABLE=VALUE
      */
     Q_SCRIPTABLE QStringList environment() const;
 
     /**
      * Sets the environment for this session.
      * @p environment should be a list of strings like
      * VARIABLE=VALUE
      */
     Q_SCRIPTABLE void setEnvironment(const QStringList &environment);
 
     /**
      * Adds one entry for the environment of this session
      * @p entry should be like VARIABLE=VALUE
      */
     void addEnvironmentEntry(const QString &entry);
 
     /**
      * Closes the terminal session. It kills the terminal process by calling
      * closeInNormalWay() and, optionally, closeInForceWay().
      */
     //Q_SCRIPTABLE void close(); // This cause the menu issues bko 185466
     void close();
 
     /**
      * Kill the terminal process in normal way. This sends a hangup signal
      * (SIGHUP) to the terminal process and causes the finished() signal to
      * be emitted. If the process does not respond to the SIGHUP signal then
      * the terminal connection (the pty) is closed and Konsole waits for the
      * process to exit. This method works most of the time, but fails with some
      * programs which respond to SIGHUP signal in special way, such as autossh
      * and irssi.
      */
     bool closeInNormalWay();
 
     /**
      * kill terminal process in force way. This send a SIGKILL signal to the
      * terminal process. It should be called only after closeInNormalWay() has
      * failed. Take it as last resort.
      */
     bool closeInForceWay();
 
     /**
      * Changes one of certain session attributes in the terminal emulation
      * display. For a list of what may be changed see the
      * Emulation::sessionAttributeChanged() signal.
      *
      * @param what The session attribute being changed, it is one of the
      * SessionAttributes enum
      * @param caption The text part of the terminal command
      */
     void setSessionAttribute(int what, const QString &caption);
 
     /**
      * Enables monitoring for activity in the session.
      * This will cause notifySessionState() to be emitted
      * with the NOTIFYACTIVITY state flag when output is
      * received from the terminal.
      */
     Q_SCRIPTABLE void setMonitorActivity(bool);
 
     /** Returns true if monitoring for activity is enabled. */
     Q_SCRIPTABLE bool isMonitorActivity() const;
 
     /**
      * Enables monitoring for silence in the session.
      * This will cause notifySessionState() to be emitted
      * with the NOTIFYSILENCE state flag when output is not
      * received from the terminal for a certain period of
      * time, specified with setMonitorSilenceSeconds()
      */
     Q_SCRIPTABLE void setMonitorSilence(bool);
 
     /**
      * Returns true if monitoring for inactivity (silence)
      * in the session is enabled.
      */
     Q_SCRIPTABLE bool isMonitorSilence() const;
 
     /** See setMonitorSilence() */
     Q_SCRIPTABLE void setMonitorSilenceSeconds(int seconds);
 
     /**
      * Sets whether flow control is enabled for this terminal
      * session.
      */
     Q_SCRIPTABLE void setFlowControlEnabled(bool enabled);
 
     /** Returns whether flow control is enabled for this terminal session. */
     Q_SCRIPTABLE bool flowControlEnabled() const;
 
     /**
      * @param text to send to the current foreground terminal program.
      * @param eol send this after @p text
      */
     void sendTextToTerminal(const QString &text, const QChar &eol = QChar()) const;
 
 #if defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
     void sendText(const QString &text) const;
 #else
     Q_SCRIPTABLE void sendText(const QString &text) const;
 #endif
 
     /**
      * Sends @p command to the current foreground terminal program.
      */
 #if defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
     void runCommand(const QString &command) const;
 #else
     Q_SCRIPTABLE void runCommand(const QString &command) const;
 #endif
 
     /**
      * Sends a mouse event of type @p eventType emitted by button
      * @p buttons on @p column/@p line to the current foreground
      * terminal program
      */
     Q_SCRIPTABLE void sendMouseEvent(int buttons, int column, int line, int eventType);
 
     /**
     * Returns the process id of the terminal process.
     * This is the id used by the system API to refer to the process.
     */
     Q_SCRIPTABLE int processId() const;
 
     /**
      * Returns the process id of the terminal's foreground process.
      * This is initially the same as processId() but can change
      * as the user starts other programs inside the terminal.
      */
     Q_SCRIPTABLE int foregroundProcessId();
 
     /** Sets the text codec used by this sessions terminal emulation.
       * Overloaded to accept a QByteArray for convenience since DBus
       * does not accept QTextCodec directly.
       */
     Q_SCRIPTABLE bool setCodec(const QByteArray &name);
 
     /** Returns the codec used to decode incoming characters in this
      * terminal emulation
      */
     Q_SCRIPTABLE QByteArray codec();
 
     /** Sets the session's title for the specified @p role to @p title.
      *  This is an overloaded member function for setTitle(TitleRole, QString)
      *  provided for convenience since enum data types may not be
      *  exported directly through DBus
      */
     Q_SCRIPTABLE void setTitle(int role, const QString &title);
 
     /** Returns the session's title for the specified @p role.
      * This is an overloaded member function for  setTitle(TitleRole)
      * provided for convenience since enum data types may not be
      * exported directly through DBus
      */
     Q_SCRIPTABLE QString title(int role) const;
 
     /** Returns the "friendly" version of the QUuid of this session.
     * This is a QUuid with the braces and dashes removed, so it cannot be
     * used to construct a new QUuid. The same text appears in the
     * SHELL_SESSION_ID environment variable.
     */
     Q_SCRIPTABLE QString shellSessionId() const;
 
     /** Sets the session's tab title format for the specified @p context to @p format.
      *  This is an overloaded member function for setTabTitleFormat(TabTitleContext, QString)
      *  provided for convenience since enum data types may not be
      *  exported directly through DBus
      */
     Q_SCRIPTABLE void setTabTitleFormat(int context, const QString &format);
 
     /** Returns the session's tab title format for the specified @p context.
      * This is an overloaded member function for tabTitleFormat(TitleRole)
      * provided for convenience since enum data types may not be
      * exported directly through DBus
      */
     Q_SCRIPTABLE QString tabTitleFormat(int context) const;
 
     /**
      * Sets the history capacity of this session.
      *
      * @param lines The history capacity in unit of lines. Its value can be:
      * <ul>
      * <li> positive integer  -  fixed size history</li>
      * <li> 0 -  no history</li>
      * <li> negative integer -  unlimited history</li>
      * </ul>
      */
     Q_SCRIPTABLE void setHistorySize(int lines);
 
     /**
      * Returns the history capacity of this session.
      */
     Q_SCRIPTABLE int historySize() const;
 
     /**
      * Sets the current session's profile
      */
     Q_SCRIPTABLE void setProfile(const QString &profileName);
 
     /**
      * Returns the current session's profile name
      */
     Q_SCRIPTABLE QString profile();
 
 Q_SIGNALS:
 
     /** Emitted when the terminal process starts. */
     void started();
 
     /**
      * Emitted when the terminal process exits.
      */
     void finished();
 
     /**
      * Emitted when one of certain session attributes has been changed.
      * See setSessionAttribute().
      */
     void sessionAttributeChanged();
 
     /** Emitted when the session gets locked / unlocked. */
     void readOnlyChanged();
 
     /**
      * Emitted when the current working directory of this session changes.
      *
      * @param dir The new current working directory of the session.
      */
     void currentDirectoryChanged(const QString &dir);
 
     /** Emitted when a bell event occurs in the session. */
     void bellRequest(const QString &message);
 
     /** Emitted when @p notification state changed to @p enabled */
     void notificationsChanged(Notification notification, bool enabled);
 
     /**
      * Requests that the background color of views on this session
      * should be changed.
      */
     void changeBackgroundColorRequest(const QColor &);
     /**
      * Requests that the text color of views on this session should
      * be changed to @p color.
      */
     void changeForegroundColorRequest(const QColor &);
 
     /** TODO: Document me. */
     void openUrlRequest(const QString &url);
 
     /**
      * Emitted when the request for data transmission through ZModem
      * protocol is detected.
      */
     void zmodemDownloadDetected();
     void zmodemUploadDetected();
 
     /**
      * Emitted when the terminal process requests a change
      * in the size of the terminal window.
      *
      * @param size The requested window size in terms of lines and columns.
      */
     void resizeRequest(const QSize &size);
 
     /**
      * Emitted when a profile change command is received from the terminal.
      *
      * @param text The text of the command.  This is a string of the form
      * "PropertyName=Value;PropertyName=Value ..."
      */
     void profileChangeCommandReceived(const QString &text);
 
     /**
      * Emitted when the flow control state changes.
      *
      * @param enabled True if flow control is enabled or false otherwise.
      */
     void flowControlEnabledChanged(bool enabled);
 
     /**
      * Emitted when the active screen is switched, to indicate whether the primary
      * screen is in use.
      *
      * This signal serves as a relayer of Emulation::priamyScreenInUse(bool),
      * making it usable for higher level component.
      */
     void primaryScreenInUse(bool use);
 
     /**
      * Emitted when the text selection is changed.
      *
      * This signal serves as a relayer of Emulation::selectedText(QString),
      * making it usable for higher level component.
      */
     void selectionChanged(const QString &text);
 
     /**
      * Emitted when foreground request ("\033]10;?\a") terminal code received.
      * Terminal is expected send "\033]10;rgb:RRRR/GGGG/BBBB\a" response.
      */
     void getForegroundColor();
 
     /**
      * Emitted when background request ("\033]11;?\a") terminal code received.
      * Terminal is expected send "\033]11;rgb:RRRR/GGGG/BBBB\a" response.
      *
      * Originally implemented to support vim's background detection feature
      * (without explictly setting 'bg=dark' within local/remote vimrc)
      */
     void getBackgroundColor();
 
 private Q_SLOTS:
     void done(int, QProcess::ExitStatus);
 
     void fireZModemDownloadDetected();
     void fireZModemUploadDetected();
 
     void onReceiveBlock(const char *buf, int len);
     void silenceTimerDone();
     void activityTimerDone();
     void resetNotifications();
 
     void onViewSizeChange(int height, int width);
 
     //automatically detach views from sessions when view is destroyed
     void viewDestroyed(QObject *view);
 
     void zmodemReadStatus();
     void zmodemReadAndSendBlock();
     void zmodemReceiveBlock(const char *data, int len);
     void zmodemFinished();
 
     void updateFlowControlState(bool suspended);
     void updateWindowSize(int lines, int columns);
 
     // Relays the signal from Emulation and sets _isPrimaryScreen
     void onPrimaryScreenInUse(bool use);
 
     void sessionAttributeRequest(int id);
 
     /**
      * Requests that the color the text for any tabs associated with
      * this session should be changed;
      *
      * TODO: Document what the parameter does
      */
     void changeTabTextColor(int);
 
 private:
     Q_DISABLE_COPY(Session)
 
     // checks that the binary 'program' is available and can be executed
     // returns the binary name if available or an empty string otherwise
     static QString checkProgram(const QString &program);
 
     void updateTerminalSize();
     WId windowId() const;
     bool kill(int signal);
     // print a warning message in the terminal.  This is used
     // if the program fails to start, or if the shell exits in
     // an unsuccessful manner
     void terminalWarning(const QString &message);
     ProcessInfo *getProcessInfo();
     void updateSessionProcessInfo();
     bool updateForegroundProcessInfo();
     void updateWorkingDirectory();
 
     QString validDirectory(const QString &dir) const;
 
     QUuid _uniqueIdentifier;            // SHELL_SESSION_ID
 
     Pty *_shellProcess;
     Emulation *_emulation;
 
     QList<TerminalDisplay *> _views;
 
     // monitor activity & silence
     bool _monitorActivity;
     bool _monitorSilence;
     bool _notifiedActivity;
     int _silenceSeconds;
     QTimer *_silenceTimer;
     QTimer *_activityTimer;
 
     void setPendingNotification(Notification notification, bool enable = true);
     void handleActivity();
 
     Notifications _activeNotifications;
 
     bool _autoClose;
     bool _closePerUserRequest;
 
     QString _nameTitle;
     QString _displayTitle;
     QString _userTitle;
 
     QString _localTabTitleFormat;
     QString _remoteTabTitleFormat;
+    QColor _tabColor;
 
     bool _tabTitleSetByUser;
+    bool _tabColorSetByUser;
 
     QString _iconName;
     QString _iconText;        // not actually used
     bool _addToUtmp;
     bool _flowControlEnabled;
 
     QString _program;
     QStringList _arguments;
 
     QStringList _environment;
     int _sessionId;
 
     QString _initialWorkingDir;
     QString _currentWorkingDir;
     QUrl _reportedWorkingUrl;
 
     ProcessInfo *_sessionProcessInfo;
     ProcessInfo *_foregroundProcessInfo;
     int _foregroundPid;
 
     // ZModem
     bool _zmodemBusy;
     KProcess *_zmodemProc;
     ZModemDialog *_zmodemProgress;
 
     bool _hasDarkBackground;
 
     QSize _preferredSize;
 
     bool _readOnly;
     static int lastSessionId;
 
     bool _isPrimaryScreen;
 };
 
 /**
  * Provides a group of sessions which is divided into master and slave sessions.
  * Activity in master sessions can be propagated to all sessions within the group.
  * The type of activity which is propagated and method of propagation is controlled
  * by the masterMode() flags.
  */
 class SessionGroup : public QObject
 {
     Q_OBJECT
 
 public:
     /** Constructs an empty session group. */
     explicit SessionGroup(QObject *parent);
     /** Destroys the session group and removes all connections between master and slave sessions. */
     ~SessionGroup() override;
 
     /** Adds a session to the group. */
     void addSession(Session *session);
     /** Removes a session from the group. */
     void removeSession(Session *session);
 
     /** Returns the list of sessions currently in the group. */
     QList<Session *> sessions() const;
 
     /**
      * Sets whether a particular session is a master within the group.
      * Changes or activity in the group's master sessions may be propagated
      * to all the sessions in the group, depending on the current masterMode()
      *
      * @param session The session whose master status should be changed.
      * @param master True to make this session a master or false otherwise
      */
     void setMasterStatus(Session *session, bool master);
 
     /**
      * This enum describes the options for propagating certain activity or
      * changes in the group's master sessions to all sessions in the group.
      */
     enum MasterMode {
         /**
          * Any input key presses in the master sessions are sent to all
          * sessions in the group.
          */
         CopyInputToAll = 1
     };
 
     /**
      * Specifies which activity in the group's master sessions is propagated
      * to all sessions in the group.
      *
      * @param mode A bitwise OR of MasterMode flags.
      */
     void setMasterMode(int mode);
 
 private Q_SLOTS:
     void sessionFinished();
     void forwardData(const QByteArray &data);
 
 private:
     // maps sessions to their master status
     QHash<Session *, bool> _sessions;
 
     int _masterMode;
 };
 }
 
 #endif
diff --git a/src/SessionController.cpp b/src/SessionController.cpp
index 5bfe6563..73ceb76e 100644
--- a/src/SessionController.cpp
+++ b/src/SessionController.cpp
@@ -1,1818 +1,1838 @@
 /*
     Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
     Copyright 2009 by Thomas Dreibholz <dreibh@iem.uni-due.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.
 */
 
 // Own
 #include "SessionController.h"
 
 #include "ProfileManager.h"
 #include "konsoledebug.h"
 
 // Qt
 #include <QApplication>
 #include <QAction>
 #include <QList>
 #include <QMenu>
 #include <QKeyEvent>
 #include <QPrinter>
 #include <QPrintDialog>
 #include <QFileDialog>
 #include <QPainter>
 #include <QStandardPaths>
 #include <QUrl>
 #include <QIcon>
 
 // KDE
 #include <KActionMenu>
 #include <KActionCollection>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KRun>
 #include <KShell>
 #include <KToolInvocation>
 #include <KToggleAction>
 #include <KSelectAction>
 #include <KXmlGuiWindow>
 #include <KXMLGUIFactory>
 #include <KXMLGUIBuilder>
 #include <KUriFilter>
 #include <KStringHandler>
 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <KCodecAction>
 
 // Konsole
 #include "EditProfileDialog.h"
 #include "CopyInputDialog.h"
 #include "Emulation.h"
 #include "Filter.h"
 #include "History.h"
 #include "HistorySizeDialog.h"
 #include "IncrementalSearchBar.h"
 #include "RenameTabDialog.h"
 #include "ScreenWindow.h"
 #include "Session.h"
 #include "ProfileList.h"
 #include "TerminalDisplay.h"
 #include "SessionManager.h"
 #include "Enumeration.h"
 #include "PrintOptions.h"
 #include "SaveHistoryTask.h"
 #include "SearchHistoryTask.h"
 
 // For Unix signal names
 #include <csignal>
 
 using namespace Konsole;
 
 QSet<SessionController*> SessionController::_allControllers;
 int SessionController::_lastControllerId;
 
 SessionController::SessionController(Session* session , TerminalDisplay* view, QObject* parent)
     : ViewProperties(parent)
     , KXMLGUIClient()
     , _session(session)
     , _view(view)
     , _copyToGroup(nullptr)
     , _profileList(nullptr)
     , _sessionIcon(QIcon())
     , _sessionIconName(QString())
     , _previousState(-1)
     , _searchFilter(nullptr)
     , _urlFilter(nullptr)
     , _fileFilter(nullptr)
     , _copyInputToAllTabsAction(nullptr)
     , _findAction(nullptr)
     , _findNextAction(nullptr)
     , _findPreviousAction(nullptr)
     , _interactionTimer(nullptr)
     , _searchStartLine(0)
     , _prevSearchResultLine(0)
     , _codecAction(nullptr)
     , _switchProfileMenu(nullptr)
     , _webSearchMenu(nullptr)
     , _listenForScreenWindowUpdates(false)
     , _preventClose(false)
     , _selectedText(QString())
     , _showMenuAction(nullptr)
     , _bookmarkValidProgramsToClear(QStringList())
     , _isSearchBarEnabled(false)
     , _editProfileDialog(nullptr)
     , _searchBar(view->searchBar())
 {
     Q_ASSERT(session);
     Q_ASSERT(view);
 
     // handle user interface related to session (menus etc.)
     if (isKonsolePart()) {
         setComponentName(QStringLiteral("konsole"), i18n("Konsole"));
         setXMLFile(QStringLiteral("partui.rc"));
         setupCommonActions();
     } else {
         setXMLFile(QStringLiteral("sessionui.rc"));
         setupCommonActions();
         setupExtraActions();
     }
 
     actionCollection()->addAssociatedWidget(view);
 
     const QList<QAction *> actionsList = actionCollection()->actions();
     for (QAction *action : actionsList) {
         action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     }
 
     setIdentifier(++_lastControllerId);
     sessionAttributeChanged();
 
     connect(_view, &TerminalDisplay::compositeFocusChanged, this, &SessionController::viewFocusChangeHandler);
     _view->setSessionController(this);
 
     // install filter on the view to highlight URLs and files
     updateFilterList(SessionManager::instance()->sessionProfile(_session));
 
     // listen for changes in session, we might need to change the enabled filters
     connect(ProfileManager::instance(), &Konsole::ProfileManager::profileChanged, this, &Konsole::SessionController::updateFilterList);
 
     // listen for session resize requests
     connect(_session.data(), &Konsole::Session::resizeRequest, this, &Konsole::SessionController::sessionResizeRequest);
 
     // listen for popup menu requests
     connect(_view.data(), &Konsole::TerminalDisplay::configureRequest, this, &Konsole::SessionController::showDisplayContextMenu);
 
     // move view to newest output when keystrokes occur
     connect(_view.data(), &Konsole::TerminalDisplay::keyPressedSignal, this, &Konsole::SessionController::trackOutput);
 
     // listen to activity / silence notifications from session
     connect(_session.data(), &Konsole::Session::notificationsChanged, this, &Konsole::SessionController::sessionNotificationsChanged);
     // listen to title and icon changes
     connect(_session.data(), &Konsole::Session::sessionAttributeChanged, this, &Konsole::SessionController::sessionAttributeChanged);
     connect(_session.data(), &Konsole::Session::readOnlyChanged, this, &Konsole::SessionController::sessionReadOnlyChanged);
 
-    connect(this, &Konsole::SessionController::tabRenamedByUser,  _session,  &Konsole::Session::tabTitleSetByUser);
+    connect(this, &Konsole::SessionController::tabRenamedByUser, _session, &Konsole::Session::tabTitleSetByUser);
+    connect(this, &Konsole::SessionController::tabColoredByUser, _session, &Konsole::Session::tabColorSetByUser);
 
     connect(_session.data() , &Konsole::Session::currentDirectoryChanged , this , &Konsole::SessionController::currentDirectoryChanged);
 
     // listen for color changes
     connect(_session.data(), &Konsole::Session::changeBackgroundColorRequest, _view.data(), &Konsole::TerminalDisplay::setBackgroundColor);
     connect(_session.data(), &Konsole::Session::changeForegroundColorRequest, _view.data(), &Konsole::TerminalDisplay::setForegroundColor);
 
     // update the title when the session starts
     connect(_session.data(), &Konsole::Session::started, this, &Konsole::SessionController::snapshot);
 
     // listen for output changes to set activity flag
     connect(_session->emulation(), &Konsole::Emulation::outputChanged, this, &Konsole::SessionController::fireActivity);
 
     // listen for detection of ZModem transfer
     connect(_session.data(), &Konsole::Session::zmodemDownloadDetected, this, &Konsole::SessionController::zmodemDownload);
     connect(_session.data(), &Konsole::Session::zmodemUploadDetected, this, &Konsole::SessionController::zmodemUpload);
 
     // listen for flow control status changes
     connect(_session.data(), &Konsole::Session::flowControlEnabledChanged, _view.data(), &Konsole::TerminalDisplay::setFlowControlWarningEnabled);
     _view->setFlowControlWarningEnabled(_session->flowControlEnabled());
 
     // take a snapshot of the session state every so often when
     // user activity occurs
     //
     // the timer is owned by the session so that it will be destroyed along
     // with the session
     _interactionTimer = new QTimer(_session);
     _interactionTimer->setSingleShot(true);
     _interactionTimer->setInterval(500);
     connect(_interactionTimer, &QTimer::timeout, this, &Konsole::SessionController::snapshot);
     connect(_view.data(), &Konsole::TerminalDisplay::compositeFocusChanged,
             this, [this](bool focused) { if (focused) { interactionHandler(); }});
     connect(_view.data(), &Konsole::TerminalDisplay::keyPressedSignal,
             this, &Konsole::SessionController::interactionHandler);
 
     // take a snapshot of the session state periodically in the background
     auto backgroundTimer = new QTimer(_session);
     backgroundTimer->setSingleShot(false);
     backgroundTimer->setInterval(2000);
     connect(backgroundTimer, &QTimer::timeout, this, &Konsole::SessionController::snapshot);
     backgroundTimer->start();
 
     // xterm '10;?' request
     connect(_session.data(), &Konsole::Session::getForegroundColor,
             this, &Konsole::SessionController::sendForegroundColor);
     // xterm '11;?' request
     connect(_session.data(), &Konsole::Session::getBackgroundColor,
             this, &Konsole::SessionController::sendBackgroundColor);
 
     _allControllers.insert(this);
 
     // A list of programs that accept Ctrl+C to clear command line used
     // before outputting bookmark.
     _bookmarkValidProgramsToClear << QStringLiteral("bash") << QStringLiteral("fish") << QStringLiteral("sh");
     _bookmarkValidProgramsToClear << QStringLiteral("tcsh") << QStringLiteral("zsh");
     setupSearchBar();
     _searchBar->setVisible(_isSearchBarEnabled);
 }
 
 SessionController::~SessionController()
 {
     _allControllers.remove(this);
 
     if (!_editProfileDialog.isNull()) {
         delete _editProfileDialog.data();
     }
     if(factory()) {
         factory()->removeClient(this);
     }
 }
 void SessionController::trackOutput(QKeyEvent* event)
 {
     Q_ASSERT(_view->screenWindow());
 
     // Qt has broken something, so we can't rely on just checking if certain
     // keys are passed as modifiers anymore.
     const int key = event->key();
     const bool shouldNotTriggerScroll =
         key == Qt::Key_Super_L      ||
         key == Qt::Key_Super_R      ||
         key == Qt::Key_Hyper_L      ||
         key == Qt::Key_Hyper_R      ||
         key == Qt::Key_Shift        ||
         key == Qt::Key_Control      ||
         key == Qt::Key_Meta         ||
         key == Qt::Key_Alt          ||
         key == Qt::Key_AltGr        ||
         key == Qt::Key_CapsLock     ||
         key == Qt::Key_NumLock      ||
         key == Qt::Key_ScrollLock;
 
 
     // Only jump to the bottom if the user actually typed something in,
     // not if the user e. g. just pressed a modifier.
     if (event->text().isEmpty() && ((event->modifiers() != 0u) || shouldNotTriggerScroll)) {
         return;
     }
 
     _view->screenWindow()->setTrackOutput(true);
 }
 
 void SessionController::viewFocusChangeHandler(bool focused)
 {
     if (focused) {
         // notify the world that the view associated with this session has been focused
         // used by the view manager to update the title of the MainWindow widget containing the view
         emit viewFocused(this);
 
         // when the view is focused, set bell events from the associated session to be delivered
         // by the focused view
 
         // first, disconnect any other views which are listening for bell signals from the session
         disconnect(_session.data(), &Konsole::Session::bellRequest, nullptr, nullptr);
         // second, connect the newly focused view to listen for the session's bell signal
         connect(_session.data(), &Konsole::Session::bellRequest, _view.data(), &Konsole::TerminalDisplay::bell);
 
         if ((_copyInputToAllTabsAction != nullptr) && _copyInputToAllTabsAction->isChecked()) {
             // A session with "Copy To All Tabs" has come into focus:
             // Ensure that newly created sessions are included in _copyToGroup!
             copyInputToAllTabs();
         }
     }
 }
 
 void SessionController::interactionHandler()
 {
     _interactionTimer->start();
 }
 
 void SessionController::snapshot()
 {
     Q_ASSERT(!_session.isNull());
 
     QString title = _session->getDynamicTitle();
     title         = title.simplified();
 
     // Visualize that the session is broadcasting to others
     if ((_copyToGroup != nullptr) && _copyToGroup->sessions().count() > 1) {
         title.append(QLatin1Char('*'));
     }
 
     // use the fallback title if needed
     if (title.isEmpty()) {
         title = _session->title(Session::NameRole);
     }
+    
+    QColor color = _session->color();
+    // use the fallback color if needed
+    if (!color.isValid()) {
+        color = QColor(QColor::Invalid);
+    }
 
     // apply new title
     _session->setTitle(Session::DisplayedTitleRole, title);
 
+    // apply new color
+    _session->setColor(color);
+
     // do not forget icon
     updateSessionIcon();
 }
 
 QString SessionController::currentDir() const
 {
     return _session->currentWorkingDirectory();
 }
 
 QUrl SessionController::url() const
 {
     return _session->getUrl();
 }
 
 void SessionController::rename()
 {
     renameSession();
 }
 
 void SessionController::openUrl(const QUrl& url)
 {
     // Clear shell's command line
     if (!_session->isForegroundProcessActive()
             && _bookmarkValidProgramsToClear.contains(_session->foregroundProcessName())) {
         _session->sendTextToTerminal(QChar(0x03), QLatin1Char('\n')); // Ctrl+C
     }
 
     // handle local paths
     if (url.isLocalFile()) {
         QString path = url.toLocalFile();
         _session->sendTextToTerminal(QStringLiteral("cd ") + KShell::quoteArg(path), QLatin1Char('\r'));
     } else if (url.scheme().isEmpty()) {
         // QUrl couldn't parse what the user entered into the URL field
         // so just dump it to the shell
         // If you change this, change it also in autotests/BookMarkTest.cpp
         QString command = QUrl::fromPercentEncoding(url.toEncoded());
         if (!command.isEmpty()) {
             _session->sendTextToTerminal(command, QLatin1Char('\r'));
         }
     } else if (url.scheme() == QLatin1String("ssh")) {
         QString sshCommand = QStringLiteral("ssh ");
 
         if (url.port() > -1) {
             sshCommand += QStringLiteral("-p %1 ").arg(url.port());
         }
         if (!url.userName().isEmpty()) {
             sshCommand += (url.userName() + QLatin1Char('@'));
         }
         if (!url.host().isEmpty()) {
             sshCommand += url.host();
         }
         _session->sendTextToTerminal(sshCommand, QLatin1Char('\r'));
 
     } else if (url.scheme() == QLatin1String("telnet")) {
         QString telnetCommand = QStringLiteral("telnet ");
 
         if (!url.userName().isEmpty()) {
             telnetCommand += QStringLiteral("-l %1 ").arg(url.userName());
         }
         if (!url.host().isEmpty()) {
             telnetCommand += (url.host() + QLatin1Char(' '));
         }
         if (url.port() > -1) {
             telnetCommand += QString::number(url.port());
         }
 
         _session->sendTextToTerminal(telnetCommand, QLatin1Char('\r'));
 
     } else {
         //TODO Implement handling for other Url types
 
         KMessageBox::sorry(_view->window(),
                            i18n("Konsole does not know how to open the bookmark: ") +
                            url.toDisplayString());
 
         qCDebug(KonsoleDebug) << "Unable to open bookmark at url" << url << ", I do not know"
                    << " how to handle the protocol " << url.scheme();
     }
 }
 
 void SessionController::setupPrimaryScreenSpecificActions(bool use)
 {
     KActionCollection* collection = actionCollection();
     QAction* clearAction = collection->action(QStringLiteral("clear-history"));
     QAction* resetAction = collection->action(QStringLiteral("clear-history-and-reset"));
     QAction* selectAllAction = collection->action(QStringLiteral("select-all"));
     QAction* selectLineAction = collection->action(QStringLiteral("select-line"));
 
     // these actions are meaningful only when primary screen is used.
     clearAction->setEnabled(use);
     resetAction->setEnabled(use);
     selectAllAction->setEnabled(use);
     selectLineAction->setEnabled(use);
 }
 
 void SessionController::selectionChanged(const QString& selectedText)
 {
     _selectedText = selectedText;
     updateCopyAction(selectedText);
 }
 
 void SessionController::updateCopyAction(const QString& selectedText)
 {
     QAction* copyAction = actionCollection()->action(QStringLiteral("edit_copy"));
 
     // copy action is meaningful only when some text is selected.
     copyAction->setEnabled(!selectedText.isEmpty());
 }
 
 void SessionController::updateWebSearchMenu()
 {
     // reset
     _webSearchMenu->setVisible(false);
     _webSearchMenu->menu()->clear();
 
     if (_selectedText.isEmpty()) {
         return;
     }
 
     QString searchText = _selectedText;
     searchText = searchText.replace(QLatin1Char('\n'), QLatin1Char(' ')).replace(QLatin1Char('\r'), QLatin1Char(' ')).simplified();
 
     if (searchText.isEmpty()) {
         return;
     }
 
     // Is 'Enable Web shortcuts' checked in System Settings?
     KSharedConfigPtr kuriikwsConfig = KSharedConfig::openConfig(QStringLiteral("kuriikwsfilterrc"));
     if (!kuriikwsConfig->group("General").readEntry("EnableWebShortcuts", true)) {
         return;
     }
 
     KUriFilterData filterData(searchText);
     filterData.setSearchFilteringOptions(KUriFilterData::RetrievePreferredSearchProvidersOnly);
 
     if (KUriFilter::self()->filterSearchUri(filterData, KUriFilter::NormalTextFilter)) {
         const QStringList searchProviders = filterData.preferredSearchProviders();
         if (!searchProviders.isEmpty()) {
             _webSearchMenu->setText(i18n("Search for '%1' with",  KStringHandler::rsqueeze(searchText, 16)));
 
             QAction* action = nullptr;
 
             for (const QString &searchProvider : searchProviders) {
                 action = new QAction(searchProvider, _webSearchMenu);
                 action->setIcon(QIcon::fromTheme(filterData.iconNameForPreferredSearchProvider(searchProvider)));
                 action->setData(filterData.queryForPreferredSearchProvider(searchProvider));
                 connect(action, &QAction::triggered, this, &Konsole::SessionController::handleWebShortcutAction);
                 _webSearchMenu->addAction(action);
             }
 
             _webSearchMenu->addSeparator();
 
             action = new QAction(i18n("Configure Web Shortcuts..."), _webSearchMenu);
             action->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
             connect(action, &QAction::triggered, this, &Konsole::SessionController::configureWebShortcuts);
             _webSearchMenu->addAction(action);
 
             _webSearchMenu->setVisible(true);
         }
     }
 }
 
 void SessionController::handleWebShortcutAction()
 {
     auto * action = qobject_cast<QAction*>(sender());
     if (action == nullptr) {
         return;
     }
 
     KUriFilterData filterData(action->data().toString());
 
     if (KUriFilter::self()->filterUri(filterData, QStringList() << QStringLiteral("kurisearchfilter"))) {
         const QUrl& url = filterData.uri();
         new KRun(url, QApplication::activeWindow());
     }
 }
 
 void SessionController::configureWebShortcuts()
 {
     KToolInvocation::kdeinitExec(QStringLiteral("kcmshell5"), QStringList() << QStringLiteral("webshortcuts"));
 }
 
 void SessionController::sendSignal(QAction* action)
 {
     const auto signal = action->data().toInt();
     _session->sendSignal(signal);
 }
 
 void SessionController::sendForegroundColor()
 {
     const QColor c = _view->getForegroundColor();
     _session->reportForegroundColor(c);
 }
 
 void SessionController::sendBackgroundColor()
 {
     const QColor c = _view->getBackgroundColor();
     _session->reportBackgroundColor(c);
 }
 
 void SessionController::toggleReadOnly()
 {
     auto *action = qobject_cast<QAction*>(sender());
     if (action != nullptr) {
         bool readonly = !isReadOnly();
         _session->setReadOnly(readonly);
     }
 }
 
 void SessionController::removeSearchFilter()
 {
     if (_searchFilter == nullptr) {
         return;
     }
 
     _view->filterChain()->removeFilter(_searchFilter);
     delete _searchFilter;
     _searchFilter = nullptr;
 }
 
 void SessionController::setupSearchBar()
 {
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::unhandledMovementKeyPressed, this, &Konsole::SessionController::movementKeyFromSearchBarReceived);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::closeClicked, this, &Konsole::SessionController::searchClosed);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchFromClicked, this, &Konsole::SessionController::searchFrom);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::findNextClicked, this, &Konsole::SessionController::findNextInHistory);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::findPreviousClicked, this, &Konsole::SessionController::findPreviousInHistory);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::highlightMatchesToggled , this , &Konsole::SessionController::highlightMatches);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::matchCaseToggled, this, &Konsole::SessionController::changeSearchMatch);
     connect(_searchBar.data(), &Konsole::IncrementalSearchBar::matchRegExpToggled, this, &Konsole::SessionController::changeSearchMatch);
 }
 
 void SessionController::setShowMenuAction(QAction* action)
 {
     _showMenuAction = action;
 }
 
 void SessionController::setupCommonActions()
 {
     KActionCollection* collection = actionCollection();
 
     // Close Session
     QAction* action = collection->addAction(QStringLiteral("close-session"), this, SLOT(closeSession()));
     action->setText(i18n("&Close Session"));
 
     action->setIcon(QIcon::fromTheme(QStringLiteral("tab-close")));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::SHIFT + Qt::Key_W);
 
     // Open Browser
     action = collection->addAction(QStringLiteral("open-browser"), this, SLOT(openBrowser()));
     action->setText(i18n("Open File Manager"));
     action->setIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));
 
     // Copy and Paste
     action = KStandardAction::copy(this, SLOT(copy()), collection);
 #ifdef Q_OS_MACOS
     // Don't use the Konsole::ACCEL const here, we really want the Command key (Qt::META)
     // TODO: check what happens if we leave it to Qt to assign the default?
     collection->setDefaultShortcut(action, Qt::META + Qt::Key_C);
 #else
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::SHIFT + Qt::Key_C);
 #endif
     // disabled at first, since nothing has been selected now
     action->setEnabled(false);
 
     action = KStandardAction::paste(this, SLOT(paste()), collection);
     QList<QKeySequence> pasteShortcut;
 #ifdef Q_OS_MACOS
     pasteShortcut.append(QKeySequence(Qt::META + Qt::Key_V));
     // No Insert key on Mac keyboards
 #else
     pasteShortcut.append(QKeySequence(Konsole::ACCEL + Qt::SHIFT + Qt::Key_V));
     pasteShortcut.append(QKeySequence(Qt::SHIFT + Qt::Key_Insert));
 #endif
     collection->setDefaultShortcuts(action, pasteShortcut);
 
     action = collection->addAction(QStringLiteral("paste-selection"), this, SLOT(pasteFromX11Selection()));
     action->setText(i18n("Paste Selection"));
 #ifdef Q_OS_MACOS
     collection->setDefaultShortcut(action, Qt::META + Qt::SHIFT + Qt::Key_V);
 #else
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::SHIFT + Qt::Key_Insert);
 #endif
 
     _webSearchMenu = new KActionMenu(i18n("Web Search"), this);
     _webSearchMenu->setIcon(QIcon::fromTheme(QStringLiteral("preferences-web-browser-shortcuts")));
     _webSearchMenu->setVisible(false);
     collection->addAction(QStringLiteral("web-search"), _webSearchMenu);
 
 
     action = collection->addAction(QStringLiteral("select-all"), this, SLOT(selectAll()));
     action->setText(i18n("&Select All"));
     action->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-all")));
 
     action = collection->addAction(QStringLiteral("select-line"), this, SLOT(selectLine()));
     action->setText(i18n("Select &Line"));
 
     action = KStandardAction::saveAs(this, SLOT(saveHistory()), collection);
     action->setText(i18n("Save Output &As..."));
 #ifdef Q_OS_MACOS
     action->setShortcut(QKeySequence(Qt::META + Qt::Key_S));
 #endif
 
     action = KStandardAction::print(this, SLOT(print_screen()), collection);
     action->setText(i18n("&Print Screen..."));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::SHIFT + Qt::Key_P);
 
     action = collection->addAction(QStringLiteral("adjust-history"), this, SLOT(showHistoryOptions()));
     action->setText(i18n("Adjust Scrollback..."));
     action->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
 
     action = collection->addAction(QStringLiteral("clear-history"), this, SLOT(clearHistory()));
     action->setText(i18n("Clear Scrollback"));
     action->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-history")));
 
     action = collection->addAction(QStringLiteral("clear-history-and-reset"), this, SLOT(clearHistoryAndReset()));
     action->setText(i18n("Clear Scrollback and Reset"));
     action->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-history")));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::SHIFT + Qt::Key_K);
 
     // Profile Options
     action = collection->addAction(QStringLiteral("edit-current-profile"), this, SLOT(editCurrentProfile()));
     action->setText(i18n("Edit Current Profile..."));
     action->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
 
     _switchProfileMenu = new KActionMenu(i18n("Switch Profile"), this);
     collection->addAction(QStringLiteral("switch-profile"), _switchProfileMenu);
     connect(_switchProfileMenu->menu(), &QMenu::aboutToShow, this, &Konsole::SessionController::prepareSwitchProfileMenu);
 
     // History
     _findAction = KStandardAction::find(this, SLOT(searchBarEvent()), collection);
 
     _findNextAction = KStandardAction::findNext(this, SLOT(findNextInHistory()), collection);
     _findNextAction->setEnabled(false);
 
     _findPreviousAction = KStandardAction::findPrev(this, SLOT(findPreviousInHistory()), collection);
     _findPreviousAction->setEnabled(false);
 
 #ifdef Q_OS_MACOS
     collection->setDefaultShortcut(_findAction, Qt::META + Qt::Key_F);
     collection->setDefaultShortcut(_findNextAction, Qt::META + Qt::Key_G);
     collection->setDefaultShortcut(_findPreviousAction, Qt::META + Qt::SHIFT + Qt::Key_G);
 #else
     collection->setDefaultShortcut(_findAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_F);
     collection->setDefaultShortcut(_findNextAction, Qt::Key_F3);
     collection->setDefaultShortcut(_findPreviousAction, Qt::SHIFT + Qt::Key_F3);
 #endif
 
     // Character Encoding
     _codecAction = new KCodecAction(i18n("Set &Encoding"), this);
     _codecAction->setIcon(QIcon::fromTheme(QStringLiteral("character-set")));
     collection->addAction(QStringLiteral("set-encoding"), _codecAction);
     connect(_codecAction->menu(), &QMenu::aboutToShow, this, &Konsole::SessionController::updateCodecAction);
     connect(_codecAction,
             QOverload<QTextCodec*>::of(&KCodecAction::triggered), this,
             &Konsole::SessionController::changeCodec);
 
     // Read-only
     action = collection->addAction(QStringLiteral("view-readonly"), this, SLOT(toggleReadOnly()));
     action->setText(i18nc("@item:inmenu A read only (locked) session", "Read-only"));
     action->setCheckable(true);
     updateReadOnlyActionStates();
 }
 
 void SessionController::setupExtraActions()
 {
     KActionCollection* collection = actionCollection();
 
     // Rename Session
     QAction* action = collection->addAction(QStringLiteral("rename-session"), this, SLOT(renameSession()));
     action->setText(i18n("&Rename Tab..."));
     action->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::ALT + Qt::Key_S);
 
     // Copy input to ==> all tabs
     auto* copyInputToAllTabsAction = collection->add<KToggleAction>(QStringLiteral("copy-input-to-all-tabs"));
     copyInputToAllTabsAction->setText(i18n("&All Tabs in Current Window"));
     copyInputToAllTabsAction->setData(CopyInputToAllTabsMode);
     // this action is also used in other place, so remember it
     _copyInputToAllTabsAction = copyInputToAllTabsAction;
 
     // Copy input to ==> selected tabs
     auto* copyInputToSelectedTabsAction = collection->add<KToggleAction>(QStringLiteral("copy-input-to-selected-tabs"));
     copyInputToSelectedTabsAction->setText(i18n("&Select Tabs..."));
     collection->setDefaultShortcut(copyInputToSelectedTabsAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_Period);
     copyInputToSelectedTabsAction->setData(CopyInputToSelectedTabsMode);
 
     // Copy input to ==> none
     auto* copyInputToNoneAction = collection->add<KToggleAction>(QStringLiteral("copy-input-to-none"));
     copyInputToNoneAction->setText(i18nc("@action:inmenu Do not select any tabs", "&None"));
     collection->setDefaultShortcut(copyInputToNoneAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_Slash);
     copyInputToNoneAction->setData(CopyInputToNoneMode);
     copyInputToNoneAction->setChecked(true); // the default state
 
     // The "Copy Input To" submenu
     // The above three choices are represented as combo boxes
     auto* copyInputActions = collection->add<KSelectAction>(QStringLiteral("copy-input-to"));
     copyInputActions->setText(i18n("Copy Input To"));
     copyInputActions->addAction(copyInputToAllTabsAction);
     copyInputActions->addAction(copyInputToSelectedTabsAction);
     copyInputActions->addAction(copyInputToNoneAction);
     connect(copyInputActions,
             QOverload<QAction*>::of(&KSelectAction::triggered), this,
             &Konsole::SessionController::copyInputActionsTriggered);
 
     action = collection->addAction(QStringLiteral("zmodem-upload"), this, SLOT(zmodemUpload()));
     action->setText(i18n("&ZModem Upload..."));
     action->setIcon(QIcon::fromTheme(QStringLiteral("document-open")));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::ALT + Qt::Key_U);
 
     // Monitor
     KToggleAction* toggleAction = new KToggleAction(i18n("Monitor for &Activity"), this);
     collection->setDefaultShortcut(toggleAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_A);
     action = collection->addAction(QStringLiteral("monitor-activity"), toggleAction);
     connect(action, &QAction::toggled, this, &Konsole::SessionController::monitorActivity);
 
     toggleAction = new KToggleAction(i18n("Monitor for &Silence"), this);
     collection->setDefaultShortcut(toggleAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_I);
     action = collection->addAction(QStringLiteral("monitor-silence"), toggleAction);
     connect(action, &QAction::toggled, this, &Konsole::SessionController::monitorSilence);
 
     // Text Size
     action = collection->addAction(QStringLiteral("enlarge-font"), this, SLOT(increaseFontSize()));
     action->setText(i18n("Enlarge Font"));
     action->setIcon(QIcon::fromTheme(QStringLiteral("format-font-size-more")));
     QList<QKeySequence> enlargeFontShortcut;
     enlargeFontShortcut.append(QKeySequence(Konsole::ACCEL + Qt::Key_Plus));
     enlargeFontShortcut.append(QKeySequence(Konsole::ACCEL + Qt::Key_Equal));
     collection->setDefaultShortcuts(action, enlargeFontShortcut);
 
     action = collection->addAction(QStringLiteral("shrink-font"), this, SLOT(decreaseFontSize()));
     action->setText(i18n("Shrink Font"));
     action->setIcon(QIcon::fromTheme(QStringLiteral("format-font-size-less")));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::Key_Minus);
 
     action = collection->addAction(QStringLiteral("reset-font-size"), this, SLOT(resetFontSize()));
     action->setText(i18n("Reset Font Size"));
     collection->setDefaultShortcut(action, Konsole::ACCEL + Qt::ALT + Qt::Key_0);
 
     // Send signal
     auto* sendSignalActions = collection->add<KSelectAction>(QStringLiteral("send-signal"));
     sendSignalActions->setText(i18n("Send Signal"));
     connect(sendSignalActions,
             QOverload<QAction*>::of(&KSelectAction::triggered), this,
             &Konsole::SessionController::sendSignal);
 
     action = collection->addAction(QStringLiteral("sigstop-signal"));
     action->setText(i18n("&Suspend Task")   + QStringLiteral(" (STOP)"));
     action->setData(SIGSTOP);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sigcont-signal"));
     action->setText(i18n("&Continue Task")  + QStringLiteral(" (CONT)"));
     action->setData(SIGCONT);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sighup-signal"));
     action->setText(i18n("&Hangup")         + QStringLiteral(" (HUP)"));
     action->setData(SIGHUP);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sigint-signal"));
     action->setText(i18n("&Interrupt Task") + QStringLiteral(" (INT)"));
     action->setData(SIGINT);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sigterm-signal"));
     action->setText(i18n("&Terminate Task") + QStringLiteral(" (TERM)"));
     action->setData(SIGTERM);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sigkill-signal"));
     action->setText(i18n("&Kill Task")      + QStringLiteral(" (KILL)"));
     action->setData(SIGKILL);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sigusr1-signal"));
     action->setText(i18n("User Signal &1")   + QStringLiteral(" (USR1)"));
     action->setData(SIGUSR1);
     sendSignalActions->addAction(action);
 
     action = collection->addAction(QStringLiteral("sigusr2-signal"));
     action->setText(i18n("User Signal &2")   + QStringLiteral(" (USR2)"));
     action->setData(SIGUSR2);
     sendSignalActions->addAction(action);
 }
 
 void SessionController::switchProfile(const Profile::Ptr &profile)
 {
     SessionManager::instance()->setSessionProfile(_session, profile);
     updateFilterList(profile);
 }
 
 void SessionController::prepareSwitchProfileMenu()
 {
     if (_switchProfileMenu->menu()->isEmpty()) {
         _profileList = new ProfileList(false, this);
         connect(_profileList, &Konsole::ProfileList::profileSelected, this, &Konsole::SessionController::switchProfile);
     }
 
     _switchProfileMenu->menu()->clear();
     _switchProfileMenu->menu()->addActions(_profileList->actions());
 }
 void SessionController::updateCodecAction()
 {
     _codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
 }
 
 void SessionController::changeCodec(QTextCodec* codec)
 {
     _session->setCodec(codec);
 }
 
 EditProfileDialog* SessionController::profileDialogPointer()
 {
     return _editProfileDialog.data();
 }
 
 void SessionController::editCurrentProfile()
 {
     // Searching for Edit profile dialog opened with the same profile
     for (SessionController *controller : qAsConst(_allControllers)) {
         if ( (controller->profileDialogPointer() != nullptr)
              && controller->profileDialogPointer()->isVisible()
              && (controller->profileDialogPointer()->lookupProfile()
                  == SessionManager::instance()->sessionProfile(_session)) ) {
             controller->profileDialogPointer()->close();
         }
     }
 
     // NOTE bug311270: For to prevent the crash, the profile must be reset.
     if (!_editProfileDialog.isNull()) {
         // exists but not visible
         delete _editProfileDialog.data();
     }
 
     _editProfileDialog = new EditProfileDialog(QApplication::activeWindow());
     _editProfileDialog.data()->setProfile(SessionManager::instance()->sessionProfile(_session));
     _editProfileDialog.data()->show();
 }
 
 void SessionController::renameSession()
 {
     const QString &sessionLocalTabTitleFormat = _session->tabTitleFormat(Session::LocalTabTitle);
     const QString &sessionRemoteTabTitleFormat = _session->tabTitleFormat(Session::RemoteTabTitle);
+    const QColor &sessionTabColor = _session->color();
 
     QScopedPointer<RenameTabDialog> dialog(new RenameTabDialog(QApplication::activeWindow()));
     dialog->setTabTitleText(sessionLocalTabTitleFormat);
     dialog->setRemoteTabTitleText(sessionRemoteTabTitleFormat);
+    dialog->setColor(sessionTabColor);
 
     if (_session->isRemote()) {
         dialog->focusRemoteTabTitleText();
     } else {
         dialog->focusTabTitleText();
     }
 
     QPointer<Session> guard(_session);
     int result = dialog->exec();
     if (guard.isNull()) {
         return;
     }
 
     if (result != 0) {
         const QString &tabTitle = dialog->tabTitleText();
         const QString &remoteTabTitle = dialog->remoteTabTitleText();
+        const QColor &tabColor = dialog->color();
 
         if (tabTitle != sessionLocalTabTitleFormat) {
             _session->setTabTitleFormat(Session::LocalTabTitle, tabTitle);
             emit tabRenamedByUser(true);
             // trigger an update of the tab text
             snapshot();
         }
 
         if(remoteTabTitle != sessionRemoteTabTitleFormat) {
             _session->setTabTitleFormat(Session::RemoteTabTitle, remoteTabTitle);
             emit tabRenamedByUser(true);
             snapshot();
         }
+
+        if (tabColor != sessionTabColor) {
+            _session->setColor(tabColor);
+            emit tabColoredByUser(true);
+            snapshot();
+        }
     }
 }
 
 // This is called upon Menu->Close Sesssion and right-click on tab->Close Tab
 bool SessionController::confirmClose() const
 {
     if (_session->isForegroundProcessActive()) {
         QString title = _session->foregroundProcessName();
 
         // hard coded for now.  In future make it possible for the user to specify which programs
         // are ignored when considering whether to display a confirmation
         QStringList ignoreList;
         ignoreList << QString::fromUtf8(qgetenv("SHELL")).section(QLatin1Char('/'), -1);
         if (ignoreList.contains(title)) {
             return true;
         }
 
         QString question;
         if (title.isEmpty()) {
             question = i18n("A program is currently running in this session."
                             "  Are you sure you want to close it?");
         } else {
             question = i18n("The program '%1' is currently running in this session."
                             "  Are you sure you want to close it?", title);
         }
 
         int result = KMessageBox::warningYesNo(_view->window(),
                                                question,
                                                i18n("Confirm Close"),
                                                KStandardGuiItem::yes(),
                                                KStandardGuiItem::no(),
                                                QStringLiteral("CloseSingleTab"));
         return result == KMessageBox::Yes;
     }
     return true;
 }
 bool SessionController::confirmForceClose() const
 {
     if (_session->isRunning()) {
         QString title = _session->program();
 
         // hard coded for now.  In future make it possible for the user to specify which programs
         // are ignored when considering whether to display a confirmation
         QStringList ignoreList;
         ignoreList << QString::fromUtf8(qgetenv("SHELL")).section(QLatin1Char('/'), -1);
         if (ignoreList.contains(title)) {
             return true;
         }
 
         QString question;
         if (title.isEmpty()) {
             question = i18n("A program in this session would not die."
                             "  Are you sure you want to kill it by force?");
         } else {
             question = i18n("The program '%1' is in this session would not die."
                             "  Are you sure you want to kill it by force?", title);
         }
 
         int result = KMessageBox::warningYesNo(_view->window(), question, i18n("Confirm Close"));
         return result == KMessageBox::Yes;
     }
     return true;
 }
 void SessionController::closeSession()
 {
     if (_preventClose) {
         return;
     }
 
     if (confirmClose()) {
         if (_session->closeInNormalWay()) {
             return;
         } else if (confirmForceClose()) {
             if (_session->closeInForceWay()) {
                 return;
             } else {
                 qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
             }
         }
     }
 }
 
 // Trying to open a remote Url may produce unexpected results.
 // Therefore, if a remote url, open the user's home path.
 // TODO consider: 1) disable menu upon remote session
 //   2) transform url to get the desired result (ssh -> sftp, etc)
 void SessionController::openBrowser()
 {
     const QUrl currentUrl = url();
 
     if (currentUrl.isLocalFile()) {
         new KRun(currentUrl, QApplication::activeWindow(), true);
     } else {
         new KRun(QUrl::fromLocalFile(QDir::homePath()), QApplication::activeWindow(), true);
     }
 }
 
 void SessionController::copy()
 {
     _view->copyToClipboard();
 }
 
 void SessionController::paste()
 {
     _view->pasteFromClipboard();
 }
 void SessionController::pasteFromX11Selection()
 {
     _view->pasteFromX11Selection();
 }
 void SessionController::selectAll()
 {
     _view->selectAll();
 }
 void SessionController::selectLine()
 {
     _view->selectCurrentLine();
 }
 static const KXmlGuiWindow* findWindow(const QObject* object)
 {
     // Walk up the QObject hierarchy to find a KXmlGuiWindow.
     while (object != nullptr) {
         const auto* window = qobject_cast<const KXmlGuiWindow*>(object);
         if (window != nullptr) {
             return(window);
         }
         object = object->parent();
     }
     return(nullptr);
 }
 
 static bool hasTerminalDisplayInSameWindow(const Session* session, const KXmlGuiWindow* window)
 {
     // Iterate all TerminalDisplays of this Session ...
     const QList<TerminalDisplay *> views = session->views();
     for (const TerminalDisplay *terminalDisplay : views) {
         // ... and check whether a TerminalDisplay has the same
         // window as given in the parameter
         if (window == findWindow(terminalDisplay)) {
             return(true);
         }
     }
     return(false);
 }
 
 void SessionController::copyInputActionsTriggered(QAction* action)
 {
     const auto mode = action->data().toInt();
 
     switch (mode) {
     case CopyInputToAllTabsMode:
         copyInputToAllTabs();
         break;
     case CopyInputToSelectedTabsMode:
         copyInputToSelectedTabs();
         break;
     case CopyInputToNoneMode:
         copyInputToNone();
         break;
     default:
         Q_ASSERT(false);
     }
 }
 
 void SessionController::copyInputToAllTabs()
 {
     if (_copyToGroup == nullptr) {
         _copyToGroup = new SessionGroup(this);
     }
 
     // Find our window ...
     const KXmlGuiWindow* myWindow = findWindow(_view);
 
     const QList<Session *> sessionsList = SessionManager::instance()->sessions();
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QSet<Session*> group(sessionsList.begin(), sessionsList.end());
 #else
     QSet<Session*> group = QSet<Session*>::fromList(sessionsList);
 #endif
     for (auto session : group) {
         // First, ensure that the session is removed
         // (necessary to avoid duplicates on addSession()!)
         _copyToGroup->removeSession(session);
 
         // Add current session if it is displayed our window
         if (hasTerminalDisplayInSameWindow(session, myWindow)) {
             _copyToGroup->addSession(session);
         }
     }
     _copyToGroup->setMasterStatus(_session, true);
     _copyToGroup->setMasterMode(SessionGroup::CopyInputToAll);
 
     snapshot();
     emit copyInputChanged(this);
 }
 
 void SessionController::copyInputToSelectedTabs()
 {
     if (_copyToGroup == nullptr) {
         _copyToGroup = new SessionGroup(this);
         _copyToGroup->addSession(_session);
         _copyToGroup->setMasterStatus(_session, true);
         _copyToGroup->setMasterMode(SessionGroup::CopyInputToAll);
     }
 
     QPointer<CopyInputDialog> dialog = new CopyInputDialog(_view);
     dialog->setMasterSession(_session);
 
     const QList<Session*> sessionsList = _copyToGroup->sessions();
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QSet<Session*> currentGroup(sessionsList.begin(), sessionsList.end());
 #else
     QSet<Session*> currentGroup = QSet<Session*>::fromList(sessionsList);
 #endif
 
     currentGroup.remove(_session);
 
     dialog->setChosenSessions(currentGroup);
 
     QPointer<Session> guard(_session);
     int result = dialog->exec();
     if (guard.isNull()) {
         return;
     }
 
     if (result == QDialog::Accepted) {
         QSet<Session*> newGroup = dialog->chosenSessions();
         newGroup.remove(_session);
 
         const QSet<Session *> completeGroup = newGroup | currentGroup;
         for (Session *session : completeGroup) {
             if (newGroup.contains(session) && !currentGroup.contains(session)) {
                 _copyToGroup->addSession(session);
             } else if (!newGroup.contains(session) && currentGroup.contains(session)) {
                 _copyToGroup->removeSession(session);
             }
         }
 
         _copyToGroup->setMasterStatus(_session, true);
         _copyToGroup->setMasterMode(SessionGroup::CopyInputToAll);
         snapshot();
         emit copyInputChanged(this);
     }
 }
 
 void SessionController::copyInputToNone()
 {
     if (_copyToGroup == nullptr) {      // No 'Copy To' is active
         return;
     }
 
     // Once Qt5.14+ is the mininum, change to use range constructors
     const QList<Session*> groupList = SessionManager::instance()->sessions();
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QSet<Session*> group(groupList.begin(), groupList.end());
 #else
     QSet<Session*> group = QSet<Session*>::fromList(groupList);
 #endif
 
     for (auto iterator : group) {
         Session* session = iterator;
 
         if (session != _session) {
             _copyToGroup->removeSession(iterator);
         }
     }
     delete _copyToGroup;
     _copyToGroup = nullptr;
     snapshot();
     emit copyInputChanged(this);
 }
 
 void SessionController::searchClosed()
 {
     _isSearchBarEnabled = false;
     searchHistory(false);
 }
 
 void SessionController::updateFilterList(Profile::Ptr profile)
 {
     if (profile != SessionManager::instance()->sessionProfile(_session)) {
         return;
     }
 
     bool underlineFiles = profile->underlineFilesEnabled();
 
     if (!underlineFiles && (_fileFilter != nullptr)) {
         _view->filterChain()->removeFilter(_fileFilter);
         delete _fileFilter;
         _fileFilter = nullptr;
     } else if (underlineFiles && (_fileFilter == nullptr)) {
         _fileFilter = new FileFilter(_session);
         _view->filterChain()->addFilter(_fileFilter);
     }
 
     bool underlineLinks = profile->underlineLinksEnabled();
     if (!underlineLinks && (_urlFilter != nullptr)) {
         _view->filterChain()->removeFilter(_urlFilter);
         delete _urlFilter;
         _urlFilter = nullptr;
     } else if (underlineLinks && (_urlFilter == nullptr)) {
         _urlFilter = new UrlFilter();
         _view->filterChain()->addFilter(_urlFilter);
     }
 }
 
 void SessionController::setSearchStartToWindowCurrentLine()
 {
     setSearchStartTo(-1);
 }
 
 void SessionController::setSearchStartTo(int line)
 {
     _searchStartLine = line;
     _prevSearchResultLine = line;
 }
 
 void SessionController::listenForScreenWindowUpdates()
 {
     if (_listenForScreenWindowUpdates) {
         return;
     }
 
     connect(_view->screenWindow(), &Konsole::ScreenWindow::outputChanged, this, &Konsole::SessionController::updateSearchFilter);
     connect(_view->screenWindow(), &Konsole::ScreenWindow::scrolled, this, &Konsole::SessionController::updateSearchFilter);
     connect(_view->screenWindow(),
             &Konsole::ScreenWindow::currentResultLineChanged, _view.data(),
             QOverload<>::of(&Konsole::TerminalDisplay::update));
 
     _listenForScreenWindowUpdates = true;
 }
 
 void SessionController::updateSearchFilter()
 {
     if ((_searchFilter != nullptr) && (!_searchBar.isNull())) {
         _view->processFilters();
     }
 }
 
 void SessionController::searchBarEvent()
 {
     QString selectedText = _view->screenWindow()->selectedText(Screen::PreserveLineBreaks | Screen::TrimLeadingWhitespace | Screen::TrimTrailingWhitespace);
     if (!selectedText.isEmpty()) {
         _searchBar->setSearchText(selectedText);
     }
 
     if (_searchBar->isVisible()) {
         _searchBar->focusLineEdit();
     } else {
         searchHistory(true);
         _isSearchBarEnabled = true;
     }
 }
 
 void SessionController::enableSearchBar(bool showSearchBar)
 {
     if (_searchBar.isNull()) {
         return;
     }
 
     if (showSearchBar && !_searchBar->isVisible()) {
         setSearchStartToWindowCurrentLine();
     }
 
     _searchBar->setVisible(showSearchBar);
     if (showSearchBar) {
         connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchChanged, this, &Konsole::SessionController::searchTextChanged);
         connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchReturnPressed, this, &Konsole::SessionController::findPreviousInHistory);
         connect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchShiftPlusReturnPressed, this, &Konsole::SessionController::findNextInHistory);
     } else {
         disconnect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchChanged, this,
                    &Konsole::SessionController::searchTextChanged);
         disconnect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchReturnPressed, this,
                    &Konsole::SessionController::findPreviousInHistory);
         disconnect(_searchBar.data(), &Konsole::IncrementalSearchBar::searchShiftPlusReturnPressed, this,
                    &Konsole::SessionController::findNextInHistory);
         if ((!_view.isNull()) && (_view->screenWindow() != nullptr)) {
             _view->screenWindow()->setCurrentResultLine(-1);
         }
     }
 }
 
 
 bool SessionController::reverseSearchChecked() const
 {
     Q_ASSERT(_searchBar);
 
     QBitArray options = _searchBar->optionsChecked();
     return options.at(IncrementalSearchBar::ReverseSearch);
 }
 
 QRegularExpression SessionController::regexpFromSearchBarOptions() const
 {
     QBitArray options = _searchBar->optionsChecked();
 
     QString text(_searchBar->searchText());
 
     QRegularExpression regExp;
     if (options.at(IncrementalSearchBar::RegExp)) {
         regExp.setPattern(text);
     } else {
         regExp.setPattern(QRegularExpression::escape(text));
     }
 
     if (!options.at(IncrementalSearchBar::MatchCase)) {
         regExp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
     }
 
     return regExp;
 }
 
 // searchHistory() may be called either as a result of clicking a menu item or
 // as a result of changing the search bar widget
 void SessionController::searchHistory(bool showSearchBar)
 {
     enableSearchBar(showSearchBar);
 
     if (!_searchBar.isNull()) {
         if (showSearchBar) {
             removeSearchFilter();
 
             listenForScreenWindowUpdates();
 
             _searchFilter = new RegExpFilter();
             _searchFilter->setRegExp(regexpFromSearchBarOptions());
             _view->filterChain()->addFilter(_searchFilter);
             _view->processFilters();
 
             setFindNextPrevEnabled(true);
         } else {
             setFindNextPrevEnabled(false);
 
             removeSearchFilter();
 
             _view->setFocus(Qt::ActiveWindowFocusReason);
         }
     }
 }
 
 void SessionController::setFindNextPrevEnabled(bool enabled)
 {
     _findNextAction->setEnabled(enabled);
     _findPreviousAction->setEnabled(enabled);
 }
 void SessionController::searchTextChanged(const QString& text)
 {
     Q_ASSERT(_view->screenWindow());
 
     if (_searchText == text) {
         return;
     }
 
     _searchText = text;
 
     if (text.isEmpty()) {
         _view->screenWindow()->clearSelection();
         _view->screenWindow()->scrollTo(_searchStartLine);
     }
 
     // update search.  this is called even when the text is
     // empty to clear the view's filters
     beginSearch(text , reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
 }
 void SessionController::searchCompleted(bool success)
 {
     _prevSearchResultLine = _view->screenWindow()->currentResultLine();
 
     if (!_searchBar.isNull()) {
         _searchBar->setFoundMatch(success);
     }
 }
 
 void SessionController::beginSearch(const QString& text, Enum::SearchDirection direction)
 {
     Q_ASSERT(_searchBar);
     Q_ASSERT(_searchFilter);
 
     QRegularExpression regExp = regexpFromSearchBarOptions();
     _searchFilter->setRegExp(regExp);
 
     if (_searchStartLine < 0 || _searchStartLine > _view->screenWindow()->lineCount()) {
         if (direction == Enum::ForwardsSearch) {
             setSearchStartTo(_view->screenWindow()->currentLine());
         } else {
             setSearchStartTo(_view->screenWindow()->currentLine() + _view->screenWindow()->windowLines());
         }
     }
 
     if (!regExp.pattern().isEmpty()) {
         _view->screenWindow()->setCurrentResultLine(-1);
         auto task = new SearchHistoryTask(this);
 
         connect(task, &Konsole::SearchHistoryTask::completed, this, &Konsole::SessionController::searchCompleted);
 
         task->setRegExp(regExp);
         task->setSearchDirection(direction);
         task->setAutoDelete(true);
         task->setStartLine(_searchStartLine);
         task->addScreenWindow(_session , _view->screenWindow());
         task->execute();
     } else if (text.isEmpty()) {
         searchCompleted(false);
     }
 
     _view->processFilters();
 }
 void SessionController::highlightMatches(bool highlight)
 {
     if (highlight) {
         _view->filterChain()->addFilter(_searchFilter);
         _view->processFilters();
     } else {
         _view->filterChain()->removeFilter(_searchFilter);
     }
 
     _view->update();
 }
 
 void SessionController::searchFrom()
 {
     Q_ASSERT(_searchBar);
     Q_ASSERT(_searchFilter);
 
     if (reverseSearchChecked()) {
         setSearchStartTo(_view->screenWindow()->lineCount());
     } else {
         setSearchStartTo(0);
     }
 
 
     beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
 }
 void SessionController::findNextInHistory()
 {
     Q_ASSERT(_searchBar);
     Q_ASSERT(_searchFilter);
 
     setSearchStartTo(_prevSearchResultLine);
 
     beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
 }
 void SessionController::findPreviousInHistory()
 {
     Q_ASSERT(_searchBar);
     Q_ASSERT(_searchFilter);
 
     setSearchStartTo(_prevSearchResultLine);
 
     beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::ForwardsSearch : Enum::BackwardsSearch);
 }
 void SessionController::changeSearchMatch()
 {
     Q_ASSERT(_searchBar);
     Q_ASSERT(_searchFilter);
 
     // reset Selection for new case match
     _view->screenWindow()->clearSelection();
     beginSearch(_searchBar->searchText(), reverseSearchChecked() ? Enum::BackwardsSearch : Enum::ForwardsSearch);
 }
 void SessionController::showHistoryOptions()
 {
     QScopedPointer<HistorySizeDialog> dialog(new HistorySizeDialog(QApplication::activeWindow()));
     const HistoryType& currentHistory = _session->historyType();
 
     if (currentHistory.isEnabled()) {
         if (currentHistory.isUnlimited()) {
             dialog->setMode(Enum::UnlimitedHistory);
         } else {
             dialog->setMode(Enum::FixedSizeHistory);
             dialog->setLineCount(currentHistory.maximumLineCount());
         }
     } else {
         dialog->setMode(Enum::NoHistory);
     }
 
     QPointer<Session> guard(_session);
     int result = dialog->exec();
     if (guard.isNull()) {
         return;
     }
 
     if (result != 0) {
         scrollBackOptionsChanged(dialog->mode(), dialog->lineCount());
     }
 }
 void SessionController::sessionResizeRequest(const QSize& size)
 {
     ////qDebug() << "View resize requested to " << size;
     _view->setSize(size.width(), size.height());
 }
 void SessionController::scrollBackOptionsChanged(int mode, int lines)
 {
     switch (mode) {
     case Enum::NoHistory:
         _session->setHistoryType(HistoryTypeNone());
         break;
     case Enum::FixedSizeHistory:
         _session->setHistoryType(CompactHistoryType(lines));
         break;
     case Enum::UnlimitedHistory:
         _session->setHistoryType(HistoryTypeFile());
         break;
     }
 }
 
 void SessionController::print_screen()
 {
     QPrinter printer;
 
     QPointer<QPrintDialog> dialog = new QPrintDialog(&printer, _view);
     auto options = new PrintOptions();
 
     dialog->setOptionTabs(QList<QWidget*>() << options);
     dialog->setWindowTitle(i18n("Print Shell"));
     connect(dialog.data(),
             QOverload<>::of(&QPrintDialog::accepted),
             options,
             &Konsole::PrintOptions::saveSettings);
     if (dialog->exec() != QDialog::Accepted) {
         return;
     }
 
     QPainter painter;
     painter.begin(&printer);
 
     KConfigGroup configGroup(KSharedConfig::openConfig(), "PrintOptions");
 
     if (configGroup.readEntry("ScaleOutput", true)) {
         double scale = qMin(printer.pageRect().width() / static_cast<double>(_view->width()),
                             printer.pageRect().height() / static_cast<double>(_view->height()));
         painter.scale(scale, scale);
     }
 
     _view->printContent(painter, configGroup.readEntry("PrinterFriendly", true));
 }
 
 void SessionController::saveHistory()
 {
     SessionTask* task = new SaveHistoryTask(this);
     task->setAutoDelete(true);
     task->addSession(_session);
     task->execute();
 }
 
 void SessionController::clearHistory()
 {
     _session->clearHistory();
     _view->updateImage();   // To reset view scrollbar
     _view->repaint();
 }
 
 void SessionController::clearHistoryAndReset()
 {
     Profile::Ptr profile = SessionManager::instance()->sessionProfile(_session);
     QByteArray name = profile->defaultEncoding().toUtf8();
 
     Emulation* emulation = _session->emulation();
     emulation->reset();
     _session->refresh();
     _session->setCodec(QTextCodec::codecForName(name));
     clearHistory();
 }
 
 void SessionController::increaseFontSize()
 {
     _view->increaseFontSize();
 }
 
 void SessionController::decreaseFontSize()
 {
     _view->decreaseFontSize();
 }
 
 void SessionController::resetFontSize()
 {
     _view->resetFontSize();
 }
 
 void SessionController::monitorActivity(bool monitor)
 {
     _session->setMonitorActivity(monitor);
 }
 void SessionController::monitorSilence(bool monitor)
 {
     _session->setMonitorSilence(monitor);
 }
 void SessionController::updateSessionIcon()
 {
     // If the default profile icon is being used, don't put it on the tab
     // Only show the icon if the user specifically chose one
     if (_session->iconName() == QStringLiteral("utilities-terminal")) {
         _sessionIconName = QString();
     } else {
         _sessionIconName = _session->iconName();
     }
     _sessionIcon = QIcon::fromTheme(_sessionIconName);
 
     setIcon(_sessionIcon);
 }
 
 void SessionController::updateReadOnlyActionStates()
 {
     bool readonly = isReadOnly();
     QAction *readonlyAction = actionCollection()->action(QStringLiteral("view-readonly"));
     Q_ASSERT(readonlyAction != nullptr);
     readonlyAction->setIcon(QIcon::fromTheme(readonly ? QStringLiteral("object-locked") : QStringLiteral("object-unlocked")));
     readonlyAction->setChecked(readonly);
 
     auto updateActionState = [this, readonly](const QString &name) {
         QAction *action = actionCollection()->action(name);
         if (action != nullptr) {
             action->setEnabled(!readonly);
         }
     };
 
     updateActionState(QStringLiteral("edit_paste"));
     updateActionState(QStringLiteral("clear-history"));
     updateActionState(QStringLiteral("clear-history-and-reset"));
     updateActionState(QStringLiteral("edit-current-profile"));
     updateActionState(QStringLiteral("switch-profile"));
     updateActionState(QStringLiteral("adjust-history"));
     updateActionState(QStringLiteral("send-signal"));
     updateActionState(QStringLiteral("zmodem-upload"));
 
     _codecAction->setEnabled(!readonly);
 
     // Without the timer, when detaching a tab while the message widget is visible,
     // the size of the terminal becomes really small...
     QTimer::singleShot(0, this, [this, readonly]() {
         _view->updateReadOnlyState(readonly);
     });
 }
 
 bool SessionController::isReadOnly() const
 {
     if (!_session.isNull()) {
         return _session->isReadOnly();
     } else {
         return false;
     }
 }
 
 bool SessionController::isCopyInputActive() const
 {
     return ((_copyToGroup != nullptr) && _copyToGroup->sessions().count() > 1);
 }
 
 void SessionController::sessionAttributeChanged()
 {
     if (_sessionIconName != _session->iconName()) {
         updateSessionIcon();
     }
 
     QString title = _session->title(Session::DisplayedTitleRole);
 
     // special handling for the "%w" marker which is replaced with the
     // window title set by the shell
     title.replace(QLatin1String("%w"), _session->userTitle());
     // special handling for the "%#" marker which is replaced with the
     // number of the shell
     title.replace(QLatin1String("%#"), QString::number(_session->sessionId()));
 
     if (title.isEmpty()) {
         title = _session->title(Session::NameRole);
     }
 
     setTitle(title);
+    setColor(_session->color());
     emit rawTitleChanged();
 }
 
 void SessionController::sessionReadOnlyChanged() {
     updateReadOnlyActionStates();
 
     // Update all views
     const QList<TerminalDisplay *> viewsList = session()->views();
     for (TerminalDisplay *terminalDisplay : viewsList) {
         if (terminalDisplay != _view.data()) {
             terminalDisplay->updateReadOnlyState(isReadOnly());
         }
         emit readOnlyChanged(this);
     }
 }
 
 void SessionController::showDisplayContextMenu(const QPoint& position)
 {
     // needed to make sure the popup menu is available, even if a hosting
     // application did not merge our GUI.
     if (factory() == nullptr) {
         if (clientBuilder() == nullptr) {
             setClientBuilder(new KXMLGUIBuilder(_view));
         }
 
         auto factory = new KXMLGUIFactory(clientBuilder(), this);
         factory->addClient(this);
         ////qDebug() << "Created xmlgui factory" << factory;
     }
 
     QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this));
     if (!popup.isNull()) {
         updateReadOnlyActionStates();
 
         auto contentSeparator = new QAction(popup);
         contentSeparator->setSeparator(true);
 
         // prepend content-specific actions such as "Open Link", "Copy Email Address" etc.
         QSharedPointer<Filter::HotSpot> hotSpot = _view->filterActions(position);
         if (hotSpot) {
             popup->insertActions(popup->actions().value(0, nullptr), hotSpot->actions() << contentSeparator );
 
         }
 
         // always update this submenu before showing the context menu,
         // because the available search services might have changed
         // since the context menu is shown last time
         updateWebSearchMenu();
 
         _preventClose = true;
 
         if (_showMenuAction != nullptr) {
             if (  _showMenuAction->isChecked() ) {
                 popup->removeAction( _showMenuAction);
             } else {
                 popup->insertAction(_switchProfileMenu, _showMenuAction);
             }
         }
 
         // they are here.
         // qDebug() << popup->actions().indexOf(contentActions[0]) << popup->actions().indexOf(contentActions[1]) << popup->actions()[3];
         QAction* chosen = popup->exec(QCursor::pos());
 
         // check for validity of the pointer to the popup menu
         if (!popup.isNull()) {
             delete contentSeparator;
         }
 
         _preventClose = false;
 
         if ((chosen != nullptr) && chosen->objectName() == QLatin1String("close-session")) {
             chosen->trigger();
         }
     } else {
         qCDebug(KonsoleDebug) << "Unable to display popup menu for session"
                    << _session->title(Session::NameRole)
                    << ", no GUI factory available to build the popup.";
     }
 }
 
 void SessionController::movementKeyFromSearchBarReceived(QKeyEvent *event)
 {
     QCoreApplication::sendEvent(_view, event);
     setSearchStartToWindowCurrentLine();
 }
 
 void SessionController::sessionNotificationsChanged(Session::Notification notification, bool enabled)
 {
     emit notificationChanged(this, notification, enabled);
 }
 
 void SessionController::zmodemDownload()
 {
     QString zmodem = QStandardPaths::findExecutable(QStringLiteral("rz"));
     if (zmodem.isEmpty()) {
         zmodem = QStandardPaths::findExecutable(QStringLiteral("lrz"));
     }
     if (!zmodem.isEmpty()) {
         const QString path = QFileDialog::getExistingDirectory(_view,
                 i18n("Save ZModem Download to..."),
                 QDir::homePath(),
                 QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
 
         if (!path.isEmpty()) {
             _session->startZModem(zmodem, path, QStringList());
             return;
         }
     } else {
         KMessageBox::error(_view,
                            i18n("<p>A ZModem file transfer attempt has been detected, "
                                 "but no suitable ZModem software was found on this system.</p>"
                                 "<p>You may wish to install the 'rzsz' or 'lrzsz' package.</p>"));
     }
     _session->cancelZModem();
 }
 
 void SessionController::zmodemUpload()
 {
     if (_session->isZModemBusy()) {
         KMessageBox::sorry(_view,
                            i18n("<p>The current session already has a ZModem file transfer in progress.</p>"));
         return;
     }
 
     QString zmodem = QStandardPaths::findExecutable(QStringLiteral("sz"));
     if (zmodem.isEmpty()) {
         zmodem = QStandardPaths::findExecutable(QStringLiteral("lsz"));
     }
     if (zmodem.isEmpty()) {
         KMessageBox::sorry(_view,
                            i18n("<p>No suitable ZModem software was found on this system.</p>"
                                 "<p>You may wish to install the 'rzsz' or 'lrzsz' package.</p>"));
         return;
     }
 
     QStringList files = QFileDialog::getOpenFileNames(_view,
                         i18n("Select Files for ZModem Upload"),
                         QDir::homePath());
     if (!files.isEmpty()) {
         _session->startZModem(zmodem, QString(), files);
     }
 }
 
 bool SessionController::isKonsolePart() const
 {
     // Check to see if we are being called from Konsole or a KPart
     return !(qApp->applicationName() == QLatin1String("konsole"));
 }
 
 QString SessionController::userTitle() const
 {
     if (!_session.isNull()) {
         return _session->userTitle();
     } else {
         return QString();
     }
 }
diff --git a/src/SessionController.h b/src/SessionController.h
index 628dd27a..bc27e011 100644
--- a/src/SessionController.h
+++ b/src/SessionController.h
@@ -1,365 +1,370 @@
 /*
     Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
     Copyright 2009 by Thomas Dreibholz <dreibh@iem.uni-due.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.
 */
 
 #ifndef SESSIONCONTROLLER_H
 #define SESSIONCONTROLLER_H
 
 // Qt
 #include <QSet>
 #include <QPointer>
 #include <QString>
 #include <QRegularExpression>
 
 // KDE
 #include <KXMLGUIClient>
 
 // Konsole
 #include "ViewProperties.h"
 #include "Profile.h"
 #include "Enumeration.h"
 #include "Session.h"
 
 class QAction;
 class QTextCodec;
 class QKeyEvent;
 class QTimer;
 class QUrl;
 
 class KCodecAction;
 class QAction;
 class KActionMenu;
 
 namespace Konsole {
 class Session;
 class SessionGroup;
 class ScreenWindow;
 class TerminalDisplay;
 class IncrementalSearchBar;
 class ProfileList;
 class RegExpFilter;
 class UrlFilter;
 class FileFilter;
 class EditProfileDialog;
 
 using SessionPtr = QPointer<Session>;
 
 /**
  * Provides the menu actions to manipulate a single terminal session and view pair.
  * The actions provided by this class are defined in the sessionui.rc XML file.
  *
  * SessionController monitors the session and provides access to basic information
  * about the session such as title(), icon() and currentDir().  SessionController
  * provides notifications of activity in the session via the activity() signal.
  *
  * When the controlled view receives the focus, the focused() signal is emitted
  * with a pointer to the controller.  This can be used by main application window
  * which contains the view to plug the controller's actions into the menu when
  * the view is focused.
  */
 class KONSOLEPRIVATE_EXPORT SessionController : public ViewProperties, public KXMLGUIClient
 {
     Q_OBJECT
 
 public:
     enum CopyInputToEnum {
         /** Copy keyboard input to all the other tabs in current window */
         CopyInputToAllTabsMode = 0,
 
         /** Copy keyboard input to user selected tabs in current window */
         CopyInputToSelectedTabsMode = 1,
 
         /** Do not copy keyboard input to other tabs */
         CopyInputToNoneMode = 2
     };
 
     /**
      * Constructs a new SessionController which operates on @p session and @p view.
      */
     SessionController(Session *session, TerminalDisplay *view, QObject *parent);
     ~SessionController() override;
 
     /** Returns the session associated with this controller */
     QPointer<Session> session()
     {
         return _session;
     }
 
     /** Returns the view associated with this controller */
     QPointer<TerminalDisplay> view()
     {
         return _view;
     }
 
     /**
      * Returns the "window title" of the associated session.
      */
     QString userTitle() const;
 
     /**
      * Returns true if the controller is valid.
      * A valid controller is one which has a non-null session() and view().
      *
      * Equivalent to "!session().isNull() && !view().isNull()"
      */
     bool isValid() const;
 
     /** Set the start line from which the next search will be done **/
     void setSearchStartTo(int line);
 
     /** set start line to the first or last line (depending on the reverse search
      * setting) in the terminal display **/
     void setSearchStartToWindowCurrentLine();
 
     /**
      * Sets the action displayed in the session's context menu to hide or
      * show the menu bar.
      */
     void setShowMenuAction(QAction *action);
 
     EditProfileDialog *profileDialogPointer();
 
     // reimplemented
     QUrl url() const override;
     QString currentDir() const override;
     void rename() override;
     bool confirmClose() const override;
     virtual bool confirmForceClose() const;
 
     /** Returns the set of all controllers that exist. */
     static QSet<SessionController *> allControllers()
     {
         return _allControllers;
     }
 
     /* Returns true if called within a KPart; false if called within Konsole. */
     bool isKonsolePart() const;
     bool isReadOnly() const;
     bool isCopyInputActive() const;
 
 Q_SIGNALS:
     /**
      * Emitted when the view associated with the controller is focused.
      * This can be used by other classes to plug the controller's actions into a window's
      * menus.
      */
     void viewFocused(SessionController *controller);
 
     void rawTitleChanged();
 
     /**
      * Emitted when the current working directory of the session associated with
      * the controller is changed.
      */
     void currentDirectoryChanged(const QString &dir);
 
     /**
      * Emitted when the user changes the tab title.
      */
     void tabRenamedByUser(bool renamed) const;
 
+    /**
+     * Emitted when the user changes the tab color.
+     */
+    void tabColoredByUser(bool set) const;
+
 public Q_SLOTS:
     /**
      * Issues a command to the session to navigate to the specified URL.
      * This may not succeed if the foreground program does not understand
      * the command sent to it ( 'cd path' for local URLs ) or is not
      * responding to input.
      *
      * openUrl() currently supports urls for local paths and those
      * using the 'ssh' protocol ( eg. "ssh://joebloggs@hostname" )
      */
     void openUrl(const QUrl &url);
 
     /**
      * update actions which are meaningful only when primary screen is in use.
      */
     void setupPrimaryScreenSpecificActions(bool use);
 
     /**
      * update actions which are closely related with the selected text.
      */
     void selectionChanged(const QString &selectedText);
 
     /**
      * close the associated session. This might involve user interaction for
      * confirmation.
      */
     void closeSession();
 
     /**  Increase font size */
     void increaseFontSize();
 
     /**  Decrease font size */
     void decreaseFontSize();
 
     /** Reset font size */
     void resetFontSize();
 
     /** Close the incremental search */
     void searchClosed(); // called when the user clicks on the
 
 private Q_SLOTS:
     // menu item handlers
     void openBrowser();
     void copy();
     void paste();
     void selectAll();
     void selectLine();
     void pasteFromX11Selection(); // shortcut only
     void copyInputActionsTriggered(QAction *action);
     void copyInputToAllTabs();
     void copyInputToSelectedTabs();
     void copyInputToNone();
     void editCurrentProfile();
     void changeCodec(QTextCodec *codec);
     void enableSearchBar(bool showSearchBar);
     void searchHistory(bool showSearchBar);
     void searchBarEvent();
     void searchFrom();
     void findNextInHistory();
     void findPreviousInHistory();
     void changeSearchMatch();
     void print_screen();
     void saveHistory();
     void showHistoryOptions();
     void clearHistory();
     void clearHistoryAndReset();
     void monitorActivity(bool monitor);
     void monitorSilence(bool monitor);
     void renameSession();
     void switchProfile(const Profile::Ptr &profile);
     void handleWebShortcutAction();
     void configureWebShortcuts();
     void sendSignal(QAction *action);
     void sendForegroundColor();
     void sendBackgroundColor();
     void toggleReadOnly();
 
     // other
     void setupSearchBar();
     void prepareSwitchProfileMenu();
     void updateCodecAction();
     void showDisplayContextMenu(const QPoint &position);
     void movementKeyFromSearchBarReceived(QKeyEvent *event);
     void sessionNotificationsChanged(Session::Notification notification, bool enabled);
     void sessionAttributeChanged();
     void sessionReadOnlyChanged();
     void searchTextChanged(const QString &text);
     void searchCompleted(bool success);
 
     void updateFilterList(Profile::Ptr profile); // Called when the profile has changed, so we might need to change the list of filters
 
     void viewFocusChangeHandler(bool focused);
     void interactionHandler();
     void snapshot(); // called periodically as the user types
     // to take a snapshot of the state of the
     // foreground process in the terminal
 
     void highlightMatches(bool highlight);
     void scrollBackOptionsChanged(int mode, int lines);
     void sessionResizeRequest(const QSize &size);
     void trackOutput(QKeyEvent *event);  // move view to end of current output
     // when a key press occurs in the
     // display area
 
     void updateSearchFilter();
 
     void zmodemDownload();
     void zmodemUpload();
 
     // update actions related with selected text
     void updateCopyAction(const QString &selectedText);
     void updateWebSearchMenu();
 
 private:
     Q_DISABLE_COPY(SessionController)
 
     // begins the search
     // text - pattern to search for
     // direction - value from SearchHistoryTask::SearchDirection enum to specify
     //             the search direction
     void beginSearch(const QString &text, Enum::SearchDirection direction);
     QRegularExpression regexpFromSearchBarOptions() const;
     bool reverseSearchChecked() const;
     void setupCommonActions();
     void setupExtraActions();
     void removeSearchFilter(); // remove and delete the current search filter if set
     void setFindNextPrevEnabled(bool enabled);
     void listenForScreenWindowUpdates();
 
 private:
     void updateSessionIcon();
     void updateReadOnlyActionStates();
 
     QPointer<Session> _session;
     QPointer<TerminalDisplay> _view;
     SessionGroup *_copyToGroup;
 
     ProfileList *_profileList;
 
     QIcon _sessionIcon;
     QString _sessionIconName;
     int _previousState;
 
     RegExpFilter *_searchFilter;
     UrlFilter *_urlFilter;
     FileFilter *_fileFilter;
 
     QAction *_copyInputToAllTabsAction;
 
     QAction *_findAction;
     QAction *_findNextAction;
     QAction *_findPreviousAction;
 
     QTimer *_interactionTimer;
 
     int _searchStartLine;
     int _prevSearchResultLine;
 
     KCodecAction *_codecAction;
 
     KActionMenu *_switchProfileMenu;
     KActionMenu *_webSearchMenu;
 
     bool _listenForScreenWindowUpdates;
     bool _preventClose;
 
     QString _selectedText;
 
     QAction *_showMenuAction;
 
     static QSet<SessionController *> _allControllers;
     static int _lastControllerId;
 
     QStringList _bookmarkValidProgramsToClear;
 
     bool _isSearchBarEnabled;
     QPointer<EditProfileDialog> _editProfileDialog;
 
     QString _searchText;
     QPointer<IncrementalSearchBar> _searchBar;
 };
 inline bool SessionController::isValid() const
 {
     return !_session.isNull() && !_view.isNull();
 }
 
 }
 
 #endif //SESSIONCONTROLLER_H
diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp
index 310dcfb2..556966d5 100644
--- a/src/SessionManager.cpp
+++ b/src/SessionManager.cpp
@@ -1,390 +1,393 @@
 /*
     This source file is part of Konsole, a terminal emulator.
 
     Copyright 2006-2008 by Robert Knight <robertknight@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 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.
 */
 
 // Own
 #include "SessionManager.h"
 
 #include "konsoledebug.h"
 
 // Qt
 #include <QStringList>
 #include <QTextCodec>
 
 // KDE
 #include <KConfig>
 #include <KConfigGroup>
 
 // Konsole
 #include "Session.h"
 #include "ProfileManager.h"
 #include "History.h"
 #include "Enumeration.h"
 #include "TerminalDisplay.h"
 
 using namespace Konsole;
 
 SessionManager::SessionManager() :
     _sessions(QList<Session *>()),
     _sessionProfiles(QHash<Session *, Profile::Ptr>()),
     _sessionRuntimeProfiles(QHash<Session *, Profile::Ptr>()),
     _restoreMapping(QHash<Session *, int>()),
     _isClosingAllSessions(false)
 {
     ProfileManager *profileMananger = ProfileManager::instance();
     connect(profileMananger, &Konsole::ProfileManager::profileChanged, this,
             &Konsole::SessionManager::profileChanged);
 }
 
 SessionManager::~SessionManager()
 {
     if (!_sessions.isEmpty()) {
         qCDebug(KonsoleDebug) << "Konsole SessionManager destroyed with"
                               << _sessions.count()
                               <<"session(s) still alive";
         // ensure that the Session doesn't later try to call back and do things to the
         // SessionManager
         for (Session *session : qAsConst(_sessions)) {
             disconnect(session, nullptr, this, nullptr);
         }
     }
 }
 
 Q_GLOBAL_STATIC(SessionManager, theSessionManager)
 SessionManager* SessionManager::instance()
 {
     return theSessionManager;
 }
 
 bool SessionManager::isClosingAllSessions() const
 {
     return _isClosingAllSessions;
 }
 
 void SessionManager::closeAllSessions()
 {
     _isClosingAllSessions = true;
     for (Session *session : qAsConst(_sessions)) {
         session->close();
     }
     _sessions.clear();
 }
 
 const QList<Session *> SessionManager::sessions() const
 {
     return _sessions;
 }
 
 Session *SessionManager::createSession(Profile::Ptr profile)
 {
     if (!profile) {
         profile = ProfileManager::instance()->defaultProfile();
     }
 
     // TODO: check whether this is really needed
     if (!ProfileManager::instance()->loadedProfiles().contains(profile)) {
         ProfileManager::instance()->addProfile(profile);
     }
 
     //configuration information found, create a new session based on this
     auto session = new Session();
     Q_ASSERT(session);
     applyProfile(session, profile, false);
 
     connect(session, &Konsole::Session::profileChangeCommandReceived, this,
             &Konsole::SessionManager::sessionProfileCommandReceived);
 
     //ask for notification when session dies
     connect(session, &Konsole::Session::finished, this,
             [this, session]() {
                 sessionTerminated(session);
             });
 
     //add session to active list
     _sessions << session;
     _sessionProfiles.insert(session, profile);
 
     return session;
 }
 
 void SessionManager::profileChanged(const Profile::Ptr &profile)
 {
     applyProfile(profile, true);
 }
 
 void SessionManager::sessionTerminated(Session *session)
 {
     Q_ASSERT(session);
 
     _sessions.removeAll(session);
     _sessionProfiles.remove(session);
     _sessionRuntimeProfiles.remove(session);
 
     session->deleteLater();
 }
 
 void SessionManager::applyProfile(const Profile::Ptr &profile, bool modifiedPropertiesOnly)
 {
     for (Session *session : qAsConst(_sessions)) {
         if (_sessionProfiles[session] == profile) {
             applyProfile(session, profile, modifiedPropertiesOnly);
         }
     }
 }
 
 Profile::Ptr SessionManager::sessionProfile(Session *session) const
 {
     return _sessionProfiles[session];
 }
 
 void SessionManager::setSessionProfile(Session *session, Profile::Ptr profile)
 {
     if (!profile) {
         profile = ProfileManager::instance()->defaultProfile();
     }
 
     Q_ASSERT(profile);
 
     _sessionProfiles[session] = profile;
 
     applyProfile(session, profile, false);
 
     emit sessionUpdated(session);
 }
 
 void SessionManager::applyProfile(Session *session, const Profile::Ptr &profile,
                                   bool modifiedPropertiesOnly)
 {
     Q_ASSERT(profile);
 
     _sessionProfiles[session] = profile;
 
     ShouldApplyProperty apply(profile, modifiedPropertiesOnly);
 
     // Basic session settings
     if (apply.shouldApply(Profile::Name)) {
         session->setTitle(Session::NameRole, profile->name());
     }
 
     if (apply.shouldApply(Profile::Command)) {
         session->setProgram(profile->command());
     }
 
     if (apply.shouldApply(Profile::Arguments)) {
         session->setArguments(profile->arguments());
     }
 
     if (apply.shouldApply(Profile::Directory)) {
         session->setInitialWorkingDirectory(profile->defaultWorkingDirectory());
     }
 
     if (apply.shouldApply(Profile::Environment)) {
         // add environment variable containing home directory of current profile
         // (if specified)
 
         // prepend a 0 to the VERSION_MICRO part to make the version string
         // length consistent, so that conditions that depend on the exported
         // env var actually work
         // e.g. the second version should be higher than the first one:
         // 18.04.12 -> 180412
         // 18.08.0  -> 180800
         QStringList list = QStringLiteral(KONSOLE_VERSION).split(QLatin1Char('.'));
         if (list[2].length() < 2) {
                 list[2].prepend(QLatin1String("0"));
         }
         const QString &numericVersion = list.join(QString());
 
         QStringList environment = profile->environment();
         environment << QStringLiteral("PROFILEHOME=%1").arg(profile->defaultWorkingDirectory());
         environment << QStringLiteral("KONSOLE_VERSION=%1").arg(numericVersion);
 
         session->setEnvironment(environment);
     }
 
     if (apply.shouldApply(Profile::TerminalColumns)
         || apply.shouldApply(Profile::TerminalRows)) {
         const auto columns = profile->property<int>(Profile::TerminalColumns);
         const auto rows = profile->property<int>(Profile::TerminalRows);
         session->setPreferredSize(QSize(columns, rows));
     }
 
     if (apply.shouldApply(Profile::Icon)) {
         session->setIconName(profile->icon());
     }
 
     // Key bindings
     if (apply.shouldApply(Profile::KeyBindings)) {
         session->setKeyBindings(profile->keyBindings());
     }
 
     // Tab formats
     // Preserve tab title changes, made by the user, when applying profile
     // changes or previewing color schemes
     if (apply.shouldApply(Profile::LocalTabTitleFormat) && !session->isTabTitleSetByUser()) {
         session->setTabTitleFormat(Session::LocalTabTitle,
                                    profile->localTabTitleFormat());
     }
     if (apply.shouldApply(Profile::RemoteTabTitleFormat) && !session->isTabTitleSetByUser()) {
         session->setTabTitleFormat(Session::RemoteTabTitle,
                                    profile->remoteTabTitleFormat());
     }
+    if (apply.shouldApply(Profile::TabColor) && !session->isTabColorSetByUser()) {
+        session->setColor(profile->tabColor());
+    }
 
     // History
     if (apply.shouldApply(Profile::HistoryMode) || apply.shouldApply(Profile::HistorySize)) {
         const auto mode = profile->property<int>(Profile::HistoryMode);
         switch (mode) {
         case Enum::NoHistory:
             session->setHistoryType(HistoryTypeNone());
             break;
 
         case Enum::FixedSizeHistory:
         {
             int lines = profile->historySize();
             session->setHistoryType(CompactHistoryType(lines));
             break;
         }
 
         case Enum::UnlimitedHistory:
             session->setHistoryType(HistoryTypeFile());
             break;
         }
     }
 
     // Terminal features
     if (apply.shouldApply(Profile::FlowControlEnabled)) {
         session->setFlowControlEnabled(profile->flowControlEnabled());
     }
 
     // Encoding
     if (apply.shouldApply(Profile::DefaultEncoding)) {
         QByteArray name = profile->defaultEncoding().toUtf8();
         session->setCodec(QTextCodec::codecForName(name));
     }
 
     // Monitor Silence
     if (apply.shouldApply(Profile::SilenceSeconds)) {
         session->setMonitorSilenceSeconds(profile->silenceSeconds());
     }
 }
 
 void SessionManager::sessionProfileCommandReceived(const QString &text)
 {
     auto *session = qobject_cast<Session *>(sender());
     Q_ASSERT(session);
 
     // store the font for each view if zoom was applied so that they can
     // be restored after applying the new profile
     QHash<TerminalDisplay *, QFont> zoomFontSizes;
     const QList<TerminalDisplay *> viewsList = session->views();
     for (TerminalDisplay *view : viewsList) {
         const QFont &viewCurFont = view->getVTFont();
         if (viewCurFont != _sessionProfiles[session]->font()) {
             zoomFontSizes.insert(view, viewCurFont);
         }
     }
 
     ProfileCommandParser parser;
     QHash<Profile::Property, QVariant> changes = parser.parse(text);
 
     Profile::Ptr newProfile;
     if (!_sessionRuntimeProfiles.contains(session)) {
         newProfile = new Profile(_sessionProfiles[session]);
         _sessionRuntimeProfiles.insert(session, newProfile);
     } else {
         newProfile = _sessionRuntimeProfiles[session];
     }
 
     QHashIterator<Profile::Property, QVariant> iter(changes);
     while (iter.hasNext()) {
         iter.next();
         newProfile->setProperty(iter.key(), iter.value());
     }
 
     _sessionProfiles[session] = newProfile;
     applyProfile(newProfile, true);
     emit sessionUpdated(session);
 
     if (!zoomFontSizes.isEmpty()) {
         QHashIterator<TerminalDisplay *, QFont> it(zoomFontSizes);
         while (it.hasNext()) {
             it.next();
             it.key()->setVTFont(it.value());
         }
     }
 }
 
 void SessionManager::saveSessions(KConfig *config)
 {
     // The session IDs can't be restored.
     // So we need to map the old ID to the future new ID.
     int n = 1;
     _restoreMapping.clear();
 
     for (Session *session : qAsConst(_sessions)) {
         QString name = QLatin1String("Session") + QString::number(n);
         KConfigGroup group(config, name);
 
         group.writePathEntry("Profile",
                              _sessionProfiles.value(session)->path());
         session->saveSession(group);
         _restoreMapping.insert(session, n);
         n++;
     }
 
     KConfigGroup group(config, "Number");
     group.writeEntry("NumberOfSessions", _sessions.count());
 }
 
 int SessionManager::getRestoreId(Session *session)
 {
     return _restoreMapping.value(session);
 }
 
 void SessionManager::restoreSessions(KConfig *config)
 {
     KConfigGroup group(config, "Number");
     const int sessions = group.readEntry("NumberOfSessions", 0);
 
     // Any sessions saved?
     for (int n = 1; n <= sessions; n++) {
         const QString name = QLatin1String("Session") + QString::number(n);
         KConfigGroup sessionGroup(config, name);
 
         const QString profile = sessionGroup.readPathEntry("Profile", QString());
         Profile::Ptr ptr = ProfileManager::instance()->defaultProfile();
         if (!profile.isEmpty()) {
             ptr = ProfileManager::instance()->loadProfile(profile);
         }
         Session *session = createSession(ptr);
         session->restoreSession(sessionGroup);
     }
 }
 
 Session *SessionManager::idToSession(int id)
 {
     for (Session *session : qAsConst(_sessions)) {
         if (session->sessionId() == id) {
             return session;
         }
     }
     // this should not happen
     qCDebug(KonsoleDebug) << "Failed to find session for ID" << id;
     return nullptr;
 }
diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index f73b0978..2b1d8369 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -1,697 +1,715 @@
 /*
     This file is part of the Konsole Terminal.
 
     Copyright 2006-2008 Robert Knight <robertknight@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 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.
 */
 
 // Own
 #include "ViewContainer.h"
 #include "config-konsole.h"
 
 // Qt
 #include <QTabBar>
 #include <QMenu>
 #include <QFile>
 #include <QKeyEvent>
 
 // KDE
 #include <KColorScheme>
 #include <KColorUtils>
 #include <KLocalizedString>
 #include <KActionCollection>
 
 // Konsole
 #include "IncrementalSearchBar.h"
 #include "ViewProperties.h"
 #include "ProfileList.h"
 #include "ViewManager.h"
 #include "KonsoleSettings.h"
 #include "SessionController.h"
 #include "DetachableTabBar.h"
 #include "TerminalDisplay.h"
 #include "ViewSplitter.h"
 #include "MainWindow.h"
 #include "Session.h"
 
 // TODO Perhaps move everything which is Konsole-specific into different files
 
 using namespace Konsole;
 
 
 TabbedViewContainer::TabbedViewContainer(ViewManager *connectedViewManager, QWidget *parent) :
     QTabWidget(parent),
     _connectedViewManager(connectedViewManager),
     _newTabButton(new QToolButton(this)),
     _closeTabButton(new QToolButton(this)),
     _contextMenuTabIndex(-1),
     _navigationVisibility(ViewManager::NavigationVisibility::NavigationNotSet),
     _newTabBehavior(PutNewTabAtTheEnd)
 {
     setAcceptDrops(true);
 
     auto tabBarWidget = new DetachableTabBar();
     setTabBar(tabBarWidget);
     setDocumentMode(true);
     setMovable(true);
     connect(tabBarWidget, &DetachableTabBar::moveTabToWindow, this, &TabbedViewContainer::moveTabToWindow);
     tabBar()->setContextMenuPolicy(Qt::CustomContextMenu);
     _newTabButton->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
     _newTabButton->setAutoRaise(true);
     connect(_newTabButton, &QToolButton::clicked, this, &TabbedViewContainer::newViewRequest);
 
     _closeTabButton->setIcon(QIcon::fromTheme(QStringLiteral("tab-close")));
     _closeTabButton->setAutoRaise(true);
     connect(_closeTabButton, &QToolButton::clicked, this, [this]{
        closeCurrentTab();
     });
 
     connect(tabBar(), &QTabBar::tabBarDoubleClicked, this,
         &Konsole::TabbedViewContainer::tabDoubleClicked);
     connect(tabBar(), &QTabBar::customContextMenuRequested, this,
         &Konsole::TabbedViewContainer::openTabContextMenu);
     connect(tabBarWidget, &DetachableTabBar::detachTab, this, [this](int idx) {
         emit detachTab(idx);
     });
     connect(tabBarWidget, &DetachableTabBar::closeTab,
         this, &TabbedViewContainer::closeTerminalTab);
     connect(tabBarWidget, &DetachableTabBar::newTabRequest,
         this, [this]{ emit newViewRequest(); });
     connect(this, &TabbedViewContainer::currentChanged, this, &TabbedViewContainer::currentTabChanged);
 
+    connect(this, &TabbedViewContainer::setColor, tabBarWidget, &DetachableTabBar::setColor);
+    connect(this, &TabbedViewContainer::removeColor, tabBarWidget, &DetachableTabBar::removeColor);
+
     // The context menu of tab bar
     _contextPopupMenu = new QMenu(tabBar());
     connect(_contextPopupMenu, &QMenu::aboutToHide, this, [this]() {
         // Remove the read-only action when the popup closes
         for (auto &action : _contextPopupMenu->actions()) {
             if (action->objectName() == QStringLiteral("view-readonly")) {
                 _contextPopupMenu->removeAction(action);
                 break;
             }
         }
     });
 
     connect(tabBar(), &QTabBar::tabCloseRequested, this, &TabbedViewContainer::closeTerminalTab);
 
     auto detachAction = _contextPopupMenu->addAction(
         QIcon::fromTheme(QStringLiteral("tab-detach")),
         i18nc("@action:inmenu", "&Detach Tab"), this,
         [this] { emit detachTab(_contextMenuTabIndex); }
     );
     detachAction->setObjectName(QStringLiteral("tab-detach"));
 
     auto editAction = _contextPopupMenu->addAction(
         QIcon::fromTheme(QStringLiteral("edit-rename")),
         i18nc("@action:inmenu", "&Rename Tab..."), this,
         [this]{ renameTab(_contextMenuTabIndex); }
     );
     editAction->setObjectName(QStringLiteral("edit-rename"));
 
     auto closeAction = _contextPopupMenu->addAction(
         QIcon::fromTheme(QStringLiteral("tab-close")),
         i18nc("@action:inmenu", "Close Tab"), this,
         [this] { closeTerminalTab(_contextMenuTabIndex); }
     );
     closeAction->setObjectName(QStringLiteral("tab-close"));
 
     auto profileMenu = new QMenu(this);
     auto profileList = new ProfileList(false, profileMenu);
     profileList->syncWidgetActions(profileMenu, true);
     connect(profileList, &Konsole::ProfileList::profileSelected, this, &TabbedViewContainer::newViewWithProfileRequest);
     _newTabButton->setMenu(profileMenu);
 
     konsoleConfigChanged();
     connect(KonsoleSettings::self(), &KonsoleSettings::configChanged, this, &TabbedViewContainer::konsoleConfigChanged);
 }
 
 TabbedViewContainer::~TabbedViewContainer()
 {
     for(int i = 0, end = count(); i < end; i++) {
         auto view = widget(i);
         disconnect(view, &QWidget::destroyed, this, &Konsole::TabbedViewContainer::viewDestroyed);
     }
 }
 
 ViewSplitter *TabbedViewContainer::activeViewSplitter()
 {
     return viewSplitterAt(currentIndex());
 }
 
 ViewSplitter *TabbedViewContainer::viewSplitterAt(int index)
 {
     return qobject_cast<ViewSplitter*>(widget(index));
 }
 
 void TabbedViewContainer::moveTabToWindow(int index, QWidget *window)
 {
     auto splitter = viewSplitterAt(index);
     auto manager = window->findChild<ViewManager*>();
 
     QHash<TerminalDisplay*, Session*> sessionsMap = _connectedViewManager->forgetAll(splitter);
 
     const QList<TerminalDisplay *> displays = splitter->findChildren<TerminalDisplay*>();
     for (TerminalDisplay *terminal : displays) {
         manager->attachView(terminal, sessionsMap[terminal]);
     }
     auto container = manager->activeContainer();
     container->addSplitter(splitter);
 
     auto controller = splitter->activeTerminalDisplay()->sessionController();
     container->currentSessionControllerChanged(controller);
 
     forgetView(splitter);
 }
 
 void TabbedViewContainer::konsoleConfigChanged()
 {
     // don't show tabs if we are in KParts mode.
     // This is a hack, and this needs to be rewritten.
     // The container should not be part of the KParts, perhaps just the
     // TerminalDisplay should.
 
     // ASAN issue if using sessionController->isKonsolePart(), just
     // duplicate code for now
     if (qApp->applicationName() != QLatin1String("konsole")) {
         tabBar()->setVisible(false);
     } else {
         // if we start with --show-tabbar or --hide-tabbar we ignore the preferences.
         setTabBarAutoHide(KonsoleSettings::tabBarVisibility() == KonsoleSettings::EnumTabBarVisibility::ShowTabBarWhenNeeded);
         if (KonsoleSettings::tabBarVisibility() == KonsoleSettings::EnumTabBarVisibility::AlwaysShowTabBar) {
             tabBar()->setVisible(true);
         } else if (KonsoleSettings::tabBarVisibility() == KonsoleSettings::EnumTabBarVisibility::AlwaysHideTabBar) {
             tabBar()->setVisible(false);
         }
     }
 
     setTabPosition((QTabWidget::TabPosition) KonsoleSettings::tabBarPosition());
 
     setCornerWidget(KonsoleSettings::newTabButton() ? _newTabButton : nullptr, Qt::TopLeftCorner);
     _newTabButton->setVisible(KonsoleSettings::newTabButton());
 
     setCornerWidget(KonsoleSettings::closeTabButton() == 1 ? _closeTabButton : nullptr, Qt::TopRightCorner);
     _closeTabButton->setVisible(KonsoleSettings::closeTabButton() == 1);
 
     tabBar()->setTabsClosable(KonsoleSettings::closeTabButton() == 0);
 
     tabBar()->setExpanding(KonsoleSettings::expandTabWidth());
     tabBar()->update();
 
     if (KonsoleSettings::tabBarUseUserStyleSheet()) {
         setCssFromFile(KonsoleSettings::tabBarUserStyleSheetFile());
     } else {
         setCss();
     }
 }
 
 void TabbedViewContainer::setCss(const QString& styleSheet)
 {
     static const QString defaultCss = QStringLiteral("QTabWidget::tab-bar, QTabWidget::pane { margin: 0; }\n");
     setStyleSheet(defaultCss + styleSheet);
 }
 
 void TabbedViewContainer::setCssFromFile(const QUrl &url)
 {
     // Let's only deal w/ local files for now
     if (!url.isLocalFile()) {
         setStyleSheet(KonsoleSettings::tabBarStyleSheet());
     }
 
     QFile file(url.toLocalFile());
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         setStyleSheet(KonsoleSettings::tabBarStyleSheet());
     }
 
     QTextStream in(&file);
     setCss(in.readAll());
 }
 
 void TabbedViewContainer::moveActiveView(MoveDirection direction)
 {
     if (count() < 2) { // return if only one view
         return;
     }
     const int currentIndex = indexOf(currentWidget());
     int newIndex = direction  == MoveViewLeft ? qMax(currentIndex - 1, 0) : qMin(currentIndex + 1, count() - 1);
 
     auto swappedWidget = viewSplitterAt(newIndex);
     auto swappedTitle = tabBar()->tabText(newIndex);
     auto swappedIcon = tabBar()->tabIcon(newIndex);
 
     auto currentWidget = viewSplitterAt(currentIndex);
     auto currentTitle = tabBar()->tabText(currentIndex);
     auto currentIcon = tabBar()->tabIcon(currentIndex);
 
     if (newIndex < currentIndex) {
         insertTab(newIndex, currentWidget, currentIcon, currentTitle);
         insertTab(currentIndex, swappedWidget, swappedIcon, swappedTitle);
     } else {
         insertTab(currentIndex, swappedWidget, swappedIcon, swappedTitle);
         insertTab(newIndex, currentWidget, currentIcon, currentTitle);
     }
     setCurrentIndex(newIndex);
 }
 
 void TabbedViewContainer::terminalDisplayDropped(TerminalDisplay *terminalDisplay) {
     if (terminalDisplay->sessionController()->parent() != connectedViewManager()) {
         // Terminal from another window - recreate SessionController for current ViewManager
         disconnectTerminalDisplay(terminalDisplay);
         Session* terminalSession = terminalDisplay->sessionController()->session();
         terminalDisplay->sessionController()->deleteLater();
         connectedViewManager()->attachView(terminalDisplay, terminalSession);
         connectTerminalDisplay(terminalDisplay);
     }
 }
 
 QSize TabbedViewContainer::sizeHint() const
 {
     // QTabWidget::sizeHint() contains some margins added by widgets
     // style, which were making the initial window size too big.
     const auto tabsSize = tabBar()->sizeHint();
     const auto *leftWidget = cornerWidget(Qt::TopLeftCorner);
     const auto *rightWidget = cornerWidget(Qt::TopRightCorner);
     const auto leftSize = leftWidget ? leftWidget->sizeHint() : QSize(0, 0);
     const auto rightSize = rightWidget ? rightWidget->sizeHint() : QSize(0, 0);
 
     auto tabBarSize = QSize(0, 0);
     // isVisible() won't work; this is called when the window is not yet visible
     if (tabBar()->isVisibleTo(this)) {
         tabBarSize.setWidth(leftSize.width() + tabsSize.width() + rightSize.width());
         tabBarSize.setHeight(qMax(tabsSize.height(), qMax(leftSize.height(), rightSize.height())));
     }
 
     const auto terminalSize = currentWidget() ? currentWidget()->sizeHint() : QSize(0, 0);
 
     //        width
     // ├──────────────────┤
     //
     // ┌──────────────────┐  ┬
     // │                  │  │
     // │     Terminal     │  │
     // │                  │  │ height
     // ├───┬──────────┬───┤  │  ┬
     // │ L │   Tabs   │ R │  │  │ tab bar height
     // └───┴──────────┴───┘  ┴  ┴
     //
     // L/R = left/right widget
 
     return {qMax(terminalSize.width(), tabBarSize.width()),
                  tabBarSize.height() + terminalSize.height()};
 }
 
 void TabbedViewContainer::addSplitter(ViewSplitter *viewSplitter, int index) {
     index = insertTab(index, viewSplitter, QString());
     connect(viewSplitter, &ViewSplitter::destroyed, this, &TabbedViewContainer::viewDestroyed);
 
     disconnect(viewSplitter, &ViewSplitter::terminalDisplayDropped, nullptr, nullptr);
     connect(viewSplitter, &ViewSplitter::terminalDisplayDropped, this, &TabbedViewContainer::terminalDisplayDropped);
 
     const auto terminalDisplays = viewSplitter->findChildren<TerminalDisplay*>();
     for (TerminalDisplay *terminal : terminalDisplays) {
         connectTerminalDisplay(terminal);
     }
     if (terminalDisplays.count() > 0) {
         updateTitle(qobject_cast<ViewProperties*>(terminalDisplays.at(0)->sessionController()));
+        updateColor(qobject_cast<ViewProperties*>(terminalDisplays.at(0)->sessionController()));
     }
     setCurrentIndex(index);
 }
 
 void TabbedViewContainer::addView(TerminalDisplay *view)
 {
     auto viewSplitter = new ViewSplitter();
     viewSplitter->addTerminalDisplay(view, Qt::Horizontal);
     auto item = view->sessionController();
     int index = _newTabBehavior == PutNewTabAfterCurrentTab ? currentIndex() + 1 : -1;
     index = insertTab(index, viewSplitter, item->icon(), item->title());
 
     connectTerminalDisplay(view);
     connect(viewSplitter, &ViewSplitter::destroyed, this, &TabbedViewContainer::viewDestroyed);
     connect(viewSplitter, &ViewSplitter::terminalDisplayDropped, this, &TabbedViewContainer::terminalDisplayDropped);
 
     setCurrentIndex(index);
     emit viewAdded(view);
 }
 
 void TabbedViewContainer::splitView(TerminalDisplay *view, Qt::Orientation orientation)
 {
     auto viewSplitter = qobject_cast<ViewSplitter*>(currentWidget());
     viewSplitter->addTerminalDisplay(view, orientation);
     connectTerminalDisplay(view);
 }
 
 void TabbedViewContainer::connectTerminalDisplay(TerminalDisplay *display)
 {
     auto item = display->sessionController();
     connect(item, &Konsole::SessionController::viewFocused, this,
             &Konsole::TabbedViewContainer::currentSessionControllerChanged);
 
     connect(item, &Konsole::ViewProperties::titleChanged, this,
             &Konsole::TabbedViewContainer::updateTitle);
 
+    connect(item, &Konsole::ViewProperties::colorChanged, this,
+            &Konsole::TabbedViewContainer::updateColor);
+
     connect(item, &Konsole::ViewProperties::iconChanged, this,
             &Konsole::TabbedViewContainer::updateIcon);
 
     connect(item, &Konsole::ViewProperties::activity, this,
             &Konsole::TabbedViewContainer::updateActivity);
 
     connect(item, &Konsole::ViewProperties::notificationChanged, this,
             &Konsole::TabbedViewContainer::updateNotification);
 
     connect(item, &Konsole::ViewProperties::readOnlyChanged, this,
             &Konsole::TabbedViewContainer::updateSpecialState);
 
     connect(item, &Konsole::ViewProperties::copyInputChanged, this,
             &Konsole::TabbedViewContainer::updateSpecialState);
 }
 
 void TabbedViewContainer::disconnectTerminalDisplay(TerminalDisplay *display)
 {
     auto item = display->sessionController();
     item->disconnect(this);
 }
 
 void TabbedViewContainer::viewDestroyed(QObject *view)
 {
     auto widget = static_cast<ViewSplitter*>(view);
     const auto idx = indexOf(widget);
 
     removeTab(idx);
     forgetView(widget);
     _tabIconState.remove(widget);
 }
 
 void TabbedViewContainer::forgetView(ViewSplitter *view)
 {
     Q_UNUSED(view)
     if (count() == 0) {
         emit empty(this);
     }
 }
 
 void TabbedViewContainer::activateNextView()
 {
     QWidget *active = currentWidget();
     int index = indexOf(active);
     setCurrentIndex(index == count() - 1 ? 0 : index + 1);
 }
 
 void TabbedViewContainer::activateLastView()
 {
     setCurrentIndex(count() - 1);
 }
 
 void TabbedViewContainer::activatePreviousView()
 {
     QWidget *active = currentWidget();
     int index = indexOf(active);
     setCurrentIndex(index == 0 ? count() - 1 : index - 1);
 }
 
 void TabbedViewContainer::keyReleaseEvent(QKeyEvent* event)
 {
     if (event->modifiers() == Qt::NoModifier) {
         _connectedViewManager->updateTerminalDisplayHistory();
     }
 }
 
 void TabbedViewContainer::closeCurrentTab()
 {
     if (currentIndex() != -1) {
         closeTerminalTab(currentIndex());
     }
 }
 
 void TabbedViewContainer::tabDoubleClicked(int index)
 {
     if (index >= 0) {
         renameTab(index);
     } else {
         emit newViewRequest();
     }
 }
 
 void TabbedViewContainer::renameTab(int index)
 {
     if (index != -1) {
         setCurrentIndex(index);
         viewSplitterAt(index)
             -> activeTerminalDisplay()
             -> sessionController()
             -> rename();
     }
 }
 
 void TabbedViewContainer::openTabContextMenu(const QPoint &point)
 {
     if (point.isNull()) {
         return;
     }
 
     _contextMenuTabIndex = tabBar()->tabAt(point);
     if (_contextMenuTabIndex < 0) {
         return;
     }
 
     //TODO: add a countChanged signal so we can remove this for.
     // Detaching in mac causes crashes.
     for(auto action : _contextPopupMenu->actions()) {
         if (action->objectName() == QStringLiteral("tab-detach")) {
             action->setEnabled(count() > 1);
         }
     }
 
     _contextPopupMenu->exec(tabBar()->mapToGlobal(point));
 }
 
 void TabbedViewContainer::currentTabChanged(int index)
 {
     if (index != -1) {
         auto splitview = qobject_cast<ViewSplitter*>(widget(index));
         auto view = splitview->activeTerminalDisplay();
         emit activeViewChanged(view);
         setTabActivity(index, false);
         _tabIconState[splitview].notification = Session::NoNotification;
         updateIcon(view->sessionController());
     } else {
         deleteLater();
     }
 }
 
 void TabbedViewContainer::wheelScrolled(int delta)
 {
     if (delta < 0) {
         activateNextView();
     } else {
         activatePreviousView();
     }
 }
 
 void TabbedViewContainer::setTabActivity(int index, bool activity)
 {
     const QPalette &palette = tabBar()->palette();
     KColorScheme colorScheme(palette.currentColorGroup());
     const QColor colorSchemeActive = colorScheme.foreground(KColorScheme::ActiveText).color();
 
     const QColor normalColor = palette.text().color();
     const QColor activityColor = KColorUtils::mix(normalColor, colorSchemeActive);
 
     QColor color = activity ? activityColor : QColor();
 
     if (color != tabBar()->tabTextColor(index)) {
         tabBar()->setTabTextColor(index, color);
     }
 }
 
 void TabbedViewContainer::updateTitle(ViewProperties *item)
 {
     auto controller = qobject_cast<SessionController*>(item);
     auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
     if (controller->view() != topLevelSplitter->activeTerminalDisplay()) {
         return;
     }
     const int index = indexOf(topLevelSplitter);
     QString tabText = item->title();
 
     setTabToolTip(index, tabText);
 
     // To avoid having & replaced with _ (shortcut indicator)
     tabText.replace(QLatin1Char('&'), QLatin1String("&&"));
     setTabText(index, tabText);
 }
 
+void TabbedViewContainer::updateColor(ViewProperties *item)
+{
+    auto controller = qobject_cast<SessionController *>(item);
+    auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
+    const int index = indexOf(topLevelSplitter);
+
+    emit setColor(index, item->color());
+}
+
 void TabbedViewContainer::updateIcon(ViewProperties *item)
 {
     auto controller = qobject_cast<SessionController *>(item);
     auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
     const int index = indexOf(topLevelSplitter);
     const auto &state = _tabIconState[topLevelSplitter];
 
     // Tab icon priority (from highest to lowest):
     //
     // 1. Latest Notification
     //    - Inactive tab: Latest notification from any view in a tab. Removed
     //      when tab is activated.
     //    - Active tab: Latest notification from focused view. Removed when
     //      focus changes or when the Session clears its notifications
     // 2. Copy input or read-only indicator when all views in the tab have
     //    the status
     // 3. Active view icon
 
     QIcon icon;
     if (state.notification != Session::NoNotification) {
         switch(state.notification) {
         case Session::Bell:
             icon = QIcon::fromTheme(QLatin1String("notifications"));
             break;
         case Session::Activity:
             icon = QIcon::fromTheme(QLatin1String("dialog-information"));
             break;
         case Session::Silence:
             icon = QIcon::fromTheme(QLatin1String("system-suspend"));
             break;
         default:
             break;
         }
     } else if (state.broadcast) {
         icon = QIcon::fromTheme(QLatin1String("irc-voice"));
     } else if (state.readOnly) {
         icon = QIcon::fromTheme(QLatin1String("object-locked"));
     } else {
         icon = item->icon();
     }
 
     if (tabIcon(index).name() != icon.name()) {
         setTabIcon(index, icon);
     }
 }
 
 void TabbedViewContainer::updateActivity(ViewProperties *item)
 {
     auto controller = qobject_cast<SessionController*>(item);
     auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
 
     const int index = indexOf(topLevelSplitter);
     if (index != currentIndex()) {
         setTabActivity(index, true);
     }
 }
 
 void TabbedViewContainer::updateNotification(ViewProperties *item, Session::Notification notification, bool enabled)
 {
     auto controller = qobject_cast<SessionController*>(item);
     auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
     const int index = indexOf(topLevelSplitter);
     auto &state = _tabIconState[topLevelSplitter];
 
     if (enabled && (index != currentIndex() || controller->view()->hasCompositeFocus())) {
         state.notification = notification;
         updateIcon(item);
     } else if (!enabled && controller->view()->hasCompositeFocus()) {
         state.notification = Session::NoNotification;
         updateIcon(item);
     }
 }
 
 void TabbedViewContainer::updateSpecialState(ViewProperties *item)
 {
     auto controller = qobject_cast<SessionController*>(item);
     auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
 
     auto &state = _tabIconState[topLevelSplitter];
     state.readOnly = true;
     state.broadcast = true;
     const auto displays = topLevelSplitter->findChildren<TerminalDisplay*>();
     for (const auto display : displays) {
         if (!display->sessionController()->isReadOnly()) {
             state.readOnly = false;
         }
         if (!display->sessionController()->isCopyInputActive()) {
             state.broadcast = false;
         }
     }
     updateIcon(item);
 }
 
 void TabbedViewContainer::currentSessionControllerChanged(SessionController *controller)
 {
     auto topLevelSplitter = qobject_cast<ViewSplitter*>(controller->view()->parentWidget())->getToplevelSplitter();
     const int index = indexOf(topLevelSplitter);
 
     if (index == currentIndex()) {
         // Active view changed in current tab - clear notifications
         auto &state = _tabIconState[topLevelSplitter];
         state.notification = Session::NoNotification;
     }
 
     updateTitle(qobject_cast<ViewProperties*>(controller));
+    updateColor(qobject_cast<ViewProperties*>(controller));
     updateActivity(qobject_cast<ViewProperties*>(controller));
     updateSpecialState(qobject_cast<ViewProperties*>(controller));
 }
 
 void TabbedViewContainer::closeTerminalTab(int idx) {
+    emit removeColor(idx);
     //TODO: This for should probably go to the ViewSplitter
     for (auto terminal : viewSplitterAt(idx)->findChildren<TerminalDisplay*>()) {
         terminal->sessionController()->closeSession();
     }
 }
 
 ViewManager *TabbedViewContainer::connectedViewManager()
 {
     return _connectedViewManager;
 }
 
 void TabbedViewContainer::setNavigationVisibility(ViewManager::NavigationVisibility navigationVisibility) {
     if (navigationVisibility == ViewManager::NavigationNotSet) {
         return;
     }
 
     setTabBarAutoHide(navigationVisibility == ViewManager::ShowNavigationAsNeeded);
     if (navigationVisibility == ViewManager::AlwaysShowNavigation) {
         tabBar()->setVisible(true);
     } else if (navigationVisibility == ViewManager::AlwaysHideNavigation) {
         tabBar()->setVisible(false);
     }
 }
 
 void TabbedViewContainer::toggleMaximizeCurrentTerminal()
 {
     if (auto *terminal = qobject_cast<TerminalDisplay*>(sender())) {
         terminal->setFocus(Qt::FocusReason::OtherFocusReason);
     }
 
     activeViewSplitter()->toggleMaximizeCurrentTerminal();
 }
 
 void TabbedViewContainer::moveTabLeft()
 {
     if (currentIndex() == 0) {
         return;
     }
     tabBar()->moveTab(currentIndex(), currentIndex() -1);
 }
 
 void TabbedViewContainer::moveTabRight()
 {
     if (currentIndex() == count() -1) {
         return;
     }
     tabBar()->moveTab(currentIndex(), currentIndex() + 1);
 }
 
 void TabbedViewContainer::setNavigationBehavior(int behavior)
 {
     _newTabBehavior = static_cast<NewTabBehavior>(behavior);
 }
diff --git a/src/ViewContainer.h b/src/ViewContainer.h
index 55a5388c..a52ae6c3 100644
--- a/src/ViewContainer.h
+++ b/src/ViewContainer.h
@@ -1,244 +1,252 @@
 /*
     This file is part of the Konsole Terminal.
 
     Copyright 2006-2008 Robert Knight <robertknight@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 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.
 */
 
 #ifndef VIEWCONTAINER_H
 #define VIEWCONTAINER_H
 
 // Qt
 #include <QObject>
 #include <QTabWidget>
 
 // Konsole
 #include "Profile.h"
 #include "ViewManager.h"
 #include "Session.h"
 
 // Qt
 class QPoint;
 class QToolButton;
 class QMenu;
 
 namespace Konsole {
 class ViewProperties;
 class ViewManager;
 class TabbedViewContainer;
 
 /**
  * An interface for container widgets which can hold one or more views.
  *
  * The container widget typically displays a list of the views which
  * it has and provides a means of switching between them.
  *
  * Subclasses should reimplement the addViewWidget() and removeViewWidget() functions
  * to actually add or remove view widgets from the container widget, as well
  * as updating any navigation aids.
  */
 class KONSOLEPRIVATE_EXPORT TabbedViewContainer : public QTabWidget
 {
     Q_OBJECT
 
 public:
     /**
      * Constructs a new view container with the specified parent.
      *
      * @param connectedViewManager Connect the new view to this manager
      * @param parent The parent object of the container
      */
     TabbedViewContainer(ViewManager *connectedViewManager, QWidget *parent);
 
     /**
      * Called when the ViewContainer is destroyed.  When reimplementing this in
      * subclasses, use object->deleteLater() to delete any widgets or other objects
      * instead of 'delete object'.
      */
     ~TabbedViewContainer() override;
 
     /** Adds a new view to the container widget */
     void addView(TerminalDisplay *view);
     void addSplitter(ViewSplitter *viewSplitter, int index = -1);
 
     /** splits the currently focused Splitter */
     void splitView(TerminalDisplay *view, Qt::Orientation orientation);
 
     void setTabActivity(int index, bool activity);
 
     /** Sets tab title to item title if the view is active */
     void updateTitle(ViewProperties *item);
+    /** Sets tab color to item color if the view is active */
+    void updateColor(ViewProperties *item);
     /** Sets tab icon to item icon if the view is active */
     void updateIcon(ViewProperties *item);
     /** Sets tab activity status if the tab is not active */
     void updateActivity(ViewProperties *item);
     /** Sets tab notification */
     void updateNotification(ViewProperties *item, Konsole::Session::Notification notification, bool enabled);
     /** Sets tab special state (copy input or read-only) */
     void updateSpecialState(ViewProperties *item);
 
     /** Changes the active view to the next view */
     void activateNextView();
 
     /** Changes the active view to the previous view */
     void activatePreviousView();
 
     /** Changes the active view to the last view */
     void activateLastView();
 
     void setCss(const QString& styleSheet = QString());
     void setCssFromFile(const QUrl& url);
 
     ViewSplitter *activeViewSplitter();
     /**
      * This enum describes the directions
      * in which views can be re-arranged within the container
      * using the moveActiveView() method.
      */
     enum MoveDirection {
         /** Moves the view to the left. */
         MoveViewLeft,
         /** Moves the view to the right. */
         MoveViewRight
     };
 
     /**
      * Moves the active view within the container and
      * updates the order in which the views are shown
      * in the container's navigation widget.
      *
      * The default implementation does nothing.
      */
     void moveActiveView(MoveDirection direction);
 
     /** Sets the menu to be shown when the new view button is clicked.
      * Only valid if the QuickNewView feature is enabled.
      * The default implementation does nothing. */
     // TODO: Reenable this later.
     //    void setNewViewMenu(QMenu *menu);
     void renameTab(int index);
     ViewManager *connectedViewManager();
     void currentTabChanged(int index);
     void closeCurrentTab();
     void wheelScrolled(int delta);
     void currentSessionControllerChanged(SessionController *controller);
     void tabDoubleClicked(int index);
     void openTabContextMenu(const QPoint &point);
     void setNavigationVisibility(ViewManager::NavigationVisibility navigationVisibility);
     void moveTabToWindow(int index, QWidget *window);
 
     void toggleMaximizeCurrentTerminal();
     /* return the widget(int index) casted to TerminalDisplay*
      *
      * The only thing that this class holds are TerminalDisplays, so
      * this is the only thing that should be used to retrieve widgets.
      */
     ViewSplitter *viewSplitterAt(int index);
 
     void connectTerminalDisplay(TerminalDisplay *display);
     void disconnectTerminalDisplay(TerminalDisplay *display);
     void moveTabLeft();
     void moveTabRight();
 
     /**
      * This enum describes where newly created tab should be placed.
      */
     enum NewTabBehavior {
         /** Put newly created tab at the end. */
         PutNewTabAtTheEnd = 0,
         /** Put newly created tab right after current tab. */
         PutNewTabAfterCurrentTab = 1
     };
 
     void setNavigationBehavior(int behavior);
     void terminalDisplayDropped(TerminalDisplay* terminalDisplay);
 
     QSize sizeHint() const override;
 
 Q_SIGNALS:
     /** Emitted when the container has no more children */
     void empty(TabbedViewContainer *container);
 
     /** Emitted when the user requests to open a new view */
     void newViewRequest();
 
     /** Requests creation of a new view, with the selected profile. */
     void newViewWithProfileRequest(const Profile::Ptr&);
 
     /** a terminalDisplay was dropped in a child Splitter */
 
     /**
      * Emitted when the user requests to move a view from another container
      * into this container.  If 'success' is set to true by a connected slot
      * then the original view will be removed.
      *
      * @param index Index at which to insert the new view in the container
      * or -1 to append it.  This index should be passed to addView() when
      * the new view has been created.
      * @param sessionControllerId The identifier of the view.
      */
     void moveViewRequest(int index, int sessionControllerId);
 
     /** Emitted when the active view changes */
     void activeViewChanged(TerminalDisplay *view);
 
     /** Emitted when a view is added to the container. */
     void viewAdded(TerminalDisplay *view);
 
     /** Emitted when a view is removed from the container. */
     void viewRemoved(TerminalDisplay *view);
 
     /** detach the specific tab */
     void detachTab(int tabIdx);
 
+    /** set the color tab */
+    void setColor(int index, const QColor &color);
+
+    /** remve the color tab */
+    void removeColor(int idx);
+
 protected:
     // close tabs and unregister
     void closeTerminalTab(int idx);
 
     void keyReleaseEvent(QKeyEvent *event) override;
 private Q_SLOTS:
     void viewDestroyed(QObject *view);
     void konsoleConfigChanged();
 
 private:
     void forgetView(ViewSplitter *view);
 
     struct TabIconState {
         TabIconState(): readOnly(false), broadcast(false), notification(Session::NoNotification) {}
 
         bool readOnly;
         bool broadcast;
         Session::Notification notification;
 
         bool isAnyStateActive() const {
             return readOnly || broadcast || (notification != Session::NoNotification);
         }
     };
 
     QHash<const QWidget *, TabIconState> _tabIconState;
     ViewManager *_connectedViewManager;
     QMenu *_contextPopupMenu;
     QToolButton *_newTabButton;
     QToolButton *_closeTabButton;
     int _contextMenuTabIndex;
     ViewManager::NavigationVisibility _navigationVisibility;
     NewTabBehavior _newTabBehavior;
 };
 
 
 }
 #endif //VIEWCONTAINER_H
diff --git a/src/ViewProperties.cpp b/src/ViewProperties.cpp
index eee304ec..8dac709a 100644
--- a/src/ViewProperties.cpp
+++ b/src/ViewProperties.cpp
@@ -1,107 +1,120 @@
 /*
     Copyright 2007-2008 by Robert Knight <robertknight@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 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.
 */
 
 // Own
 #include "ViewProperties.h"
 
 using Konsole::ViewProperties;
 
 QHash<int, ViewProperties *> ViewProperties::_viewProperties;
 
 ViewProperties::ViewProperties(QObject *parent) :
     QObject(parent),
     _icon(QIcon()),
     _title(QString()),
     _identifier(0)
 {
 }
 
 ViewProperties::~ViewProperties()
 {
     _viewProperties.remove(_identifier);
 }
 
 ViewProperties *ViewProperties::propertiesById(int id)
 {
     return _viewProperties[id];
 }
 
 QUrl ViewProperties::url() const
 {
     return QUrl();
 }
 
 QString ViewProperties::currentDir() const
 {
     return QString();
 }
 
 void ViewProperties::fireActivity()
 {
     emit activity(this);
 }
 
 void ViewProperties::rename()
 {
 }
 
 void ViewProperties::setTitle(const QString &title)
 {
     if (title != _title) {
         _title = title;
         emit titleChanged(this);
     }
 }
 
 void ViewProperties::setIcon(const QIcon &icon)
 {
     // the icon's cache key is used to determine whether this icon is the same
     // as the old one.  if so no signal is emitted.
 
     if (icon.cacheKey() != _icon.cacheKey()) {
         _icon = icon;
         emit iconChanged(this);
     }
 }
 
+void ViewProperties::setColor(const QColor &color)
+{
+    if (color != _color) {
+        _color = color;
+        emit colorChanged(this);
+    }
+}
+
 void ViewProperties::setIdentifier(int id)
 {
     if (_viewProperties.contains(_identifier)) {
         _viewProperties.remove(_identifier);
     }
 
     _identifier = id;
 
     _viewProperties.insert(id, this);
 }
 
 QString ViewProperties::title() const
 {
     return _title;
 }
 
 QIcon ViewProperties::icon() const
 {
     return _icon;
 }
 
 int ViewProperties::identifier() const
 {
     return _identifier;
 }
+
+QColor ViewProperties::color() const
+{
+    return _color;
+}
diff --git a/src/ViewProperties.h b/src/ViewProperties.h
index 2d69ab47..5a7dfb3a 100644
--- a/src/ViewProperties.h
+++ b/src/ViewProperties.h
@@ -1,135 +1,146 @@
 /*
     Copyright 2007-2008 by Robert Knight <robertknight@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 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.
 */
 
 #ifndef VIEWPROPERTIES_H
 #define VIEWPROPERTIES_H
 
 // Qt
 #include <QIcon>
 #include <QObject>
 #include <QHash>
 #include <QUrl>
+#include <QColor>
 
 // Konsole
 #include "konsoleprivate_export.h"
 #include "Session.h"
 
 namespace Konsole {
 /**
  * Encapsulates user-visible information about the terminal session currently being displayed in a view,
  * such as the associated title and icon.
  *
  * This can be used by navigation widgets in a ViewContainer sub-class to provide a tab, label or other
  * item for switching between views.
  */
 class KONSOLEPRIVATE_EXPORT ViewProperties : public QObject
 {
     Q_OBJECT
 
 public:
     explicit ViewProperties(QObject *parent);
     ~ViewProperties() override;
 
     /** Returns the icon associated with a view */
     QIcon icon() const;
     /** Returns the title associated with a view */
     QString title() const;
+    /** Returns the color associated with a view */
+    QColor color() const;
 
     /**
      * Returns the URL current associated with a view.
      * The default implementation returns an empty URL.
      */
     virtual QUrl url() const;
 
     /**
      * Returns the current directory associated with a view.
      * This may be the same as url()
      * The default implementation returns an empty string.
      */
     virtual QString currentDir() const;
 
     /**
      * A unique identifier associated with this
      * ViewProperties instance.
      */
     int identifier() const;
 
     /**
      * Sub-classes may re-implement this method to display a message to the user
      * to allow them to confirm whether to close a view.
      * The default implementation always returns true
      */
     virtual bool confirmClose() const
     {
         return true;
     }
 
     /** Finds a ViewProperties instance given its numeric identifier. */
     static ViewProperties *propertiesById(int id);
 
 Q_SIGNALS:
     /** Emitted when the icon for a view changes */
     void iconChanged(ViewProperties *properties);
     /** Emitted when the title for a view changes */
     void titleChanged(ViewProperties *properties);
+    /** Emitted when the color for a view changes */
+    void colorChanged(ViewProperties *properties);
     /** Emitted when activity has occurred in this view. */
     void activity(ViewProperties *item);
     /** Emitted when notification for a view changes */
     void notificationChanged(ViewProperties *item, Session::Notification notification, bool enabled);
     /** Emitted when read only state changes */
     void readOnlyChanged(ViewProperties *item);
     /** Emitted when "copy input" state changes */
     void copyInputChanged(ViewProperties *item);
 
 public Q_SLOTS:
     /**
      * Requests the renaming of this view.
      * The default implementation does nothing.
      */
     virtual void rename();
 
 protected Q_SLOTS:
     /** Emits the activity() signal. */
     void fireActivity();
 
 protected:
     /**
      * Subclasses may call this method to change the title.  This causes
      * a titleChanged() signal to be emitted
      */
     void setTitle(const QString &title);
     /**
      * Subclasses may call this method to change the icon.  This causes
      * an iconChanged() signal to be emitted
      */
     void setIcon(const QIcon &icon);
+    /**
+     * Subclasses may call this method to change the color.  This causes
+     * a colorChanged() signal to be emitted
+     */
+    void setColor(const QColor &color);
     /** Subclasses may call this method to change the identifier. */
     void setIdentifier(int id);
 private:
     Q_DISABLE_COPY(ViewProperties)
 
     QIcon _icon;
     QString _title;
+    QColor _color;
     int _identifier;
 
     static QHash<int, ViewProperties *> _viewProperties;
 };
 }
 
 #endif //VIEWPROPERTIES_H