1 files changed, 0 insertions, 2 deletions
diff --git a/Swift/Controllers/Highlighting/HighlightManager.cpp b/Swift/Controllers/Highlighting/HighlightManager.cpp
index 89261af..2ca77e7 100644
--- a/Swift/Controllers/Highlighting/HighlightManager.cpp
+++ b/Swift/Controllers/Highlighting/HighlightManager.cpp
@@ -23,62 +23,60 @@
 #include <boost/regex.hpp>
 #include <boost/serialization/vector.hpp>
 
 #include <Swiften/Base/Log.h>
 
 #include <Swift/Controllers/Highlighting/HighlightConfiguration.h>
 #include <Swift/Controllers/Highlighting/Highlighter.h>
 #include <Swift/Controllers/SettingConstants.h>
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 
 namespace Swift {
 
 HighlightManager::HighlightManager(SettingsProvider* settings)
     : settings_(settings)
     , storingSettings_(false) {
     highlightConfiguration_ = std::make_shared<HighlightConfiguration>();
     loadSettings();
     handleSettingChangedConnection_ = settings_->onSettingChanged.connect(boost::bind(&HighlightManager::handleSettingChanged, this, _1));
 }
 
 void HighlightManager::handleSettingChanged(const std::string& settingPath) {
     if (!storingSettings_ && SettingConstants::HIGHLIGHT_RULES.getKey() == settingPath) {
         loadSettings();
     }
 }
 
 HighlightConfiguration HighlightManager::getDefaultConfig() {
     HighlightConfiguration defaultConfiguration;
     defaultConfiguration.playSoundOnIncomingDirectMessages = true;
     defaultConfiguration.showNotificationOnIncomingDirectMessages = true;
-    defaultConfiguration.ownMentionAction.setFrontColor(std::string("black"));
-    defaultConfiguration.ownMentionAction.setBackColor(std::string("yellow"));
     defaultConfiguration.ownMentionAction.setSoundFilePath(std::string("/sounds/message-received.wav"));
     defaultConfiguration.ownMentionAction.setSystemNotificationEnabled(true);
     return defaultConfiguration;
 }
 
 void HighlightManager::storeSettings() {
     storingSettings_ = true;    // don't reload settings while saving
     settings_->storeSetting(SettingConstants::HIGHLIGHT_RULES_V2, highlightConfigurationToString(*highlightConfiguration_));
     storingSettings_ = false;
 }
 
 void HighlightManager::loadSettings() {
     std::string configString = settings_->getSetting(SettingConstants::HIGHLIGHT_RULES_V2);
     *highlightConfiguration_ = highlightConfigurationFromString(configString);
 }
 
 Highlighter* HighlightManager::createHighlighter(NickResolver* nickResolver) {
     return new Highlighter(this, nickResolver);
 }
 
 void HighlightManager::resetToDefaultConfiguration() {
     *highlightConfiguration_ = getDefaultConfig();
 }
 
 HighlightConfiguration HighlightManager::highlightConfigurationFromString(const std::string& dataString) {
     std::stringstream stream;
     stream << dataString;
 
     HighlightConfiguration configuration;
     try {