diff --git a/Source/CUI/source/CommandPopover.mm b/Source/CUI/source/CommandPopover.mm
index 23c27a4a7..33cf49d4c 100644
--- a/Source/CUI/source/CommandPopover.mm
+++ b/Source/CUI/source/CommandPopover.mm
@@ -29,7 +29,7 @@ @interface NCCommandPopoverViewController : NSViewController <NSTableViewDataSou
 - (instancetype _Nonnull)initWithPopover:(NCCommandPopover *)_popover andTitle:(NSString *)_title;
 - (void)tableView:(NSTableView *)_table didClickTableRow:(NSInteger)_row;
 - (bool)processKeyDown:(NSEvent *)_event;
-@property (readonly, nonatomic) bool numericHotkeysEnabled;
+@property(readonly, nonatomic) bool numericHotkeysEnabled;
 @end
 
 @interface NCCommandPopoverTableView : NSTableView
@@ -404,9 +404,9 @@ - (NSString *)hotkeyLabelForItemAtIndex:(size_t)_index
 
 - (std::optional<size_t>)itemIndexFromKeyDown:(NSEvent *)_event
 {
-    if(!self.numericHotkeysEnabled)
+    if( !self.numericHotkeysEnabled )
         return {};
-    
+
     // Use only clear keypresses, no modifiers
     if( _event.modifierFlags & (NSEventModifierFlagShift | NSEventModifierFlagControl | NSEventModifierFlagOption |
                                 NSEventModifierFlagCommand) )
@@ -565,7 +565,7 @@ - (NSView *)tableView:(NSTableView *)_table viewForTableColumn:(NSTableColumn *)
             return cv;
         }
 
-        if( [_column.identifier isEqualToString:@"K"] && self.numericHotkeysEnabled) {
+        if( [_column.identifier isEqualToString:@"K"] && self.numericHotkeysEnabled ) {
             NSString *hk = [self hotkeyLabelForItemAtIndex:_row];
             if( hk.length == 0 )
                 return nil;
@@ -759,7 +759,7 @@ - (void)selectFirstSelectableRow
     }
 }
 
-- (bool) numericHotkeysEnabled
+- (bool)numericHotkeysEnabled
 {
     return m_LabelTextField.stringValue == nil || m_LabelTextField.stringValue.length == 0;
 }
diff --git a/Source/NimbleCommander/NimbleCommander.xcodeproj/project.pbxproj b/Source/NimbleCommander/NimbleCommander.xcodeproj/project.pbxproj
index 0572130ef..78079124c 100644
--- a/Source/NimbleCommander/NimbleCommander.xcodeproj/project.pbxproj
+++ b/Source/NimbleCommander/NimbleCommander.xcodeproj/project.pbxproj
@@ -2961,7 +2961,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ $CODE_SIGNING_ALLOWED == NO ]] ; then exit ; fi\ncodesign --verbose --sign 'Developer ID Application' --force --deep --timestamp --options runtime \"${TARGET_BUILD_DIR}/${XPCSERVICES_FOLDER_PATH}/Highlighter.xpc/Contents/MacOS/Highlighter\"\n";
+			shellScript = "if [[ $CODE_SIGNING_ALLOWED == NO ]] ; then exit ; fi\ncodesign \\\n --verbose \\\n --sign 'Developer ID Application' \\\n --force \\\n --deep \\\n --timestamp \\\n --entitlements \"${PROJECT_DIR}/../Viewer/resources/Highlighter.entitlements\" \\\n --options runtime \\\n \"${TARGET_BUILD_DIR}/${XPCSERVICES_FOLDER_PATH}/Highlighter.xpc/Contents/MacOS/Highlighter\"\n";
 		};
 		CF9EEB3E17256372001443FA /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
index 38dddd74c..7598805ab 100644
--- a/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
+++ b/Source/NimbleCommander/NimbleCommander/Bootstrap/AppDelegate.mm
@@ -78,7 +78,7 @@
 #include <Viewer/Log.h>
 #include <Viewer/ViewerViewController.h>
 #include <Viewer/InternalViewerWindowController.h>
-#include <Viewer/Highlighting/SettingsStorage.h>
+#include <Viewer/Highlighting/FileSettingsStorage.h>
 
 #include <Term/Log.h>
 
diff --git a/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.mm b/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.mm
index 1279607be..a65942fdd 100644
--- a/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.mm
+++ b/Source/NimbleCommander/NimbleCommander/Core/Theming/Theme.mm
@@ -61,7 +61,7 @@
     NSColor *m_FilePanelsBriefFocusedActiveItemBackgroundColor;
     NSColor *m_FilePanelsBriefFocusedInactiveItemBackgroundColor;
     NSColor *m_FilePanelsBriefSelectedItemBackgroundColor;
-    
+
     NSFont *m_TerminalFont;
     NSColor *m_TerminalOverlayColor;
     NSColor *m_TerminalForegroundColor;
@@ -85,7 +85,7 @@
     NSColor *m_TerminalAnsiColorD;
     NSColor *m_TerminalAnsiColorE;
     NSColor *m_TerminalAnsiColorF;
-    
+
     NSFont *m_ViewerFont;
     NSColor *m_ViewerOverlayColor;
     NSColor *m_ViewerTextColor;
