From 01e71361f2adfe70fb1605f11e1584becc644bbb Mon Sep 17 00:00:00 2001
From: Anthony Rose <20302208+Cx01N@users.noreply.github.com>
Date: Mon, 16 Mar 2026 08:22:26 -0400
Subject: [PATCH 1/5] Add background override toggle to module execution (#266)

Adds a "Run as Background Job" checkbox to the module execute form,
allowing users to override a module's default background setting.
The toggle pre-populates from the module's YAML background value.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/api/module-api.js                        |  2 ++
 src/components/agents/AgentExecuteModule.vue | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/api/module-api.js b/src/api/module-api.js
index 3f8fcbf9..a418ef81 100644
--- a/src/api/module-api.js
+++ b/src/api/module-api.js
@@ -18,6 +18,7 @@ export function executeModule(
   options,
   ignoreAdminCheck,
   ignoreLanguageCheck,
+  backgroundOverride,
 ) {
   return axios
     .post(`/agents/${options.Agent}/tasks/module/`, {
@@ -25,6 +26,7 @@ export function executeModule(
       options,
       ignore_admin_check: ignoreAdminCheck,
       ignore_language_version_check: ignoreLanguageCheck,
+      background_override: backgroundOverride,
     })
     .then(({ data }) => ({ agent: options.Agent, ...data }))
     .catch((error) =>
diff --git a/src/components/agents/AgentExecuteModule.vue b/src/components/agents/AgentExecuteModule.vue
index 9210281a..5fd043e7 100644
--- a/src/components/agents/AgentExecuteModule.vue
+++ b/src/components/agents/AgentExecuteModule.vue
@@ -106,6 +106,12 @@
           label="Ignore Language Version Check"
           color="primary"
         />
+        <v-checkbox
+          v-model="backgroundOverride"
+          class="pa-1"
+          label="Run as Background Job"
+          color="primary"
+        />
       </div>
 
       <general-form
@@ -227,6 +233,7 @@ export default {
       errorState: false,
       ignoreAdminCheck: false,
       ignoreLanguageCheck: false,
+      backgroundOverride: false,
       treeSelected: [],
       treeOpen: [],
       showTreeDialog: false,
@@ -401,6 +408,8 @@ export default {
       this.selectedItem = results || {};
       if (!Object.keys(this.selectedItem).length) {
         this.errorState = true;
+      } else {
+        this.backgroundOverride = !!this.selectedItem.background;
       }
     },
     handleTreeSelect(selected) {
@@ -438,6 +447,7 @@ export default {
             },
             this.ignoreAdminCheck,
             this.ignoreLanguageCheck,
+            this.backgroundOverride,
           ),
         ),
       );

From 441555b706dc68a4ed6984ca06ef7bca3c475695 Mon Sep 17 00:00:00 2001
From: Anthony Rose <20302208+Cx01N@users.noreply.github.com>
Date: Sun, 22 Mar 2026 12:47:51 -0400
Subject: [PATCH 2/5] Add dedicated Shell session tab and multi-tab Terminal
 support (#265)

* Add dedicated Shell session tab and multi-tab Terminal support

- Add AgentShellSession component: dedicated interactive shell that
  immediately enters shell mode with directory tracking, command history,
  and inline result display
- Add TabbedTerminalContainer component: supports multiple Terminal
  instances with add/close/rename (right-click) tabs
- Remove shell menu mode from AgentTerminal (redundant with Shell tab)
- Persist active interact sub-tab and terminal tab state to localStorage

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix review findings: tab storage collision, dead style binding, eslint comment

- Pass tabId prop from TabbedTerminalContainer to child components so
  each terminal/shell tab gets a unique localStorage key
- Remove undefined contextMenuStyle binding from v-menu
- Add eslint-disable comment for v-html in AgentShellSession

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/components/agents/AgentShellSession.vue   | 348 ++++++++++++++++++
 src/components/agents/AgentTerminal.vue       |  90 +----
 .../agents/TabbedTerminalContainer.vue        | 199 ++++++++++
 src/views/AgentEdit.vue                       |  28 +-
 4 files changed, 580 insertions(+), 85 deletions(-)
 create mode 100644 src/components/agents/AgentShellSession.vue
 create mode 100644 src/components/agents/TabbedTerminalContainer.vue

diff --git a/src/components/agents/AgentShellSession.vue b/src/components/agents/AgentShellSession.vue
new file mode 100644
index 00000000..4fe09f4d
--- /dev/null
+++ b/src/components/agents/AgentShellSession.vue
@@ -0,0 +1,348 @@
+<template>
+  <div>
+    <div class="terminal-container">
+      <div ref="output" class="terminal-output">
+        <!-- eslint-disable-next-line vue/no-v-html -->
+        <div
+          v-for="(line, index) in outputLines"
+          :key="index"
+          :class="line.cssClasses"
+          style="white-space: pre-wrap"
+          v-html="ansiToHTML(line.content)"
+        />
+      </div>
+      <div class="terminal-input">
+        <!-- eslint-disable-next-line vue/no-v-html -->
+        <span class="prompt" v-html="ansiToHTML(currentPrompt)" />
+        <input
+          ref="inputField"
+          v-model="currentInput"
+          @keyup.enter="processCommand"
+          @keydown="handleKeyEvents"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import pause from "@/utils/pause";
+import * as agentTaskApi from "@/api/agent-task-api";
+import AnsiUp from "ansi_up";
+
+export default {
+  name: "AgentShellSession",
+  props: {
+    agent: {
+      type: Object,
+      required: true,
+    },
+    tabId: {
+      type: Number,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      currentInput: "",
+      outputLines: [],
+      commandHistory: [],
+      historyIndex: -1,
+      currentDir: "loading...",
+    };
+  },
+  computed: {
+    currentPrompt() {
+      const prefix = this.colorizeText("(Empire: ", "white");
+      const suffix = this.colorizeText(" )>", "white");
+      const body = this.colorizeText(this.currentDir, "green");
+      return prefix + body + suffix;
+    },
+  },
+  watch: {
+    outputLines(val) {
+      localStorage.setItem(this.storageName(), JSON.stringify(val));
+    },
+  },
+  async mounted() {
+    this.$refs.inputField.focus();
+
+    const savedHistory = localStorage.getItem(this.storageName());
+    if (savedHistory) {
+      this.outputLines = JSON.parse(savedHistory);
+    }
+
+    this.scrollToBottom();
+    this.updateCurrentDirectory();
+  },
+  methods: {
+    storageName() {
+      const suffix = this.tabId != null ? `-${this.tabId}` : "";
+      return `shell-session-${this.agent.session_id}${suffix}`;
+    },
+    handleKeyEvents(event) {
+      if (event.code === "ArrowUp") {
+        event.preventDefault();
+        if (this.historyIndex > 0) {
+          this.historyIndex--;
+          this.currentInput = this.commandHistory[this.historyIndex];
+        }
+      } else if (event.code === "ArrowDown") {
+        if (this.historyIndex < this.commandHistory.length - 1) {
+          this.historyIndex++;
+          this.currentInput = this.commandHistory[this.historyIndex];
+        }
+      }
+    },
+    async processCommand() {
+      if (!this.currentInput.trim()) {
+        this.addLine("");
+        this.addLine(this.currentPrompt);
+        this.currentInput = "";
+        return;
+      }
+
+      this.addLine(`${this.currentPrompt} ${this.currentInput}`);
+      const command = this.currentInput;
+
+      if (command.trim() === "clear") {
+        this.outputLines = [];
+        this.currentInput = "";
+        return;
+      }
+
+      this.commandHistory.push(command);
+      this.historyIndex = this.commandHistory.length;
+      this.currentInput = "";
+
+      await this.shellCommandOperator(command);
+    },
+    async shellCommandOperator(stdin) {
+      let response = null;
+      try {
+        if (stdin.trim() === "sysinfo") {
+          response = await agentTaskApi.sysinfo(this.agent.session_id);
+        } else {
+          response = await agentTaskApi.shell(
+            this.agent.session_id,
+            stdin,
+            false,
+          );
+        }
+      } catch (error) {
+        this.addError(`Error executing command: ${error.message}`);
+        return;
+      }
+
+      const complete = await this.pollForResult(response.id, { print: false });
+
+      if (["cd", "set-location"].includes(stdin.toLowerCase().split(" ")[0])) {
+        this.updateCurrentDirectory();
+        return;
+      }
+
+      if (complete) {
+        this.addLine(complete.output, "indent-5-spaces");
+      }
+    },
+    getDirectoryCommand() {
+      if (this.agent.language === "python") {
+        return "echo $PWD";
+      }
+      if (this.agent.language === "ironpython") {
+        return "cd .";
+      }
+      return "(Resolve-Path .\\).Path";
+    },
+    async updateCurrentDirectory() {
+      this.currentDir = "loading...";
+      const response = await agentTaskApi.shell(
+        this.agent.session_id,
+        this.getDirectoryCommand(),
+      );
+
+      const complete = await this.pollForResult(response.id, { print: false });
+
+      if (complete) {
+        // eslint-disable-next-line prefer-destructuring
+        this.currentDir = (
+          await this.checkTaskComplete(response.id)
+        ).output.split("\r")[0];
+      }
+    },
+    async pollForResult(
+      taskId,
+      config = { print: true, attempts: 30, delay: 5000 },
+    ) {
+      if (!config.attempts) config.attempts = 30;
+      config.delay = Math.max(
+        config.delay ||
+          (this.agent.delay != null ? this.agent.delay * 1000 : 5000),
+        1000,
+      );
+
+      let res = null;
+      let hasPrintedJobStarted = false;
+      let i = 0;
+      let complete = false;
+      while (i < config.attempts) {
+        // eslint-disable-next-line no-await-in-loop
+        res = await this.checkTaskComplete(taskId);
+        if (res) {
+          const { output } = res;
+          if (!output.toLowerCase().includes("job started")) {
+            if (config.print) {
+              const taskName = res.module_name || res.task_name || "shell";
+              this.addLine(
+                `[*] Task ${res.id} (${taskName}) completed`,
+                "info-text",
+              );
+              this.addLine(output, "indent-5-spaces");
+            }
+            complete = true;
+            break;
+          } else if (!hasPrintedJobStarted) {
+            this.addLine(output, "indent-5-spaces");
+            hasPrintedJobStarted = true;
+          }
+        }
+
+        // eslint-disable-next-line no-await-in-loop
+        await pause(config.delay);
+        i++;
+      }
+
+      if (!complete) {
+        this.addInfo(`No output received for task ${taskId}.`);
+      }
+
+      return res;
+    },
+    async checkTaskComplete(taskId) {
+      try {
+        const task = await agentTaskApi.getTask(this.agent.session_id, taskId);
+        if (task.output) {
+          return task;
+        }
+        return false;
+      } catch (_err) {
+        return false;
+      }
+    },
+    addLine(content, cssClasses = "preserve-newlines") {
+      this.outputLines.push({ content, cssClasses });
+      this.scrollToBottom();
+    },
+    addError(content) {
+      this.addLine(content, "error-text");
+    },
+    addInfo(content) {
+      this.addLine(content, "info-text");
+    },
+    scrollToBottom() {
+      this.$nextTick(() => {
+        const outputDiv = this.$refs.output;
+        outputDiv.scrollTop = outputDiv.scrollHeight;
+      });
+    },
+    ansiToHTML(input) {
+      const ansiUp = new AnsiUp();
+      return ansiUp.ansi_to_html(input);
+    },
+    colorizeText(text, color = "") {
+      let colorCode = "";
+      const boldCode = "\u001b[1m";
+      switch (color.toLowerCase()) {
+        case "red":
+          colorCode = "\u001b[91m";
+          break;
+        case "green":
+          colorCode = "\u001b[92m";
+          break;
+        case "blue":
+          colorCode = "\u001b[94m";
+          break;
+        case "yellow":
+          colorCode = "\u001b[93m";
+          break;
+        case "white":
+          colorCode = "\u001b[97m";
+          break;
+        default:
+          return text;
+      }
+      return `${boldCode}${colorCode}${text}\u001b[0m`;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.terminal-container {
+  font-family: "Courier New", Courier, monospace;
+  font-size: 14px;
+  max-height: 60vh;
+  padding: 10px;
+  background-color: #424242fc;
+  color: white;
+  border: 1px solid #57d9a3;
+  border-radius: 5px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.terminal-output {
+  overflow-y: auto;
+}
+
+.terminal-input {
+  display: flex;
+  align-items: center;
+}
+
+.terminal-input input {
+  background-color: transparent;
+  color: white;
+  border: none;
+  outline: none;
+  flex: 1;
+  padding-left: 5px;
+}
+
+.error-text {
+  color: #ff0000;
+  font-weight: bold;
+  margin-right: 5px;
+}
+
+.error-text::before {
+  content: "[!] ";
+}
+
+.info-text {
+  color: #009dff;
+  font-weight: bold;
+  margin-right: 5px;
+}
+
+.info-text::before {
+  content: "[*] ";
+}
+
+.prompt {
+  color: #ff0000;
+  font-weight: bold;
+  margin-right: 5px;
+}
+
+.preserve-newlines {
+  white-space: pre-line;
+}
+
+.indent-5-spaces {
+  padding-left: 5ch;
+  white-space: pre-wrap;
+}
+</style>
diff --git a/src/components/agents/AgentTerminal.vue b/src/components/agents/AgentTerminal.vue
index 1fd17993..2fc250b4 100644
--- a/src/components/agents/AgentTerminal.vue
+++ b/src/components/agents/AgentTerminal.vue
@@ -16,7 +16,6 @@
         <input
           ref="inputField"
           v-model="currentInput"
-          @keyup.ctrl.c.prevent.stop="ctrlCHandler"
           @keyup.enter="processCommand"
           @keydown="handleKeyEvents"
         />
@@ -66,6 +65,10 @@ export default {
       type: Object,
       required: true,
     },
+    tabId: {
+      type: Number,
+      default: null,
+    },
   },
   data() {
     return {
@@ -136,6 +139,7 @@ export default {
           command: "shell",
           description: "Tasks the specified agent to execute a shell command",
           usage: "shell [--literal / -l] <shell_cmd>",
+          // For interactive shell sessions, use the Shell tab
         },
         {
           command: "ps",
@@ -224,8 +228,6 @@ export default {
           usage: "back",
         },
       ],
-      isShellMenu: false,
-      currentDir: "loading...",
     };
   },
   computed: {
@@ -250,8 +252,6 @@ export default {
       let body = "";
       if (this.currentModule) {
         body = this.colorizeText(`usemodule/${this.currentModule.id}`, "red");
-      } else if (this.isShellMenu) {
-        body = this.colorizeText(this.currentDir, "green");
       } else {
         body = this.colorizeText(this.agent.session_id, "red");
       }
@@ -290,14 +290,8 @@ export default {
   },
   methods: {
     storageName() {
-      return `terminal-history-${this.agent.session_id}`;
-    },
-    ctrlCHandler(_event) {
-      if (this.isShellMenu) {
-        this.isShellMenu = false;
-      }
-      this.addLine(`${this.currentPrompt} ${this.currentInput}`);
-      this.currentInput = "";
+      const suffix = this.tabId != null ? `-${this.tabId}` : "";
+      return `terminal-history-${this.agent.session_id}${suffix}`;
     },
     positionSuggestions() {
       const { inputField } = this.$refs;
@@ -386,10 +380,6 @@ export default {
       }
     },
     async generateSuggestions() {
-      if (this.isShellMenu) {
-        this.suggestions = [];
-        return;
-      }
       const query = this.currentInput.toLowerCase().trim();
 
       if (!query) {
@@ -512,9 +502,7 @@ export default {
       const command = commandParts[0];
       const args = commandParts.slice(1);
 
-      if (this.isShellMenu) {
-        this.shellCommandOperator(this.currentInput);
-      } else if (command === "back") {
+      if (command === "back") {
         if (this.currentModule) {
           this.currentModule = null;
         } else {
@@ -562,10 +550,9 @@ export default {
             break;
           case "shell":
             if (args.length < 1) {
-              this.isShellMenu = true;
-              this.updateCurrentDirectory();
-              this.addInfo(`Shell session started on ${this.agent.session_id}`);
-              this.addInfo("Exit shell menu with Ctrl+C.");
+              this.addError(
+                "Usage: shell [--literal / -l] <shell_cmd>. Use the Shell tab for an interactive session.",
+              );
             } else {
               this.runShellCommand(commandParts.slice(1).join(" "));
             }
@@ -799,61 +786,6 @@ export default {
 
       return res;
     },
-    getDirectoryCommand() {
-      if (this.agent.language === "python") {
-        return "echo $PWD";
-      }
-      if (this.agent.language === "ironpython") {
-        return "cd .";
-      }
-      return "(Resolve-Path .\\).Path";
-    },
-    async updateCurrentDirectory() {
-      this.currentDir = "loading...";
-      const response = await agentTaskApi.shell(
-        this.agent.session_id,
-        this.getDirectoryCommand(),
-      );
-
-      const complete = await this.pollForResult(response.id, { print: false });
-
-      if (complete) {
-        // eslint-disable-next-line prefer-destructuring
-        this.currentDir = (
-          await this.checkTaskComplete(response.id)
-        ).output.split("\r")[0];
-      }
-    },
-    // This is for when in the shell menu.
-    // The other function is for when not in the shell menu.
-    async shellCommandOperator(stdin) {
-      let response = null;
-      try {
-        if (stdin.trim() === "sysinfo") {
-          response = await agentTaskApi.sysinfo(this.agent.session_id);
-        } else {
-          response = await agentTaskApi.shell(
-            this.agent.session_id,
-            stdin,
-            false,
-          );
-        }
-      } catch (error) {
-        this.addError(`Error executing command: ${error.message}`);
-        return;
-      }
-
-      const complete = await this.pollForResult(response.id, { print: false });
-
-      if (["cd", "set-location"].includes(stdin.toLowerCase().split(" ")[0])) {
-        this.updateCurrentDirectory();
-        return;
-      }
-
-      if (complete) {
-        this.addLine(complete.output, "indent-5-spaces");
-      }
-    },
     async checkTaskComplete(taskId) {
       try {
         const task = await agentTaskApi.getTask(this.agent.session_id, taskId);
diff --git a/src/components/agents/TabbedTerminalContainer.vue b/src/components/agents/TabbedTerminalContainer.vue
new file mode 100644
index 00000000..2ac4acc8
--- /dev/null
+++ b/src/components/agents/TabbedTerminalContainer.vue
@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <div class="d-flex align-center">
+      <v-tabs
+        v-model="activeTab"
+        :height="30"
+        color="primary"
+        density="compact"
+      >
+        <v-tab
+          v-for="(tab, index) in tabs"
+          :key="tab.id"
+          :value="tab.id"
+          class="tabbed-terminal-tab"
+          @contextmenu.prevent="openContextMenu($event, tab)"
+        >
+          <input
+            v-if="renamingTabId === tab.id"
+            ref="renameInput"
+            v-model="renameValue"
+            class="rename-input"
+            @click.stop
+            @keyup.enter="commitRename(tab)"
+            @keyup.escape="cancelRename"
+            @blur="commitRename(tab)"
+          />
+          <span v-else>{{ tab.name || `${label} ${index + 1}` }}</span>
+          <v-btn
+            v-if="tabs.length > 1"
+            icon
+            variant="text"
+            size="x-small"
+            class="ml-1 close-btn"
+            @click.stop="removeTab(tab.id)"
+          >
+            <v-icon size="x-small">fa-times</v-icon>
+          </v-btn>
+        </v-tab>
+      </v-tabs>
+      <v-btn icon variant="text" size="x-small" class="ml-1" @click="addTab">
+        <v-icon size="small">fa-plus</v-icon>
+      </v-btn>
+    </div>
+    <v-menu
+      v-model="contextMenu"
+      location="bottom start"
+      :target="contextMenuTarget"
+    >
+      <v-list density="compact">
+        <v-list-item @click="startRename(contextMenuTab)">
+          <template #prepend>
+            <v-icon size="small">fa-pen</v-icon>
+          </template>
+          <v-list-item-title>Rename</v-list-item-title>
+        </v-list-item>
+      </v-list>
+    </v-menu>
+    <v-window v-model="activeTab">
+      <v-window-item
+        v-for="tab in tabs"
+        :key="tab.id"
+        :value="tab.id"
+        :transition="false"
+        :reverse-transition="false"
+      >
+        <component :is="childComponent" :agent="agent" :tab-id="tab.id" />
+      </v-window-item>
+    </v-window>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "TabbedTerminalContainer",
+  props: {
+    agent: {
+      type: Object,
+      required: true,
+    },
+    childComponent: {
+      type: Object,
+      required: true,
+    },
+    label: {
+      type: String,
+      default: "Tab",
+    },
+    storageKey: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    const saved = this.storageKey
+      ? JSON.parse(localStorage.getItem(this.storageKey) || "null")
+      : null;
+    return {
+      tabs: saved?.tabs || [{ id: 1, name: "" }],
+      activeTab: saved?.activeTab || 1,
+      nextId: saved?.nextId || 2,
+      renamingTabId: null,
+      renameValue: "",
+      contextMenu: false,
+      contextMenuTab: null,
+      contextMenuTarget: [0, 0],
+    };
+  },
+  watch: {
+    tabs: {
+      deep: true,
+      handler() {
+        this.saveState();
+      },
+    },
+    activeTab() {
+      this.saveState();
+    },
+  },
+  methods: {
+    saveState() {
+      if (!this.storageKey) return;
+      localStorage.setItem(
+        this.storageKey,
+        JSON.stringify({
+          tabs: this.tabs,
+          activeTab: this.activeTab,
+          nextId: this.nextId,
+        }),
+      );
+    },
+    addTab() {
+      const id = this.nextId;
+      this.nextId++;
+      this.tabs.push({ id, name: "" });
+      this.activeTab = id;
+    },
+    removeTab(id) {
+      const index = this.tabs.findIndex((t) => t.id === id);
+      this.tabs = this.tabs.filter((t) => t.id !== id);
+      if (this.activeTab === id) {
+        const newIndex = Math.min(index, this.tabs.length - 1);
+        this.activeTab = this.tabs[newIndex].id;
+      }
+    },
+    openContextMenu(event, tab) {
+      this.contextMenuTab = tab;
+      this.contextMenuTarget = [event.clientX, event.clientY];
+      this.contextMenu = true;
+    },
+    startRename(tab) {
+      this.renamingTabId = tab.id;
+      this.renameValue = tab.name;
+      this.$nextTick(() => {
+        const inputs = this.$refs.renameInput;
+        if (inputs) {
+          const input = Array.isArray(inputs) ? inputs[0] : inputs;
+          input.focus();
+          input.select();
+        }
+      });
+    },
+    commitRename(tab) {
+      if (this.renamingTabId === null) return;
+      tab.name = this.renameValue.trim();
+      this.renamingTabId = null;
+      this.renameValue = "";
+    },
+    cancelRename() {
+      this.renamingTabId = null;
+      this.renameValue = "";
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.tabbed-terminal-tab {
+  min-width: 0;
+  text-transform: none;
+}
+
+.close-btn {
+  opacity: 0.6;
+  &:hover {
+    opacity: 1;
+  }
+}
+
+.rename-input {
+  background: transparent;
+  border: 1px solid currentColor;
+  border-radius: 3px;
+  color: inherit;
+  font: inherit;
+  outline: none;
+  padding: 0 4px;
+  max-width: 120px;
+}
+</style>
diff --git a/src/views/AgentEdit.vue b/src/views/AgentEdit.vue
index 2dfe9a05..3dcde5a0 100644
--- a/src/views/AgentEdit.vue
+++ b/src/views/AgentEdit.vue
@@ -194,11 +194,12 @@
                   <v-window v-model="interactTab">
                     <v-window-item
                       key="shell"
+                      style="height: auto"
                       value="shell"
                       :transition="false"
                       :reverse-transition="false"
                     >
-                      <agent-interact :agent="agent" />
+                      <agent-shell-session class="mt-2" :agent="agent" />
                     </v-window-item>
                     <v-window-item
                       key="module"
@@ -215,7 +216,13 @@
                       :transition="false"
                       :reverse-transition="false"
                     >
-                      <agent-terminal class="mt-2" :agent="agent" />
+                      <tabbed-terminal-container
+                        class="mt-2"
+                        :agent="agent"
+                        :child-component="terminalComponent"
+                        label="Terminal"
+                        :storage-key="`terminal-tabs-${id}`"
+                      />
                     </v-window-item>
                   </v-window>
                 </v-card>
@@ -296,12 +303,13 @@
 
 <script>
 import AgentForm from "@/components/agents/AgentForm.vue";
-import AgentInteract from "@/components/agents/AgentInteract.vue";
 import AgentTasksList from "@/components/agents/AgentTasksList.vue";
 import AgentJobs from "@/components/agents/AgentJobs.vue";
 import AgentExecuteModule from "@/components/agents/AgentExecuteModule.vue";
 import AgentFileBrowser from "@/components/agents/AgentFileBrowser.vue";
 import AgentTerminal from "@/components/agents/AgentTerminal.vue";
+import AgentShellSession from "@/components/agents/AgentShellSession.vue";
+import TabbedTerminalContainer from "@/components/agents/TabbedTerminalContainer.vue";
 import AgentUploadDialog from "@/components/agents/AgentUploadDialog.vue";
 import AgentDownloadDialog from "@/components/agents/AgentDownloadDialog.vue";
 import TooltipButtonToggle from "@/components/TooltipButtonToggle.vue";
@@ -317,12 +325,12 @@ export default {
   name: "AgentEdit",
   components: {
     AgentForm,
-    AgentInteract,
     AgentExecuteModule,
     AgentFileBrowser,
     AgentTasksList,
     AgentJobs,
-    AgentTerminal,
+    AgentShellSession,
+    TabbedTerminalContainer,
     AgentUploadDialog,
     AgentDownloadDialog,
     TooltipButtonToggle,
@@ -346,10 +354,15 @@ export default {
       rightPaneInitialized: false,
       pathToFile: "",
       isRefreshTasks: true,
-      interactTab: "module",
+      interactTab:
+        localStorage.getItem(`interact-tab-${this.$route.params.id}`) ||
+        "module",
     };
   },
   computed: {
+    terminalComponent() {
+      return AgentTerminal;
+    },
     agentStore() {
       return useAgentStore();
     },
@@ -400,6 +413,9 @@ export default {
     },
   },
   watch: {
+    interactTab(val) {
+      localStorage.setItem(`interact-tab-${this.id}`, val);
+    },
     id(val) {
       if (val) {
         this.getAgent(val);

From 18442fe0f737469164e125b95b4a55ddcec505c8 Mon Sep 17 00:00:00 2001
From: Anthony Rose <20302208+Cx01N@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:52:19 -0400
Subject: [PATCH 3/5] Fix mass kill action not sending kill commands on agents
 list page (#267)

The v-data-table selected items are session_id strings (via item-value),
not agent objects. The mass kill forEach was accessing agent.session_id
which resolved to undefined, silently failing to kill any agents.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 CHANGELOG.md                         | 4 ++++
 src/components/agents/AgentsList.vue | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a09462dd..4b926ce0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+-   Fixed mass kill action on agents list page not sending kill commands due to incorrect session ID reference
+
 ## [3.4.0] - 2026-03-08
 
 ### Changed
diff --git a/src/components/agents/AgentsList.vue b/src/components/agents/AgentsList.vue
index c33d3ff6..b515e50d 100644
--- a/src/components/agents/AgentsList.vue
+++ b/src/components/agents/AgentsList.vue
@@ -150,8 +150,8 @@ export default {
           { color: "red" },
         )
       ) {
-        this.selected.forEach((agent) => {
-          this.agentStore.killAgent({ sessionId: agent.session_id });
+        this.selected.forEach((sessionId) => {
+          this.agentStore.killAgent({ sessionId });
         });
         this.snack.success(
           `${this.selected.length} agents tasked to run TASK_EXIT.`,

From 3c3d53d6001cc7758551bb10171f61ca0987ee6f Mon Sep 17 00:00:00 2001
From: Vincent Rose <vrose04@gmail.com>
Date: Sun, 12 Apr 2026 11:10:57 -0700
Subject: [PATCH 4/5] Vuetify 4 migration (#268)

---
 CHANGELOG.md                                  | 12 +++++++
 package.json                                  |  4 +--
 src/App.vue                                   | 35 +++++++++++--------
 src/app.scss                                  |  8 +++++
 src/components/AutoRunModules.vue             |  2 +-
 src/components/ClickToEdit.vue                |  4 +--
 src/components/DynamicFormInput.vue           |  2 +-
 src/components/EditPageTop.vue                | 34 +++++++++---------
 src/components/ErrorStateAlert.vue            |  2 +-
 src/components/FileUploadDialog.vue           |  2 +-
 src/components/TagChip.vue                    |  7 ++--
 src/components/TooltipButton.vue              |  3 +-
 src/components/agents/AgentDownloadDialog.vue |  2 +-
 src/components/agents/AgentExecuteModule.vue  |  6 ++--
 src/components/agents/AgentJobs.vue           |  1 -
 src/components/agents/AgentTasksTable.vue     | 20 +++++------
 src/components/agents/AgentUploadDialog.vue   |  2 +-
 src/components/agents/ExecuteModuleDialog.vue |  2 +-
 src/components/plugins/PluginMarketplace.vue  |  5 ++-
 src/components/plugins/PluginTasksTable.vue   | 20 +++++------
 src/components/tables/AdvancedTable.vue       |  4 +--
 src/plugins/vuetify.js                        |  6 ++--
 src/views/Credentials.vue                     |  4 +--
 src/views/Downloads.vue                       |  4 +--
 src/views/ListenerEdit.vue                    |  4 +--
 src/views/Notifications.vue                   |  7 +---
 src/views/Obfuscation.vue                     | 28 +++++++--------
 src/views/PluginEdit.vue                      |  9 ++---
 src/views/Settings.vue                        | 15 ++++----
 yarn.lock                                     | 10 +++---
 30 files changed, 138 insertions(+), 126 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b926ce0..aa5e87df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+-   Upgraded Vuetify from v3 to v4
+    -   Migrated deprecated VRow/VCol props (align, justify, dense) to utility classes
+    -   Migrated MD2 typography classes (headline, text-h5, subtitle-1/2) to MD3 equivalents
+    -   Adopted MD3 visual defaults (elevation, density, button styling)
+    -   Improved table UX with row hover highlighting
+    -   Improved Settings page layout with max-width constraint and inner password icons
+    -   Improved empty table state styling
+    -   Improved edit page toolbar button ordering and spacing
+    -   Refined footer, tag chips, and app bar density
+
 ### Fixed
 
 -   Fixed mass kill action on agents list page not sending kill commands due to incorrect session ID reference
diff --git a/package.json b/package.json
index b04aec62..beba6198 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "vue-markdown-render": "^2.3.0",
     "vue-router": "^4.3",
     "vuedraggable": "^4.1",
-    "vuetify": "^3.12"
+    "vuetify": "^4.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.2.0",
@@ -43,6 +43,6 @@
     "prettier": "^3.0.2",
     "sass": "^1.70",
     "vite": "^5.0",
-    "vite-plugin-vuetify": "^2.0"
+    "vite-plugin-vuetify": "^2.1"
   }
 }
diff --git a/src/App.vue b/src/App.vue
index 9f6d663b..0caff80c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,11 @@
         ref="socketNotifications"
       />
       <starkiller-snackbar ref="snack" />
-      <v-app-bar v-if="isLoggedIn" scroll-behavior="elevate">
+      <v-app-bar
+        v-if="isLoggedIn"
+        density="comfortable"
+        scroll-behavior="elevate"
+      >
         <template
           v-if="
             $route.name === 'agentEdit' ||
@@ -48,33 +52,36 @@
         </v-container>
       </v-main>
 
-      <v-footer v-if="!hideSideBar" app>
-        <span class="mr-2">Copyright (c) 2023 BC Security |</span>
+      <v-footer
+        v-if="!hideSideBar"
+        app
+        class="text-body-small pa-2 justify-center"
+        style="font-size: 0.8rem"
+      >
+        <span class="mr-1">&copy; 2026 BC Security</span>
+        <span class="mr-1">&middot;</span>
         <a
-          class="mr-2"
+          class="mr-1"
           target="_blank"
           rel="noopener noreferrer"
           href="https://github.com/bc-security/starkiller"
+          >Starkiller</a
         >
-          Starkiller
-        </a>
-        <span class="mr-2">|</span>
+        <span class="mr-1">&middot;</span>
         <a
-          class="mr-2"
+          class="mr-1"
           target="_blank"
           rel="noopener noreferrer"
           href="https://github.com/bc-security/empire"
+          >Empire</a
         >
-          Empire</a
-        >
-        <span class="mr-2">|</span>
+        <span class="mr-1">&middot;</span>
         <a
-          class="mr-2"
+          class="mr-1"
           target="_blank"
           rel="noopener noreferrer"
           href="https://github.com/sponsors/BC-SECURITY"
-        >
-          Sponsor for extra features</a
+          >Sponsor</a
         >
       </v-footer>
     </v-app>
diff --git a/src/app.scss b/src/app.scss
index 109078ea..1dbb938d 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -13,3 +13,11 @@
 .v-toolbar__extension > div > .v-tabs {
   background-color: inherit;
 }
+
+// Style empty data table state
+.v-data-table-rows-no-data td {
+  text-align: center;
+  padding: 48px 16px !important;
+  color: rgba(255, 255, 255, 0.4);
+  font-style: italic;
+}
diff --git a/src/components/AutoRunModules.vue b/src/components/AutoRunModules.vue
index b3919b0f..bebbfbbd 100644
--- a/src/components/AutoRunModules.vue
+++ b/src/components/AutoRunModules.vue
@@ -96,7 +96,7 @@
     <v-dialog v-model="showDialog" max-width="600px">
       <v-card>
         <v-card-title>
-          <span class="headline">Options</span>
+          <span class="text-headline-small">Options</span>
         </v-card-title>
 
         <v-card-text>
diff --git a/src/components/ClickToEdit.vue b/src/components/ClickToEdit.vue
index 8145bfc6..a506fca4 100644
--- a/src/components/ClickToEdit.vue
+++ b/src/components/ClickToEdit.vue
@@ -1,7 +1,7 @@
 <template>
-  <v-row class="pb-5">
+  <v-row class="pb-2">
     <v-col cols="4" class="d-flex align-center justify-start">
-      <span class="text--bold">{{ label }}</span>
+      <span class="font-weight-bold">{{ label }}</span>
       <v-tooltip v-if="infoText" location="bottom">
         <template #activator="{ props: activatorProps }">
           <v-icon size="small" class="ml-2" v-bind="activatorProps">
diff --git a/src/components/DynamicFormInput.vue b/src/components/DynamicFormInput.vue
index e3bda50d..a2062ea1 100644
--- a/src/components/DynamicFormInput.vue
+++ b/src/components/DynamicFormInput.vue
@@ -51,7 +51,7 @@
       item-value="id"
       item-title="id"
     >
-      <template #item="{ item, props: itemProps }">
+      <template #item="{ internalItem: item, props: itemProps }">
         <v-list-item v-bind="itemProps">
           <v-list-item-title>
             {{
diff --git a/src/components/EditPageTop.vue b/src/components/EditPageTop.vue
index 55739370..f81274dd 100644
--- a/src/components/EditPageTop.vue
+++ b/src/components/EditPageTop.vue
@@ -8,6 +8,22 @@
         class="mr-4"
       >
         <slot name="extra-stuff" />
+        <v-btn
+          v-if="showCopy && Object.keys(copyLink).length > 0 && !smallCopy"
+          color="primary"
+          variant="text"
+          class="mr-2"
+          :to="copyLink"
+        >
+          {{ copyText }}
+          <v-icon end> fa-copy </v-icon>
+        </v-btn>
+        <tooltip-button
+          v-else-if="showCopy && Object.keys(copyLink).length > 0 && smallCopy"
+          icon="fa-copy"
+          :text="copyText"
+          :to="copyLink"
+        />
         <v-btn
           v-if="showDelete && !smallDelete"
           color="error"
@@ -25,27 +41,11 @@
           :text="deleteText"
           @click="$emit('delete')"
         />
-        <v-btn
-          v-if="showCopy && Object.keys(copyLink).length > 0 && !smallCopy"
-          color="primary"
-          variant="text"
-          class="mr-2"
-          :to="copyLink"
-        >
-          {{ copyText }}
-          <v-icon end> fa-copy </v-icon>
-        </v-btn>
-        <tooltip-button
-          v-else-if="showCopy && Object.keys(copyLink).length > 0 && smallCopy"
-          icon="fa-copy"
-          :text="copyText"
-          :to="copyLink"
-        />
         <v-btn
           v-if="showSubmit"
           :disabled="disableSubmit"
           type="submit"
-          color="primary"
+          :color="disableSubmit ? undefined : 'primary'"
           :loading="submitLoading"
           @click="$emit('submit')"
         >
diff --git a/src/components/ErrorStateAlert.vue b/src/components/ErrorStateAlert.vue
index 7cdfade0..1ec71e25 100644
--- a/src/components/ErrorStateAlert.vue
+++ b/src/components/ErrorStateAlert.vue
@@ -1,6 +1,6 @@
 <template>
   <v-alert prominent type="error">
-    <v-row align="center">
+    <v-row class="align-center">
       <v-col class="grow">
         {{ displayMessage }}
       </v-col>
diff --git a/src/components/FileUploadDialog.vue b/src/components/FileUploadDialog.vue
index fb754318..b65dd6a3 100644
--- a/src/components/FileUploadDialog.vue
+++ b/src/components/FileUploadDialog.vue
@@ -2,7 +2,7 @@
   <v-dialog ref="uploadDialog" v-model="show" max-width="750px">
     <v-card>
       <v-card-title>
-        <span class="headline">Upload To Empire Server</span>
+        <span class="text-headline-small">Upload To Empire Server</span>
       </v-card-title>
       <v-card-text>
         <v-form ref="form" @submit.prevent>
diff --git a/src/components/TagChip.vue b/src/components/TagChip.vue
index e63a56ea..7717849a 100644
--- a/src/components/TagChip.vue
+++ b/src/components/TagChip.vue
@@ -10,13 +10,16 @@
     <template #activator="{ props: activatorProps }">
       <v-chip
         :color="internalTag.color"
-        class="mt-4 mr-1 ml-1 mb-4 text-white"
+        class="mt-4 mr-1 ml-1 mb-4"
+        :class="{ 'text-white': !isNew }"
+        :variant="isNew ? 'outlined' : 'flat'"
+        size="small"
         :closable="close"
         v-bind="activatorProps"
         @click:close="deleteTag(internalTag)"
       >
         {{ `${tag.name}:${tag.value}` }}
-        <v-icon v-if="customIcon" end>
+        <v-icon v-if="customIcon" end size="x-small">
           {{ customIcon }}
         </v-icon>
       </v-chip>
diff --git a/src/components/TooltipButton.vue b/src/components/TooltipButton.vue
index 3bcb9c81..32e3c1ac 100644
--- a/src/components/TooltipButton.vue
+++ b/src/components/TooltipButton.vue
@@ -5,8 +5,9 @@
         :color="flat ? '' : color"
         :to="to"
         :disabled="disabled"
-        class="mr-5"
+        class="mr-2"
         icon
+        variant="text"
         :size="xSmall ? 'x-small' : 'small'"
         v-bind="activatorProps"
         @click="$emit('click')"
diff --git a/src/components/agents/AgentDownloadDialog.vue b/src/components/agents/AgentDownloadDialog.vue
index e0603f16..616dacca 100644
--- a/src/components/agents/AgentDownloadDialog.vue
+++ b/src/components/agents/AgentDownloadDialog.vue
@@ -2,7 +2,7 @@
   <v-dialog ref="downloadDialog" v-model="show" max-width="500px">
     <v-card>
       <v-card-title>
-        <span class="headline">Download</span>
+        <span class="text-headline-small">Download</span>
       </v-card-title>
       <v-card-text>
         <v-form ref="form" @submit.prevent>
diff --git a/src/components/agents/AgentExecuteModule.vue b/src/components/agents/AgentExecuteModule.vue
index 5fd043e7..542f3e11 100644
--- a/src/components/agents/AgentExecuteModule.vue
+++ b/src/components/agents/AgentExecuteModule.vue
@@ -52,7 +52,7 @@
       <v-dialog v-model="showTreeDialog" max-width="500px">
         <v-card>
           <v-card-title>
-            <span class="headline">Browse Modules</span>
+            <span class="text-headline-small">Browse Modules</span>
           </v-card-title>
           <v-card-text>
             <v-treeview
@@ -80,7 +80,7 @@
       </v-dialog>
 
       <v-alert v-if="selectedItem.opsec_safe === false" type="warning">
-        <v-row align="center">
+        <v-row class="align-center">
           <v-col
             class="grow"
             style="word-wrap: break-word; word-break: break-word; width: 500px"
@@ -134,7 +134,7 @@
       <v-dialog ref="nameDialog" v-model="showDialog" max-width="900px">
         <v-card>
           <v-card-title>
-            <span class="headline">Execution Result</span>
+            <span class="text-headline-small">Execution Result</span>
           </v-card-title>
           <v-card-text>
             <v-data-table
diff --git a/src/components/agents/AgentJobs.vue b/src/components/agents/AgentJobs.vue
index 43fb068b..f5e06aa6 100644
--- a/src/components/agents/AgentJobs.vue
+++ b/src/components/agents/AgentJobs.vue
@@ -49,7 +49,6 @@
       :items-per-page="10"
       item-value="id"
       show-expand
-      class="elevation-1"
       no-data-text="No background jobs found. Jobs will appear here when you run modules with Background=true."
     >
       <template #item.status="{ item }">
diff --git a/src/components/agents/AgentTasksTable.vue b/src/components/agents/AgentTasksTable.vue
index 40e695e7..1d9f8942 100644
--- a/src/components/agents/AgentTasksTable.vue
+++ b/src/components/agents/AgentTasksTable.vue
@@ -29,8 +29,8 @@
       <template #expanded-row="{ columns, item }">
         <td :colspan="columns.length" class="pa-4">
           <v-card flat>
-            <v-card-title class="subtitle-1 pb-4">
-              <v-row no-gutters align="center">
+            <v-card-title class="text-subtitle-1 pb-4">
+              <v-row no-gutters class="align-center">
                 <v-col cols="4">
                   <span class="font-weight-bold">Task #{{ item.id }}</span>
                   <v-chip
@@ -55,7 +55,7 @@
                   cols="6"
                 >
                   <div class="d-flex flex-wrap gap-2">
-                    <span class="font-weight-bold ml-2 mr-2 subtitle-1"
+                    <span class="font-weight-bold ml-2 mr-2 text-subtitle-1"
                       >Options:</span
                     >
                     <v-chip
@@ -66,10 +66,10 @@
                       label
                       class="mr-1 mb-1"
                     >
-                      <span class="subtitle-2 font-weight-bold mr-1"
+                      <span class="text-subtitle-2 font-weight-bold mr-1"
                         >{{ key }}:</span
                       >
-                      <span class="subtitle-2">{{
+                      <span class="text-subtitle-2">{{
                         value.length > 20
                           ? value.substring(0, 20) + "..."
                           : value
@@ -94,11 +94,11 @@
             <v-divider />
 
             <v-card-text>
-              <v-row dense>
+              <v-row density="compact">
                 <v-col cols="12">
                   <div class="mb-4">
                     <div class="d-flex align-center mb-1">
-                      <span class="subtitle-2 font-weight-bold"
+                      <span class="text-subtitle-2 font-weight-bold"
                         >Task Input</span
                       >
                       <v-spacer />
@@ -137,7 +137,7 @@
 
                   <div v-if="hasOutput(item)">
                     <div class="d-flex align-center mb-1">
-                      <span class="subtitle-2 font-weight-bold"
+                      <span class="text-subtitle-2 font-weight-bold"
                         >Task Output</span
                       >
                       <v-spacer />
@@ -176,9 +176,7 @@
                         >
                           <template #placeholder>
                             <v-row
-                              class="fill-height ma-0"
-                              align="center"
-                              justify="center"
+                              class="fill-height ma-0 align-center justify-center"
                             >
                               <v-progress-circular
                                 indeterminate
diff --git a/src/components/agents/AgentUploadDialog.vue b/src/components/agents/AgentUploadDialog.vue
index 1ec05b13..6326d3b3 100644
--- a/src/components/agents/AgentUploadDialog.vue
+++ b/src/components/agents/AgentUploadDialog.vue
@@ -2,7 +2,7 @@
   <v-dialog ref="agentUploadDialog" v-model="show" max-width="750px">
     <v-card>
       <v-card-title>
-        <span class="headline">Upload To Agent</span>
+        <span class="text-headline-small">Upload To Agent</span>
       </v-card-title>
       <v-card-text>
         <p>Only showing files smaller than {{ formatBytes(maxBytes) }}</p>
diff --git a/src/components/agents/ExecuteModuleDialog.vue b/src/components/agents/ExecuteModuleDialog.vue
index cfc133a6..8e030995 100644
--- a/src/components/agents/ExecuteModuleDialog.vue
+++ b/src/components/agents/ExecuteModuleDialog.vue
@@ -2,7 +2,7 @@
   <v-dialog ref="downloadDialog" v-model="show" max-width="800px">
     <v-card>
       <v-card-title>
-        <span class="headline" />
+        <span class="text-headline-small" />
       </v-card-title>
       <v-card-text>
         <agent-execute-module
diff --git a/src/components/plugins/PluginMarketplace.vue b/src/components/plugins/PluginMarketplace.vue
index f0c0faf8..b8a411c0 100644
--- a/src/components/plugins/PluginMarketplace.vue
+++ b/src/components/plugins/PluginMarketplace.vue
@@ -9,7 +9,7 @@
     />
     <div style="display: flex; flex-direction: row">
       <div style="width: 350px; min-width: 350px; max-width: 350px">
-        <v-card elevation="2" border class="pl-4 pr-4 pb-4">
+        <v-card border class="pl-4 pr-4 pb-4">
           <v-list
             :disabled="installing"
             class="overflow-y-auto"
@@ -45,7 +45,6 @@
       <div style="flex-grow: 1">
         <v-card
           v-if="selectedPluginObj"
-          elevation="2"
           border
           style="max-height: 600px"
           class="pl-4 pr-4 pb-4 overflow-y-auto"
@@ -132,7 +131,7 @@
             </div>
           </div>
           <v-divider class="mt-4 mb-4" />
-          <v-card class="pa-4" elevation="2" border>
+          <v-card class="pa-4" border>
             <vue-markdown :source="selectedPluginObj.description" />
           </v-card>
           <v-divider class="mt-4 mb-4" />
diff --git a/src/components/plugins/PluginTasksTable.vue b/src/components/plugins/PluginTasksTable.vue
index 692af676..2a15eb5b 100644
--- a/src/components/plugins/PluginTasksTable.vue
+++ b/src/components/plugins/PluginTasksTable.vue
@@ -29,8 +29,8 @@
       <template #expanded-row="{ columns, item }">
         <td :colspan="columns.length" class="pa-4">
           <v-card flat>
-            <v-card-title class="subtitle-1 pb-4">
-              <v-row no-gutters align="center">
+            <v-card-title class="text-subtitle-1 pb-4">
+              <v-row no-gutters class="align-center">
                 <v-col cols="4">
                   <span class="font-weight-bold">Task #{{ item.id }}</span>
                   <v-chip
@@ -55,7 +55,7 @@
                   cols="6"
                 >
                   <div class="d-flex flex-wrap gap-2">
-                    <span class="font-weight-bold ml-2 mr-2 subtitle-1"
+                    <span class="font-weight-bold ml-2 mr-2 text-subtitle-1"
                       >Options:</span
                     >
                     <v-chip
@@ -66,10 +66,10 @@
                       label
                       class="mr-1 mb-1"
                     >
-                      <span class="subtitle-2 font-weight-bold mr-1"
+                      <span class="text-subtitle-2 font-weight-bold mr-1"
                         >{{ key }}:</span
                       >
-                      <span class="subtitle-2">{{ value }}</span>
+                      <span class="text-subtitle-2">{{ value }}</span>
                     </v-chip>
                   </div>
                 </v-col>
@@ -90,11 +90,11 @@
             <v-divider />
 
             <v-card-text>
-              <v-row dense>
+              <v-row density="compact">
                 <v-col cols="12">
                   <div class="mb-4">
                     <div class="d-flex align-center mb-1">
-                      <span class="subtitle-2 font-weight-bold"
+                      <span class="text-subtitle-2 font-weight-bold"
                         >Task Input</span
                       >
                       <v-spacer />
@@ -133,7 +133,7 @@
 
                   <div v-if="hasOutput(item)">
                     <div class="d-flex align-center mb-1">
-                      <span class="subtitle-2 font-weight-bold"
+                      <span class="text-subtitle-2 font-weight-bold"
                         >Task Output</span
                       >
                       <v-spacer />
@@ -172,9 +172,7 @@
                         >
                           <template #placeholder>
                             <v-row
-                              class="fill-height ma-0"
-                              align="center"
-                              justify="center"
+                              class="fill-height ma-0 align-center justify-center"
                             >
                               <v-progress-circular
                                 indeterminate
diff --git a/src/components/tables/AdvancedTable.vue b/src/components/tables/AdvancedTable.vue
index 77909b71..47df9f80 100644
--- a/src/components/tables/AdvancedTable.vue
+++ b/src/components/tables/AdvancedTable.vue
@@ -1,11 +1,11 @@
 <template>
   <div style="display: flex; flex-direction: row; flex-wrap: wrap">
-    <v-card class="mr-2 pa-2" elevation="2" border style="flex-basis: 250px">
+    <v-card class="mr-2 pa-2" border style="flex-basis: 250px">
       <v-expansion-panels class="mb-6" multiple>
         <slot name="filters" />
       </v-expansion-panels>
     </v-card>
-    <v-card style="flex: 1; min-width: 0" elevation="2" border>
+    <v-card style="flex: 1; min-width: 0" border>
       <slot name="table" />
     </v-card>
   </div>
diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js
index ff0cef35..222f0116 100644
--- a/src/plugins/vuetify.js
+++ b/src/plugins/vuetify.js
@@ -1,5 +1,4 @@
 import { createVuetify } from "vuetify";
-import * as labsComponents from "vuetify/labs/components";
 import { aliases } from "vuetify/iconsets/fa";
 import "vuetify/styles";
 import "@mdi/font/css/materialdesignicons.css";
@@ -31,8 +30,9 @@ const autoIconComponent = {
 };
 
 export default createVuetify({
-  components: {
-    ...labsComponents,
+  defaults: {
+    VDataTable: { density: "comfortable", hover: true },
+    VDataTableServer: { density: "comfortable", hover: true },
   },
   theme: {
     defaultTheme: "dark",
diff --git a/src/views/Credentials.vue b/src/views/Credentials.vue
index b954bcc4..844ff6d0 100644
--- a/src/views/Credentials.vue
+++ b/src/views/Credentials.vue
@@ -11,7 +11,7 @@
       @refresh="getCredentials"
     />
     <div style="display: flex; flex-direction: row; flex-wrap: wrap">
-      <v-card class="mr-2 pa-2" elevation="2" border style="flex-basis: 250px">
+      <v-card class="mr-2 pa-2" border style="flex-basis: 250px">
         <v-expansion-panels class="mb-6" multiple>
           <expansion-panel-search
             v-model="search"
@@ -29,7 +29,7 @@
           />
         </v-expansion-panels>
       </v-card>
-      <v-card style="flex: 1; min-width: 0" elevation="2" border>
+      <v-card style="flex: 1; min-width: 0" border>
         <v-data-table
           v-model="selected"
           :loading="loading"
diff --git a/src/views/Downloads.vue b/src/views/Downloads.vue
index b9a35bc0..7b396a77 100644
--- a/src/views/Downloads.vue
+++ b/src/views/Downloads.vue
@@ -23,7 +23,7 @@
       </template>
     </list-page-top>
     <div style="display: flex; flex-direction: row; flex-wrap: wrap">
-      <v-card class="mr-2 pa-2" elevation="2" border style="flex-basis: 250px">
+      <v-card class="mr-2 pa-2" border style="flex-basis: 250px">
         <v-expansion-panels class="mb-6" multiple>
           <expansion-panel-search
             v-model="search"
@@ -49,7 +49,7 @@
           />
         </v-expansion-panels>
       </v-card>
-      <v-card style="flex: 1; min-width: 0" elevation="2" border>
+      <v-card style="flex: 1; min-width: 0" border>
         <v-data-table-server
           v-model:sort-by="sortBy"
           v-model:items-per-page="itemsPerPage"
diff --git a/src/views/ListenerEdit.vue b/src/views/ListenerEdit.vue
index 63ad9e38..aeb54068 100644
--- a/src/views/ListenerEdit.vue
+++ b/src/views/ListenerEdit.vue
@@ -41,7 +41,7 @@
         <v-menu v-if="!isNew && initialLoad" open-on-hover>
           <template #activator="{ props: activatorProps }">
             <v-btn
-              class="mr-5"
+              class="mr-2"
               variant="text"
               icon
               size="small"
@@ -117,7 +117,7 @@
               :readonly="!canEdit"
             />
             <v-alert v-if="validationMessage" prominent type="warning">
-              <v-row align="center">
+              <v-row class="align-center">
                 <v-col class="grow" style="word-wrap: word-break; width: 500px">
                   {{ validationMessage }}
                 </v-col>
diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
index 53b26afc..94e85af5 100644
--- a/src/views/Notifications.vue
+++ b/src/views/Notifications.vue
@@ -16,12 +16,7 @@
         </v-btn>
       </template>
     </list-page-top>
-    <v-card
-      class="mr-2 pa-2"
-      elevation="2"
-      variant="outlined"
-      style="flex-basis: 250px"
-    >
+    <v-card class="mr-2 pa-2" variant="outlined" style="flex-basis: 250px">
       <v-list>
         <template v-for="(item, i) in notifications" :key="i">
           <v-list-item
diff --git a/src/views/Obfuscation.vue b/src/views/Obfuscation.vue
index 83ab7c4b..473584b5 100644
--- a/src/views/Obfuscation.vue
+++ b/src/views/Obfuscation.vue
@@ -10,7 +10,7 @@
     <v-dialog v-model="keywordDialog" max-width="500px">
       <v-card>
         <v-card-title>
-          <span class="text-h5">{{ keywordDialogTitle }}</span>
+          <span class="text-headline-small">{{ keywordDialogTitle }}</span>
         </v-card-title>
         <v-card-text>
           <v-container>
@@ -54,7 +54,7 @@
     <v-dialog v-model="preobfuscateDialog" max-width="500px">
       <v-card>
         <v-card-title>
-          <span class="text-h5" />
+          <span class="text-headline-small" />
         </v-card-title>
         <v-card-text>
           <p>
@@ -87,18 +87,14 @@
       </v-card>
     </v-dialog>
     <div style="display: flex; flex-direction: row; align-items: flex-start">
-      <v-card style="flex: 1 0 50%" class="ma-2 pa-2">
-        <v-card-title>
-          <span
-            style="display: flex; justify-content: space-between; width: 100%"
-          >
-            <span class="headline">Keyword Obfuscation</span>
-            <v-btn color="primary" @click="createKeyword">
-              Create
-              <v-icon end> fa-plus-square </v-icon>
-            </v-btn>
-          </span>
-        </v-card-title>
+      <v-card style="flex: 1 0 50%" class="ma-2 pa-2" border>
+        <div class="d-flex align-center justify-space-between pa-4">
+          <span class="text-headline-small">Keyword Obfuscation</span>
+          <v-btn color="primary" @click="createKeyword">
+            Create
+            <v-icon end> fa-plus-square </v-icon>
+          </v-btn>
+        </div>
         <v-data-table :headers="headers" :items="keywords">
           <template #item.actions="{ item }">
             <v-menu>
@@ -131,10 +127,10 @@
           </template>
         </v-data-table>
       </v-card>
-      <v-card style="flex: 1 0 50%" class="ma-2 pa-2">
+      <v-card style="flex: 1 0 50%" class="ma-2 pa-2" border>
         <v-card-title>
           <span>
-            <span class="headline">Global Obfuscation</span>
+            <span class="text-headline-small">Global Obfuscation</span>
           </span>
         </v-card-title>
         <v-card-text>
diff --git a/src/views/PluginEdit.vue b/src/views/PluginEdit.vue
index 7a24bbd9..8200f106 100644
--- a/src/views/PluginEdit.vue
+++ b/src/views/PluginEdit.vue
@@ -109,7 +109,7 @@
               <v-col cols="12">
                 <span v-if="!plugin.loaded">
                   <v-alert prominent type="warning" variant="outlined">
-                    <v-row align="center">
+                    <v-row class="align-center">
                       <v-col class="grow">
                         <vue-markdown
                           :source="pluginPythonDeps"
@@ -123,12 +123,7 @@
                 Authors:
                 <author-chips :authors="plugin.authors" />
                 <v-spacer />
-                <v-card
-                  v-if="plugin.readme"
-                  class="pa-4"
-                  variant="outlined"
-                  elevation="2"
-                >
+                <v-card v-if="plugin.readme" class="pa-4" variant="outlined">
                   <vue-markdown :source="plugin.readme" />
                 </v-card>
               </v-col>
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 3022a7e0..94013d51 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <list-page-top :breads="breads" />
-    <div class="page">
+    <div class="page" style="max-width: 900px">
       <div
         class="first-part point"
         style="display: flex; flex-direction: row; align-items: center"
@@ -47,33 +47,34 @@
         <v-text-field
           v-model="password.form.password"
           :type="showPassword ? 'text' : 'password'"
-          :append-icon="showPassword ? 'fa-eye' : 'fa-eye-slash'"
+          :append-inner-icon="showPassword ? 'fa-eye' : 'fa-eye-slash'"
           :rules="rules['password']"
           label="Password"
           autocomplete="off"
           variant="outlined"
           density="compact"
           required
-          @click:append="showPassword = !showPassword"
+          @click:append-inner="showPassword = !showPassword"
         />
         <v-text-field
           v-model="password.form.confirmPassword"
           :type="showConfirm ? 'text' : 'password'"
-          :append-icon="showConfirm ? 'fa-eye' : 'fa-eye-slash'"
+          :append-inner-icon="showConfirm ? 'fa-eye' : 'fa-eye-slash'"
           :rules="rules['confirmPassword']"
           label="Confirm Password"
           autocomplete="off"
           variant="outlined"
           density="compact"
           required
-          @click:append="showConfirm = !showConfirm"
+          @click:append-inner="showConfirm = !showConfirm"
         />
         <v-btn
           type="submit"
-          class="mt-4 mb-4 primary"
+          class="mt-4 mb-4"
+          color="primary"
           :loading="password.loading"
         >
-          submit
+          Submit
         </v-btn>
       </v-form>
       <div class="headers pl-0 mt-2">
diff --git a/yarn.lock b/yarn.lock
index b96eb20c..bde70283 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2666,7 +2666,7 @@ uuid@^8.3.2:
   resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-vite-plugin-vuetify@^2.0:
+vite-plugin-vuetify@^2.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/vite-plugin-vuetify/-/vite-plugin-vuetify-2.1.3.tgz#9968d1e85429f93fc2dc06da8c4a5e7651986964"
   integrity sha512-Q4SC/4TqbNvaZIFb9YsfBqkGlYHbJJJ6uU3CnRBZqLUF3s5eCMVZAaV4GkTbehIH/bhSj42lMXztOwc71u6rVw==
@@ -2736,10 +2736,10 @@ vuedraggable@^4.1:
   dependencies:
     sortablejs "1.14.0"
 
-vuetify@^3.12:
-  version "3.12.2"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.12.2.tgz#c6d5a74243925115b56a488a9627d0a4a57108be"
-  integrity sha512-cVQa4+5iQpDs00ToMUnWRHlMdv1d5tEH2wcZIthqSCmBipQAG4rQKE55zFwZFYlPyiDhUVY1RcAFtXCuHNcCww==
+vuetify@^4.0:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-4.0.5.tgz#bcaf674d2d5c9ebb6cf0517b733bbb4922e94cb3"
+  integrity sha512-pFysKOHuY3dROTVh9PdlhVz50ZR0E5/goY5ecTXc8F8tajUA2ee3xZ8Lqs1WtEw/X3w93wx/LogyjgaQCAL/Ig==
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"

From 62ba1fa246d8f7e8d26797774564f58a87ebff96 Mon Sep 17 00:00:00 2001
From: GitHub Actions <noreply@github.com>
Date: Sun, 26 Apr 2026 20:18:36 +0000
Subject: [PATCH 5/5] Prepare release 3.5.0 private

---
 CHANGELOG.md | 6 +++++-
 package.json | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa5e87df..6fe0edb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.5.0] - 2026-04-26
+
 ### Changed
 
 -   Upgraded Vuetify from v3 to v4
@@ -475,7 +477,9 @@ Including but not limited to:
 
 -   Initial Release
 
-[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v3.4.0...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v3.5.0...HEAD
+
+[3.5.0]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v3.4.0...v3.5.0
 
 [3.4.0]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v3.3.0...v3.4.0
 
diff --git a/package.json b/package.json
index beba6198..2ad28237 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starkiller",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "private": true,
   "scripts": {
     "dev": "vite",