diff --git a/package.json b/package.json
index 1ada48e..ae2d2fa 100644
--- a/package.json
+++ b/package.json
@@ -112,14 +112,14 @@
       "view/title": [
         {
           "command": "twitchHighlighter.refreshTreeView",
-          "when": "view == twitchHighlighterTreeView",
+          "when": "view == twitchHighlighterTreeView || view == twitchHighlighterTreeView-explorer || view == twitchHighlighterTreeView-debug",
           "group": "navigation"
         }
       ],
       "view/item/context": [
         {
           "command": "twitchHighlighter.removeHighlight",
-          "when": "view == twitchHighlighterTreeView",
+          "when": "view == twitchHighlighterTreeView || view == twitchHighlighterTreeView-explorer || view == twitchHighlighterTreeView-debug",
           "group": "edit"
         }
       ]
@@ -136,13 +136,13 @@
     "views": {
       "explorer": [
         {
-          "id": "twitchHighlighterTreeView",
+          "id": "twitchHighlighterTreeView-explorer",
           "name": "Highlights"
         }
       ],
       "debug": [
         {
-          "id": "twitchHighlighterTreeView",
+          "id": "twitchHighlighterTreeView-debug",
           "name": "Highlights"
         }
       ],
diff --git a/src/extension.ts b/src/extension.ts
index f583394..f7d64d5 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -45,11 +45,25 @@ export function activate(context: vscode.ExtensionContext) {
   twitchHighlighterTreeView = new TwitchHighlighterDataProvider(() => {
     return highlighters;
   });
+
+  // TreeView registration for the Highlighter Panel
   vscode.window.registerTreeDataProvider(
     'twitchHighlighterTreeView',
     twitchHighlighterTreeView
   );
 
+  // TreeView registration for the Explorer Panel
+  vscode.window.registerTreeDataProvider(
+    'twitchHighlighterTreeView-explorer',
+    twitchHighlighterTreeView
+  );
+
+  // TreeView registration for the Debug Panel
+  vscode.window.registerTreeDataProvider(
+    'twitchHighlighterTreeView-debug',
+    twitchHighlighterTreeView
+  );
+
   // Creates the status bar toggle button
   twitchHighlighterStatusBar = vscode.window.createStatusBarItem(
     vscode.StatusBarAlignment.Left
@@ -111,6 +125,7 @@ export function activate(context: vscode.ExtensionContext) {
       removeHighlight(v.lineNumber, v.fileName, true)
     );
     twitchHighlighterTreeView.refresh();
+    triggerUpdateDecorations();
   }
 
   function refreshTreeViewHandler() {