diff --git a/Source/NimbleCommander/NimbleCommander/Resources/SyntaxHighlighting/C++.json b/Source/NimbleCommander/NimbleCommander/Resources/SyntaxHighlighting/C++.json
index acbf785d7..2940c238b 100644
--- a/Source/NimbleCommander/NimbleCommander/Resources/SyntaxHighlighting/C++.json
+++ b/Source/NimbleCommander/NimbleCommander/Resources/SyntaxHighlighting/C++.json
@@ -1,7 +1,10 @@
 {
     "lexer": "cpp",
-    "wordlists": ["alignas alignof and and_eq asm auto bitand bitor bool break case catch char char8_t char16_t char32_t class compl concept const consteval constexpr constinit const_cast continue co_await co_return co_yield decltype default delete do double dynamic_cast else enum explicit export extern false float for friend goto if inline int long mutable namespace new noexcept not not_eq nullptr operator or or_eq private protected public register reinterpret_cast requires return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq"],
-    "properties": {},
+    "wordlists": ["alignas alignof and and_eq asm auto bitand bitor bool break case catch char char8_t char16_t char32_t class compl concept const consteval constexpr constinit const_cast continue co_await co_return co_yield decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if import inline int long module mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast requires return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq"],
+    "properties": {
+        "styling.within.preprocessor": "1",
+        "lexer.cpp.allow.dollars": "0"
+    },
     "mapping": {
         "SCE_C_DEFAULT": "default",
         "SCE_C_COMMENT": "comment",
@@ -15,6 +18,22 @@
         "SCE_C_PREPROCESSOR": "preprocessor",
         "SCE_C_OPERATOR": "operator",
         "SCE_C_IDENTIFIER": "identifier",
-        "SCE_C_STRINGEOL": "string"
+        "SCE_C_STRINGEOL": "string",
+        "SCE_C_VERBATIM": "string",
+        "SCE_C_REGEX": "string",
+        "SCE_C_REGEX": "string",
+        "SCE_C_COMMENTLINEDOC": "comment",
+        "SCE_C_WORD2": "keyword",
+        "SCE_C_COMMENTDOCKEYWORD": "comment",
+        "SCE_C_COMMENTDOCKEYWORDERROR": "comment",
+        "SCE_C_GLOBALCLASS": "identifier",
+        "SCE_C_STRINGRAW": "string",
+        "SCE_C_TRIPLEVERBATIM": "string",
+        "SCE_C_HASHQUOTEDSTRING": "string",
+        "SCE_C_PREPROCESSORCOMMENT": "comment",
+        "SCE_C_PREPROCESSORCOMMENTDOC": "comment",
+        "SCE_C_USERLITERAL": "identifier",
+        "SCE_C_TASKMARKER": "comment",
+        "SCE_C_ESCAPESEQUENCE": "string"
     }
 }
diff --git a/Source/Viewer/Viewer.xcodeproj/project.pbxproj b/Source/Viewer/Viewer.xcodeproj/project.pbxproj
index c27a0bd4e..f37a7b930 100644
--- a/Source/Viewer/Viewer.xcodeproj/project.pbxproj
+++ b/Source/Viewer/Viewer.xcodeproj/project.pbxproj
@@ -9,6 +9,9 @@
 /* Begin PBXBuildFile section */
 		CF1325622225FD630097F9A1 /* TextModeFrame_UT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF13255E2225FB610097F9A1 /* TextModeFrame_UT.cpp */; };
 		CF24E1D3227F0B2A00C166FA /* HexModeLayout_UT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF24E1D1227F0B2400C166FA /* HexModeLayout_UT.cpp */; };
+		CF26778A2C1E03FD00EE8F06 /* FileSettingsStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = CF2677892C1E03FD00EE8F06 /* FileSettingsStorage.h */; };
+		CF26778C2C1E041400EE8F06 /* FileSettingsStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF26778B2C1E041400EE8F06 /* FileSettingsStorage.cpp */; };
+		CF26778E2C1E0A0E00EE8F06 /* hlFileSettingsStorage_UT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF26778D2C1E0A0E00EE8F06 /* hlFileSettingsStorage_UT.cpp */; };
 		CF3989B62B41707F006103C1 /* libBase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CF3989B52B41707F006103C1 /* libBase.a */; };
 		CF46FEFF255EF4480095FC73 /* Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = CF46FEFE255EF4480095FC73 /* Internal.h */; };
 		CF5BF7832BF90FF20057C92E /* Document.h in Headers */ = {isa = PBXBuildFile; fileRef = CF5BF7822BF90FF20057C92E /* Document.h */; };
@@ -132,6 +135,9 @@
 		CF24E1D1227F0B2400C166FA /* HexModeLayout_UT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HexModeLayout_UT.cpp; path = tests/HexModeLayout_UT.cpp; sourceTree = "<group>"; };
 		CF24E1D62286E23800C166FA /* PreviewModeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PreviewModeView.mm; path = source/PreviewModeView.mm; sourceTree = "<group>"; };
 		CF24E1D82286E24300C166FA /* PreviewModeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewModeView.h; path = include/Viewer/PreviewModeView.h; sourceTree = "<group>"; };
+		CF2677892C1E03FD00EE8F06 /* FileSettingsStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSettingsStorage.h; path = include/Viewer/Highlighting/FileSettingsStorage.h; sourceTree = "<group>"; };
+		CF26778B2C1E041400EE8F06 /* FileSettingsStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSettingsStorage.cpp; path = source/Highlighting/FileSettingsStorage.cpp; sourceTree = "<group>"; };
+		CF26778D2C1E0A0E00EE8F06 /* hlFileSettingsStorage_UT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = hlFileSettingsStorage_UT.cpp; path = tests/hlFileSettingsStorage_UT.cpp; sourceTree = "<group>"; };
 		CF3989B52B41707F006103C1 /* libBase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libBase.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		CF46FEFE255EF4480095FC73 /* Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Internal.h; path = source/Internal.h; sourceTree = "<group>"; };
 		CF46FF03255EF4690095FC73 /* Bundle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Bundle.h; path = include/Viewer/Bundle.h; sourceTree = "<group>"; };
@@ -266,6 +272,7 @@
 			children = (
 				CF5BF7B72BFE8B3B0057C92E /* Client.h */,
 				CF5BF7822BF90FF20057C92E /* Document.h */,
