diff --git a/src/data/extra/themes/vue-light/highlight.css b/src/data/extra/themes/vue-light/highlight.css
index 669bbf50..b5a74338 100644
--- a/src/data/extra/themes/vue-light/highlight.css
+++ b/src/data/extra/themes/vue-light/highlight.css
@@ -6,236 +6,240 @@ https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javasc
  * @author Lea Verou
  */
 
- code[class*="language-"],
- pre[class*="language-"] {
-     color: #525252;
-     background: none;
-     text-shadow: 0 1px white;
-     font-size:  0.9rem;
-     text-align: left;
-     white-space: pre;
-     word-spacing: normal;
-     word-break: normal;
-     word-wrap: normal;
-     line-height: 1.5;
- 
-     -moz-tab-size: 4;
-     -o-tab-size: 4;
-     tab-size: 4;
- 
-     -webkit-hyphens: none;
-     -moz-hyphens: none;
-     -ms-hyphens: none;
-     hyphens: none;
- }
- 
- pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
- code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
-     text-shadow: none;
-     background-color: #1976D2;
-     color: white;
- }
- 
- pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
- code[class*="language-"]::selection, code[class*="language-"] ::selection {
-     text-shadow: none;
-     background-color: #1976D2;
-     color: white;
- }
- 
- @media print {
-     code[class*="language-"],
-     pre[class*="language-"] {
-         text-shadow: none;
-     }
- }
- 
- /* Code blocks */
- pre[class*="language-"] {
-     padding: 1em;
-     margin: 0;
-     overflow: auto;
-     border-radius: 4px;
- }
- 
- :not(pre) > code[class*="language-"],
- pre[class*="language-"] {
-     background:#F8F8F8 !important;
- }
- 
- /* Inline code */
- :not(pre) > code[class*="language-"] {
-     padding: .1em;
-     border-radius: .3em;
-     white-space: normal;
- }
- 
- .token.comment,
- .token.prolog,
- .token.doctype,
- .token.cdata {
-     color: #a50;
- }
- 
- .token.punctuation {
-     color: #999;
- }
- 
- .token.namespace {
-     opacity: .7;
- }
- 
- .token.property,
- .token.tag,
- .token.boolean,
- .token.number,
- .token.constant,
- .token.symbol,
- .token.deleted {
-     color: #905;
- }
- 
- .token.selector,
- .token.attr-name,
- .token.string,
- .token.char,
- .token.builtin,
- .token.inserted {
-     color: #690;
- }
- 
- .token.operator,
- .token.entity,
- .token.url,
- .language-css .token.string,
- .style .token.string {
-     color: #9a6e3a;
-     /* This background color was intended by the author of this theme. */
-     background: hsla(0, 0%, 100%, .5);
- }
- 
- .token.atrule,
- .token.attr-value,
- .token.keyword {
-     color: #708;
- }
- 
- .token.function,
- .token.class-name {
-     color: #DD4A68;
- }
- 
- .token.regex,
- .token.important,
- .token.variable {
-     color: #e90;
- }
- 
- .token.important,
- .token.bold {
-     font-weight: bold;
- }
- .token.italic {
-     font-style: italic;
- }
- 
- .token.entity {
-     cursor: help;
- }
- 
- pre[class*="language-"].line-numbers {
-     position: relative;
-     padding-left: 3.8em;
-     counter-reset: linenumber;
- }
- 
- pre[class*="language-"].line-numbers > code {
-     position: relative;
-     white-space: inherit;
-     letter-spacing: 1px;
- }
- 
- .line-numbers .line-numbers-rows {
-     position: absolute;
-     pointer-events: none;
-     top: 0;
-     font-size: 100%;
-     left: -3.8em;
-     width: 3em; /* works for line-numbers below 1000 lines */
-     letter-spacing: -1px;
-     border-right: 1px solid #ddd;
-     color: #999;
-     -webkit-user-select: none;
-     -moz-user-select: none;
-     -ms-user-select: none;
-     user-select: none;
- 
- }
- 
-     .line-numbers-rows > span {
-         display: block;
-         counter-increment: linenumber;
-     }
- 
-         .line-numbers-rows > span:before {
-             content: counter(linenumber);
-             color: #999;
-             display: block;
-             padding-right: 0.8em;
-             text-align: right;
-         }
- 
- div.code-toolbar {
-     position: relative;
- }
- 
- div.code-toolbar > .toolbar {
-     position: absolute;
-     top: 0;
-     right: 0;
-     transition: opacity 0.3s ease-in-out;
-     opacity: 0;
- }
- 
- div.code-toolbar:hover > .toolbar {
-     opacity: 1;
- }
- 
- /* Separate line b/c rules are thrown out if selector is invalid.
-    IE11 and old Edge versions don't support :focus-within. */
- div.code-toolbar:focus-within > .toolbar {
-     opacity: 1;
- }
- 
- div.code-toolbar > .toolbar .toolbar-item {
-     display: inline-block;
- }
- 
- div.code-toolbar > .toolbar a {
-     cursor: pointer;
- }
- 
- div.code-toolbar > .toolbar button {
-     background: none;
-     border: 0;
-     color: inherit;
-     font: inherit;
-     line-height: normal;
-     overflow: visible;
-     padding: 0;
-     -webkit-user-select: none; /* for button */
-     -moz-user-select: none;
-     -ms-user-select: none;
- }
- 
- div.code-toolbar > .toolbar a,
- div.code-toolbar > .toolbar button,
- div.code-toolbar > .toolbar span {
-     color: #fff;
-     font-size: .8em;
-     font-weight: bold;
-     padding: .2em .5em;
-     border-radius: 0 4px 0 4px;
-     background-color: #5C9DFF;
- }
- 
\ No newline at end of file
+code[class*="language-"],
+pre[class*="language-"] {
+    color: black;
+    background: none;
+    font-size: 1em;
+    text-align: left;
+    white-space: pre;
+    word-spacing: normal;
+    word-break: normal;
+    word-wrap: normal;
+    line-height: 1.5;
+
+    -moz-tab-size: 4;
+    -o-tab-size: 4;
+    tab-size: 4;
+
+    -webkit-hyphens: none;
+    -moz-hyphens: none;
+    -ms-hyphens: none;
+    hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
+    text-shadow: none;
+    background-color: #1976d2;
+    color: #ffffff;
+}
+
+pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
+code[class*="language-"]::selection, code[class*="language-"] ::selection {
+    text-shadow: none;
+    background-color: #1976d2;
+    color: #ffffff;
+}
+
+@media print {
+    code[class*="language-"],
+    pre[class*="language-"] {
+        text-shadow: none;
+    }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+    padding: 1em;
+    margin: .5em 0;
+    overflow: auto;
+}
+
+:not(pre) > code[class*="language-"],
+pre[class*="language-"] {
+    background: #ede8e4;
+}
+
+/* Inline code */
+:not(pre) > code[class*="language-"] {
+    padding: .1em;
+    border-radius: .3em;
+    white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+    color: slategray;
+}
+
+.token.punctuation {
+    color: #999;
+}
+
+.token.namespace {
+    opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+    color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+    color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+    color: #9a6e3a;
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+    color: #07a;
+}
+
+.token.function,
+.token.class-name {
+    color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+    color: #e90;
+}
+
+.token.important,
+.token.bold {
+    font-weight: bold;
+}
+.token.italic {
+    font-style: italic;
+}
+
+.token.entity {
+    cursor: help;
+}
+
+pre[class*="language-"].line-numbers {
+    position: relative;
+    padding-left: 3.8em;
+    counter-reset: linenumber;
+}
+
+pre[class*="language-"].line-numbers > code {
+    position: relative;
+    white-space: inherit;
+}
+
+.line-numbers .line-numbers-rows {
+    position: absolute;
+    pointer-events: none;
+    top: 0;
+    font-size: 100%;
+    left: -3.8em;
+    width: 3em; /* works for line-numbers below 1000 lines */
+    letter-spacing: -1px;
+    border-right: 1px solid #999;
+
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+}
+
+    .line-numbers-rows > span {
+        display: block;
+        counter-increment: linenumber;
+    }
+
+        .line-numbers-rows > span:before {
+            content: counter(linenumber);
+            color: #999;
+            display: block;
+            padding-right: 0.8em;
+            text-align: right;
+        }
+
+div.code-toolbar {
+    position: relative;
+}
+
+div.code-toolbar > .toolbar {
+    position: absolute;
+    top: .3em;
+    right: .2em;
+    transition: opacity 0.3s ease-in-out;
+    opacity: 0;
+}
+
+div.code-toolbar:hover > .toolbar {
+    opacity: 1;
+}
+
+/* Separate line b/c rules are thrown out if selector is invalid.
+   IE11 and old Edge versions don't support :focus-within. */
+div.code-toolbar:focus-within > .toolbar {
+    opacity: 1;
+}
+
+div.code-toolbar > .toolbar .toolbar-item {
+    display: inline-block;
+}
+
+div.code-toolbar > .toolbar a {
+    cursor: pointer;
+}
+
+div.code-toolbar > .toolbar button {
+    background: none;
+    border: 0;
+    color: inherit;
+    font: inherit;
+    line-height: normal;
+    overflow: visible;
+    padding: 0;
+    -webkit-user-select: none; /* for button */
+    -moz-user-select: none;
+    -ms-user-select: none;
+}
+
+div.code-toolbar > .toolbar a,
+div.code-toolbar > .toolbar button,
+div.code-toolbar > .toolbar span {
+    color: #bbb;
+    font-size: .8em;
+    padding: 0 .5em;
+    background: rgba(224, 224, 224, 0.2);
+    box-shadow: 0 2px 0 0 rgba(0,0,0,0.2);
+    border-radius: .5em;
+}
+
+div.code-toolbar > .toolbar a:hover,
+div.code-toolbar > .toolbar a:focus,
+div.code-toolbar > .toolbar button:hover,
+div.code-toolbar > .toolbar button:focus,
+div.code-toolbar > .toolbar span:hover,
+div.code-toolbar > .toolbar span:focus {
+    color: inherit;
+    text-decoration: none;
+}
diff --git a/src/data/extra/themes/vue-light/palette.json b/src/data/extra/themes/vue-light/palette.json
index ef89f469..4a4b9ed6 100644
--- a/src/data/extra/themes/vue-light/palette.json
+++ b/src/data/extra/themes/vue-light/palette.json
@@ -642,6 +642,7 @@
                     }
                 },
                 "hover" : {
+                    "fg" : "@widgets#mainwindow#side_bar#fg",
                     "bg" : "@palette#layer3"
                 },
                 "widget" : {
diff --git a/src/data/extra/web/js/markjs.js b/src/data/extra/web/js/markjs.js
index 34a2f938..d55e5ea7 100644
--- a/src/data/extra/web/js/markjs.js
+++ b/src/data/extra/web/js/markjs.js
@@ -81,7 +81,9 @@ class MarkJs {
             'caseSensitive': p_options.caseSensitive,
             'accuracy': p_options.wholeWordOnly ? 'exactly' : 'partially',
             // Ignore SVG, or SVG will be corrupted.
-            'exclude': ['svg *']
+            'exclude': ['svg *'],
+            'separateWordSearch': false,
+            'acrossElements': true
         }
         return opt;
     }
diff --git a/src/main.cpp b/src/main.cpp
index 43580a45..a28607cf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,6 +72,11 @@ int main(int argc, char *argv[])
     }
 #endif
 
+#if defined(Q_OS_LINUX)
+    // Disable sandbox on Linux.
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
+#endif
+
     Application app(argc, argv);
 
     initWebEngineSettings();