diff --git a/src/SeerCppSourceHighlighter.cpp b/src/SeerCppSourceHighlighter.cpp
index e675e00..ff8cdd0 100644
--- a/src/SeerCppSourceHighlighter.cpp
+++ b/src/SeerCppSourceHighlighter.cpp
@@ -10,11 +10,6 @@ SeerCppSourceHighlighter::SeerCppSourceHighlighter (QTextDocument* parent) : See
     setHighlighterSettings(SeerHighlighterSettings::populate(""));
 }
 
-const SeerHighlighterSettings& SeerCppSourceHighlighter::highlighterSettings() {
-
-    return _highlighterSettings;
-}
-
 void SeerCppSourceHighlighter::setHighlighterSettings (const SeerHighlighterSettings& settings) {
 
     _highlighterSettings     = settings;
@@ -96,10 +91,8 @@ void SeerCppSourceHighlighter::setHighlighterSettings (const SeerHighlighterSett
 
 	// Set keywords format and expression (must have precedence over functions)
     for (const QString& pattern : keywordPatterns) {
-
         rule.pattern = QRegularExpression(pattern);
         rule.format  = _keywordFormat;
-
         _highlightingRules.append(rule);
     }
 
diff --git a/src/SeerCppSourceHighlighter.h b/src/SeerCppSourceHighlighter.h
index 0ba1f1b..eae82e2 100644
--- a/src/SeerCppSourceHighlighter.h
+++ b/src/SeerCppSourceHighlighter.h
@@ -14,7 +14,6 @@ class SeerCppSourceHighlighter : public SeerSourceHighlighter {
 public:
   SeerCppSourceHighlighter(QTextDocument *parent = 0);
 
-  virtual const SeerHighlighterSettings &highlighterSettings() override;
   virtual void
   setHighlighterSettings(const SeerHighlighterSettings &settings) override;
 };
diff --git a/src/SeerEditorConfigPage.ui b/src/SeerEditorConfigPage.ui
index 5850fa5..e105a12 100644
--- a/src/SeerEditorConfigPage.ui
+++ b/src/SeerEditorConfigPage.ui
@@ -50,10 +50,10 @@
      <item>
       <widget class="QCheckBox" name="highlighterEnabledCheckBox">
        <property name="toolTip">
-        <string>Enable or disable highlighting for C/C++ files.</string>
+        <string>Enable or disable highlighting for supported languages' files.</string>
        </property>
        <property name="text">
-        <string>Enable C/C++ highlighter.</string>
+        <string>Enable Syntax highlighting.</string>
        </property>
       </widget>
      </item>
diff --git a/src/SeerOdinSourceHighlighter.cpp b/src/SeerOdinSourceHighlighter.cpp
index bed6477..9b849bc 100644
--- a/src/SeerOdinSourceHighlighter.cpp
+++ b/src/SeerOdinSourceHighlighter.cpp
@@ -10,11 +10,6 @@ SeerOdinSourceHighlighter::SeerOdinSourceHighlighter (QTextDocument* parent) : S
     setHighlighterSettings(SeerHighlighterSettings::populate(""));
 }
 
-const SeerHighlighterSettings& SeerOdinSourceHighlighter::highlighterSettings() {
-
-    return _highlighterSettings;
-}
-
 void SeerOdinSourceHighlighter::setHighlighterSettings (const SeerHighlighterSettings& settings) {
     _highlighterSettings     = settings;
 
@@ -86,7 +81,6 @@ void SeerOdinSourceHighlighter::setHighlighterSettings (const SeerHighlighterSet
     for (const QString& pattern : keywordPatterns) {
         rule.pattern = QRegularExpression(pattern);
         rule.format  = _keywordFormat;
-
         _highlightingRules.append(rule);
     }
 
diff --git a/src/SeerOdinSourceHighlighter.h b/src/SeerOdinSourceHighlighter.h
index 926d4b0..b5a3961 100644
--- a/src/SeerOdinSourceHighlighter.h
+++ b/src/SeerOdinSourceHighlighter.h
@@ -14,7 +14,6 @@ class SeerOdinSourceHighlighter : public SeerSourceHighlighter {
 public:
   SeerOdinSourceHighlighter(QTextDocument *parent = 0);
 
-  virtual const SeerHighlighterSettings &highlighterSettings() override;
   virtual void
-  setHighlighterSettings(const SeerHighlighterSettings &settings) override;
+  setHighlighterSettings(SeerHighlighterSettings const &settings) override;
 };
diff --git a/src/SeerRustSourceHighlighter.cpp b/src/SeerRustSourceHighlighter.cpp
index ee5078d..057d288 100644
--- a/src/SeerRustSourceHighlighter.cpp
+++ b/src/SeerRustSourceHighlighter.cpp
@@ -11,12 +11,6 @@ SeerRustSourceHighlighter::SeerRustSourceHighlighter(QTextDocument *parent)
   setHighlighterSettings(SeerHighlighterSettings::populate(""));
 }
 
-const SeerHighlighterSettings &
-SeerRustSourceHighlighter::highlighterSettings() {
-
-  return _highlighterSettings;
-}
-
 void SeerRustSourceHighlighter::setHighlighterSettings(
     const SeerHighlighterSettings &settings) {
   _highlighterSettings = settings;
@@ -83,7 +77,6 @@ void SeerRustSourceHighlighter::setHighlighterSettings(
   for (const QString &pattern : keywordPatterns) {
     rule.pattern = QRegularExpression(pattern);
     rule.format = _keywordFormat;
-
     _highlightingRules.append(rule);
   }
 
diff --git a/src/SeerRustSourceHighlighter.h b/src/SeerRustSourceHighlighter.h
index ac84cb8..4b722c3 100644
--- a/src/SeerRustSourceHighlighter.h
+++ b/src/SeerRustSourceHighlighter.h
@@ -14,7 +14,6 @@ class SeerRustSourceHighlighter : public SeerSourceHighlighter {
 public:
   SeerRustSourceHighlighter(QTextDocument *parent = 0);
 
-  virtual const SeerHighlighterSettings &highlighterSettings() override;
   virtual void
   setHighlighterSettings(const SeerHighlighterSettings &settings) override;
 };
diff --git a/src/SeerSourceHighlighter.cpp b/src/SeerSourceHighlighter.cpp
index 732afe9..9c3dee3 100644
--- a/src/SeerSourceHighlighter.cpp
+++ b/src/SeerSourceHighlighter.cpp
@@ -9,6 +9,10 @@
 
 SeerSourceHighlighter::SeerSourceHighlighter (QTextDocument* parent) : QSyntaxHighlighter(parent) {}
 
+const SeerHighlighterSettings& SeerSourceHighlighter::highlighterSettings() {
+    return _highlighterSettings;
+}
+
 SeerSourceHighlighter* getSourceHighlighter(QString const& file, SeerHighlighterSettings settings) {
     QRegularExpression cpp_re("(?:" + settings.sourceSuffixes() + ")$");
     if (file.contains(cpp_re)) {
diff --git a/src/SeerSourceHighlighter.h b/src/SeerSourceHighlighter.h
index 731d7ef..4250433 100644
--- a/src/SeerSourceHighlighter.h
+++ b/src/SeerSourceHighlighter.h
@@ -21,9 +21,8 @@ class SeerSourceHighlighter : public QSyntaxHighlighter {
 public:
   SeerSourceHighlighter(QTextDocument *parent = 0);
 
-  virtual const SeerHighlighterSettings &highlighterSettings() = 0;
-  virtual void
-  setHighlighterSettings(const SeerHighlighterSettings &settings) = 0;
+  const SeerHighlighterSettings &highlighterSettings();
+  virtual void setHighlighterSettings(SeerHighlighterSettings const& settings) = 0;
 
 protected:
   virtual void highlightBlock(const QString &text);