+				CF2677892C1E03FD00EE8F06 /* FileSettingsStorage.h */,
 				CF5BF7952BFBD9480057C92E /* Highlighter.h */,
 				CF5BF7932BFBCA030057C92E /* LexerSettings.h */,
 				CF5BF7C72C0B89B40057C92E /* SettingsStorage.h */,
@@ -279,6 +286,7 @@
 			children = (
 				CF5BF7B82BFE8B540057C92E /* Client.cpp */,
 				CF5BF7852BF910100057C92E /* Document.cpp */,
+				CF26778B2C1E041400EE8F06 /* FileSettingsStorage.cpp */,
 				CF5BF7972BFBD9510057C92E /* Highlighter.cpp */,
 				CF5BF7912BFBC9F90057C92E /* LexerSettings.cpp */,
 				CF5BF7AA2BFD48950057C92E /* Service.cpp */,
@@ -410,6 +418,7 @@
 				CF9BF9052269FD7000AD36D9 /* HexModeProcessing_UT.cpp */,
 				CF5BF7C12BFFDD240057C92E /* hlClient_UT.cpp */,
 				CF5BF7872BF9209E0057C92E /* hlDocument_UT.cpp */,
+				CF26778D2C1E0A0E00EE8F06 /* hlFileSettingsStorage_UT.cpp */,
 				CF5BF7992BFBDF1F0057C92E /* hlHighlighter_UT.cpp */,
 				CF5BF79B2BFD39A60057C92E /* hlLexerSettings_UT.cpp */,
 				CF5BF78E2BFA19F50057C92E /* hlStyle_UT.cpp */,
@@ -450,6 +459,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CF5BF78B2BFA12F70057C92E /* Style.h in Headers */,
+				CF26778A2C1E03FD00EE8F06 /* FileSettingsStorage.h in Headers */,
 				CF5BF7962BFBD9480057C92E /* Highlighter.h in Headers */,
 				CF5BF7C82C0B89B40057C92E /* SettingsStorage.h in Headers */,
 				CF5BF7C42C0B41F90057C92E /* TextModeWorkingSetHighlighting.h in Headers */,
@@ -661,6 +671,7 @@
 				CFA9998D26468A4300F72E93 /* Log.cpp in Sources */,
 				CF5BF7982BFBD9510057C92E /* Highlighter.cpp in Sources */,
 				CF5C1D86255EEA6A00ADE703 /* PreviewModeView.mm in Sources */,
+				CF26778C2C1E041400EE8F06 /* FileSettingsStorage.cpp in Sources */,
 				CF5C1D7F255EEA6A00ADE703 /* HexModeView.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -670,6 +681,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CF5BF79A2BFBDF1F0057C92E /* hlHighlighter_UT.cpp in Sources */,
+				CF26778E2C1E0A0E00EE8F06 /* hlFileSettingsStorage_UT.cpp in Sources */,
 				CF9BF90D226CF99000AD36D9 /* HexModeFrame_UT.cpp in Sources */,
 				CF61F2FC263D610A009FF900 /* TextMoveView_UT.mm in Sources */,
 				CF9BF9062269FD7000AD36D9 /* HexModeProcessing_UT.cpp in Sources */,
diff --git a/Source/Viewer/include/Viewer/DataBackend.h b/Source/Viewer/include/Viewer/DataBackend.h
index c0f2f45c4..2779d6c7f 100644
--- a/Source/Viewer/include/Viewer/DataBackend.h
+++ b/Source/Viewer/include/Viewer/DataBackend.h
@@ -58,7 +58,7 @@ class DataBackend
 
     // Returns a filename component of the underlying VFS file's path
     std::filesystem::path FileName() const;
-    
+
 private:
     void DecodeBuffer(); // called by internal update logic
 
diff --git a/Source/Viewer/include/Viewer/Highlighting/Document.h b/Source/Viewer/include/Viewer/Highlighting/Document.h
index fb0102b5d..9f45f93a3 100644
--- a/Source/Viewer/include/Viewer/Highlighting/Document.h
+++ b/Source/Viewer/include/Viewer/Highlighting/Document.h
@@ -35,7 +35,7 @@ class Document final : public Scintilla::IDocument
     int GetLineIndentation(Sci_Position line) noexcept override;
 
     Sci_Position LineStart(Sci_Position line) const noexcept override;
-    
+
     Sci_Position LineEnd(Sci_Position line) const noexcept override;
 
     Sci_Position GetRelativePosition(Sci_Position positionStart, Sci_Position characterOffset) const noexcept override;
@@ -67,6 +67,7 @@ class Document final : public Scintilla::IDocument
     void ChangeLexerState(Sci_Position start, Sci_Position end) noexcept override;
 
     std::span<const char> Styles() const noexcept;
+
 private:
     std::string_view m_Text;
     std::vector<uint32_t> m_Lines;
diff --git a/Source/Viewer/include/Viewer/Highlighting/FileSettingsStorage.h b/Source/Viewer/include/Viewer/Highlighting/FileSettingsStorage.h
new file mode 100644
index 000000000..694438c2d
--- /dev/null
+++ b/Source/Viewer/include/Viewer/Highlighting/FileSettingsStorage.h
@@ -0,0 +1,38 @@
+// Copyright (C) 2024 Michael Kazakov. Subject to GNU General Public License version 3.
+#pragma once
+#include "SettingsStorage.h"
+#include <Base/RobinHoodUtil.h>
+#include <Utility/FileMask.h>
+#include <filesystem>
+#include <vector>
+
+namespace nc::viewer::hl {
+
+class FileSettingsStorage : public SettingsStorage
+{
+public:
+    FileSettingsStorage(const std::filesystem::path &_base_dir, const std::filesystem::path &_overrides_dir);
+
+    std::optional<std::string> Language(std::string_view _filename) noexcept override;
+
+    std::shared_ptr<const std::string> Settings(std::string_view _lang) override;
+
+private:
+    struct Lang {
+        std::string name;
+        std::string settings_filename;
+        nc::utility::FileMask mask;
+    };
+
+    std::vector<Lang> LoadLangs();
+
+    std::filesystem::path m_BaseDir;
+    std::vector<Lang> m_Langs;
+    robin_hood::unordered_flat_map<std::string,
+                                   std::shared_ptr<const std::string>,
+                                   RHTransparentStringHashEqual,
+                                   RHTransparentStringHashEqual>
+        m_Settings;
+};
+
+} // namespace nc::viewer::hl
diff --git a/Source/Viewer/include/Viewer/Highlighting/Highlighter.h b/Source/Viewer/include/Viewer/Highlighting/Highlighter.h
index 724d79646..32c101642 100644
--- a/Source/Viewer/include/Viewer/Highlighting/Highlighter.h
+++ b/Source/Viewer/include/Viewer/Highlighting/Highlighter.h
@@ -4,8 +4,7 @@
 #include "Style.h"
 #include "LexerSettings.h"
 
-namespace Scintilla
-{
+namespace Scintilla {
 class ILexer5;
 }
 
@@ -15,15 +14,15 @@ class Highlighter
 {
 public:
     Highlighter(LexerSettings _settings);
-    Highlighter(const Highlighter&) = delete;
+    Highlighter(const Highlighter &) = delete;
     ~Highlighter();
-    Highlighter &operator=(const Highlighter&) = delete;
+    Highlighter &operator=(const Highlighter &) = delete;
 
     std::vector<Style> Highlight(std::string_view _text) const;
-    
+
 private:
     LexerSettings m_Settings;
     Scintilla::ILexer5 *m_Lexer = nullptr;
 };
 
-}
+} // namespace nc::viewer::hl
diff --git a/Source/Viewer/include/Viewer/Highlighting/LexerSettings.h b/Source/Viewer/include/Viewer/Highlighting/LexerSettings.h
index 042b5cea7..ccf6497ca 100644
--- a/Source/Viewer/include/Viewer/Highlighting/LexerSettings.h
+++ b/Source/Viewer/include/Viewer/Highlighting/LexerSettings.h
@@ -14,7 +14,7 @@ struct LexerSettings {
     struct Property {
         std::string key;
         std::string value;
-        auto operator<=>(const Property& ) const noexcept = default;
+        auto operator<=>(const Property &) const noexcept = default;
     };
 
     std::string name;
diff --git a/Source/Viewer/include/Viewer/Highlighting/SettingsStorage.h b/Source/Viewer/include/Viewer/Highlighting/SettingsStorage.h
index 156afacec..8b73b3709 100644
--- a/Source/Viewer/include/Viewer/Highlighting/SettingsStorage.h
+++ b/Source/Viewer/include/Viewer/Highlighting/SettingsStorage.h
@@ -1,13 +1,10 @@
 // Copyright (C) 2024 Michael Kazakov. Subject to GNU General Public License version 3.
 #pragma once
 
-#include <Utility/FileMask.h>
-#include <Base/RobinHoodUtil.h>
 #include <string>
-#include <filesystem>
 #include <string_view>
 #include <memory>
-#include <vector>
+#include <optional>
 
 namespace nc::viewer::hl {
 
@@ -16,44 +13,19 @@ class SettingsStorage
 public:
     virtual ~SettingsStorage() = default;
 
-    virtual std::string Language(std::string_view _filename) = 0;
+    // Returns a name of a predicted language for the given filename.
+    virtual std::optional<std::string> Language(std::string_view _filename) = 0;
 
+    // Returns the syntax settings of the given language name or nullptr if no such language is defined
     virtual std::shared_ptr<const std::string> Settings(std::string_view _lang) = 0;
 };
 
 class DummySettingsStorage : public SettingsStorage
 {
 public:
-    std::string Language(std::string_view _filename) override;
-    
-    std::shared_ptr<const std::string> Settings(std::string_view _lang) override;
-};
-
-class FileSettingsStorage : public SettingsStorage
-{
-public:
-    FileSettingsStorage(const std::filesystem::path &_base_dir, const std::filesystem::path &_overrides_dir);
+    std::optional<std::string> Language(std::string_view _filename) override;
 
-    std::string Language(std::string_view _filename) override;
-    
     std::shared_ptr<const std::string> Settings(std::string_view _lang) override;
-
-private:
-    struct Lang {
-        std::string name;
-        std::string settings_filename;
-        nc::utility::FileMask mask;
-    };
-
-    void LoadLangs();
-
-    std::filesystem::path m_BaseDir;
-    std::vector<Lang> m_Langs;
-    robin_hood::unordered_flat_map<std::string,
-                                   std::shared_ptr<const std::string>,
-                                   RHTransparentStringHashEqual,
-                                   RHTransparentStringHashEqual>
-        m_Settings;
 };
 
 } // namespace nc::viewer::hl
