[pretty-print] fix an issue with shifting attributes when rewriting

Related to #705

NEWS.md

@@ -95,6 +95,10 @@ Bug Fixes:
   configuration can be viewed by passing the `-W` flag.
 * Importing from regex101.com broke due to some changes in the
   API.
+* The details overlay for a log message no longer shows keys
+  for unknown JSON properties.  These extra fields are now
+  shown with the proper `jget(log_raw_text, '/...')` SQL
+  expression needed to retrieve the value.
 
 Interface changes:
 * The breadcrumb bar hotkey is moving to backtick `` ` ``
@@ -110,6 +114,8 @@ Interface changes:
   used to draw the overlay contents now as well. (The
   overlay is used to display the parser details, comments,
   and annotations.)
+* Added indent guidelines to the data reformatted in the pretty-print
+  view.
 
 Breaking changes:
 * Removed the `-w` command-line option.  This option was
@@ -123,6 +129,8 @@ Breaking changes:
 * Data piped into **lnav** is now stored in the work
   directory instead of the `stdin-captures` dot-lnav
   directory.
+* Changed the "Bunyan" log format name from `bunyan` to
+  `bunyan_log` to be consistent with other format names.
 
 ## lnav v0.11.2
 

docs/schemas/config-v1.schema.json

@@ -469,6 +469,11 @@
                                             "description": "Styling for snippet borders",
                                             "title": "/ui/theme-defs/<theme_name>/styles/snippet-border",
                                             "$ref": "#/definitions/style"
+                                        },
+                                        "indent-guide": {
+                                            "description": "Styling for indent guide lines",
+                                            "title": "/ui/theme-defs/<theme_name>/styles/indent-guide",
+                                            "$ref": "#/definitions/style"
                                         }
                                     },
                                     "additionalProperties": false

src/all_logs_vtab.cc

@@ -37,10 +37,12 @@ static auto intern_lifetime = intern_string::get_table_lifetime();
 
 all_logs_vtab::all_logs_vtab()
     : log_vtab_impl(intern_string::lookup("all_logs")),
-      alv_msg_meta(
-          intern_string::lookup("log_msg_format"), value_kind_t::VALUE_TEXT, 0),
-      alv_schema_meta(
-          intern_string::lookup("log_msg_schema"), value_kind_t::VALUE_TEXT, 1)
+      alv_msg_meta(intern_string::lookup("log_msg_format"),
+                   value_kind_t::VALUE_TEXT,
+                   logline_value_meta::table_column{0}),
+      alv_schema_meta(intern_string::lookup("log_msg_schema"),
+                      value_kind_t::VALUE_TEXT,
+                      logline_value_meta::table_column{1})
 {
     this->alv_msg_meta.lvm_identifier = true;
     this->alv_schema_meta.lvm_identifier = true;

src/base/attr_line.cc

@@ -505,6 +505,27 @@ line_range::intersection(const line_range& other) const
     return line_range{std::max(this->lr_start, other.lr_start), actual_end};
 }
 
+line_range&
+line_range::shift_range(const line_range& cover, int32_t amount)
+{
+    if (cover.lr_end <= this->lr_start) {
+        this->lr_start = std::max(0, this->lr_start + amount);
+        if (this->lr_end != -1) {
+            this->lr_end = std::max(0, this->lr_end + amount);
+        }
+    } else if (this->lr_end != -1) {
+        if (cover.lr_start < this->lr_end) {
+            if (amount < 0 && amount < (cover.lr_start - this->lr_end)) {
+                this->lr_end = cover.lr_start;
+            } else {
+                this->lr_end = std::max(this->lr_start, this->lr_end + amount);
+            }
+        }
+    }
+
+    return *this;
+}
+
 line_range&
 line_range::shift(int32_t start, int32_t amount)
 {
@@ -567,6 +588,14 @@ shift_string_attrs(string_attrs_t& sa, int32_t start, int32_t amount)
     }
 }
 
+void
+shift_string_attrs(string_attrs_t& sa, const line_range& cover, int32_t amount)
+{
+    for (auto& iter : sa) {
+        iter.sa_range.shift_range(cover, amount);
+    }
+}
+
 struct line_range
 find_string_attr_range(const string_attrs_t& sa, string_attr_type_base* type)
 {

src/base/attr_line.hh

@@ -175,6 +175,10 @@ void remove_string_attr(string_attrs_t& sa, string_attr_type_base* type);
 
 void shift_string_attrs(string_attrs_t& sa, int32_t start, int32_t amount);
 
+void shift_string_attrs(string_attrs_t& sa,
+                        const line_range& cover,
+                        int32_t amount);
+
 struct text_wrap_settings {
     text_wrap_settings& with_indent(int indent)
     {

src/base/line_range.hh

@@ -101,6 +101,8 @@ struct line_range {
 
     line_range& shift(int32_t start, int32_t amount);
 
+    line_range& shift_range(const line_range& cover, int32_t amount);
+
     void ltrim(const char* str)
     {
         while (this->lr_start < this->lr_end && isspace(str[this->lr_start])) {

src/base/string_attr_type.hh

@@ -126,6 +126,7 @@ enum class role_t : int32_t {
     VCR_FOOTNOTE_BORDER,
     VCR_FOOTNOTE_TEXT,
     VCR_SNIPPET_BORDER,
+    VCR_INDENT_GUIDE,
     VCR_INLINE_CODE,
     VCR_FUNCTION,
     VCR_TYPE,

src/field_overlay_source.cc

@@ -230,11 +230,16 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
     }
     this->fos_unknown_key_size = 0;
 
-    for (auto& ldh_line_value : this->fos_log_helper.ldh_line_values.lvv_values)
+    for (const auto& ldh_line_value :
+         this->fos_log_helper.ldh_line_values.lvv_values)
     {
         auto& meta = ldh_line_value.lv_meta;
         int this_key_size = meta.lvm_name.size();
 
+        if (!meta.lvm_column.is<logline_value_meta::table_column>()) {
+            continue;
+        }
+
         if (!this->fos_contexts.empty()) {
             this_key_size += this->fos_contexts.top().c_prefix.length();
         }
@@ -282,12 +287,17 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
 
     const log_format* last_format = nullptr;
 
-    for (auto& lv : this->fos_log_helper.ldh_line_values.lvv_values) {
-        if (!lv.lv_meta.lvm_format) {
+    for (const auto& lv : this->fos_log_helper.ldh_line_values.lvv_values) {
+        auto& meta = lv.lv_meta;
+        if (!meta.lvm_format) {
+            continue;
+        }
+
+        if (!meta.lvm_column.is<logline_value_meta::table_column>()) {
             continue;
         }
 
-        auto* curr_format = lv.lv_meta.lvm_format.value();
+        auto* curr_format = meta.lvm_format.value();
         auto* curr_elf = dynamic_cast<external_log_format*>(curr_format);
         const auto format_name = curr_format->get_name().to_string();
         attr_line_t al;
@@ -304,15 +314,15 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
         }
 
         std::string field_name, orig_field_name;
-        if (lv.lv_meta.lvm_struct_name.empty()) {
-            if (curr_elf && curr_elf->elf_body_field == lv.lv_meta.lvm_name) {
+        if (meta.lvm_struct_name.empty()) {
+            if (curr_elf && curr_elf->elf_body_field == meta.lvm_name) {
                 field_name = LOG_BODY;
             } else if (curr_elf
-                       && curr_elf->lf_timestamp_field == lv.lv_meta.lvm_name)
+                       && curr_elf->lf_timestamp_field == meta.lvm_name)
             {
                 field_name = LOG_TIME;
             } else {
-                field_name = lv.lv_meta.lvm_name.to_string();
+                field_name = meta.lvm_name.to_string();
             }
             orig_field_name = field_name;
             if (!this->fos_contexts.empty()) {
@@ -323,39 +333,37 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
             auto_mem<char, sqlite3_free> jgetter;
 
             jgetter = sqlite3_mprintf("   jget(%s, '/%q')",
-                                      lv.lv_meta.lvm_struct_name.get(),
-                                      lv.lv_meta.lvm_name.get());
+                                      meta.lvm_struct_name.get(),
+                                      meta.lvm_name.get());
             str = jgetter;
         }
         str.append(this->fos_known_key_size - (str.length() - 3), ' ');
         str += " = " + value_str;
 
         al.with_string(str);
-        if (lv.lv_meta.lvm_struct_name.empty()) {
+        if (meta.lvm_struct_name.empty()) {
             auto prefix_len = field_name.length() - orig_field_name.length();
             al.with_attr(string_attr(
                 line_range(3 + prefix_len, 3 + prefix_len + field_name.size()),
                 VC_STYLE.value(vc.attrs_for_ident(orig_field_name))));
         } else {
             al.with_attr(string_attr(
-                line_range(8, 8 + lv.lv_meta.lvm_struct_name.size()),
-                VC_STYLE.value(
-                    vc.attrs_for_ident(lv.lv_meta.lvm_struct_name))));
+                line_range(8, 8 + meta.lvm_struct_name.size()),
+                VC_STYLE.value(vc.attrs_for_ident(meta.lvm_struct_name))));
         }
 
         this->fos_lines.emplace_back(al);
         this->add_key_line_attrs(this->fos_known_key_size);
 
-        if (lv.lv_meta.lvm_kind == value_kind_t::VALUE_STRUCT) {
+        if (meta.lvm_kind == value_kind_t::VALUE_STRUCT) {
             json_string js = extract(value_str.c_str());
 
             al.clear()
                 .append("   extract(")
-                .append(lv.lv_meta.lvm_name.get(),
-                        VC_STYLE.value(vc.attrs_for_ident(lv.lv_meta.lvm_name)))
+                .append(meta.lvm_name.get(),
+                        VC_STYLE.value(vc.attrs_for_ident(meta.lvm_name)))
                 .append(")")
-                .append(this->fos_known_key_size - lv.lv_meta.lvm_name.size()
-                            - 9 + 3,
+                .append(this->fos_known_key_size - meta.lvm_name.size() - 9 + 3,
                         ' ')
                 .append(" = ")
                 .append(
@@ -365,25 +373,37 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
         }
     }
 
-    std::map<const intern_string_t, json_ptr_walk::walk_list_t>::iterator
-        json_iter;
-
-    if (!this->fos_log_helper.ldh_json_pairs.empty()) {
+    if (!this->fos_log_helper.ldh_extra_json.empty()
+        || !this->fos_log_helper.ldh_json_pairs.empty())
+    {
         this->fos_lines.emplace_back(" JSON fields:");
     }
 
-    for (json_iter = this->fos_log_helper.ldh_json_pairs.begin();
-         json_iter != this->fos_log_helper.ldh_json_pairs.end();
-         ++json_iter)
-    {
-        json_ptr_walk::walk_list_t& jpairs = json_iter->second;
+    for (const auto& extra_pair : this->fos_log_helper.ldh_extra_json) {
+        auto_mem<char, sqlite3_free> qname;
+
+        qname = sqlite3_mprintf("%Q", extra_pair.first.c_str());
+
+        auto key_line = attr_line_t("   jget(log_raw_text, ")
+                            .append(qname.in())
+                            .append(")");
+        auto key_size = key_line.length();
+        key_line.append(" = ").append(extra_pair.second);
+        this->fos_lines.emplace_back(key_line);
+        this->add_key_line_attrs(key_size - 3);
+    }
+
+    for (const auto& jpairs_map : this->fos_log_helper.ldh_json_pairs) {
+        const auto& jpairs = jpairs_map.second;
 
         for (size_t lpc = 0; lpc < jpairs.size(); lpc++) {
-            this->fos_lines.emplace_back(
-                "   "
-                + this->fos_log_helper.format_json_getter(json_iter->first, lpc)
-                + " = " + jpairs[lpc].wt_value);
-            this->add_key_line_attrs(0);
+            auto key_line = attr_line_t("   ").append(
+                this->fos_log_helper.format_json_getter(jpairs_map.first, lpc));
+
+            auto key_size = key_line.length();
+            key_line.append(" = ").append(jpairs[lpc].wt_value);
+            this->fos_lines.emplace_back(key_line);
+            this->add_key_line_attrs(key_size - 3);
         }
     }
 
@@ -400,7 +420,7 @@ field_overlay_source::build_field_lines(const listview_curses& lv,
             "xpath(%Q, %s)", xml_pair.first.second.c_str(), qname.in());
         this->fos_lines.emplace_back(fmt::format(
             FMT_STRING("   {} = {}"), xp_call.in(), xml_pair.second));
-        this->add_key_line_attrs(0);
+        this->add_key_line_attrs(strlen(xp_call));
     }
 
     if (!this->fos_contexts.empty()
@@ -608,7 +628,7 @@ field_overlay_source::build_meta_line(const listview_curses& lv,
 void
 field_overlay_source::add_key_line_attrs(int key_size, bool last_line)
 {
-    string_attrs_t& sa = this->fos_lines.back().get_attrs();
+    auto& sa = this->fos_lines.back().get_attrs();
     struct line_range lr(1, 2);
     int64_t graphic = (int64_t) (last_line ? ACS_LLCORNER : ACS_LTEE);
     sa.emplace_back(lr, VC_GRAPHIC.value(graphic));

src/formats/bunyan_log.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://lnav.org/schemas/format-v1.schema.json",
-    "bunyan": {
+    "bunyan_log": {
         "title": "Bunyan log",
         "url": "https://github.com/trentm/node-bunyan",
         "description": "Bunyan JSON logging library for node.js",

src/keymaps/default-keymap.json

@@ -132,7 +132,7 @@
                     "alt-msg": "${keymap_def_scroll_horiz}"
                 },
                 "x70": {
-                    "command": ";UPDATE lnav_views SET options = json_set(options, '$.show-details', CASE jget(options, '/show-details', 'hide') WHEN 'hide' THEN 'show' ELSE 'hide' END) WHERE name = (SELECT name FROM lnav_top_view)"
+                    "command": ";UPDATE lnav_views SET options = json_set(options, '$.row-details', CASE jget(options, '/row-details', 'hide') WHEN 'hide' THEN 'show' ELSE 'hide' END) WHERE name = (SELECT name FROM lnav_top_view)"
                 },
                 "x75": {
                     "command": ":next-mark",

src/lnav_config.cc

@@ -762,6 +762,10 @@ static const struct json_path_container theme_styles_handlers = {
         .with_description("Styling for snippet borders")
         .for_child(&lnav_theme::lt_style_snippet_border)
         .with_children(style_config_handlers),
+    yajlpp::property_handler("indent-guide")
+        .with_description("Styling for indent guide lines")
+        .for_child(&lnav_theme::lt_style_indent_guide)
+        .with_children(style_config_handlers),
 };
 
 static const struct json_path_container theme_syntax_styles_handlers = {

src/log_data_helper.cc

@@ -41,6 +41,7 @@ log_data_helper::clear()
     this->ldh_parser.reset();
     this->ldh_scanner.reset();
     this->ldh_namer.reset();
+    this->ldh_extra_json.clear();
     this->ldh_json_pairs.clear();
     this->ldh_xml_pairs.clear();
     this->ldh_line_attrs.clear();
@@ -67,6 +68,7 @@ log_data_helper::parse_line(content_line_t line, bool allow_middle)
         this->ldh_parser.reset();
         this->ldh_scanner.reset();
         this->ldh_namer.reset();
+        this->ldh_extra_json.clear();
         this->ldh_json_pairs.clear();
         this->ldh_xml_pairs.clear();
         this->ldh_line_attrs.clear();
@@ -96,6 +98,7 @@ log_data_helper::parse_line(content_line_t line, bool allow_middle)
         this->ldh_parser->parse();
         this->ldh_namer
             = std::make_unique<column_namer>(column_namer::language::SQL);
+        this->ldh_extra_json.clear();
         this->ldh_json_pairs.clear();
         this->ldh_xml_pairs.clear();
 
@@ -105,8 +108,28 @@ log_data_helper::parse_line(content_line_t line, bool allow_middle)
         }
 
         for (auto& ldh_line_value : this->ldh_line_values.lvv_values) {
+            if (ldh_line_value.lv_meta.lvm_name == format->lf_timestamp_field) {
+                continue;
+            }
+            if (ldh_line_value.lv_meta.lvm_column
+                    .is<logline_value_meta::external_column>())
+            {
+                char buf[ldh_line_value.lv_meta.lvm_name.size() + 2];
+
+                auto rc = fmt::format_to(
+                    buf, FMT_STRING("/{}"), ldh_line_value.lv_meta.lvm_name);
+                *rc = '\0';
+                this->ldh_extra_json[intern_string::lookup(buf, -1)]
+                    = ldh_line_value.to_string();
+                continue;
+            }
+
             switch (ldh_line_value.lv_meta.lvm_kind) {
                 case value_kind_t::VALUE_JSON: {
+                    if (!ldh_line_value.lv_meta.lvm_struct_name.empty()) {
+                        continue;
+                    }
+
                     json_ptr_walk jpw;
 
                     if (jpw.parse(ldh_line_value.text_value(),

src/log_data_helper.hh

@@ -83,6 +83,7 @@ public:
     std::unique_ptr<column_namer> ldh_namer;
     string_attrs_t ldh_line_attrs;
     logline_value_vector ldh_line_values;
+    std::map<const intern_string_t, std::string> ldh_extra_json;
     std::map<const intern_string_t, json_ptr_walk::walk_list_t> ldh_json_pairs;
     std::map<std::pair<const intern_string_t, std::string>, std::string>
         ldh_xml_pairs;

src/log_data_table.cc

@@ -103,8 +103,10 @@ log_data_table::get_columns_int()
                 collator = "naturalnocase";
                 break;
         }
-        metas.emplace_back(
-            intern_string::lookup(colname), kind, cols.size(), format.get());
+        metas.emplace_back(intern_string::lookup(colname),
+                           kind,
+                           logline_value_meta::table_column{cols.size()},
+                           format.get());
         cols.emplace_back(colname, sql_type, collator);
     }
     this->ldt_schema_id = dp.dp_schema_id;

src/log_format.cc

@@ -1702,7 +1702,8 @@ external_log_format::rewrite(exec_context& ec,
          ++iter)
     {
         if (!iter->lv_origin.is_valid()) {
-            log_debug("not rewriting value with invalid origin -- %s",
+            log_debug("%d: not rewriting value with invalid origin -- %s",
+                      ec.ec_top_line,
                       iter->lv_meta.lvm_name.get());
             continue;
         }
@@ -1734,14 +1735,15 @@ external_log_format::rewrite(exec_context& ec,
 
         int32_t shift_amount
             = ((int32_t) field_value.length()) - iter->lv_origin.length();
+        auto orig_lr = iter->lv_origin;
         value_out.insert(iter->lv_origin.lr_start, field_value);
         for (shift_iter = values.lvv_values.begin();
              shift_iter != values.lvv_values.end();
              ++shift_iter)
         {
-            shift_iter->lv_origin.shift(iter->lv_origin.lr_start, shift_amount);
+            shift_iter->lv_origin.shift_range(orig_lr, shift_amount);
         }
-        shift_string_attrs(sa, iter->lv_origin.lr_start, shift_amount);
+        shift_string_attrs(sa, orig_lr, shift_amount);
     }
 }
 
@@ -1844,8 +1846,10 @@ rewrite_json_field(yajlpp_parse_context* ypc,
         auto str_offset = (int) ((const char*) str - jlu->jlu_line_value);
         if (field_name == jlu->jlu_format->elf_body_field) {
             jlu->jlu_format->jlf_line_values.lvv_values.emplace_back(
-                jlu->jlu_format->get_value_meta(body_name,
-                                                value_kind_t::VALUE_TEXT),
+                logline_value_meta(body_name,
+                                   value_kind_t::VALUE_TEXT,
+                                   logline_value_meta::internal_column{},
+                                   jlu->jlu_format),
                 string_fragment::from_byte_range(
                     jlu->jlu_shared_buffer.get_data(),
                     str_offset,
@@ -1864,8 +1868,10 @@ rewrite_json_field(yajlpp_parse_context* ypc,
     } else {
         if (field_name == jlu->jlu_format->elf_body_field) {
             jlu->jlu_format->jlf_line_values.lvv_values.emplace_back(
-                jlu->jlu_format->get_value_meta(body_name,
-                                                value_kind_t::VALUE_TEXT),
+                logline_value_meta(body_name,
+                                   value_kind_t::VALUE_TEXT,
+                                   logline_value_meta::internal_column{},
+                                   jlu->jlu_format),
                 std::string{(const char*) str, len});
         }
         if (!ypc->is_level(1) && !jlu->jlu_format->has_value_def(field_name)) {
@@ -2434,10 +2440,14 @@ external_log_format::build(std::vector<lnav::console::user_message>& errors)
         auto& vd = this->elf_value_defs[this->lf_timestamp_field];
         if (vd.get() == nullptr) {
             vd = std::make_shared<external_log_format::value_def>(
-                this->lf_timestamp_field, value_kind_t::VALUE_TEXT, -1, this);
+                this->lf_timestamp_field,
+                value_kind_t::VALUE_TEXT,
+                logline_value_meta::internal_column{},
+                this);
         }
         vd->vd_meta.lvm_name = this->lf_timestamp_field;
         vd->vd_meta.lvm_kind = value_kind_t::VALUE_TEXT;
+        vd->vd_meta.lvm_column = logline_value_meta::internal_column{};
         vd->vd_internal = true;
     }
     if (startswith(this->elf_level_field.get(), "/")) {
@@ -2451,20 +2461,28 @@ external_log_format::build(std::vector<lnav::console::user_message>& errors)
         auto& vd = this->elf_value_defs[this->elf_level_field];
         if (vd.get() == nullptr) {
             vd = std::make_shared<external_log_format::value_def>(
-                this->elf_level_field, value_kind_t::VALUE_TEXT, -1, this);
+                this->elf_level_field,
+                value_kind_t::VALUE_TEXT,
+                logline_value_meta::internal_column{},
+                this);
         }
         vd->vd_meta.lvm_name = this->elf_level_field;
         vd->vd_meta.lvm_kind = value_kind_t::VALUE_TEXT;
+        vd->vd_meta.lvm_column = logline_value_meta::internal_column{};
         vd->vd_internal = true;
     }
     if (!this->elf_body_field.empty()) {
         auto& vd = this->elf_value_defs[this->elf_body_field];
         if (vd.get() == nullptr) {
             vd = std::make_shared<external_log_format::value_def>(
-                this->elf_body_field, value_kind_t::VALUE_TEXT, -1, this);
+                this->elf_body_field,
+                value_kind_t::VALUE_TEXT,
+                logline_value_meta::internal_column{},
+                this);
         }
         vd->vd_meta.lvm_name = this->elf_body_field;
         vd->vd_meta.lvm_kind = value_kind_t::VALUE_TEXT;
+        vd->vd_meta.lvm_column = logline_value_meta::internal_column{};
         vd->vd_internal = true;
     }
 
@@ -2523,8 +2541,12 @@ external_log_format::build(std::vector<lnav::console::user_message>& errors)
                 } else {
                     ivd.ivd_unit_field_index = -1;
                 }
-                if (!vd->vd_internal && vd->vd_meta.lvm_column == -1) {
-                    vd->vd_meta.lvm_column = this->elf_column_count++;
+                if (!vd->vd_internal
+                    && !vd->vd_meta.lvm_column
+                            .is<logline_value_meta::table_column>())
+                {
+                    vd->vd_meta.lvm_column = logline_value_meta::table_column{
+                        this->elf_column_count++};
                 }
                 ivd.ivd_value_def = vd;
                 pat.p_value_by_index.push_back(ivd);
@@ -2686,8 +2708,11 @@ external_log_format::build(std::vector<lnav::console::user_message>& errors)
         std::vector<std::string>::iterator act_iter;
 
         vd->vd_meta.lvm_format = this;
-        if (!vd->vd_internal && vd->vd_meta.lvm_column == -1) {
-            vd->vd_meta.lvm_column = this->elf_column_count++;
+        if (!vd->vd_internal
+            && !vd->vd_meta.lvm_column.is<logline_value_meta::table_column>())
+        {
+            vd->vd_meta.lvm_column
+                = logline_value_meta::table_column{this->elf_column_count++};
         }
 
         if (vd->vd_meta.lvm_kind == value_kind_t::VALUE_UNKNOWN) {
@@ -3513,18 +3538,21 @@ public:
             auto type_pair = log_vtab_impl::logline_value_to_sqlite_type(
                 vd->vd_meta.lvm_kind);
 
-            if (vd->vd_meta.lvm_column == -1) {
+            if (!vd->vd_meta.lvm_column.is<logline_value_meta::table_column>())
+            {
                 continue;
             }
 
-            require(0 <= vd->vd_meta.lvm_column
-                    && vd->vd_meta.lvm_column < elf.elf_column_count);
+            auto col
+                = vd->vd_meta.lvm_column.get<logline_value_meta::table_column>()
+                      .value;
+            require(0 <= col && col < elf.elf_column_count);
 
-            cols[vd->vd_meta.lvm_column].vc_name = vd->vd_meta.lvm_name.get();
-            cols[vd->vd_meta.lvm_column].vc_type = type_pair.first;
-            cols[vd->vd_meta.lvm_column].vc_subtype = type_pair.second;
-            cols[vd->vd_meta.lvm_column].vc_collator = vd->vd_collate;
-            cols[vd->vd_meta.lvm_column].vc_comment = vd->vd_description;
+            cols[col].vc_name = vd->vd_meta.lvm_name.get();
+            cols[col].vc_type = type_pair.first;
+            cols[col].vc_subtype = type_pair.second;
+            cols[col].vc_collator = vd->vd_collate;
+            cols[col].vc_comment = vd->vd_description;
         }
     }
 
@@ -3810,7 +3838,8 @@ external_log_format::get_value_meta(intern_string_t field_name,
     auto iter = this->elf_value_defs.find(field_name);
 
     if (iter == this->elf_value_defs.end()) {
-        auto retval = logline_value_meta(field_name, kind, -1, this);
+        auto retval = logline_value_meta(
+            field_name, kind, logline_value_meta::external_column{}, this);
 
         retval.lvm_hidden = this->jlf_hide_extra;
         return retval;

src/log_format.hh

@@ -109,9 +109,27 @@ enum class value_kind_t : int {
 };
 
 struct logline_value_meta {
+    struct internal_column {
+        bool operator==(const internal_column&) const { return true; }
+    };
+    struct external_column {
+        bool operator==(const external_column&) const { return true; }
+    };
+    struct table_column {
+        size_t value;
+
+        bool operator==(const table_column& rhs) const
+        {
+            return this->value == rhs.value;
+        }
+    };
+
+    using column_t
+        = mapbox::util::variant<internal_column, external_column, table_column>;
+
     logline_value_meta(intern_string_t name,
                        value_kind_t kind,
-                       int col = -1,
+                       column_t col = external_column{},
                        const nonstd::optional<log_format*>& format
                        = nonstd::nullopt)
         : lvm_name(name), lvm_kind(kind), lvm_column(col), lvm_format(format)
@@ -134,7 +152,7 @@ struct logline_value_meta {
 
     intern_string_t lvm_name;
     value_kind_t lvm_kind;
-    int lvm_column{-1};
+    column_t lvm_column{external_column{}};
     nonstd::optional<size_t> lvm_values_index;
     bool lvm_identifier{false};
     bool lvm_hidden{false};
@@ -284,8 +302,9 @@ struct logline_value_stats {
 };
 
 struct logline_value_cmp {
-    explicit logline_value_cmp(const intern_string_t* name = nullptr,
-                               int col = -1)
+    explicit logline_value_cmp(
+        const intern_string_t* name = nullptr,
+        nonstd::optional<logline_value_meta::column_t> col = nonstd::nullopt)
         : lvc_name(name), lvc_column(col)
     {
     }
@@ -297,15 +316,16 @@ struct logline_value_cmp {
         if (this->lvc_name != nullptr) {
             retval = retval && ((*this->lvc_name) == lv.lv_meta.lvm_name);
         }
-        if (this->lvc_column != -1) {
-            retval = retval && (this->lvc_column == lv.lv_meta.lvm_column);
+        if (this->lvc_column) {
+            retval
+                = retval && (this->lvc_column.value() == lv.lv_meta.lvm_column);
         }
 
         return retval;
     }
 
     const intern_string_t* lvc_name;
-    int lvc_column;
+    nonstd::optional<logline_value_meta::column_t> lvc_column;
 };
 
 class log_vtab_impl;

src/log_format_ext.hh

@@ -52,7 +52,7 @@ public:
     struct value_def {
         value_def(intern_string_t name,
                   value_kind_t kind,
-                  int col,
+                  logline_value_meta::column_t col,
                   log_format* format)
             : vd_meta(name, kind, col, format)
         {
@@ -341,7 +341,7 @@ public:
 
     std::vector<std::shared_ptr<value_def>> elf_value_def_order;
     std::vector<std::shared_ptr<value_def>> elf_numeric_value_defs;
-    int elf_column_count{0};
+    size_t elf_column_count{0};
     double elf_timestamp_divisor{1.0};
     intern_string_t elf_level_field;
     factory_container<lnav::pcre2pp::code> elf_level_pointer;

src/log_format_impls.cc

@@ -334,9 +334,12 @@ public:
         nonstd::optional<size_t> fd_numeric_index;
 
         explicit field_def(const intern_string_t name,
-                           int col,
+                           size_t col,
                            log_format* format)
-            : fd_meta(name, value_kind_t::VALUE_TEXT, col, format),
+            : fd_meta(name,
+                      value_kind_t::VALUE_TEXT,
+                      logline_value_meta::table_column{col},
+                      format),
               fd_root_meta(&FIELD_META.find(name)->second)
         {
         }
@@ -963,7 +966,7 @@ public:
         {
         }
 
-        field_def(int col,
+        field_def(size_t col,
                   const char* name,
                   value_kind_t kind,
                   bool ident = false,
@@ -972,7 +975,7 @@ public:
               fd_meta(
                   intern_string::lookup(sql_safe_ident(string_fragment(name))),
                   kind,
-                  col),
+                  logline_value_meta::table_column{col}),
               fd_collator(std::move(coll))
         {
             this->fd_meta.lvm_identifier = ident;
@@ -1274,10 +1277,11 @@ public:
                                 logline_value_meta(
                                     field_name,
                                     value_kind_t::VALUE_TEXT,
-                                    KNOWN_FIELDS.size() + 1
+                                    logline_value_meta::table_column{
+                                        KNOWN_FIELDS.size() + 1
                                         + std::distance(
                                             begin(KNOWN_STRUCT_FIELDS),
-                                            fs_iter),
+                                            fs_iter)},
                                     this)
                                     .with_struct_name(fs_iter->fs_struct_name));
                         } else {
@@ -1288,7 +1292,8 @@ public:
                                 logline_value_meta(
                                     field_name,
                                     value_kind_t::VALUE_TEXT,
-                                    KNOWN_FIELDS.size() + X_FIELDS_IDX,
+                                    logline_value_meta::table_column{
+                                        KNOWN_FIELDS.size() + X_FIELDS_IDX},
                                     this)
                                     .with_struct_name(X_FIELDS_NAME));
                         }
@@ -1503,7 +1508,7 @@ public:
 std::unordered_map<const intern_string_t, logline_value_meta>
     w3c_log_format::FIELD_META;
 
-static int KNOWN_FIELD_INDEX = 0;
+static size_t KNOWN_FIELD_INDEX = 0;
 const std::vector<w3c_log_format::field_def> w3c_log_format::KNOWN_FIELDS = {
     {
         KNOWN_FIELD_INDEX++,
@@ -1786,7 +1791,8 @@ public:
                                                               kvp.first),
                                                           value_kind_t::
                                                               VALUE_INTEGER,
-                                                          0,
+                                                          logline_value_meta::
+                                                              table_column{0},
                                                           (log_format*) this}
                                            .with_struct_name(FIELDS_NAME);
                             values.lvv_values.emplace_back(lvm, bv.bv_value);
@@ -1799,7 +1805,8 @@ public:
                                                               kvp.first),
                                                           value_kind_t::
                                                               VALUE_INTEGER,
-                                                          0,
+                                                          logline_value_meta::
+                                                              table_column{0},
                                                           (log_format*) this}
                                            .with_struct_name(FIELDS_NAME);
                             values.lvv_values.emplace_back(lvm, iv.iv_value);
@@ -1812,7 +1819,8 @@ public:
                                                               kvp.first),
                                                           value_kind_t::
                                                               VALUE_INTEGER,
-                                                          0,
+                                                          logline_value_meta::
+                                                              table_column{0},
                                                           (log_format*) this}
                                            .with_struct_name(FIELDS_NAME);
                             values.lvv_values.emplace_back(lvm, fv.fv_value);
@@ -1833,8 +1841,9 @@ public:
                     } else if (kvp.first == "level") {
                     } else if (kvp.first == "msg") {
                         sa.emplace_back(value_lr, SA_BODY.value());
-                    } else if (!kvp.second.is<logfmt::parser::int_value>()
-                               && !kvp.second.is<logfmt::parser::bool_value>())
+                    } else if (kvp.second.is<logfmt::parser::quoted_value>()
+                               || kvp.second
+                                      .is<logfmt::parser::unquoted_value>())
                     {
                         auto lvm
                             = logline_value_meta{intern_string::lookup(
@@ -1842,7 +1851,8 @@ public:
                                                  value_frag.startswith("\"")
                                                      ? value_kind_t::VALUE_JSON
                                                      : value_kind_t::VALUE_TEXT,
-                                                 0,
+                                                 logline_value_meta::
+                                                     table_column{0},
                                                  (log_format*) this}
                                   .with_struct_name(FIELDS_NAME);
                         values.lvv_values.emplace_back(lvm, value_frag);

src/log_format_loader.cc

@@ -138,7 +138,10 @@ value_def_provider(const yajlpp_provider_context& ypc, external_log_format* elf)
 
     if (iter == elf->elf_value_defs.end()) {
         retval = std::make_shared<external_log_format::value_def>(
-            value_name, value_kind_t::VALUE_TEXT, -1, elf);
+            value_name,
+            value_kind_t::VALUE_TEXT,
+            logline_value_meta::external_column{},
+            elf);
         elf->elf_value_defs[value_name] = retval;
         elf->elf_value_def_order.emplace_back(retval);
     } else {

src/log_search_table.cc

@@ -54,19 +54,23 @@ log_search_table::get_columns_int(std::vector<vtab_column>& cols) const
         this->lst_format_column_count = this->lst_column_metas.size();
         cols.resize(this->lst_column_metas.size());
         for (const auto& meta : this->lst_column_metas) {
-            if (meta.lvm_column == -1) {
+            if (!meta.lvm_column.is<logline_value_meta::table_column>()) {
                 continue;
             }
+            auto col
+                = meta.lvm_column.get<logline_value_meta::table_column>().value;
             auto type_pair
                 = log_vtab_impl::logline_value_to_sqlite_type(meta.lvm_kind);
-            cols[meta.lvm_column].vc_name = meta.lvm_name.to_string();
-            cols[meta.lvm_column].vc_type = type_pair.first;
-            cols[meta.lvm_column].vc_subtype = type_pair.second;
+            cols[col].vc_name = meta.lvm_name.to_string();
+            cols[col].vc_type = type_pair.first;
+            cols[col].vc_subtype = type_pair.second;
         }
     }
 
     this->lst_column_metas.emplace_back(
-        match_index_name, value_kind_t::VALUE_INTEGER, cols.size());
+        match_index_name,
+        value_kind_t::VALUE_INTEGER,
+        logline_value_meta::table_column{cols.size()});
     cols.emplace_back(MATCH_INDEX, SQLITE_INTEGER);
     cn.add_column(string_fragment::from_const("__all__"));
     auto captures = this->lst_regex->get_captures();
@@ -86,19 +90,19 @@ log_search_table::get_columns_int(std::vector<vtab_column>& cols) const
                     this->lst_column_metas.emplace_back(
                         intern_string::lookup(colname),
                         value_kind_t::VALUE_FLOAT,
-                        cols.size());
+                        logline_value_meta::table_column{cols.size()});
                     break;
                 case SQLITE_INTEGER:
                     this->lst_column_metas.emplace_back(
                         intern_string::lookup(colname),
                         value_kind_t::VALUE_INTEGER,
-                        cols.size());
+                        logline_value_meta::table_column{cols.size()});
                     break;
                 default:
                     this->lst_column_metas.emplace_back(
                         intern_string::lookup(colname),
                         value_kind_t::VALUE_TEXT,
-                        cols.size());
+                        logline_value_meta::table_column{cols.size()});
                     break;
             }
         }

src/log_vtab_impl.cc

@@ -461,7 +461,8 @@ populate_indexed_columns(vtab_cursor* vc, log_vtab* vt)
             vt->vi->extract(lf, line_number, vc->line_values);
         }
 
-        int sub_col = ic.cc_column - VT_COL_MAX;
+        auto sub_col = logline_value_meta::table_column{
+            (size_t) (ic.cc_column - VT_COL_MAX)};
         auto lv_iter = find_if(vc->line_values.lvv_values.begin(),
                                vc->line_values.lvv_values.end(),
                                logline_value_cmp(nullptr, sub_col));
@@ -977,7 +978,8 @@ vt_column(sqlite3_vtab_cursor* cur, sqlite3_context* ctx, int col)
                     vt->vi->extract(lf, line_number, vc->line_values);
                 }
 
-                int sub_col = col - VT_COL_MAX;
+                auto sub_col = logline_value_meta::table_column{
+                    (size_t) (col - VT_COL_MAX)};
                 auto lv_iter = find_if(vc->line_values.lvv_values.begin(),
                                        vc->line_values.lvv_values.end(),
                                        logline_value_cmp(nullptr, sub_col));

src/pretty_printer.cc

@@ -141,7 +141,11 @@ pretty_printer::append_to(attr_line_t& al)
 
     attr_line_t combined;
     combined.get_string() = this->pp_stream.str();
-    combined.get_attrs() = this->pp_attrs;
+    auto& attrs = combined.get_attrs();
+    attrs = this->pp_attrs;
+    attrs.insert(
+        attrs.end(), this->pp_post_attrs.begin(), this->pp_post_attrs.end());
+    this->pp_post_attrs.clear();
 
     if (!al.empty()) {
         al.append("\n");
@@ -248,7 +252,13 @@ pretty_printer::append_indent()
         return;
     }
     for (int lpc = 0; lpc < this->pp_depth; lpc++) {
-        this->pp_stream << "    ";
+        if (lpc > 0) {
+            int off = this->pp_stream.tellp();
+            this->pp_post_attrs.emplace_back(
+                line_range{off, off + 3},
+                VC_ROLE.value(role_t::VCR_INDENT_GUIDE));
+        }
+        this->pp_stream << (lpc == 0 ? "    " : "\u258f   ");
     }
 }
 

src/pretty_printer.hh

@@ -121,6 +121,7 @@ private:
     std::stack<int> pp_body_lines{};
     data_scanner* pp_scanner;
     string_attrs_t pp_attrs;
+    string_attrs_t pp_post_attrs;
     std::ostringstream pp_stream;
     std::deque<element> pp_values{};
     int pp_shift_accum{0};

src/readline_callbacks.cc

@@ -476,7 +476,7 @@ rl_search_internal(readline_curses* rc, ln_mode_t mode, bool complete = false)
                 lnav_data.ld_bottom_source.grep_error("");
             } else if (!sqlite3_complete(term_val.c_str())) {
                 lnav_data.ld_bottom_source.grep_error(
-                    "sql error: incomplete statement");
+                    "SQL error: incomplete statement");
             } else {
                 auto_mem<sqlite3_stmt> stmt(sqlite3_finalize);
                 int retcode;
@@ -491,7 +491,7 @@ rl_search_internal(readline_curses* rc, ln_mode_t mode, bool complete = false)
                     const char* errmsg = sqlite3_errmsg(lnav_data.ld_db);
 
                     lnav_data.ld_bottom_source.grep_error(
-                        fmt::format(FMT_STRING("sql error: {}"), errmsg));
+                        fmt::format(FMT_STRING("SQL error: {}"), errmsg));
                 } else {
                     lnav_data.ld_bottom_source.grep_error("");
                 }

src/styling.hh

@@ -226,6 +226,7 @@ struct lnav_theme {
     positioned_property<style_config> lt_style_footnote_border;
     positioned_property<style_config> lt_style_footnote_text;
     positioned_property<style_config> lt_style_snippet_border;
+    positioned_property<style_config> lt_style_indent_guide;
     std::map<log_level_t, positioned_property<style_config>> lt_level_styles;
     std::map<std::string, highlighter_config> lt_highlights;
 };

src/themes/default-theme.json

@@ -91,6 +91,12 @@
                     },
                     "breadcrumb": {
                         "color": "Teal"
+                    },
+                    "snippet-border": {
+                        "color": "Teal"
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/themes/dracula.json

@@ -141,6 +141,9 @@
                     },
                     "snippet-border": {
                         "color": "$cyan"
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/themes/eldar.json

@@ -85,6 +85,9 @@
                     },
                     "h6": {
                         "underline": true
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/themes/grayscale.json

@@ -94,6 +94,9 @@
                     },
                     "h6": {
                         "underline": true
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "status-styles": {

src/themes/monocai.json

@@ -137,6 +137,9 @@
                     },
                     "snippet-border": {
                         "color": "$cyan"
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/themes/night-owl.json

@@ -93,6 +93,9 @@
                     },
                     "h6": {
                         "underline": true
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/themes/solarized-dark.json

@@ -102,6 +102,9 @@
                     },
                     "h6": {
                         "underline": true
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/themes/solarized-light.json

@@ -102,6 +102,9 @@
                     },
                     "h6": {
                         "underline": true
+                    },
+                    "indent-guide": {
+                        "color": "#444"
                     }
                 },
                 "syntax-styles": {

src/view_curses.cc

@@ -838,6 +838,8 @@ view_colors::init_roles(const lnav_theme& lt,
         = this->to_attrs(lt, lt.lt_style_footnote_text, reporter);
     this->vc_role_attrs[lnav::enums::to_underlying(role_t::VCR_SNIPPET_BORDER)]
         = this->to_attrs(lt, lt.lt_style_snippet_border, reporter);
+    this->vc_role_attrs[lnav::enums::to_underlying(role_t::VCR_INDENT_GUIDE)]
+        = this->to_attrs(lt, lt.lt_style_indent_guide, reporter);
 
     {
         positioned_property<style_config> stitch_sc;

src/views_vtab.cc

@@ -197,10 +197,13 @@ static const json_path_handler_base::enum_value_t ROW_DETAILS_ENUM[] = {
 };
 
 static const typed_json_path_container<view_options> view_options_handlers = {
-    yajlpp::property_handler("show-details")
+    yajlpp::property_handler("row-details")
         .with_enum_values(ROW_DETAILS_ENUM)
+        .with_description(
+            "Show or hide the details overlay for the focused row")
         .for_field(&view_options::vo_row_details),
     yajlpp::property_handler("overlay-focused-line")
+        .with_description("The focused line in an overlay")
         .for_field(&view_options::vo_overlay_focus),
 };
 

test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out

@@ -330,7 +330,13 @@
                         "bold": false
                     },
                     "snippet-border": {
-                        "color": "",
+                        "color": "Teal",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
                         "background-color": "",
                         "underline": false,
                         "bold": false
@@ -894,6 +900,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -1416,6 +1428,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -1938,6 +1956,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -2460,6 +2484,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -2982,6 +3012,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -3513,6 +3549,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -4044,6 +4086,12 @@
                         "background-color": "",
                         "underline": false,
                         "bold": false
+                    },
+                    "indent-guide": {
+                        "color": "#444",
+                        "background-color": "",
+                        "underline": false,
+                        "bold": false
                     }
                 },
                 "syntax-styles": {
@@ -4561,7 +4609,7 @@
                     "alt-msg": "${keymap_def_scroll_horiz}"
                 },
                 "x70": {
-                    "command": ";UPDATE lnav_views SET options = json_set(options, '$.show-details', CASE jget(options, '/show-details', 'hide') WHEN 'hide' THEN 'show' ELSE 'hide' END) WHERE name = (SELECT name FROM lnav_top_view)",
+                    "command": ";UPDATE lnav_views SET options = json_set(options, '$.row-details', CASE jget(options, '/row-details', 'hide') WHEN 'hide' THEN 'show' ELSE 'hide' END) WHERE name = (SELECT name FROM lnav_top_view)",
                     "alt-msg": ""
                 },
                 "x71": {

test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out

@@ -165,46 +165,46 @@
 /ui/keymap-defs/us/x5e/command -> us-keymap.json:46
 /ui/movement/mode -> root-config.json:10
 /ui/theme -> root-config.json:8
-/ui/theme-defs/default/highlights/colors/pattern -> default-theme.json:217
-/ui/theme-defs/default/highlights/colors/style/color -> default-theme.json:219
-/ui/theme-defs/default/highlights/ipv4/pattern -> default-theme.json:223
-/ui/theme-defs/default/highlights/ipv4/style/color -> default-theme.json:225
-/ui/theme-defs/default/highlights/xml-decl/pattern -> default-theme.json:235
-/ui/theme-defs/default/highlights/xml-decl/style/color -> default-theme.json:237
-/ui/theme-defs/default/highlights/xml/pattern -> default-theme.json:229
-/ui/theme-defs/default/highlights/xml/style/color -> default-theme.json:231
-/ui/theme-defs/default/log-level-styles/critical/color -> default-theme.json:209
-/ui/theme-defs/default/log-level-styles/error/color -> default-theme.json:206
-/ui/theme-defs/default/log-level-styles/fatal/color -> default-theme.json:212
-/ui/theme-defs/default/log-level-styles/warning/color -> default-theme.json:203
-/ui/theme-defs/default/status-styles/active/background-color -> default-theme.json:176
-/ui/theme-defs/default/status-styles/active/color -> default-theme.json:175
-/ui/theme-defs/default/status-styles/alert/background-color -> default-theme.json:172
-/ui/theme-defs/default/status-styles/alert/color -> default-theme.json:171
-/ui/theme-defs/default/status-styles/disabled-title/background-color -> default-theme.json:155
-/ui/theme-defs/default/status-styles/disabled-title/bold -> default-theme.json:156
-/ui/theme-defs/default/status-styles/disabled-title/color -> default-theme.json:154
-/ui/theme-defs/default/status-styles/hotkey/bold -> default-theme.json:198
-/ui/theme-defs/default/status-styles/hotkey/color -> default-theme.json:196
-/ui/theme-defs/default/status-styles/hotkey/underline -> default-theme.json:197
-/ui/theme-defs/default/status-styles/inactive-alert/background-color -> default-theme.json:188
-/ui/theme-defs/default/status-styles/inactive-alert/color -> default-theme.json:187
-/ui/theme-defs/default/status-styles/inactive/background-color -> default-theme.json:184
-/ui/theme-defs/default/status-styles/inactive/color -> default-theme.json:183
-/ui/theme-defs/default/status-styles/info/background-color -> default-theme.json:180
-/ui/theme-defs/default/status-styles/info/color -> default-theme.json:179
-/ui/theme-defs/default/status-styles/subtitle/background-color -> default-theme.json:160
-/ui/theme-defs/default/status-styles/subtitle/color -> default-theme.json:159
-/ui/theme-defs/default/status-styles/text/background-color -> default-theme.json:164
-/ui/theme-defs/default/status-styles/text/color -> default-theme.json:163
-/ui/theme-defs/default/status-styles/title-hotkey/background-color -> default-theme.json:192
-/ui/theme-defs/default/status-styles/title-hotkey/color -> default-theme.json:191
-/ui/theme-defs/default/status-styles/title-hotkey/underline -> default-theme.json:193
-/ui/theme-defs/default/status-styles/title/background-color -> default-theme.json:150
-/ui/theme-defs/default/status-styles/title/bold -> default-theme.json:151
-/ui/theme-defs/default/status-styles/title/color -> default-theme.json:149
-/ui/theme-defs/default/status-styles/warn/background-color -> default-theme.json:168
-/ui/theme-defs/default/status-styles/warn/color -> default-theme.json:167
+/ui/theme-defs/default/highlights/colors/pattern -> default-theme.json:223
+/ui/theme-defs/default/highlights/colors/style/color -> default-theme.json:225
+/ui/theme-defs/default/highlights/ipv4/pattern -> default-theme.json:229
+/ui/theme-defs/default/highlights/ipv4/style/color -> default-theme.json:231
+/ui/theme-defs/default/highlights/xml-decl/pattern -> default-theme.json:241
+/ui/theme-defs/default/highlights/xml-decl/style/color -> default-theme.json:243
+/ui/theme-defs/default/highlights/xml/pattern -> default-theme.json:235
+/ui/theme-defs/default/highlights/xml/style/color -> default-theme.json:237
+/ui/theme-defs/default/log-level-styles/critical/color -> default-theme.json:215
+/ui/theme-defs/default/log-level-styles/error/color -> default-theme.json:212
+/ui/theme-defs/default/log-level-styles/fatal/color -> default-theme.json:218
+/ui/theme-defs/default/log-level-styles/warning/color -> default-theme.json:209
+/ui/theme-defs/default/status-styles/active/background-color -> default-theme.json:182
+/ui/theme-defs/default/status-styles/active/color -> default-theme.json:181
+/ui/theme-defs/default/status-styles/alert/background-color -> default-theme.json:178
+/ui/theme-defs/default/status-styles/alert/color -> default-theme.json:177
+/ui/theme-defs/default/status-styles/disabled-title/background-color -> default-theme.json:161
+/ui/theme-defs/default/status-styles/disabled-title/bold -> default-theme.json:162
+/ui/theme-defs/default/status-styles/disabled-title/color -> default-theme.json:160
+/ui/theme-defs/default/status-styles/hotkey/bold -> default-theme.json:204
+/ui/theme-defs/default/status-styles/hotkey/color -> default-theme.json:202
+/ui/theme-defs/default/status-styles/hotkey/underline -> default-theme.json:203
+/ui/theme-defs/default/status-styles/inactive-alert/background-color -> default-theme.json:194
+/ui/theme-defs/default/status-styles/inactive-alert/color -> default-theme.json:193
+/ui/theme-defs/default/status-styles/inactive/background-color -> default-theme.json:190
+/ui/theme-defs/default/status-styles/inactive/color -> default-theme.json:189
+/ui/theme-defs/default/status-styles/info/background-color -> default-theme.json:186
+/ui/theme-defs/default/status-styles/info/color -> default-theme.json:185
+/ui/theme-defs/default/status-styles/subtitle/background-color -> default-theme.json:166
+/ui/theme-defs/default/status-styles/subtitle/color -> default-theme.json:165
+/ui/theme-defs/default/status-styles/text/background-color -> default-theme.json:170
+/ui/theme-defs/default/status-styles/text/color -> default-theme.json:169
+/ui/theme-defs/default/status-styles/title-hotkey/background-color -> default-theme.json:198
+/ui/theme-defs/default/status-styles/title-hotkey/color -> default-theme.json:197
+/ui/theme-defs/default/status-styles/title-hotkey/underline -> default-theme.json:199
+/ui/theme-defs/default/status-styles/title/background-color -> default-theme.json:156
+/ui/theme-defs/default/status-styles/title/bold -> default-theme.json:157
+/ui/theme-defs/default/status-styles/title/color -> default-theme.json:155
+/ui/theme-defs/default/status-styles/warn/background-color -> default-theme.json:174
+/ui/theme-defs/default/status-styles/warn/color -> default-theme.json:173
 /ui/theme-defs/default/styles/adjusted-time/color -> default-theme.json:44
 /ui/theme-defs/default/styles/alt-text/background-color -> default-theme.json:19
 /ui/theme-defs/default/styles/breadcrumb/color -> default-theme.json:93
@@ -228,6 +228,7 @@
 /ui/theme-defs/default/styles/hidden/color -> default-theme.json:34
 /ui/theme-defs/default/styles/identifier/background-color -> default-theme.json:15
 /ui/theme-defs/default/styles/identifier/color -> default-theme.json:16
+/ui/theme-defs/default/styles/indent-guide/color -> default-theme.json:99
 /ui/theme-defs/default/styles/invalid-msg/color -> default-theme.json:53
 /ui/theme-defs/default/styles/list-glyph/color -> default-theme.json:90
 /ui/theme-defs/default/styles/offset-time/color -> default-theme.json:50
@@ -238,60 +239,61 @@
 /ui/theme-defs/default/styles/scrollbar/background-color -> default-theme.json:61
 /ui/theme-defs/default/styles/scrollbar/color -> default-theme.json:60
 /ui/theme-defs/default/styles/skewed-time/color -> default-theme.json:47
+/ui/theme-defs/default/styles/snippet-border/color -> default-theme.json:96
 /ui/theme-defs/default/styles/text/background-color -> default-theme.json:12
 /ui/theme-defs/default/styles/text/color -> default-theme.json:11
 /ui/theme-defs/default/styles/warning/bold -> default-theme.json:31
 /ui/theme-defs/default/styles/warning/color -> default-theme.json:30
-/ui/theme-defs/default/syntax-styles/comment/color -> default-theme.json:105
-/ui/theme-defs/default/syntax-styles/diff-add/color -> default-theme.json:126
-/ui/theme-defs/default/syntax-styles/diff-delete/color -> default-theme.json:123
-/ui/theme-defs/default/syntax-styles/diff-section/color -> default-theme.json:129
-/ui/theme-defs/default/syntax-styles/doc-directive/color -> default-theme.json:108
-/ui/theme-defs/default/syntax-styles/file/color -> default-theme.json:141
-/ui/theme-defs/default/syntax-styles/keyword/color -> default-theme.json:98
-/ui/theme-defs/default/syntax-styles/number/bold -> default-theme.json:144
-/ui/theme-defs/default/syntax-styles/re-repeat/color -> default-theme.json:120
-/ui/theme-defs/default/syntax-styles/re-special/color -> default-theme.json:117
-/ui/theme-defs/default/syntax-styles/spectrogram-high/background-color -> default-theme.json:138
-/ui/theme-defs/default/syntax-styles/spectrogram-low/background-color -> default-theme.json:132
-/ui/theme-defs/default/syntax-styles/spectrogram-medium/background-color -> default-theme.json:135
-/ui/theme-defs/default/syntax-styles/string/bold -> default-theme.json:102
-/ui/theme-defs/default/syntax-styles/string/color -> default-theme.json:101
-/ui/theme-defs/default/syntax-styles/symbol/color -> default-theme.json:114
-/ui/theme-defs/default/syntax-styles/variable/color -> default-theme.json:111
+/ui/theme-defs/default/syntax-styles/comment/color -> default-theme.json:111
+/ui/theme-defs/default/syntax-styles/diff-add/color -> default-theme.json:132
+/ui/theme-defs/default/syntax-styles/diff-delete/color -> default-theme.json:129
+/ui/theme-defs/default/syntax-styles/diff-section/color -> default-theme.json:135
+/ui/theme-defs/default/syntax-styles/doc-directive/color -> default-theme.json:114
+/ui/theme-defs/default/syntax-styles/file/color -> default-theme.json:147
+/ui/theme-defs/default/syntax-styles/keyword/color -> default-theme.json:104
+/ui/theme-defs/default/syntax-styles/number/bold -> default-theme.json:150
+/ui/theme-defs/default/syntax-styles/re-repeat/color -> default-theme.json:126
+/ui/theme-defs/default/syntax-styles/re-special/color -> default-theme.json:123
+/ui/theme-defs/default/syntax-styles/spectrogram-high/background-color -> default-theme.json:144
+/ui/theme-defs/default/syntax-styles/spectrogram-low/background-color -> default-theme.json:138
+/ui/theme-defs/default/syntax-styles/spectrogram-medium/background-color -> default-theme.json:141
+/ui/theme-defs/default/syntax-styles/string/bold -> default-theme.json:108
+/ui/theme-defs/default/syntax-styles/string/color -> default-theme.json:107
+/ui/theme-defs/default/syntax-styles/symbol/color -> default-theme.json:120
+/ui/theme-defs/default/syntax-styles/variable/color -> default-theme.json:117
 /ui/theme-defs/default/vars/semantic_highlight_color -> default-theme.json:7
-/ui/theme-defs/dracula/log-level-styles/critical/color -> dracula.json:281
-/ui/theme-defs/dracula/log-level-styles/error/color -> dracula.json:278
-/ui/theme-defs/dracula/log-level-styles/fatal/color -> dracula.json:284
-/ui/theme-defs/dracula/log-level-styles/warning/color -> dracula.json:275
-/ui/theme-defs/dracula/status-styles/active/background-color -> dracula.json:262
-/ui/theme-defs/dracula/status-styles/active/color -> dracula.json:261
-/ui/theme-defs/dracula/status-styles/alert/background-color -> dracula.json:258
-/ui/theme-defs/dracula/status-styles/alert/color -> dracula.json:257
-/ui/theme-defs/dracula/status-styles/disabled-title/background-color -> dracula.json:222
-/ui/theme-defs/dracula/status-styles/disabled-title/bold -> dracula.json:223
-/ui/theme-defs/dracula/status-styles/disabled-title/color -> dracula.json:221
-/ui/theme-defs/dracula/status-styles/hotkey/color -> dracula.json:245
-/ui/theme-defs/dracula/status-styles/hotkey/underline -> dracula.json:246
-/ui/theme-defs/dracula/status-styles/inactive-alert/background-color -> dracula.json:270
-/ui/theme-defs/dracula/status-styles/inactive-alert/color -> dracula.json:269
-/ui/theme-defs/dracula/status-styles/inactive/background-color -> dracula.json:266
-/ui/theme-defs/dracula/status-styles/inactive/color -> dracula.json:265
-/ui/theme-defs/dracula/status-styles/info/background-color -> dracula.json:237
-/ui/theme-defs/dracula/status-styles/info/color -> dracula.json:236
-/ui/theme-defs/dracula/status-styles/subtitle/background-color -> dracula.json:232
-/ui/theme-defs/dracula/status-styles/subtitle/bold -> dracula.json:233
-/ui/theme-defs/dracula/status-styles/subtitle/color -> dracula.json:231
-/ui/theme-defs/dracula/status-styles/text/background-color -> dracula.json:250
-/ui/theme-defs/dracula/status-styles/text/color -> dracula.json:249
-/ui/theme-defs/dracula/status-styles/title-hotkey/background-color -> dracula.json:241
-/ui/theme-defs/dracula/status-styles/title-hotkey/color -> dracula.json:240
-/ui/theme-defs/dracula/status-styles/title-hotkey/underline -> dracula.json:242
-/ui/theme-defs/dracula/status-styles/title/background-color -> dracula.json:227
-/ui/theme-defs/dracula/status-styles/title/bold -> dracula.json:228
-/ui/theme-defs/dracula/status-styles/title/color -> dracula.json:226
-/ui/theme-defs/dracula/status-styles/warn/background-color -> dracula.json:254
-/ui/theme-defs/dracula/status-styles/warn/color -> dracula.json:253
+/ui/theme-defs/dracula/log-level-styles/critical/color -> dracula.json:284
+/ui/theme-defs/dracula/log-level-styles/error/color -> dracula.json:281
+/ui/theme-defs/dracula/log-level-styles/fatal/color -> dracula.json:287
+/ui/theme-defs/dracula/log-level-styles/warning/color -> dracula.json:278
+/ui/theme-defs/dracula/status-styles/active/background-color -> dracula.json:265
+/ui/theme-defs/dracula/status-styles/active/color -> dracula.json:264
+/ui/theme-defs/dracula/status-styles/alert/background-color -> dracula.json:261
+/ui/theme-defs/dracula/status-styles/alert/color -> dracula.json:260
+/ui/theme-defs/dracula/status-styles/disabled-title/background-color -> dracula.json:225
+/ui/theme-defs/dracula/status-styles/disabled-title/bold -> dracula.json:226
+/ui/theme-defs/dracula/status-styles/disabled-title/color -> dracula.json:224
+/ui/theme-defs/dracula/status-styles/hotkey/color -> dracula.json:248
+/ui/theme-defs/dracula/status-styles/hotkey/underline -> dracula.json:249
+/ui/theme-defs/dracula/status-styles/inactive-alert/background-color -> dracula.json:273
+/ui/theme-defs/dracula/status-styles/inactive-alert/color -> dracula.json:272
+/ui/theme-defs/dracula/status-styles/inactive/background-color -> dracula.json:269
+/ui/theme-defs/dracula/status-styles/inactive/color -> dracula.json:268
+/ui/theme-defs/dracula/status-styles/info/background-color -> dracula.json:240
+/ui/theme-defs/dracula/status-styles/info/color -> dracula.json:239
+/ui/theme-defs/dracula/status-styles/subtitle/background-color -> dracula.json:235
+/ui/theme-defs/dracula/status-styles/subtitle/bold -> dracula.json:236
+/ui/theme-defs/dracula/status-styles/subtitle/color -> dracula.json:234
+/ui/theme-defs/dracula/status-styles/text/background-color -> dracula.json:253
+/ui/theme-defs/dracula/status-styles/text/color -> dracula.json:252
+/ui/theme-defs/dracula/status-styles/title-hotkey/background-color -> dracula.json:244
+/ui/theme-defs/dracula/status-styles/title-hotkey/color -> dracula.json:243
+/ui/theme-defs/dracula/status-styles/title-hotkey/underline -> dracula.json:245
+/ui/theme-defs/dracula/status-styles/title/background-color -> dracula.json:230
+/ui/theme-defs/dracula/status-styles/title/bold -> dracula.json:231
+/ui/theme-defs/dracula/status-styles/title/color -> dracula.json:229
+/ui/theme-defs/dracula/status-styles/warn/background-color -> dracula.json:257
+/ui/theme-defs/dracula/status-styles/warn/color -> dracula.json:256
 /ui/theme-defs/dracula/styles/adjusted-time/color -> dracula.json:61
 /ui/theme-defs/dracula/styles/alt-text/background-color -> dracula.json:29
 /ui/theme-defs/dracula/styles/breadcrumb/color -> dracula.json:118
@@ -323,6 +325,7 @@
 /ui/theme-defs/dracula/styles/hr/color -> dracula.json:109
 /ui/theme-defs/dracula/styles/hyperlink/underline -> dracula.json:112
 /ui/theme-defs/dracula/styles/identifier/color -> dracula.json:22
+/ui/theme-defs/dracula/styles/indent-guide/color -> dracula.json:146
 /ui/theme-defs/dracula/styles/info/bold -> dracula.json:37
 /ui/theme-defs/dracula/styles/info/color -> dracula.json:36
 /ui/theme-defs/dracula/styles/invalid-msg/color -> dracula.json:70
@@ -346,33 +349,33 @@
 /ui/theme-defs/dracula/styles/text/color -> dracula.json:25
 /ui/theme-defs/dracula/styles/warning/bold -> dracula.json:45
 /ui/theme-defs/dracula/styles/warning/color -> dracula.json:44
-/ui/theme-defs/dracula/syntax-styles/code-border/background-color -> dracula.json:157
-/ui/theme-defs/dracula/syntax-styles/code-border/color -> dracula.json:156
-/ui/theme-defs/dracula/syntax-styles/comment/color -> dracula.json:168
-/ui/theme-defs/dracula/syntax-styles/diff-add/color -> dracula.json:189
-/ui/theme-defs/dracula/syntax-styles/diff-delete/color -> dracula.json:186
-/ui/theme-defs/dracula/syntax-styles/diff-section/color -> dracula.json:192
-/ui/theme-defs/dracula/syntax-styles/doc-directive/color -> dracula.json:171
-/ui/theme-defs/dracula/syntax-styles/file/color -> dracula.json:204
-/ui/theme-defs/dracula/syntax-styles/function/color -> dracula.json:210
-/ui/theme-defs/dracula/syntax-styles/inline-code/background-color -> dracula.json:149
-/ui/theme-defs/dracula/syntax-styles/inline-code/color -> dracula.json:148
-/ui/theme-defs/dracula/syntax-styles/keyword/bold -> dracula.json:161
-/ui/theme-defs/dracula/syntax-styles/keyword/color -> dracula.json:160
-/ui/theme-defs/dracula/syntax-styles/number/bold -> dracula.json:207
-/ui/theme-defs/dracula/syntax-styles/quoted-code/background-color -> dracula.json:153
-/ui/theme-defs/dracula/syntax-styles/quoted-code/color -> dracula.json:152
-/ui/theme-defs/dracula/syntax-styles/re-repeat/color -> dracula.json:183
-/ui/theme-defs/dracula/syntax-styles/re-special/color -> dracula.json:180
-/ui/theme-defs/dracula/syntax-styles/separators-references-accessors/color -> dracula.json:213
-/ui/theme-defs/dracula/syntax-styles/spectrogram-high/background-color -> dracula.json:201
-/ui/theme-defs/dracula/syntax-styles/spectrogram-low/background-color -> dracula.json:195
-/ui/theme-defs/dracula/syntax-styles/spectrogram-medium/background-color -> dracula.json:198
-/ui/theme-defs/dracula/syntax-styles/string/bold -> dracula.json:165
-/ui/theme-defs/dracula/syntax-styles/string/color -> dracula.json:164
-/ui/theme-defs/dracula/syntax-styles/symbol/color -> dracula.json:177
-/ui/theme-defs/dracula/syntax-styles/type/color -> dracula.json:216
-/ui/theme-defs/dracula/syntax-styles/variable/color -> dracula.json:174
+/ui/theme-defs/dracula/syntax-styles/code-border/background-color -> dracula.json:160
+/ui/theme-defs/dracula/syntax-styles/code-border/color -> dracula.json:159
+/ui/theme-defs/dracula/syntax-styles/comment/color -> dracula.json:171
+/ui/theme-defs/dracula/syntax-styles/diff-add/color -> dracula.json:192
+/ui/theme-defs/dracula/syntax-styles/diff-delete/color -> dracula.json:189
+/ui/theme-defs/dracula/syntax-styles/diff-section/color -> dracula.json:195
+/ui/theme-defs/dracula/syntax-styles/doc-directive/color -> dracula.json:174
+/ui/theme-defs/dracula/syntax-styles/file/color -> dracula.json:207
+/ui/theme-defs/dracula/syntax-styles/function/color -> dracula.json:213
+/ui/theme-defs/dracula/syntax-styles/inline-code/background-color -> dracula.json:152
+/ui/theme-defs/dracula/syntax-styles/inline-code/color -> dracula.json:151
+/ui/theme-defs/dracula/syntax-styles/keyword/bold -> dracula.json:164
+/ui/theme-defs/dracula/syntax-styles/keyword/color -> dracula.json:163
+/ui/theme-defs/dracula/syntax-styles/number/bold -> dracula.json:210
+/ui/theme-defs/dracula/syntax-styles/quoted-code/background-color -> dracula.json:156
+/ui/theme-defs/dracula/syntax-styles/quoted-code/color -> dracula.json:155
+/ui/theme-defs/dracula/syntax-styles/re-repeat/color -> dracula.json:186
+/ui/theme-defs/dracula/syntax-styles/re-special/color -> dracula.json:183
+/ui/theme-defs/dracula/syntax-styles/separators-references-accessors/color -> dracula.json:216
+/ui/theme-defs/dracula/syntax-styles/spectrogram-high/background-color -> dracula.json:204
+/ui/theme-defs/dracula/syntax-styles/spectrogram-low/background-color -> dracula.json:198
+/ui/theme-defs/dracula/syntax-styles/spectrogram-medium/background-color -> dracula.json:201
+/ui/theme-defs/dracula/syntax-styles/string/bold -> dracula.json:168
+/ui/theme-defs/dracula/syntax-styles/string/color -> dracula.json:167
+/ui/theme-defs/dracula/syntax-styles/symbol/color -> dracula.json:180
+/ui/theme-defs/dracula/syntax-styles/type/color -> dracula.json:219
+/ui/theme-defs/dracula/syntax-styles/variable/color -> dracula.json:177
 /ui/theme-defs/dracula/vars/black -> dracula.json:7
 /ui/theme-defs/dracula/vars/blue -> dracula.json:11
 /ui/theme-defs/dracula/vars/cyan -> dracula.json:13
@@ -385,30 +388,30 @@
 /ui/theme-defs/dracula/vars/semantic_highlight_color -> dracula.json:18
 /ui/theme-defs/dracula/vars/white -> dracula.json:14
 /ui/theme-defs/dracula/vars/yellow -> dracula.json:10
-/ui/theme-defs/eldar/log-level-styles/critical/color -> eldar.json:189
-/ui/theme-defs/eldar/log-level-styles/error/color -> eldar.json:186
-/ui/theme-defs/eldar/log-level-styles/fatal/color -> eldar.json:192
-/ui/theme-defs/eldar/log-level-styles/warning/color -> eldar.json:183
-/ui/theme-defs/eldar/status-styles/active/background-color -> eldar.json:166
-/ui/theme-defs/eldar/status-styles/active/color -> eldar.json:165
-/ui/theme-defs/eldar/status-styles/alert/background-color -> eldar.json:162
-/ui/theme-defs/eldar/status-styles/alert/color -> eldar.json:161
-/ui/theme-defs/eldar/status-styles/inactive-alert/background-color -> eldar.json:178
-/ui/theme-defs/eldar/status-styles/inactive-alert/color -> eldar.json:177
-/ui/theme-defs/eldar/status-styles/inactive/background-color -> eldar.json:174
-/ui/theme-defs/eldar/status-styles/inactive/color -> eldar.json:173
-/ui/theme-defs/eldar/status-styles/info/background-color -> eldar.json:170
-/ui/theme-defs/eldar/status-styles/info/color -> eldar.json:169
-/ui/theme-defs/eldar/status-styles/subtitle/background-color -> eldar.json:149
-/ui/theme-defs/eldar/status-styles/subtitle/bold -> eldar.json:150
-/ui/theme-defs/eldar/status-styles/subtitle/color -> eldar.json:148
-/ui/theme-defs/eldar/status-styles/text/background-color -> eldar.json:154
-/ui/theme-defs/eldar/status-styles/text/color -> eldar.json:153
-/ui/theme-defs/eldar/status-styles/title/background-color -> eldar.json:144
-/ui/theme-defs/eldar/status-styles/title/bold -> eldar.json:145
-/ui/theme-defs/eldar/status-styles/title/color -> eldar.json:143
-/ui/theme-defs/eldar/status-styles/warn/background-color -> eldar.json:158
-/ui/theme-defs/eldar/status-styles/warn/color -> eldar.json:157
+/ui/theme-defs/eldar/log-level-styles/critical/color -> eldar.json:192
+/ui/theme-defs/eldar/log-level-styles/error/color -> eldar.json:189
+/ui/theme-defs/eldar/log-level-styles/fatal/color -> eldar.json:195
+/ui/theme-defs/eldar/log-level-styles/warning/color -> eldar.json:186
+/ui/theme-defs/eldar/status-styles/active/background-color -> eldar.json:169
+/ui/theme-defs/eldar/status-styles/active/color -> eldar.json:168
+/ui/theme-defs/eldar/status-styles/alert/background-color -> eldar.json:165
+/ui/theme-defs/eldar/status-styles/alert/color -> eldar.json:164
+/ui/theme-defs/eldar/status-styles/inactive-alert/background-color -> eldar.json:181
+/ui/theme-defs/eldar/status-styles/inactive-alert/color -> eldar.json:180
+/ui/theme-defs/eldar/status-styles/inactive/background-color -> eldar.json:177
+/ui/theme-defs/eldar/status-styles/inactive/color -> eldar.json:176
+/ui/theme-defs/eldar/status-styles/info/background-color -> eldar.json:173
+/ui/theme-defs/eldar/status-styles/info/color -> eldar.json:172
+/ui/theme-defs/eldar/status-styles/subtitle/background-color -> eldar.json:152
+/ui/theme-defs/eldar/status-styles/subtitle/bold -> eldar.json:153
+/ui/theme-defs/eldar/status-styles/subtitle/color -> eldar.json:151
+/ui/theme-defs/eldar/status-styles/text/background-color -> eldar.json:157
+/ui/theme-defs/eldar/status-styles/text/color -> eldar.json:156
+/ui/theme-defs/eldar/status-styles/title/background-color -> eldar.json:147
+/ui/theme-defs/eldar/status-styles/title/bold -> eldar.json:148
+/ui/theme-defs/eldar/status-styles/title/color -> eldar.json:146
+/ui/theme-defs/eldar/status-styles/warn/background-color -> eldar.json:161
+/ui/theme-defs/eldar/status-styles/warn/color -> eldar.json:160
 /ui/theme-defs/eldar/styles/adjusted-time/color -> eldar.json:52
 /ui/theme-defs/eldar/styles/alt-text/bold -> eldar.json:27
 /ui/theme-defs/eldar/styles/cursor-line/background-color -> eldar.json:47
@@ -427,6 +430,7 @@
 /ui/theme-defs/eldar/styles/hidden/color -> eldar.json:42
 /ui/theme-defs/eldar/styles/identifier/background-color -> eldar.json:19
 /ui/theme-defs/eldar/styles/identifier/color -> eldar.json:20
+/ui/theme-defs/eldar/styles/indent-guide/color -> eldar.json:90
 /ui/theme-defs/eldar/styles/invalid-msg/color -> eldar.json:61
 /ui/theme-defs/eldar/styles/offset-time/color -> eldar.json:58
 /ui/theme-defs/eldar/styles/ok/bold -> eldar.json:31
@@ -440,23 +444,23 @@
 /ui/theme-defs/eldar/styles/text/color -> eldar.json:23
 /ui/theme-defs/eldar/styles/warning/bold -> eldar.json:39
 /ui/theme-defs/eldar/styles/warning/color -> eldar.json:38
-/ui/theme-defs/eldar/syntax-styles/comment/color -> eldar.json:99
-/ui/theme-defs/eldar/syntax-styles/diff-add/color -> eldar.json:123
-/ui/theme-defs/eldar/syntax-styles/diff-delete/color -> eldar.json:120
-/ui/theme-defs/eldar/syntax-styles/diff-section/color -> eldar.json:126
-/ui/theme-defs/eldar/syntax-styles/doc-directive/color -> eldar.json:102
-/ui/theme-defs/eldar/syntax-styles/file/color -> eldar.json:138
-/ui/theme-defs/eldar/syntax-styles/keyword/color -> eldar.json:92
-/ui/theme-defs/eldar/syntax-styles/number/color -> eldar.json:105
-/ui/theme-defs/eldar/syntax-styles/re-repeat/color -> eldar.json:117
-/ui/theme-defs/eldar/syntax-styles/re-special/color -> eldar.json:114
-/ui/theme-defs/eldar/syntax-styles/spectrogram-high/background-color -> eldar.json:135
-/ui/theme-defs/eldar/syntax-styles/spectrogram-low/background-color -> eldar.json:129
-/ui/theme-defs/eldar/syntax-styles/spectrogram-medium/background-color -> eldar.json:132
-/ui/theme-defs/eldar/syntax-styles/string/bold -> eldar.json:96
-/ui/theme-defs/eldar/syntax-styles/string/color -> eldar.json:95
-/ui/theme-defs/eldar/syntax-styles/symbol/color -> eldar.json:111
-/ui/theme-defs/eldar/syntax-styles/variable/color -> eldar.json:108
+/ui/theme-defs/eldar/syntax-styles/comment/color -> eldar.json:102
+/ui/theme-defs/eldar/syntax-styles/diff-add/color -> eldar.json:126
+/ui/theme-defs/eldar/syntax-styles/diff-delete/color -> eldar.json:123
+/ui/theme-defs/eldar/syntax-styles/diff-section/color -> eldar.json:129
+/ui/theme-defs/eldar/syntax-styles/doc-directive/color -> eldar.json:105
+/ui/theme-defs/eldar/syntax-styles/file/color -> eldar.json:141
+/ui/theme-defs/eldar/syntax-styles/keyword/color -> eldar.json:95
+/ui/theme-defs/eldar/syntax-styles/number/color -> eldar.json:108
+/ui/theme-defs/eldar/syntax-styles/re-repeat/color -> eldar.json:120
+/ui/theme-defs/eldar/syntax-styles/re-special/color -> eldar.json:117
+/ui/theme-defs/eldar/syntax-styles/spectrogram-high/background-color -> eldar.json:138
+/ui/theme-defs/eldar/syntax-styles/spectrogram-low/background-color -> eldar.json:132
+/ui/theme-defs/eldar/syntax-styles/spectrogram-medium/background-color -> eldar.json:135
+/ui/theme-defs/eldar/syntax-styles/string/bold -> eldar.json:99
+/ui/theme-defs/eldar/syntax-styles/string/color -> eldar.json:98
+/ui/theme-defs/eldar/syntax-styles/symbol/color -> eldar.json:114
+/ui/theme-defs/eldar/syntax-styles/variable/color -> eldar.json:111
 /ui/theme-defs/eldar/vars/black -> eldar.json:7
 /ui/theme-defs/eldar/vars/blue -> eldar.json:11
 /ui/theme-defs/eldar/vars/cyan -> eldar.json:12
@@ -466,38 +470,38 @@
 /ui/theme-defs/eldar/vars/semantic_highlight_color -> eldar.json:15
 /ui/theme-defs/eldar/vars/white -> eldar.json:14
 /ui/theme-defs/eldar/vars/yellow -> eldar.json:8
-/ui/theme-defs/grayscale/log-level-styles/critical/color -> grayscale.json:161
-/ui/theme-defs/grayscale/log-level-styles/error/color -> grayscale.json:158
-/ui/theme-defs/grayscale/log-level-styles/fatal/color -> grayscale.json:164
-/ui/theme-defs/grayscale/log-level-styles/warning/color -> grayscale.json:155
-/ui/theme-defs/grayscale/status-styles/active/background-color -> grayscale.json:138
-/ui/theme-defs/grayscale/status-styles/active/color -> grayscale.json:137
-/ui/theme-defs/grayscale/status-styles/alert/background-color -> grayscale.json:134
-/ui/theme-defs/grayscale/status-styles/alert/color -> grayscale.json:133
-/ui/theme-defs/grayscale/status-styles/disabled-title/background-color -> grayscale.json:102
-/ui/theme-defs/grayscale/status-styles/disabled-title/bold -> grayscale.json:103
-/ui/theme-defs/grayscale/status-styles/disabled-title/color -> grayscale.json:101
-/ui/theme-defs/grayscale/status-styles/hotkey/color -> grayscale.json:121
-/ui/theme-defs/grayscale/status-styles/hotkey/underline -> grayscale.json:122
-/ui/theme-defs/grayscale/status-styles/inactive-alert/background-color -> grayscale.json:150
-/ui/theme-defs/grayscale/status-styles/inactive-alert/color -> grayscale.json:149
-/ui/theme-defs/grayscale/status-styles/inactive/background-color -> grayscale.json:146
-/ui/theme-defs/grayscale/status-styles/inactive/color -> grayscale.json:145
-/ui/theme-defs/grayscale/status-styles/info/background-color -> grayscale.json:142
-/ui/theme-defs/grayscale/status-styles/info/color -> grayscale.json:141
-/ui/theme-defs/grayscale/status-styles/subtitle/background-color -> grayscale.json:112
-/ui/theme-defs/grayscale/status-styles/subtitle/bold -> grayscale.json:113
-/ui/theme-defs/grayscale/status-styles/subtitle/color -> grayscale.json:111
-/ui/theme-defs/grayscale/status-styles/text/background-color -> grayscale.json:126
-/ui/theme-defs/grayscale/status-styles/text/color -> grayscale.json:125
-/ui/theme-defs/grayscale/status-styles/title-hotkey/background-color -> grayscale.json:117
-/ui/theme-defs/grayscale/status-styles/title-hotkey/color -> grayscale.json:116
-/ui/theme-defs/grayscale/status-styles/title-hotkey/underline -> grayscale.json:118
-/ui/theme-defs/grayscale/status-styles/title/background-color -> grayscale.json:107
-/ui/theme-defs/grayscale/status-styles/title/bold -> grayscale.json:108
-/ui/theme-defs/grayscale/status-styles/title/color -> grayscale.json:106
-/ui/theme-defs/grayscale/status-styles/warn/background-color -> grayscale.json:130
-/ui/theme-defs/grayscale/status-styles/warn/color -> grayscale.json:129
+/ui/theme-defs/grayscale/log-level-styles/critical/color -> grayscale.json:164
+/ui/theme-defs/grayscale/log-level-styles/error/color -> grayscale.json:161
+/ui/theme-defs/grayscale/log-level-styles/fatal/color -> grayscale.json:167
+/ui/theme-defs/grayscale/log-level-styles/warning/color -> grayscale.json:158
+/ui/theme-defs/grayscale/status-styles/active/background-color -> grayscale.json:141
+/ui/theme-defs/grayscale/status-styles/active/color -> grayscale.json:140
+/ui/theme-defs/grayscale/status-styles/alert/background-color -> grayscale.json:137
+/ui/theme-defs/grayscale/status-styles/alert/color -> grayscale.json:136
+/ui/theme-defs/grayscale/status-styles/disabled-title/background-color -> grayscale.json:105
+/ui/theme-defs/grayscale/status-styles/disabled-title/bold -> grayscale.json:106
+/ui/theme-defs/grayscale/status-styles/disabled-title/color -> grayscale.json:104
+/ui/theme-defs/grayscale/status-styles/hotkey/color -> grayscale.json:124
+/ui/theme-defs/grayscale/status-styles/hotkey/underline -> grayscale.json:125
+/ui/theme-defs/grayscale/status-styles/inactive-alert/background-color -> grayscale.json:153
+/ui/theme-defs/grayscale/status-styles/inactive-alert/color -> grayscale.json:152
+/ui/theme-defs/grayscale/status-styles/inactive/background-color -> grayscale.json:149
+/ui/theme-defs/grayscale/status-styles/inactive/color -> grayscale.json:148
+/ui/theme-defs/grayscale/status-styles/info/background-color -> grayscale.json:145
+/ui/theme-defs/grayscale/status-styles/info/color -> grayscale.json:144
+/ui/theme-defs/grayscale/status-styles/subtitle/background-color -> grayscale.json:115
+/ui/theme-defs/grayscale/status-styles/subtitle/bold -> grayscale.json:116
+/ui/theme-defs/grayscale/status-styles/subtitle/color -> grayscale.json:114
+/ui/theme-defs/grayscale/status-styles/text/background-color -> grayscale.json:129
+/ui/theme-defs/grayscale/status-styles/text/color -> grayscale.json:128
+/ui/theme-defs/grayscale/status-styles/title-hotkey/background-color -> grayscale.json:120
+/ui/theme-defs/grayscale/status-styles/title-hotkey/color -> grayscale.json:119
+/ui/theme-defs/grayscale/status-styles/title-hotkey/underline -> grayscale.json:121
+/ui/theme-defs/grayscale/status-styles/title/background-color -> grayscale.json:110
+/ui/theme-defs/grayscale/status-styles/title/bold -> grayscale.json:111
+/ui/theme-defs/grayscale/status-styles/title/color -> grayscale.json:109
+/ui/theme-defs/grayscale/status-styles/warn/background-color -> grayscale.json:133
+/ui/theme-defs/grayscale/status-styles/warn/color -> grayscale.json:132
 /ui/theme-defs/grayscale/styles/adjusted-time/color -> grayscale.json:53
 /ui/theme-defs/grayscale/styles/alt-text/bold -> grayscale.json:28
 /ui/theme-defs/grayscale/styles/cursor-line/background-color -> grayscale.json:48
@@ -521,6 +525,7 @@
 /ui/theme-defs/grayscale/styles/identifier/background-color -> grayscale.json:19
 /ui/theme-defs/grayscale/styles/identifier/bold -> grayscale.json:21
 /ui/theme-defs/grayscale/styles/identifier/color -> grayscale.json:20
+/ui/theme-defs/grayscale/styles/indent-guide/color -> grayscale.json:99
 /ui/theme-defs/grayscale/styles/invalid-msg/color -> grayscale.json:62
 /ui/theme-defs/grayscale/styles/offset-time/color -> grayscale.json:59
 /ui/theme-defs/grayscale/styles/ok/bold -> grayscale.json:32
@@ -543,38 +548,38 @@
 /ui/theme-defs/grayscale/vars/red -> grayscale.json:8
 /ui/theme-defs/grayscale/vars/white -> grayscale.json:14
 /ui/theme-defs/grayscale/vars/yellow -> grayscale.json:10
-/ui/theme-defs/monocai/log-level-styles/critical/color -> monocai.json:277
-/ui/theme-defs/monocai/log-level-styles/error/color -> monocai.json:274
-/ui/theme-defs/monocai/log-level-styles/fatal/color -> monocai.json:280
-/ui/theme-defs/monocai/log-level-styles/warning/color -> monocai.json:271
-/ui/theme-defs/monocai/status-styles/active/background-color -> monocai.json:258
-/ui/theme-defs/monocai/status-styles/active/color -> monocai.json:257
-/ui/theme-defs/monocai/status-styles/alert/background-color -> monocai.json:254
-/ui/theme-defs/monocai/status-styles/alert/color -> monocai.json:253
-/ui/theme-defs/monocai/status-styles/disabled-title/background-color -> monocai.json:218
-/ui/theme-defs/monocai/status-styles/disabled-title/bold -> monocai.json:219
-/ui/theme-defs/monocai/status-styles/disabled-title/color -> monocai.json:217
-/ui/theme-defs/monocai/status-styles/hotkey/color -> monocai.json:241
-/ui/theme-defs/monocai/status-styles/hotkey/underline -> monocai.json:242
-/ui/theme-defs/monocai/status-styles/inactive-alert/background-color -> monocai.json:266
-/ui/theme-defs/monocai/status-styles/inactive-alert/color -> monocai.json:265
-/ui/theme-defs/monocai/status-styles/inactive/background-color -> monocai.json:262
-/ui/theme-defs/monocai/status-styles/inactive/color -> monocai.json:261
-/ui/theme-defs/monocai/status-styles/info/background-color -> monocai.json:233
-/ui/theme-defs/monocai/status-styles/info/color -> monocai.json:232
-/ui/theme-defs/monocai/status-styles/subtitle/background-color -> monocai.json:228
-/ui/theme-defs/monocai/status-styles/subtitle/bold -> monocai.json:229
-/ui/theme-defs/monocai/status-styles/subtitle/color -> monocai.json:227
-/ui/theme-defs/monocai/status-styles/text/background-color -> monocai.json:246
-/ui/theme-defs/monocai/status-styles/text/color -> monocai.json:245
-/ui/theme-defs/monocai/status-styles/title-hotkey/background-color -> monocai.json:237
-/ui/theme-defs/monocai/status-styles/title-hotkey/color -> monocai.json:236
-/ui/theme-defs/monocai/status-styles/title-hotkey/underline -> monocai.json:238
-/ui/theme-defs/monocai/status-styles/title/background-color -> monocai.json:223
-/ui/theme-defs/monocai/status-styles/title/bold -> monocai.json:224
-/ui/theme-defs/monocai/status-styles/title/color -> monocai.json:222
-/ui/theme-defs/monocai/status-styles/warn/background-color -> monocai.json:250
-/ui/theme-defs/monocai/status-styles/warn/color -> monocai.json:249
+/ui/theme-defs/monocai/log-level-styles/critical/color -> monocai.json:280
+/ui/theme-defs/monocai/log-level-styles/error/color -> monocai.json:277
+/ui/theme-defs/monocai/log-level-styles/fatal/color -> monocai.json:283
+/ui/theme-defs/monocai/log-level-styles/warning/color -> monocai.json:274
+/ui/theme-defs/monocai/status-styles/active/background-color -> monocai.json:261
+/ui/theme-defs/monocai/status-styles/active/color -> monocai.json:260
+/ui/theme-defs/monocai/status-styles/alert/background-color -> monocai.json:257
+/ui/theme-defs/monocai/status-styles/alert/color -> monocai.json:256
+/ui/theme-defs/monocai/status-styles/disabled-title/background-color -> monocai.json:221
+/ui/theme-defs/monocai/status-styles/disabled-title/bold -> monocai.json:222
+/ui/theme-defs/monocai/status-styles/disabled-title/color -> monocai.json:220
+/ui/theme-defs/monocai/status-styles/hotkey/color -> monocai.json:244
+/ui/theme-defs/monocai/status-styles/hotkey/underline -> monocai.json:245
+/ui/theme-defs/monocai/status-styles/inactive-alert/background-color -> monocai.json:269
+/ui/theme-defs/monocai/status-styles/inactive-alert/color -> monocai.json:268
+/ui/theme-defs/monocai/status-styles/inactive/background-color -> monocai.json:265
+/ui/theme-defs/monocai/status-styles/inactive/color -> monocai.json:264
+/ui/theme-defs/monocai/status-styles/info/background-color -> monocai.json:236
+/ui/theme-defs/monocai/status-styles/info/color -> monocai.json:235
+/ui/theme-defs/monocai/status-styles/subtitle/background-color -> monocai.json:231
+/ui/theme-defs/monocai/status-styles/subtitle/bold -> monocai.json:232
+/ui/theme-defs/monocai/status-styles/subtitle/color -> monocai.json:230
+/ui/theme-defs/monocai/status-styles/text/background-color -> monocai.json:249
+/ui/theme-defs/monocai/status-styles/text/color -> monocai.json:248
+/ui/theme-defs/monocai/status-styles/title-hotkey/background-color -> monocai.json:240
+/ui/theme-defs/monocai/status-styles/title-hotkey/color -> monocai.json:239
+/ui/theme-defs/monocai/status-styles/title-hotkey/underline -> monocai.json:241
+/ui/theme-defs/monocai/status-styles/title/background-color -> monocai.json:226
+/ui/theme-defs/monocai/status-styles/title/bold -> monocai.json:227
+/ui/theme-defs/monocai/status-styles/title/color -> monocai.json:225
+/ui/theme-defs/monocai/status-styles/warn/background-color -> monocai.json:253
+/ui/theme-defs/monocai/status-styles/warn/color -> monocai.json:252
 /ui/theme-defs/monocai/styles/adjusted-time/color -> monocai.json:58
 /ui/theme-defs/monocai/styles/alt-text/background-color -> monocai.json:26
 /ui/theme-defs/monocai/styles/breadcrumb/color -> monocai.json:115
@@ -606,6 +611,7 @@
 /ui/theme-defs/monocai/styles/hr/color -> monocai.json:106
 /ui/theme-defs/monocai/styles/hyperlink/underline -> monocai.json:109
 /ui/theme-defs/monocai/styles/identifier/color -> monocai.json:19
+/ui/theme-defs/monocai/styles/indent-guide/color -> monocai.json:142
 /ui/theme-defs/monocai/styles/info/bold -> monocai.json:34
 /ui/theme-defs/monocai/styles/info/color -> monocai.json:33
 /ui/theme-defs/monocai/styles/invalid-msg/color -> monocai.json:67
@@ -628,33 +634,33 @@
 /ui/theme-defs/monocai/styles/text/color -> monocai.json:22
 /ui/theme-defs/monocai/styles/warning/bold -> monocai.json:42
 /ui/theme-defs/monocai/styles/warning/color -> monocai.json:41
-/ui/theme-defs/monocai/syntax-styles/code-border/background-color -> monocai.json:153
-/ui/theme-defs/monocai/syntax-styles/code-border/color -> monocai.json:152
-/ui/theme-defs/monocai/syntax-styles/comment/color -> monocai.json:164
-/ui/theme-defs/monocai/syntax-styles/diff-add/color -> monocai.json:185
-/ui/theme-defs/monocai/syntax-styles/diff-delete/color -> monocai.json:182
-/ui/theme-defs/monocai/syntax-styles/diff-section/color -> monocai.json:188
-/ui/theme-defs/monocai/syntax-styles/doc-directive/color -> monocai.json:167
-/ui/theme-defs/monocai/syntax-styles/file/color -> monocai.json:200
-/ui/theme-defs/monocai/syntax-styles/function/color -> monocai.json:206
-/ui/theme-defs/monocai/syntax-styles/inline-code/background-color -> monocai.json:145
-/ui/theme-defs/monocai/syntax-styles/inline-code/color -> monocai.json:144
-/ui/theme-defs/monocai/syntax-styles/keyword/bold -> monocai.json:157
-/ui/theme-defs/monocai/syntax-styles/keyword/color -> monocai.json:156
-/ui/theme-defs/monocai/syntax-styles/number/bold -> monocai.json:203
-/ui/theme-defs/monocai/syntax-styles/quoted-code/background-color -> monocai.json:149
-/ui/theme-defs/monocai/syntax-styles/quoted-code/color -> monocai.json:148
-/ui/theme-defs/monocai/syntax-styles/re-repeat/color -> monocai.json:179
-/ui/theme-defs/monocai/syntax-styles/re-special/color -> monocai.json:176
-/ui/theme-defs/monocai/syntax-styles/separators-references-accessors/color -> monocai.json:209
-/ui/theme-defs/monocai/syntax-styles/spectrogram-high/background-color -> monocai.json:197
-/ui/theme-defs/monocai/syntax-styles/spectrogram-low/background-color -> monocai.json:191
-/ui/theme-defs/monocai/syntax-styles/spectrogram-medium/background-color -> monocai.json:194
-/ui/theme-defs/monocai/syntax-styles/string/bold -> monocai.json:161
-/ui/theme-defs/monocai/syntax-styles/string/color -> monocai.json:160
-/ui/theme-defs/monocai/syntax-styles/symbol/color -> monocai.json:173
-/ui/theme-defs/monocai/syntax-styles/type/color -> monocai.json:212
-/ui/theme-defs/monocai/syntax-styles/variable/color -> monocai.json:170
+/ui/theme-defs/monocai/syntax-styles/code-border/background-color -> monocai.json:156
+/ui/theme-defs/monocai/syntax-styles/code-border/color -> monocai.json:155
+/ui/theme-defs/monocai/syntax-styles/comment/color -> monocai.json:167
+/ui/theme-defs/monocai/syntax-styles/diff-add/color -> monocai.json:188
+/ui/theme-defs/monocai/syntax-styles/diff-delete/color -> monocai.json:185
+/ui/theme-defs/monocai/syntax-styles/diff-section/color -> monocai.json:191
+/ui/theme-defs/monocai/syntax-styles/doc-directive/color -> monocai.json:170
+/ui/theme-defs/monocai/syntax-styles/file/color -> monocai.json:203
+/ui/theme-defs/monocai/syntax-styles/function/color -> monocai.json:209
+/ui/theme-defs/monocai/syntax-styles/inline-code/background-color -> monocai.json:148
+/ui/theme-defs/monocai/syntax-styles/inline-code/color -> monocai.json:147
+/ui/theme-defs/monocai/syntax-styles/keyword/bold -> monocai.json:160
+/ui/theme-defs/monocai/syntax-styles/keyword/color -> monocai.json:159
+/ui/theme-defs/monocai/syntax-styles/number/bold -> monocai.json:206
+/ui/theme-defs/monocai/syntax-styles/quoted-code/background-color -> monocai.json:152
+/ui/theme-defs/monocai/syntax-styles/quoted-code/color -> monocai.json:151
+/ui/theme-defs/monocai/syntax-styles/re-repeat/color -> monocai.json:182
+/ui/theme-defs/monocai/syntax-styles/re-special/color -> monocai.json:179
+/ui/theme-defs/monocai/syntax-styles/separators-references-accessors/color -> monocai.json:212
+/ui/theme-defs/monocai/syntax-styles/spectrogram-high/background-color -> monocai.json:200
+/ui/theme-defs/monocai/syntax-styles/spectrogram-low/background-color -> monocai.json:194
+/ui/theme-defs/monocai/syntax-styles/spectrogram-medium/background-color -> monocai.json:197
+/ui/theme-defs/monocai/syntax-styles/string/bold -> monocai.json:164
+/ui/theme-defs/monocai/syntax-styles/string/color -> monocai.json:163
+/ui/theme-defs/monocai/syntax-styles/symbol/color -> monocai.json:176
+/ui/theme-defs/monocai/syntax-styles/type/color -> monocai.json:215
+/ui/theme-defs/monocai/syntax-styles/variable/color -> monocai.json:173
 /ui/theme-defs/monocai/vars/black -> monocai.json:7
 /ui/theme-defs/monocai/vars/blue -> monocai.json:11
 /ui/theme-defs/monocai/vars/cyan -> monocai.json:13
@@ -664,39 +670,39 @@
 /ui/theme-defs/monocai/vars/semantic_highlight_color -> monocai.json:15
 /ui/theme-defs/monocai/vars/white -> monocai.json:14
 /ui/theme-defs/monocai/vars/yellow -> monocai.json:10
-/ui/theme-defs/night-owl/log-level-styles/critical/color -> night-owl.json:212
-/ui/theme-defs/night-owl/log-level-styles/error/color -> night-owl.json:209
-/ui/theme-defs/night-owl/log-level-styles/fatal/color -> night-owl.json:215
-/ui/theme-defs/night-owl/log-level-styles/warning/color -> night-owl.json:206
-/ui/theme-defs/night-owl/status-styles/active/background-color -> night-owl.json:182
-/ui/theme-defs/night-owl/status-styles/active/color -> night-owl.json:181
-/ui/theme-defs/night-owl/status-styles/alert/background-color -> night-owl.json:178
-/ui/theme-defs/night-owl/status-styles/alert/color -> night-owl.json:177
-/ui/theme-defs/night-owl/status-styles/disabled-title/background-color -> night-owl.json:152
-/ui/theme-defs/night-owl/status-styles/disabled-title/bold -> night-owl.json:153
-/ui/theme-defs/night-owl/status-styles/disabled-title/color -> night-owl.json:151
-/ui/theme-defs/night-owl/status-styles/hotkey/bold -> night-owl.json:194
-/ui/theme-defs/night-owl/status-styles/hotkey/color -> night-owl.json:193
-/ui/theme-defs/night-owl/status-styles/hotkey/underline -> night-owl.json:195
-/ui/theme-defs/night-owl/status-styles/inactive-alert/background-color -> night-owl.json:190
-/ui/theme-defs/night-owl/status-styles/inactive-alert/color -> night-owl.json:189
-/ui/theme-defs/night-owl/status-styles/inactive/background-color -> night-owl.json:186
-/ui/theme-defs/night-owl/status-styles/inactive/color -> night-owl.json:185
-/ui/theme-defs/night-owl/status-styles/info/background-color -> night-owl.json:166
-/ui/theme-defs/night-owl/status-styles/info/color -> night-owl.json:165
-/ui/theme-defs/night-owl/status-styles/subtitle/background-color -> night-owl.json:162
-/ui/theme-defs/night-owl/status-styles/subtitle/color -> night-owl.json:161
-/ui/theme-defs/night-owl/status-styles/text/background-color -> night-owl.json:170
-/ui/theme-defs/night-owl/status-styles/text/color -> night-owl.json:169
-/ui/theme-defs/night-owl/status-styles/title-hotkey/background-color -> night-owl.json:199
-/ui/theme-defs/night-owl/status-styles/title-hotkey/bold -> night-owl.json:200
-/ui/theme-defs/night-owl/status-styles/title-hotkey/color -> night-owl.json:198
-/ui/theme-defs/night-owl/status-styles/title-hotkey/underline -> night-owl.json:201
-/ui/theme-defs/night-owl/status-styles/title/background-color -> night-owl.json:157
-/ui/theme-defs/night-owl/status-styles/title/bold -> night-owl.json:158
-/ui/theme-defs/night-owl/status-styles/title/color -> night-owl.json:156
-/ui/theme-defs/night-owl/status-styles/warn/background-color -> night-owl.json:174
-/ui/theme-defs/night-owl/status-styles/warn/color -> night-owl.json:173
+/ui/theme-defs/night-owl/log-level-styles/critical/color -> night-owl.json:215
+/ui/theme-defs/night-owl/log-level-styles/error/color -> night-owl.json:212
+/ui/theme-defs/night-owl/log-level-styles/fatal/color -> night-owl.json:218
+/ui/theme-defs/night-owl/log-level-styles/warning/color -> night-owl.json:209
+/ui/theme-defs/night-owl/status-styles/active/background-color -> night-owl.json:185
+/ui/theme-defs/night-owl/status-styles/active/color -> night-owl.json:184
+/ui/theme-defs/night-owl/status-styles/alert/background-color -> night-owl.json:181
+/ui/theme-defs/night-owl/status-styles/alert/color -> night-owl.json:180
+/ui/theme-defs/night-owl/status-styles/disabled-title/background-color -> night-owl.json:155
+/ui/theme-defs/night-owl/status-styles/disabled-title/bold -> night-owl.json:156
+/ui/theme-defs/night-owl/status-styles/disabled-title/color -> night-owl.json:154
+/ui/theme-defs/night-owl/status-styles/hotkey/bold -> night-owl.json:197
+/ui/theme-defs/night-owl/status-styles/hotkey/color -> night-owl.json:196
+/ui/theme-defs/night-owl/status-styles/hotkey/underline -> night-owl.json:198
+/ui/theme-defs/night-owl/status-styles/inactive-alert/background-color -> night-owl.json:193
+/ui/theme-defs/night-owl/status-styles/inactive-alert/color -> night-owl.json:192
+/ui/theme-defs/night-owl/status-styles/inactive/background-color -> night-owl.json:189
+/ui/theme-defs/night-owl/status-styles/inactive/color -> night-owl.json:188
+/ui/theme-defs/night-owl/status-styles/info/background-color -> night-owl.json:169
+/ui/theme-defs/night-owl/status-styles/info/color -> night-owl.json:168
+/ui/theme-defs/night-owl/status-styles/subtitle/background-color -> night-owl.json:165
+/ui/theme-defs/night-owl/status-styles/subtitle/color -> night-owl.json:164
+/ui/theme-defs/night-owl/status-styles/text/background-color -> night-owl.json:173
+/ui/theme-defs/night-owl/status-styles/text/color -> night-owl.json:172
+/ui/theme-defs/night-owl/status-styles/title-hotkey/background-color -> night-owl.json:202
+/ui/theme-defs/night-owl/status-styles/title-hotkey/bold -> night-owl.json:203
+/ui/theme-defs/night-owl/status-styles/title-hotkey/color -> night-owl.json:201
+/ui/theme-defs/night-owl/status-styles/title-hotkey/underline -> night-owl.json:204
+/ui/theme-defs/night-owl/status-styles/title/background-color -> night-owl.json:160
+/ui/theme-defs/night-owl/status-styles/title/bold -> night-owl.json:161
+/ui/theme-defs/night-owl/status-styles/title/color -> night-owl.json:159
+/ui/theme-defs/night-owl/status-styles/warn/background-color -> night-owl.json:177
+/ui/theme-defs/night-owl/status-styles/warn/color -> night-owl.json:176
 /ui/theme-defs/night-owl/styles/adjusted-time/color -> night-owl.json:52
 /ui/theme-defs/night-owl/styles/alt-text/background-color -> night-owl.json:27
 /ui/theme-defs/night-owl/styles/cursor-line/background-color -> night-owl.json:47
@@ -719,6 +725,7 @@
 /ui/theme-defs/night-owl/styles/hidden/color -> night-owl.json:42
 /ui/theme-defs/night-owl/styles/identifier/background-color -> night-owl.json:19
 /ui/theme-defs/night-owl/styles/identifier/color -> night-owl.json:20
+/ui/theme-defs/night-owl/styles/indent-guide/color -> night-owl.json:98
 /ui/theme-defs/night-owl/styles/invalid-msg/color -> night-owl.json:61
 /ui/theme-defs/night-owl/styles/offset-time/color -> night-owl.json:58
 /ui/theme-defs/night-owl/styles/ok/bold -> night-owl.json:31
@@ -732,23 +739,23 @@
 /ui/theme-defs/night-owl/styles/text/color -> night-owl.json:23
 /ui/theme-defs/night-owl/styles/warning/bold -> night-owl.json:39
 /ui/theme-defs/night-owl/styles/warning/color -> night-owl.json:38
-/ui/theme-defs/night-owl/syntax-styles/comment/color -> night-owl.json:107
-/ui/theme-defs/night-owl/syntax-styles/diff-add/color -> night-owl.json:131
-/ui/theme-defs/night-owl/syntax-styles/diff-delete/color -> night-owl.json:128
-/ui/theme-defs/night-owl/syntax-styles/diff-section/color -> night-owl.json:134
-/ui/theme-defs/night-owl/syntax-styles/doc-directive/color -> night-owl.json:110
-/ui/theme-defs/night-owl/syntax-styles/file/color -> night-owl.json:146
-/ui/theme-defs/night-owl/syntax-styles/keyword/color -> night-owl.json:100
-/ui/theme-defs/night-owl/syntax-styles/number/color -> night-owl.json:119
-/ui/theme-defs/night-owl/syntax-styles/re-repeat/color -> night-owl.json:125
-/ui/theme-defs/night-owl/syntax-styles/re-special/color -> night-owl.json:122
-/ui/theme-defs/night-owl/syntax-styles/spectrogram-high/background-color -> night-owl.json:143
-/ui/theme-defs/night-owl/syntax-styles/spectrogram-low/background-color -> night-owl.json:137
-/ui/theme-defs/night-owl/syntax-styles/spectrogram-medium/background-color -> night-owl.json:140
-/ui/theme-defs/night-owl/syntax-styles/string/bold -> night-owl.json:104
-/ui/theme-defs/night-owl/syntax-styles/string/color -> night-owl.json:103
-/ui/theme-defs/night-owl/syntax-styles/symbol/color -> night-owl.json:116
-/ui/theme-defs/night-owl/syntax-styles/variable/color -> night-owl.json:113
+/ui/theme-defs/night-owl/syntax-styles/comment/color -> night-owl.json:110
+/ui/theme-defs/night-owl/syntax-styles/diff-add/color -> night-owl.json:134
+/ui/theme-defs/night-owl/syntax-styles/diff-delete/color -> night-owl.json:131
+/ui/theme-defs/night-owl/syntax-styles/diff-section/color -> night-owl.json:137
+/ui/theme-defs/night-owl/syntax-styles/doc-directive/color -> night-owl.json:113
+/ui/theme-defs/night-owl/syntax-styles/file/color -> night-owl.json:149
+/ui/theme-defs/night-owl/syntax-styles/keyword/color -> night-owl.json:103
+/ui/theme-defs/night-owl/syntax-styles/number/color -> night-owl.json:122
+/ui/theme-defs/night-owl/syntax-styles/re-repeat/color -> night-owl.json:128
+/ui/theme-defs/night-owl/syntax-styles/re-special/color -> night-owl.json:125
+/ui/theme-defs/night-owl/syntax-styles/spectrogram-high/background-color -> night-owl.json:146
+/ui/theme-defs/night-owl/syntax-styles/spectrogram-low/background-color -> night-owl.json:140
+/ui/theme-defs/night-owl/syntax-styles/spectrogram-medium/background-color -> night-owl.json:143
+/ui/theme-defs/night-owl/syntax-styles/string/bold -> night-owl.json:107
+/ui/theme-defs/night-owl/syntax-styles/string/color -> night-owl.json:106
+/ui/theme-defs/night-owl/syntax-styles/symbol/color -> night-owl.json:119
+/ui/theme-defs/night-owl/syntax-styles/variable/color -> night-owl.json:116
 /ui/theme-defs/night-owl/vars/black -> night-owl.json:7
 /ui/theme-defs/night-owl/vars/blue -> night-owl.json:11
 /ui/theme-defs/night-owl/vars/cyan -> night-owl.json:13
@@ -758,30 +765,30 @@
 /ui/theme-defs/night-owl/vars/semantic_highlight_color -> night-owl.json:15
 /ui/theme-defs/night-owl/vars/white -> night-owl.json:14
 /ui/theme-defs/night-owl/vars/yellow -> night-owl.json:10
-/ui/theme-defs/solarized-dark/log-level-styles/critical/color -> solarized-dark.json:203
-/ui/theme-defs/solarized-dark/log-level-styles/error/color -> solarized-dark.json:200
-/ui/theme-defs/solarized-dark/log-level-styles/fatal/color -> solarized-dark.json:206
-/ui/theme-defs/solarized-dark/log-level-styles/warning/color -> solarized-dark.json:197
-/ui/theme-defs/solarized-dark/status-styles/active/background-color -> solarized-dark.json:180
-/ui/theme-defs/solarized-dark/status-styles/active/color -> solarized-dark.json:179
-/ui/theme-defs/solarized-dark/status-styles/alert/background-color -> solarized-dark.json:176
-/ui/theme-defs/solarized-dark/status-styles/alert/color -> solarized-dark.json:175
-/ui/theme-defs/solarized-dark/status-styles/inactive-alert/background-color -> solarized-dark.json:192
-/ui/theme-defs/solarized-dark/status-styles/inactive-alert/color -> solarized-dark.json:191
-/ui/theme-defs/solarized-dark/status-styles/inactive/background-color -> solarized-dark.json:188
-/ui/theme-defs/solarized-dark/status-styles/inactive/color -> solarized-dark.json:187
-/ui/theme-defs/solarized-dark/status-styles/info/background-color -> solarized-dark.json:184
-/ui/theme-defs/solarized-dark/status-styles/info/color -> solarized-dark.json:183
-/ui/theme-defs/solarized-dark/status-styles/subtitle/background-color -> solarized-dark.json:163
-/ui/theme-defs/solarized-dark/status-styles/subtitle/bold -> solarized-dark.json:164
-/ui/theme-defs/solarized-dark/status-styles/subtitle/color -> solarized-dark.json:162
-/ui/theme-defs/solarized-dark/status-styles/text/background-color -> solarized-dark.json:168
-/ui/theme-defs/solarized-dark/status-styles/text/color -> solarized-dark.json:167
-/ui/theme-defs/solarized-dark/status-styles/title/background-color -> solarized-dark.json:158
-/ui/theme-defs/solarized-dark/status-styles/title/bold -> solarized-dark.json:159
-/ui/theme-defs/solarized-dark/status-styles/title/color -> solarized-dark.json:157
-/ui/theme-defs/solarized-dark/status-styles/warn/background-color -> solarized-dark.json:172
-/ui/theme-defs/solarized-dark/status-styles/warn/color -> solarized-dark.json:171
+/ui/theme-defs/solarized-dark/log-level-styles/critical/color -> solarized-dark.json:206
+/ui/theme-defs/solarized-dark/log-level-styles/error/color -> solarized-dark.json:203
+/ui/theme-defs/solarized-dark/log-level-styles/fatal/color -> solarized-dark.json:209
+/ui/theme-defs/solarized-dark/log-level-styles/warning/color -> solarized-dark.json:200
+/ui/theme-defs/solarized-dark/status-styles/active/background-color -> solarized-dark.json:183
+/ui/theme-defs/solarized-dark/status-styles/active/color -> solarized-dark.json:182
+/ui/theme-defs/solarized-dark/status-styles/alert/background-color -> solarized-dark.json:179
+/ui/theme-defs/solarized-dark/status-styles/alert/color -> solarized-dark.json:178
+/ui/theme-defs/solarized-dark/status-styles/inactive-alert/background-color -> solarized-dark.json:195
+/ui/theme-defs/solarized-dark/status-styles/inactive-alert/color -> solarized-dark.json:194
+/ui/theme-defs/solarized-dark/status-styles/inactive/background-color -> solarized-dark.json:191
+/ui/theme-defs/solarized-dark/status-styles/inactive/color -> solarized-dark.json:190
+/ui/theme-defs/solarized-dark/status-styles/info/background-color -> solarized-dark.json:187
+/ui/theme-defs/solarized-dark/status-styles/info/color -> solarized-dark.json:186
+/ui/theme-defs/solarized-dark/status-styles/subtitle/background-color -> solarized-dark.json:166
+/ui/theme-defs/solarized-dark/status-styles/subtitle/bold -> solarized-dark.json:167
+/ui/theme-defs/solarized-dark/status-styles/subtitle/color -> solarized-dark.json:165
+/ui/theme-defs/solarized-dark/status-styles/text/background-color -> solarized-dark.json:171
+/ui/theme-defs/solarized-dark/status-styles/text/color -> solarized-dark.json:170
+/ui/theme-defs/solarized-dark/status-styles/title/background-color -> solarized-dark.json:161
+/ui/theme-defs/solarized-dark/status-styles/title/bold -> solarized-dark.json:162
+/ui/theme-defs/solarized-dark/status-styles/title/color -> solarized-dark.json:160
+/ui/theme-defs/solarized-dark/status-styles/warn/background-color -> solarized-dark.json:175
+/ui/theme-defs/solarized-dark/status-styles/warn/color -> solarized-dark.json:174
 /ui/theme-defs/solarized-dark/styles/adjusted-time/color -> solarized-dark.json:61
 /ui/theme-defs/solarized-dark/styles/alt-text/background-color -> solarized-dark.json:36
 /ui/theme-defs/solarized-dark/styles/cursor-line/background-color -> solarized-dark.json:56
@@ -804,6 +811,7 @@
 /ui/theme-defs/solarized-dark/styles/hidden/color -> solarized-dark.json:51
 /ui/theme-defs/solarized-dark/styles/identifier/background-color -> solarized-dark.json:28
 /ui/theme-defs/solarized-dark/styles/identifier/color -> solarized-dark.json:29
+/ui/theme-defs/solarized-dark/styles/indent-guide/color -> solarized-dark.json:107
 /ui/theme-defs/solarized-dark/styles/invalid-msg/color -> solarized-dark.json:70
 /ui/theme-defs/solarized-dark/styles/offset-time/color -> solarized-dark.json:67
 /ui/theme-defs/solarized-dark/styles/ok/bold -> solarized-dark.json:40
@@ -817,22 +825,22 @@
 /ui/theme-defs/solarized-dark/styles/text/color -> solarized-dark.json:32
 /ui/theme-defs/solarized-dark/styles/warning/bold -> solarized-dark.json:48
 /ui/theme-defs/solarized-dark/styles/warning/color -> solarized-dark.json:47
-/ui/theme-defs/solarized-dark/syntax-styles/comment/color -> solarized-dark.json:116
-/ui/theme-defs/solarized-dark/syntax-styles/diff-add/color -> solarized-dark.json:137
-/ui/theme-defs/solarized-dark/syntax-styles/diff-delete/color -> solarized-dark.json:134
-/ui/theme-defs/solarized-dark/syntax-styles/diff-section/color -> solarized-dark.json:140
-/ui/theme-defs/solarized-dark/syntax-styles/doc-directive/color -> solarized-dark.json:119
-/ui/theme-defs/solarized-dark/syntax-styles/file/color -> solarized-dark.json:152
-/ui/theme-defs/solarized-dark/syntax-styles/keyword/color -> solarized-dark.json:109
-/ui/theme-defs/solarized-dark/syntax-styles/re-repeat/color -> solarized-dark.json:131
-/ui/theme-defs/solarized-dark/syntax-styles/re-special/color -> solarized-dark.json:128
-/ui/theme-defs/solarized-dark/syntax-styles/spectrogram-high/background-color -> solarized-dark.json:149
-/ui/theme-defs/solarized-dark/syntax-styles/spectrogram-low/background-color -> solarized-dark.json:143
-/ui/theme-defs/solarized-dark/syntax-styles/spectrogram-medium/background-color -> solarized-dark.json:146
-/ui/theme-defs/solarized-dark/syntax-styles/string/bold -> solarized-dark.json:113
-/ui/theme-defs/solarized-dark/syntax-styles/string/color -> solarized-dark.json:112
-/ui/theme-defs/solarized-dark/syntax-styles/symbol/color -> solarized-dark.json:125
-/ui/theme-defs/solarized-dark/syntax-styles/variable/color -> solarized-dark.json:122
+/ui/theme-defs/solarized-dark/syntax-styles/comment/color -> solarized-dark.json:119
+/ui/theme-defs/solarized-dark/syntax-styles/diff-add/color -> solarized-dark.json:140
+/ui/theme-defs/solarized-dark/syntax-styles/diff-delete/color -> solarized-dark.json:137
+/ui/theme-defs/solarized-dark/syntax-styles/diff-section/color -> solarized-dark.json:143
+/ui/theme-defs/solarized-dark/syntax-styles/doc-directive/color -> solarized-dark.json:122
+/ui/theme-defs/solarized-dark/syntax-styles/file/color -> solarized-dark.json:155
+/ui/theme-defs/solarized-dark/syntax-styles/keyword/color -> solarized-dark.json:112
+/ui/theme-defs/solarized-dark/syntax-styles/re-repeat/color -> solarized-dark.json:134
+/ui/theme-defs/solarized-dark/syntax-styles/re-special/color -> solarized-dark.json:131
+/ui/theme-defs/solarized-dark/syntax-styles/spectrogram-high/background-color -> solarized-dark.json:152
+/ui/theme-defs/solarized-dark/syntax-styles/spectrogram-low/background-color -> solarized-dark.json:146
+/ui/theme-defs/solarized-dark/syntax-styles/spectrogram-medium/background-color -> solarized-dark.json:149
+/ui/theme-defs/solarized-dark/syntax-styles/string/bold -> solarized-dark.json:116
+/ui/theme-defs/solarized-dark/syntax-styles/string/color -> solarized-dark.json:115
+/ui/theme-defs/solarized-dark/syntax-styles/symbol/color -> solarized-dark.json:128
+/ui/theme-defs/solarized-dark/syntax-styles/variable/color -> solarized-dark.json:125
 /ui/theme-defs/solarized-dark/vars/base0 -> solarized-dark.json:11
 /ui/theme-defs/solarized-dark/vars/base00 -> solarized-dark.json:10
 /ui/theme-defs/solarized-dark/vars/base01 -> solarized-dark.json:9
@@ -851,30 +859,30 @@
 /ui/theme-defs/solarized-dark/vars/semantic_highlight_color -> solarized-dark.json:24
 /ui/theme-defs/solarized-dark/vars/violet -> solarized-dark.json:20
 /ui/theme-defs/solarized-dark/vars/yellow -> solarized-dark.json:16
-/ui/theme-defs/solarized-light/log-level-styles/critical/color -> solarized-light.json:203
-/ui/theme-defs/solarized-light/log-level-styles/error/color -> solarized-light.json:200
-/ui/theme-defs/solarized-light/log-level-styles/fatal/color -> solarized-light.json:206
-/ui/theme-defs/solarized-light/log-level-styles/warning/color -> solarized-light.json:197
-/ui/theme-defs/solarized-light/status-styles/active/background-color -> solarized-light.json:180
-/ui/theme-defs/solarized-light/status-styles/active/color -> solarized-light.json:179
-/ui/theme-defs/solarized-light/status-styles/alert/background-color -> solarized-light.json:176
-/ui/theme-defs/solarized-light/status-styles/alert/color -> solarized-light.json:175
-/ui/theme-defs/solarized-light/status-styles/inactive-alert/background-color -> solarized-light.json:192
-/ui/theme-defs/solarized-light/status-styles/inactive-alert/color -> solarized-light.json:191
-/ui/theme-defs/solarized-light/status-styles/inactive/background-color -> solarized-light.json:188
-/ui/theme-defs/solarized-light/status-styles/inactive/color -> solarized-light.json:187
-/ui/theme-defs/solarized-light/status-styles/info/background-color -> solarized-light.json:184
-/ui/theme-defs/solarized-light/status-styles/info/color -> solarized-light.json:183
-/ui/theme-defs/solarized-light/status-styles/subtitle/background-color -> solarized-light.json:163
-/ui/theme-defs/solarized-light/status-styles/subtitle/bold -> solarized-light.json:164
-/ui/theme-defs/solarized-light/status-styles/subtitle/color -> solarized-light.json:162
-/ui/theme-defs/solarized-light/status-styles/text/background-color -> solarized-light.json:168
-/ui/theme-defs/solarized-light/status-styles/text/color -> solarized-light.json:167
-/ui/theme-defs/solarized-light/status-styles/title/background-color -> solarized-light.json:158
-/ui/theme-defs/solarized-light/status-styles/title/bold -> solarized-light.json:159
-/ui/theme-defs/solarized-light/status-styles/title/color -> solarized-light.json:157
-/ui/theme-defs/solarized-light/status-styles/warn/background-color -> solarized-light.json:172
-/ui/theme-defs/solarized-light/status-styles/warn/color -> solarized-light.json:171
+/ui/theme-defs/solarized-light/log-level-styles/critical/color -> solarized-light.json:206
+/ui/theme-defs/solarized-light/log-level-styles/error/color -> solarized-light.json:203
+/ui/theme-defs/solarized-light/log-level-styles/fatal/color -> solarized-light.json:209
+/ui/theme-defs/solarized-light/log-level-styles/warning/color -> solarized-light.json:200
+/ui/theme-defs/solarized-light/status-styles/active/background-color -> solarized-light.json:183
+/ui/theme-defs/solarized-light/status-styles/active/color -> solarized-light.json:182
+/ui/theme-defs/solarized-light/status-styles/alert/background-color -> solarized-light.json:179
+/ui/theme-defs/solarized-light/status-styles/alert/color -> solarized-light.json:178
+/ui/theme-defs/solarized-light/status-styles/inactive-alert/background-color -> solarized-light.json:195
+/ui/theme-defs/solarized-light/status-styles/inactive-alert/color -> solarized-light.json:194
+/ui/theme-defs/solarized-light/status-styles/inactive/background-color -> solarized-light.json:191
+/ui/theme-defs/solarized-light/status-styles/inactive/color -> solarized-light.json:190
+/ui/theme-defs/solarized-light/status-styles/info/background-color -> solarized-light.json:187
+/ui/theme-defs/solarized-light/status-styles/info/color -> solarized-light.json:186
+/ui/theme-defs/solarized-light/status-styles/subtitle/background-color -> solarized-light.json:166
+/ui/theme-defs/solarized-light/status-styles/subtitle/bold -> solarized-light.json:167
+/ui/theme-defs/solarized-light/status-styles/subtitle/color -> solarized-light.json:165
+/ui/theme-defs/solarized-light/status-styles/text/background-color -> solarized-light.json:171
+/ui/theme-defs/solarized-light/status-styles/text/color -> solarized-light.json:170
+/ui/theme-defs/solarized-light/status-styles/title/background-color -> solarized-light.json:161
+/ui/theme-defs/solarized-light/status-styles/title/bold -> solarized-light.json:162
+/ui/theme-defs/solarized-light/status-styles/title/color -> solarized-light.json:160
+/ui/theme-defs/solarized-light/status-styles/warn/background-color -> solarized-light.json:175
+/ui/theme-defs/solarized-light/status-styles/warn/color -> solarized-light.json:174
 /ui/theme-defs/solarized-light/styles/adjusted-time/color -> solarized-light.json:61
 /ui/theme-defs/solarized-light/styles/alt-text/background-color -> solarized-light.json:36
 /ui/theme-defs/solarized-light/styles/cursor-line/background-color -> solarized-light.json:56
@@ -897,6 +905,7 @@
 /ui/theme-defs/solarized-light/styles/hidden/color -> solarized-light.json:51
 /ui/theme-defs/solarized-light/styles/identifier/background-color -> solarized-light.json:28
 /ui/theme-defs/solarized-light/styles/identifier/color -> solarized-light.json:29
+/ui/theme-defs/solarized-light/styles/indent-guide/color -> solarized-light.json:107
 /ui/theme-defs/solarized-light/styles/invalid-msg/color -> solarized-light.json:70
 /ui/theme-defs/solarized-light/styles/offset-time/color -> solarized-light.json:67
 /ui/theme-defs/solarized-light/styles/ok/bold -> solarized-light.json:40
@@ -910,22 +919,22 @@
 /ui/theme-defs/solarized-light/styles/text/color -> solarized-light.json:32
 /ui/theme-defs/solarized-light/styles/warning/bold -> solarized-light.json:48
 /ui/theme-defs/solarized-light/styles/warning/color -> solarized-light.json:47
-/ui/theme-defs/solarized-light/syntax-styles/comment/color -> solarized-light.json:116
-/ui/theme-defs/solarized-light/syntax-styles/diff-add/color -> solarized-light.json:137
-/ui/theme-defs/solarized-light/syntax-styles/diff-delete/color -> solarized-light.json:134
-/ui/theme-defs/solarized-light/syntax-styles/diff-section/color -> solarized-light.json:140
-/ui/theme-defs/solarized-light/syntax-styles/doc-directive/color -> solarized-light.json:119
-/ui/theme-defs/solarized-light/syntax-styles/file/color -> solarized-light.json:152
-/ui/theme-defs/solarized-light/syntax-styles/keyword/color -> solarized-light.json:109
-/ui/theme-defs/solarized-light/syntax-styles/re-repeat/color -> solarized-light.json:131
-/ui/theme-defs/solarized-light/syntax-styles/re-special/color -> solarized-light.json:128
-/ui/theme-defs/solarized-light/syntax-styles/spectrogram-high/background-color -> solarized-light.json:149
-/ui/theme-defs/solarized-light/syntax-styles/spectrogram-low/background-color -> solarized-light.json:143
-/ui/theme-defs/solarized-light/syntax-styles/spectrogram-medium/background-color -> solarized-light.json:146
-/ui/theme-defs/solarized-light/syntax-styles/string/bold -> solarized-light.json:113
-/ui/theme-defs/solarized-light/syntax-styles/string/color -> solarized-light.json:112
-/ui/theme-defs/solarized-light/syntax-styles/symbol/color -> solarized-light.json:125
-/ui/theme-defs/solarized-light/syntax-styles/variable/color -> solarized-light.json:122
+/ui/theme-defs/solarized-light/syntax-styles/comment/color -> solarized-light.json:119
+/ui/theme-defs/solarized-light/syntax-styles/diff-add/color -> solarized-light.json:140
+/ui/theme-defs/solarized-light/syntax-styles/diff-delete/color -> solarized-light.json:137
+/ui/theme-defs/solarized-light/syntax-styles/diff-section/color -> solarized-light.json:143
+/ui/theme-defs/solarized-light/syntax-styles/doc-directive/color -> solarized-light.json:122
+/ui/theme-defs/solarized-light/syntax-styles/file/color -> solarized-light.json:155
+/ui/theme-defs/solarized-light/syntax-styles/keyword/color -> solarized-light.json:112
+/ui/theme-defs/solarized-light/syntax-styles/re-repeat/color -> solarized-light.json:134
+/ui/theme-defs/solarized-light/syntax-styles/re-special/color -> solarized-light.json:131
+/ui/theme-defs/solarized-light/syntax-styles/spectrogram-high/background-color -> solarized-light.json:152
+/ui/theme-defs/solarized-light/syntax-styles/spectrogram-low/background-color -> solarized-light.json:146
+/ui/theme-defs/solarized-light/syntax-styles/spectrogram-medium/background-color -> solarized-light.json:149
+/ui/theme-defs/solarized-light/syntax-styles/string/bold -> solarized-light.json:116
+/ui/theme-defs/solarized-light/syntax-styles/string/color -> solarized-light.json:115
+/ui/theme-defs/solarized-light/syntax-styles/symbol/color -> solarized-light.json:128
+/ui/theme-defs/solarized-light/syntax-styles/variable/color -> solarized-light.json:125
 /ui/theme-defs/solarized-light/vars/base0 -> solarized-light.json:11
 /ui/theme-defs/solarized-light/vars/base00 -> solarized-light.json:10
 /ui/theme-defs/solarized-light/vars/base01 -> solarized-light.json:9

test/expected/test_cmds.sh_661ec61acdd8f6fa6ec1e3c2cf5f896eef431351.out

@@ -2,13 +2,13 @@
 {
     "foo bar" : null,
     "array" : [
-        1,
-        2,
-        3
+    ▏   1,
+    ▏   2,
+    ▏   3
     ],
     "obj" : {
-        "one" : 1,
-        "two" : true 
+    ▏   "one" : 1,
+    ▏   "two" : true 
     } 
 }
 ''

test/expected/test_cmds.sh_8765cbf326648e9014f8cf5f761895010fff443a.out

@@ -9,29 +9,29 @@
     <value id="ipv4Enabled" actions="enabled">true</value>
     <value id="name" actions="enabled">nic1</value>
     <value id="v4config" actions="enabled">
-        <value id="defaultGateway" actions="enabled">0.0.0.0</value>
-        <value id="updateable" actions="enabled">True</value>
-        <value id="prefix" actions="enabled">22</value>
-        <value id="mode" actions="enabled">dhcp</value>
-        <value id="address" actions="enabled">198.51.100.110</value>
-        <value id="interface" actions="enabled">nic1</value>
+    ▏   <value id="defaultGateway" actions="enabled">0.0.0.0</value>
+    ▏   <value id="updateable" actions="enabled">True</value>
+    ▏   <value id="prefix" actions="enabled">22</value>
+    ▏   <value id="mode" actions="enabled">dhcp</value>
+    ▏   <value id="address" actions="enabled">198.51.100.110</value>
+    ▏   <value id="interface" actions="enabled">nic1</value>
     </value>
     <value id="v6config" actions="enabled">
-        <value id="defaultGateway" actions="enabled">fe80::214:f609:19f7:6bf1</value>
-        <value id="updateable" actions="enabled">True</value>
-        <value id="interface" actions="enabled">nic1</value>
-        <value id="dhcp" actions="enabled">False</value>
-        <value id="autoconf" actions="enabled">False</value>
-        <value id="addresses" actions="enabled">
-            <value id="origin" actions="enabled">other</value>
-            <value id="status" actions="enabled">preferred</value>
-            <value id="prefix" actions="enabled">64</value>
-            <value id="address" actions="enabled">fe80::250:56ff:feaa:5abf</value>
-        </value>
+    ▏   <value id="defaultGateway" actions="enabled">fe80::214:f609:19f7:6bf1</value>
+    ▏   <value id="updateable" actions="enabled">True</value>
+    ▏   <value id="interface" actions="enabled">nic1</value>
+    ▏   <value id="dhcp" actions="enabled">False</value>
+    ▏   <value id="autoconf" actions="enabled">False</value>
+    ▏   <value id="addresses" actions="enabled">
+    ▏   ▏   <value id="origin" actions="enabled">other</value>
+    ▏   ▏   <value id="status" actions="enabled">preferred</value>
+    ▏   ▏   <value id="prefix" actions="enabled">64</value>
+    ▏   ▏   <value id="address" actions="enabled">fe80::250:56ff:feaa:5abf</value>
+    ▏   </value>
     </value>
     <value id="interfaceInfo" actions="enabled">
-        <value id="status" actions="enabled">up</value>
-        <value id="mac" actions="enabled">00:50:56:aa:5a:bf</value>
-        <value id="name" actions="enabled">nic1</value>
+    ▏   <value id="status" actions="enabled">up</value>
+    ▏   <value id="mac" actions="enabled">00:50:56:aa:5a:bf</value>
+    ▏   <value id="name" actions="enabled">nic1</value>
     </value>
 </response>

test/expected/test_cmds.sh_b755a8b48c0f602f0270500b0117b76e11db546e.out

@@ -18,11 +18,11 @@ Apr  7 05:49:53 Tim-Stacks-iMac.local GoogleSoftwareUpdateDaemon[17212]: -[KSUpd
     body=
     <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     <o:gupdate xmlns:o="http://www.google.com/update2/request" protocol="2.0" version="KeystoneDaemon-1.2.0.7709" ismachine="1" requestid="{0DFDBCD1-5E29-4DFC-BD99-31A2397198FE}">
-        <o:os platform="mac" version="MacOSX" sp="10.10.2_x86_64h"></o:os>
-        <o:app appid="com.google.Keystone" version="1.2.0.7709" lang="en-us" installage="180" brand="GGLG">
-            <o:ping r="1" a="1"></o:ping>
-            <o:updatecheck></o:updatecheck>
-        </o:app>
+    ▏   <o:os platform="mac" version="MacOSX" sp="10.10.2_x86_64h"></o:os>
+    ▏   <o:app appid="com.google.Keystone" version="1.2.0.7709" lang="en-us" installage="180" brand="GGLG">
+    ▏   ▏   <o:ping r="1" a="1"></o:ping>
+    ▏   ▏   <o:updatecheck></o:updatecheck>
+    ▏   </o:app>
     </o:gupdate>
  >
 Apr  7 07:31:56 Tim-Stacks-iMac.local VirtualBox[36403]: WARNING: The Gestalt selector gestaltSystemVersion is returning 10.9.2 instead of 10.10.2. Use NSProcessInfo's operatingSystemVersion property to get correct system version number.

test/expected/test_cmds.sh_e7e8244fac65bc51dbd5af31be476fe3b8776bfc.out

@@ -1,12 +1,12 @@
 {
     "foo bar" : null,
     "array" : [
-        1,
-        2,
-        3
+    â–Ź   1,
+    â–Ź   2,
+    â–Ź   3
     ],
-    "obj" : {
-        "one" : 1,
-        "two" : true 
+    "obj" : {
+    â–Ź   "one" : 1,
+    â–Ź   "two" : true 
     } 
 }

test/expected/test_json_format.sh_a06b3cdd46b387e72d6faa4cce648b8b11ae870b.out

@@ -24,6 +24,6 @@ bork bork bork
  
 [2013-09-06T22:01:49.124] ⋮ not looking goodbork bork bork
  
-[2013-09-06T22:01:49.124] ⋮ looking badbork bork bork
+[2013-09-06T22:01:49.124] ⋮ looking badbork bork bork
  
-[2013-09-06T22:01:49.124] ⋮ sooo badbork bork bork
+[2013-09-06T22:01:49.124] ⋮ sooo badbork bork bork

test/expected/test_pretty_print.sh_3c255c3c8b28df9d694b329a265e8b8140dae4a2.out

@@ -1,6 +1,6 @@
 {
     "wrapper": [
-            {"message":""
+    ▏   ▏   {"message":""
             select Id from Account where id = $sfid
                                              ^
             ERROR at Row:1:Column:34