diff --git a/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js b/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js
index 40244f69d..300dee9b7 100644
--- a/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js
+++ b/src/public/app/widgets/type_widgets/options/code_notes/code_mime_types.js
@@ -62,14 +62,14 @@ export default class CodeMimeTypesOptions extends OptionsWidget {
         const groupedMimeTypes = groupMimeTypesAlphabetically(ungroupedMimeTypes);
 
         // Plain text is displayed at the top intentionally.
-        this.$mimeTypes.append(buildSelectionForMimeType(plainTextMimeType));
+        this.$mimeTypes.append(buildSelectionForMimeType.call(this, plainTextMimeType));
         
         for (const [ initial, mimeTypes ] of Object.entries(groupedMimeTypes)) {
             const $section = $("<section>");
             $section.append($("<h5>").text(initial));            
 
             for (const mimeType of mimeTypes) {
-                $section.append(buildSelectionForMimeType(mimeType));
+                $section.append(buildSelectionForMimeType.call(this, mimeType));
             }
 
             this.$mimeTypes.append($section);
diff --git a/src/public/stylesheets/theme-next.css b/src/public/stylesheets/theme-next.css
index f66d60e48..65a7bc6d5 100644
--- a/src/public/stylesheets/theme-next.css
+++ b/src/public/stylesheets/theme-next.css
@@ -266,6 +266,7 @@
         --left-pane-item-selected-action-button-hover-shadow: 2px 2px 10px rgba(0, 0, 0, .25);
      
         --launcher-pane-background-color: #1a1a1a;
+        --launcher-pane-horizontal-background-color: #282828;
         --launcher-pane-text-color: #909090;
         --launcher-pane-button-hover-color: #ffffff;
         --launcher-pane-button-hover-background: #ffffff1c;
@@ -539,14 +540,12 @@ html body #left-pane .quick-search:focus-within .search-button:hover,
 }
 
 #left-pane .ui-fancytree ul {
-    padding-left: 1px;
-    margin-left: 14px;
-    border-left: 1px solid var(--subtle-border-color);
+    padding-left: 10px;
 }
 
 /* The root element of the tree */
 #left-pane .fancytree-container > li:first-child > span {
-    padding-left: 6px;
+    padding-left: 12px;
 }
 
 #left-pane span.fancytree-node.fancytree-active {
diff --git a/src/services/hidden_subtree.ts b/src/services/hidden_subtree.ts
index 584803a2f..3f0c01bdb 100644
--- a/src/services/hidden_subtree.ts
+++ b/src/services/hidden_subtree.ts
@@ -54,7 +54,7 @@ enum Command {
  * duplicate subtrees. This way, all instances will generate the same structure with the same IDs.
  */
 
-let HIDDEN_SUBTREE_DEFINITION = buildHiddenSubtreeDefinition();
+let hiddenSubtreeDefinition: Item;
 
 function buildHiddenSubtreeDefinition(): Item {
     return {
@@ -288,11 +288,11 @@ function checkHiddenSubtree(force = false, extraOpts: CheckHiddenExtraOpts = {})
         return;
     }
 
-    if (force) {
-        HIDDEN_SUBTREE_DEFINITION = buildHiddenSubtreeDefinition();
+    if (!hiddenSubtreeDefinition || force) {
+        hiddenSubtreeDefinition = buildHiddenSubtreeDefinition();
     }
 
-    checkHiddenSubtreeRecursively('root', HIDDEN_SUBTREE_DEFINITION, extraOpts);
+    checkHiddenSubtreeRecursively('root', hiddenSubtreeDefinition, extraOpts);
 }
 
 function checkHiddenSubtreeRecursively(parentNoteId: string, item: Item, extraOpts: CheckHiddenExtraOpts = {}) {