diff --git a/Source/Viewer/resources/Highlighter.entitlements b/Source/Viewer/resources/Highlighter.entitlements
index 852fa1a47..6c5bad12b 100644
--- a/Source/Viewer/resources/Highlighter.entitlements
+++ b/Source/Viewer/resources/Highlighter.entitlements
@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.get-task-allow</key>
+	<true/>
 </dict>
 </plist>
diff --git a/Source/Viewer/source/DataBackend.cpp b/Source/Viewer/source/DataBackend.cpp
index 4dfa1de7e..2d5b3a30a 100644
--- a/Source/Viewer/source/DataBackend.cpp
+++ b/Source/Viewer/source/DataBackend.cpp
@@ -61,7 +61,7 @@ std::filesystem::path DataBackend::FileName() const
     if( path == nullptr ) {
         return {};
     }
-    
+
     return utility::PathManip::Filename(path);
 }
 
diff --git a/Source/Viewer/source/Highlighting/Client.cpp b/Source/Viewer/source/Highlighting/Client.cpp
index 71e27538a..40c096f76 100644
--- a/Source/Viewer/source/Highlighting/Client.cpp
+++ b/Source/Viewer/source/Highlighting/Client.cpp
@@ -105,7 +105,6 @@ void Client::HighlightAsync(std::string_view _text,
     }
 
     auto handler = ^(xpc_object_t _reply) {
-      auto release_connection = at_scope_end([&] { xpc_release(connection); });
       Log::Trace(SPDLOC, "Got a response from the XPC service");
       const xpc_type_t type = xpc_get_type(_reply);
       if( type == XPC_TYPE_ERROR ) {
@@ -161,6 +160,9 @@ void Client::HighlightAsync(std::string_view _text,
     auto release_message = at_scope_end([&] { xpc_release(message); });
 
     xpc_connection_send_message_with_reply(connection, message, _queue, handler);
+
+    // VVV I seriously don't understand the ownership model of xpc_connection_t and why this seem to be correct...
+    xpc_release(connection);
 }
 
 } // namespace nc::viewer::hl
diff --git a/Source/Viewer/source/Highlighting/FileSettingsStorage.cpp b/Source/Viewer/source/Highlighting/FileSettingsStorage.cpp
new file mode 100644
index 000000000..1fa7166ba
--- /dev/null
+++ b/Source/Viewer/source/Highlighting/FileSettingsStorage.cpp
@@ -0,0 +1,130 @@
+// Copyright (C) 2024 Michael Kazakov. Subject to GNU General Public License version 3.
+#include <Viewer/Highlighting/FileSettingsStorage.h>
+#include <Viewer/Log.h>
+#include <fstream>
+#include <nlohmann/json.hpp>
+#include <ranges>
+#include <fmt/format.h>
+
+using json = nlohmann::json;
+
+namespace nc::viewer::hl {
+
+[[clang::no_destroy]] static const std::filesystem::path g_MainFile = "Main.json";
+
+FileSettingsStorage::FileSettingsStorage(const std::filesystem::path &_base_dir,
+                                         const std::filesystem::path &_overrides_dir)
+    : m_BaseDir(_base_dir)
+{
+    (void)_overrides_dir;
+    m_Langs = LoadLangs();
+}
+
+std::vector<FileSettingsStorage::Lang> FileSettingsStorage::LoadLangs()
+{
+    const std::filesystem::path main_path = m_BaseDir / g_MainFile;
+
+    Log::Debug(SPDLOC, "Loading languages definitions from '{}'", main_path.native());
+
+    std::ifstream f(main_path);
+    if( !f.is_open() ) {
+        Log::Error(SPDLOC, "Unable to open the file '{}'", main_path.native());
+        throw std::invalid_argument(fmt::format("Unable to open the file '{}'", main_path.native()));
+    }
+
+    json data;
+    try {
+        data = json::parse(f);
+    } catch( std::exception &ex ) {
+        Log::Error(SPDLOC, "Unable to parse '{}': {}", main_path.native());
+        throw std::invalid_argument(fmt::format("Unable to parse '{}': {}", main_path.native(), ex.what()));
+    }
+
+    if( !data.contains("langs") ) {
+        Log::Error(SPDLOC, "Invalid JSON format '{}': no 'langs' array", main_path.native());
+        throw std::invalid_argument(fmt::format("Invalid JSON format '{}': no 'langs' array", main_path.native()));
+    }
+
+    std::vector<FileSettingsStorage::Lang> output;
+    try {
+        auto &langs = data.at("langs");
+        for( auto it = langs.begin(); it != langs.end(); ++it ) {
+            std::string name = it->at("name");
+            if( name.empty() ) {
+                throw std::invalid_argument("empty name is not allowed");
+            }
+
+            std::string settings = it->at("settings");
+            if( settings.empty() ) {
+                throw std::invalid_argument("empty settings is not allowed");
+            }
+
+            const std::string filemask = it->at("filemask");
+            if( filemask.empty() ) {
+                throw std::invalid_argument("empty filemask is not allowed");
+            }
+
+            Lang lang;
+            lang.name = std::move(name);
+            lang.settings_filename = std::move(settings);
+            lang.mask = utility::FileMask(filemask, utility::FileMask::Type::Mask);
+            output.push_back(std::move(lang));
+        }
+
+    } catch( std::exception &ex ) {
+        Log::Error(SPDLOC, "Parse error in '{}': {}", main_path.native(), ex.what());
+        throw std::invalid_argument(fmt::format("Parse error in '{}': {}", main_path.native(), ex.what()));
+    }
+
+    robin_hood::unordered_flat_set<std::string_view, RHTransparentStringHashEqual, RHTransparentStringHashEqual> set;
+    set.reserve(output.size());
+    for( auto &lang : output ) {
+        if( set.contains(lang.name) ) {
+            Log::Error(SPDLOC, "The language '{}' is defined more than once", lang.name);
+            throw std::invalid_argument(fmt::format("The language '{}' is defined more than once", lang.name));
+        }
+        set.emplace(lang.name);
+    }
+
+    return output;
+}
+
+std::optional<std::string> FileSettingsStorage::Language(std::string_view _filename) noexcept
+{
+    for( auto &lang : m_Langs ) {
+        if( lang.mask.MatchName(_filename) ) {
+            return lang.name;
+        }
+    }
+    return {};
+}
+
+std::shared_ptr<const std::string> FileSettingsStorage::Settings(std::string_view _lang)
+{
+    if( auto sett_it = m_Settings.find(_lang); sett_it != m_Settings.end() ) {
+        Log::Trace(SPDLOC, "Retreived the syntax settings for the language '{}'", _lang);
+        return sett_it->second;
+    }
+
+    const auto lang_it = std::ranges::find_if(m_Langs, [&](auto &lang) { return lang.name == _lang; });
+    if( lang_it == m_Langs.end() ) {
+        return {};
+    }
+
+    const std::filesystem::path settings_path = m_BaseDir / lang_it->settings_filename;
+    std::ifstream ifs{settings_path};
+    if( ifs ) {
+        std::string text((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
+        auto shared = std::make_shared<std::string>(std::move(text));
+        m_Settings.emplace(_lang, shared);
+        Log::Debug(SPDLOC, "Sucessfuly loaded the syntax settings from the file '{}'", settings_path.native());
+        return shared;
+    }
+    else {
+        m_Settings.emplace(_lang, nullptr);
+        Log::Error(SPDLOC, "Unable to load the syntax settings from the file '{}'", settings_path.native());
+        return {};
+    }
+}
+
+} // namespace nc::viewer::hl
diff --git a/Source/Viewer/source/Highlighting/LexerSettings.cpp b/Source/Viewer/source/Highlighting/LexerSettings.cpp
index 6fcaaa318..9541e11bd 100644
--- a/Source/Viewer/source/Highlighting/LexerSettings.cpp
+++ b/Source/Viewer/source/Highlighting/LexerSettings.cpp
@@ -37,7 +37,7 @@ static constinit frozen::unordered_map<frozen::string, Style, 8> g_MappedStyles{
 std::expected<LexerSettings, std::string> ParseLexerSettings(std::string_view _json) noexcept
 {
     try {
-        json json_obj = json::parse(_json);
+        json json_obj = json::parse(_json, nullptr, true, true);
 
         LexerSettings sets;
         sets.name = json_obj.at("lexer");
diff --git a/Source/Viewer/source/Highlighting/Service.cpp b/Source/Viewer/source/Highlighting/Service.cpp
index 202530286..f2869c5b1 100644
--- a/Source/Viewer/source/Highlighting/Service.cpp
+++ b/Source/Viewer/source/Highlighting/Service.cpp
@@ -34,6 +34,13 @@ static void send_reply_styles(xpc_connection_t _peer,
 static void peer_event_handler(xpc_connection_t _peer, xpc_object_t _event) noexcept
 {
     const xpc_type_t type = xpc_get_type(_event);
+    if( type == XPC_TYPE_ERROR ) {
+        if( _event == XPC_ERROR_TERMINATION_IMMINENT ) {
+            exit(0);
+        }
+        return;
+    }
+
     if( type != XPC_TYPE_DICTIONARY ) {
         send_reply_error(_peer, _event, "The request type must be dictionary.");
         return;
diff --git a/Source/Viewer/source/Highlighting/SettingsStorage.cpp b/Source/Viewer/source/Highlighting/SettingsStorage.cpp
index b6203e964..8e0ac2a9b 100644
--- a/Source/Viewer/source/Highlighting/SettingsStorage.cpp
+++ b/Source/Viewer/source/Highlighting/SettingsStorage.cpp
@@ -1,14 +1,9 @@
 // Copyright (C) 2024 Michael Kazakov. Subject to GNU General Public License version 3.
 #include <Viewer/Highlighting/SettingsStorage.h>
-#include <fstream>
-#include <nlohmann/json.hpp>
-#include <ranges>
-#include <fmt/format.h>
-using json = nlohmann::json;
 
 namespace nc::viewer::hl {
 
-std::string DummySettingsStorage::Language(std::string_view _filename)
+std::optional<std::string> DummySettingsStorage::Language(std::string_view _filename)
 {
     (void)_filename;
     return {};
@@ -41,77 +36,4 @@ std::shared_ptr<const std::string> DummySettingsStorage::Settings(std::string_vi
     return ptr;
 }
 
-// TODO: logging
-// TODO: error handling
-
-FileSettingsStorage::FileSettingsStorage(const std::filesystem::path &_base_dir,
-                                         const std::filesystem::path &_overrides_dir)
-    : m_BaseDir(_base_dir)
-{
-    (void)_overrides_dir;
-    LoadLangs();
-}
-
-void FileSettingsStorage::LoadLangs()
-{
-    std::ifstream f(m_BaseDir / "Main.json");
-    json data = json::parse(f);
-
-    m_Langs.clear();
-    if( data.contains("langs") ) {
-        auto &langs = data.at("langs");
-        for( auto it = langs.begin(); it != langs.end(); ++it ) {
-            std::string name = it->at("name");
-            std::string settings = it->at("settings");
-            std::string filemask = it->at("filemask");
-            if( name.empty() || settings.empty() || filemask.empty() ) {
-                continue;
-            }
-
-            // TODO: check that the lang is unique
-
-            Lang lang;
-            lang.name = name;
-            lang.settings_filename = settings;
-            lang.mask = utility::FileMask(filemask, utility::FileMask::Type::Mask);
-            m_Langs.push_back(std::move(lang));
-        }
-    }
-}
-
-std::string FileSettingsStorage::Language(std::string_view _filename)
-{
-    for( auto &lang : m_Langs ) {
-        if( lang.mask.MatchName(_filename) ) {
-            return lang.name;
-        }
-    }
-    return {};
-}
-
-std::shared_ptr<const std::string> FileSettingsStorage::Settings(std::string_view _lang)
-{
-    if( auto sett_it = m_Settings.find(_lang); sett_it != m_Settings.end() ) {
-        return sett_it->second;
-    }
-
-    auto lang_it = std::ranges::find_if(m_Langs, [&](auto &lang) { return lang.name == _lang; });
-    if( lang_it == m_Langs.end() ) {
-        return {};
-    }
-
-    const std::filesystem::path settings_path = m_BaseDir / lang_it->settings_filename;
-    std::ifstream ifs{settings_path};
-    if( ifs ) {
-        std::string text((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
-        auto shared = std::make_shared<std::string>(std::move(text));
-        m_Settings.emplace(_lang, shared);
-        return shared;
-    }
-    else {
-        m_Settings.emplace(_lang, nullptr);
-        return {};
-    }
-}
-
 } // namespace nc::viewer::hl
diff --git a/Source/Viewer/source/Highlighting/Style.cpp b/Source/Viewer/source/Highlighting/Style.cpp
index f6ee621af..df1d32a4d 100644
--- a/Source/Viewer/source/Highlighting/Style.cpp
+++ b/Source/Viewer/source/Highlighting/Style.cpp
@@ -6,11 +6,11 @@ namespace nc::viewer::hl {
 
 void StyleMapper::SetMapping(char _lexilla_style, Style _nc_style) noexcept
 {
-    if( _lexilla_style < 0) {
+    if( _lexilla_style < 0 ) {
         return;
     }
     if( m_MapsTo.size() < static_cast<size_t>(_lexilla_style) + 1 ) {
-        m_MapsTo.resize( static_cast<size_t>(_lexilla_style) + 1, Style::Default );
+        m_MapsTo.resize(static_cast<size_t>(_lexilla_style) + 1, Style::Default);
     }
     m_MapsTo[static_cast<size_t>(_lexilla_style)] = _nc_style;
 }
@@ -20,7 +20,7 @@ void StyleMapper::MapStyles(std::span<const char> _lexilla_styles, std::span<Sty
     if( _lexilla_styles.size() != _nc_styles.size() ) {
         abort();
     }
-    
+
     for( size_t i = 0; i < _lexilla_styles.size(); ++i ) {
         const char ls = _lexilla_styles[i];
         if( ls < 0 || static_cast<size_t>(ls) >= m_MapsTo.size() ) {
diff --git a/Source/Viewer/source/TextModeView.mm b/Source/Viewer/source/TextModeView.mm
index 46488ddaf..76051e538 100644
--- a/Source/Viewer/source/TextModeView.mm
+++ b/Source/Viewer/source/TextModeView.mm
@@ -159,22 +159,20 @@ - (void)attachToNewBackend:(std::shared_ptr<const nc::viewer::DataBackend>)_back
 - (void)rebuildWorkingSetAndFrame
 {
     m_WorkingSet = BuildWorkingSetForBackendState(*m_Backend);
-
-    const std::string lang = m_HighlightingSettings->Language(m_Backend->FileName().native());
-    if( !lang.empty() && m_HighlightingSettings->Settings(lang) != nullptr ) {
-        auto settings = m_HighlightingSettings->Settings(lang);
-        m_WorkingSetHighlighting = std::make_shared<TextModeWorkingSetHighlighting>(m_WorkingSet, settings);
-        __weak NCViewerTextModeView *weak_self = self;
-        m_WorkingSetHighlighting->Highlight(g_SyncHighlightingThreshold,
-                                            [weak_self](std::shared_ptr<const TextModeWorkingSetHighlighting> _hl) {
-            NCViewerTextModeView *strong_self = weak_self;
-            if( !strong_self || _hl != strong_self->m_WorkingSetHighlighting )
-                return;
-            [strong_self highlightingHasChanged];
-        });
-    }
-    else {
-        m_WorkingSetHighlighting.reset();
+    m_WorkingSetHighlighting.reset();
+
+    if( const std::optional<std::string> lang = m_HighlightingSettings->Language(m_Backend->FileName().native()) ) {
+        if( const std::shared_ptr<const std::string> settings = m_HighlightingSettings->Settings(*lang) ) {
+            m_WorkingSetHighlighting = std::make_shared<TextModeWorkingSetHighlighting>(m_WorkingSet, settings);
+            __weak NCViewerTextModeView *weak_self = self;
+            m_WorkingSetHighlighting->Highlight(g_SyncHighlightingThreshold,
+                                                [weak_self](std::shared_ptr<const TextModeWorkingSetHighlighting> _hl) {
+                                                    NCViewerTextModeView *strong_self = weak_self;
+                                                    if( !strong_self || _hl != strong_self->m_WorkingSetHighlighting )
+                                                        return;
+                                                    [strong_self highlightingHasChanged];
+                                                });
+        }
     }
 
     m_Frame = [self buildLayout];
diff --git a/Source/Viewer/tests/Tests.cpp b/Source/Viewer/tests/Tests.cpp
index ae6740591..448b8bca2 100644
--- a/Source/Viewer/tests/Tests.cpp
+++ b/Source/Viewer/tests/Tests.cpp
@@ -1,8 +1,36 @@
-// Copyright (C) 2018 Michael Kazakov. Subject to GNU General Public License version 3.
+// Copyright (C) 2018-2024 Michael Kazakov. Subject to GNU General Public License version 3.
 #define CATCH_CONFIG_RUNNER
 #include <catch2/catch.hpp>
+#include <Base/CommonPaths.h>
+#include <sys/stat.h>
+#include <sys/fcntl.h>
+#include <sys/dirent.h>
+#include "Tests.h"
+
+static auto g_TestDirPrefix = "_nc__viewer__test_";
 
 int main(int argc, char *argv[])
 {
     return Catch::Session().run(argc, argv);
 }
+
+static std::string MakeTempFilesStorage()
+{
+    const auto base_path = nc::base::CommonPaths::AppTemporaryDirectory();
+    const auto tmp_path = base_path + g_TestDirPrefix + "/";
+    if( access(tmp_path.c_str(), F_OK) == 0 )
+        std::filesystem::remove_all(tmp_path);
+    if( mkdir(tmp_path.c_str(), S_IRWXU) != 0 )
+        throw std::runtime_error("mkdir failed");
+    return tmp_path;
+}
+
+TempTestDir::TempTestDir()
+{
+    directory = MakeTempFilesStorage();
+}
+
+TempTestDir::~TempTestDir()
+{
+    std::filesystem::remove_all(directory);
+}
diff --git a/Source/Viewer/tests/Tests.h b/Source/Viewer/tests/Tests.h
index f5c1a5941..993111a1b 100644
--- a/Source/Viewer/tests/Tests.h
+++ b/Source/Viewer/tests/Tests.h
@@ -1,4 +1,11 @@
-// Copyright (C) 2018 Michael Kazakov. Subject to GNU General Public License version 3.
+// Copyright (C) 2018-2024 Michael Kazakov. Subject to GNU General Public License version 3.
 #pragma once
 
 #include <catch2/catch.hpp>
+#include <filesystem>
+
+struct TempTestDir {
+    TempTestDir();
+    ~TempTestDir();
+    std::filesystem::path directory;
+};
diff --git a/Source/Viewer/tests/hlFileSettingsStorage_UT.cpp b/Source/Viewer/tests/hlFileSettingsStorage_UT.cpp
new file mode 100644
index 000000000..7194c4830
--- /dev/null
+++ b/Source/Viewer/tests/hlFileSettingsStorage_UT.cpp
@@ -0,0 +1,106 @@
+// Copyright (C) 2024 Michael Kazakov. Subject to GNU General Public License version 3.
+#include "Tests.h"
+#include "Highlighting/FileSettingsStorage.h"
+#include <robin_hood.h>
+#include <fstream>
+
+using namespace nc::viewer::hl;
+using FSL = FileSettingsStorage;
+
+#define PREFIX "hl::FileSettingsStorage "
+
+TEST_CASE(PREFIX "Check invalid inputs")
+{
+    TempTestDir dir;
+    SECTION("Base dir doesn't exist")
+    {
+        CHECK_THROWS_AS(FSL("blah-blah-blah", ""), std::invalid_argument);
+    }
+    SECTION("Main file doesn't exist")
+    {
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("Main file is not a valid json")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "blah-blah-blah" = "blah-blah-blah" })";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("No langs array")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("No langs array")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": false })";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("No name")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [{"settings": "a", "filemask":"a"}]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("No settings")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [{"name": "a", "filemask":"a"}]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("No filemask")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [{"name": "a", "settings":"a"}]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("Empty name")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [{"name": "", "settings": "a", "filemask":"a"}]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("Empty settings")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [{"name": "a", "settings": "", "filemask":"a"}]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("Empty filemask")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [{"name": "a", "settings": "a", "filemask":""}]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+    SECTION("Duplicate")
+    {
+        std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [
+            {"name": "a", "settings": "a", "filemask":"a"},
+            {"name": "a", "settings": "a", "filemask":"a"}
+        ]})";
+        CHECK_THROWS_AS(FSL(dir.directory, ""), std::invalid_argument);
+    }
+}
+
+TEST_CASE(PREFIX "Language()")
+{
+    TempTestDir dir;
+    std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [
+        {"name": "C++", "settings": "a", "filemask":"*.cpp"},
+        {"name": "C#", "settings": "a", "filemask":"*.cs"}
+    ]})";
+    FSL stor{dir.directory, ""};
+    CHECK(stor.Language("meow.cpp") == "C++");
+    CHECK(stor.Language("meow.cs") == "C#");
+    CHECK(stor.Language("meow.m") == std::nullopt);
+    CHECK(stor.Language("") == std::nullopt);
+}
+
+TEST_CASE(PREFIX "Settings()")
+{
+    TempTestDir dir;
+    std::ofstream{dir.directory / "Main.json"} << R"({ "langs": [
+        {"name": "C++", "settings": "cpp.json", "filemask":"*.cpp"},
+        {"name": "C#", "settings": "cs.json", "filemask":"*.cs"}
+    ]})";
+    std::ofstream{dir.directory / "cpp.json"} << "Hello, World!";
+    FSL stor{dir.directory, ""};
+    REQUIRE(stor.Settings("C++") != nullptr);
+    CHECK(*stor.Settings("C++") == "Hello, World!");
+    CHECK(stor.Settings("C++").get() == stor.Settings("C++").get());
+    CHECK(stor.Settings("C#") == nullptr);
+    CHECK(stor.Settings("C#") == nullptr);
+}
diff --git a/Source/Viewer/tests/hlLexerSettings_UT.cpp b/Source/Viewer/tests/hlLexerSettings_UT.cpp
index 3ceb12765..4dc51ef0b 100644
--- a/Source/Viewer/tests/hlLexerSettings_UT.cpp
+++ b/Source/Viewer/tests/hlLexerSettings_UT.cpp
@@ -23,19 +23,17 @@ TEST_CASE(PREFIX "Load from a JSON")
             "SCE_C_NUMBER": "number"
         }
     })";
-    
+
     auto sets = ParseLexerSettings(json);
     REQUIRE(sets.has_value());
-    
-    CHECK( sets->name == "cpp" );
-    CHECK( sets->wordlists == std::vector<std::string>{"int float char", "enum class"} );
-    CHECK( sets->properties == std::vector<LexerSettings::Property>{
-        LexerSettings::Property{ "some key1", "some val1"},
-        LexerSettings::Property{ "some key2", "some val2"}
-    } );
-        
+
+    CHECK(sets->name == "cpp");
+    CHECK(sets->wordlists == std::vector<std::string>{"int float char", "enum class"});
+    CHECK(sets->properties == std::vector<LexerSettings::Property>{LexerSettings::Property{"some key1", "some val1"},
+                                                                   LexerSettings::Property{"some key2", "some val2"}});
+
     const std::vector<char> in{SCE_C_WORD, SCE_C_STRING, SCE_C_PREPROCESSOR, SCE_C_NUMBER};
     std::vector<Style> out(in.size());
     sets->mapping.MapStyles(in, out);
-    CHECK( out == std::vector<Style>{Style::Keyword, Style::Default, Style::Preprocessor, Style::Number} );
+    CHECK(out == std::vector<Style>{Style::Keyword, Style::Default, Style::Preprocessor, Style::Number});
 }