diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8c409d..a5c2bac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,44 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+**Added** for new features.
+**Changed** for changes in existing functionality.
+**Deprecated** for soon-to-be removed features.
+**Removed** for now removed features.
+**Fixed** for any bug fixes.
+**Security** in case of vulnerabilities.
+
 ## [Unreleased]
 
+## [2.7.1] - 2023-12-03
+
+### Changed
+
+-   Remove Interactive Agent Shell from README
+
+## [2.7.0] - 2023-11-15
+
+### Added
+
+-   Add agent dropdown when Agent is a field in a form
+-   Add auto-refresh on Agents / Agents Tasks page
+-   Add auto-refresh on Plugins Tasks page
+
+### Changed
+
+-   Migrate from Vuex to Pinia
+
+### Fixed
+
+-   Fix form dropdowns getting out of sync with reality by refreshing the store on load
+-   Making edits to an Agent on the 'View' tab now properly updates the parent Agent page
+-   Updating an agent's name no longer refreshes the page on submit
+-   After updating a stager, the download/clipboard of the stager now reflects the changes without requiring the page to be reloaded
+
+### Removed
+
+-   Remove unused AgentCommandViewer component
+
 ## [2.6.1] - 2023-09-25
 
 -   Make notification bell menu scrollable with a max height
@@ -307,7 +343,11 @@ Including but not limited to:
 
 -   Initial Release
 
-[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.6.1...HEAD
+[Unreleased]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.1...HEAD
+
+[2.7.1]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.7.0...v2.7.1
+
+[2.7.0]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.6.1...v2.7.0
 
 [2.6.1]: https://github.com/BC-SECURITY/Starkiller-Sponsors/compare/v2.6.0...v2.6.1
 
diff --git a/README.md b/README.md
index 74ece7d..0cfcf00 100644
--- a/README.md
+++ b/README.md
@@ -52,10 +52,6 @@ At the moment, the extra Starkiller sponsorship features include:
 
   <div align="left"><img width="800" src="https://user-images.githubusercontent.com/9831420/216792129-5b0fed82-b209-48cb-9a43-eeb3e69c7229.gif"></div>
 
-## Interactive agent shell
-
-  <div align="left"><img width="800" src="https://user-images.githubusercontent.com/9831420/104983879-e37fc700-59ca-11eb-9c90-bd2d166c4ac5.gif"></div>
-
 ## Process Browser
 
   <div align="left"><img width="800" src="https://user-images.githubusercontent.com/9831420/131264080-0264558d-59c4-44d9-8dae-7b518c47a9cb.gif"></div>
diff --git a/package.json b/package.json
index 5e45dab..02da505 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "starkiller",
-  "version": "2.6.1",
+  "version": "2.7.1",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -18,6 +18,8 @@
     "axios": "^0.24.0",
     "lodash.debounce": "^4.0.8",
     "moment": "^2.29.1",
+    "pinia": "^2.1.7",
+    "pinia-plugin-persistedstate": "^3.2.0",
     "portal-vue": "^2.1.7",
     "qs": "^6.10.3",
     "semver": "^7.3.5",
@@ -28,9 +30,7 @@
     "vue": "2.7",
     "vue-beautiful-chat": "^2.5.0",
     "vue-router": "^3.5.1",
-    "vuetify": "^2.6.0",
-    "vuex": "^3.6.2",
-    "vuex-persistedstate": "^3.0.1"
+    "vuetify": "^2.6.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.2.0",
@@ -42,6 +42,6 @@
     "prettier": "^3.0.2",
     "sass": "~1.32",
     "unplugin-vue-components": "^0.22.12",
-    "vite": "^3"
+    "vite": "^4"
   }
 }
diff --git a/src/App.vue b/src/App.vue
index 6db6310..56b17aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <v-app :dark="isDarkMode">
+    <v-app :dark="darkMode">
       <side-nav v-if="isLoggedIn && !hideSideBar" />
       <confirm ref="confirm" />
       <socket-notifications
@@ -70,13 +70,14 @@
 <script>
 import Vue from "vue";
 import semver from "semver";
-import { mapGetters, mapState } from "vuex";
+import { mapState } from "pinia";
 
 import SideNav from "@/components/SideNav.vue";
 import Confirm from "@/components/Confirm.vue";
 import SocketNotifications from "@/components/SocketNotifications.vue";
 import StarkillerSnackbar from "@/components/StarkillerSnackbar.vue";
 import NotificationBell from "@/components/NotificationBell.vue";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "App",
@@ -88,14 +89,12 @@ export default {
     StarkillerSnackbar,
   },
   computed: {
-    ...mapGetters({
-      isLoggedIn: "application/isLoggedIn",
-      isDarkMode: "application/isDarkMode",
-    }),
-    ...mapState({
-      empireVersion: (state) => state.application.empireVersion,
-      connectionError: (state) => state.application.connectionError,
-    }),
+    ...mapState(useApplicationStore, [
+      "isLoggedIn",
+      "darkMode",
+      "empireVersion",
+      "connectionError",
+    ]),
     isLoginPage() {
       return this.$route.name === "home";
     },
@@ -114,7 +113,7 @@ export default {
         }
       },
     },
-    isDarkMode: {
+    darkMode: {
       immediate: true,
       handler(val) {
         if (val === true) {
diff --git a/src/api/axios-instance.js b/src/api/axios-instance.js
index ff0b8ca..49002ec 100644
--- a/src/api/axios-instance.js
+++ b/src/api/axios-instance.js
@@ -1,7 +1,5 @@
 import axios from "axios";
-
-// I don't like this cyclic dependency, but struggling to find a better way atm.
-import store from "@/store/index";
+import { useApplicationStore } from "@/stores/application-module";
 
 // eslint-disable-next-line import/no-mutable-exports
 export let axiosInstance = null;
@@ -20,12 +18,13 @@ export function setInstance(url, token) {
     (response) => response,
     (err) => {
       if (!err?.response) {
-        store.dispatch("application/connectionError");
+        useApplicationStore().connectionError += 1;
       }
 
       if (err?.response?.status === 401 || err?.response?.status === 403) {
-        store.dispatch("application/logout");
+        useApplicationStore().logout();
       }
+
       return Promise.reject(err);
     },
   );
diff --git a/src/api/bypass-api.js b/src/api/bypass-api.js
index 8370f12..f49f66d 100644
--- a/src/api/bypass-api.js
+++ b/src/api/bypass-api.js
@@ -3,7 +3,6 @@ import { axiosInstance as axios, handleError } from "@/api/axios-instance";
 /**
  * Returns a full list of bypasses.
  */
-// eslint-disable-next-line import/prefer-default-export
 export function getBypasses() {
   return axios
     .get("/bypasses")
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index 04e54da..a8c449a 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -43,7 +43,8 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import { useUserStore } from "@/stores/user-module";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "Chat",
@@ -66,11 +67,21 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      me: (state) => state.application.user.username,
-      allUsers: (state) => state.user.users,
-      darkMode: (state) => state.application.darkMode,
-    }),
+    userStore() {
+      return useUserStore();
+    },
+    allUsers() {
+      return this.userStore.users;
+    },
+    applicationStore() {
+      return useApplicationStore();
+    },
+    me() {
+      return this.applicationStore.user.username;
+    },
+    darkMode() {
+      return this.applicationStore.darkMode;
+    },
     colors() {
       if (this.darkMode) {
         return {
@@ -107,7 +118,7 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch("user/getUsers");
+    this.userStore.getUsers();
     this.socket.on("chat/join", (data) => {
       if (!this.isChatOpen) this.newMessagesCount++;
       const message = { type: "system", data: { text: data.message } };
diff --git a/src/components/ClickToEdit.vue b/src/components/ClickToEdit.vue
index 2a7b218..814c187 100644
--- a/src/components/ClickToEdit.vue
+++ b/src/components/ClickToEdit.vue
@@ -86,7 +86,7 @@
           dense
           required
           @blur="update"
-          @keyup.enter="update"
+          @keyup.enter.native="update"
         />
       </template>
       <span v-else class="ml-3">
@@ -97,8 +97,9 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapState } from "pinia";
 import moment from "moment";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   components: {},
@@ -145,9 +146,7 @@ export default {
     dirty() {
       return this.original !== this.internalValue;
     },
-    ...mapGetters({
-      isDarkMode: "application/isDarkMode",
-    }),
+    ...mapState(useApplicationStore, ["darkMode"]),
   },
   watch: {
     internalValue(val) {
@@ -197,7 +196,7 @@ export default {
     },
     getColClass() {
       if (this.editing === false && this.editable === true) {
-        if (this.isDarkMode) {
+        if (this.darkMode) {
           return "column-not-editing-dark";
         }
         return "column-not-editing";
diff --git a/src/components/DynamicFormInput.vue b/src/components/DynamicFormInput.vue
index f31022b..563fc5c 100644
--- a/src/components/DynamicFormInput.vue
+++ b/src/components/DynamicFormInput.vue
@@ -30,6 +30,17 @@
       :label="name"
     />
 
+    <v-autocomplete
+      v-else-if="name === 'Agent'"
+      v-model="internalValue"
+      :items="suggestedValues"
+      :label="name"
+      outlined
+      dense
+      item-value="session_id"
+      item-text="name"
+    />
+
     <v-autocomplete
       v-else-if="name === 'CredID'"
       v-model="internalValue"
diff --git a/src/components/GeneralForm.vue b/src/components/GeneralForm.vue
index 3502866..025db30 100644
--- a/src/components/GeneralForm.vue
+++ b/src/components/GeneralForm.vue
@@ -45,7 +45,11 @@
 
 <script>
 import Vue from "vue";
-import { mapGetters } from "vuex";
+import { useListenerStore } from "@/stores/listener-module";
+import { useBypassStore } from "@/stores/bypass-module";
+import { useCredentialStore } from "@/stores/credential-module";
+import { useMalleableProfileStore } from "@/stores/malleable-module";
+import { useAgentStore } from "@/stores/agent-module";
 import DynamicFormInput from "./DynamicFormInput.vue";
 
 export default {
@@ -73,12 +77,36 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      listeners: "listener/listenerNames",
-      bypasses: "bypass/bypassNames",
-      malleableProfiles: "malleable/profileNames",
-      credentials: "credential/credentials",
-    }),
+    agentStore() {
+      return useAgentStore();
+    },
+    listenerStore() {
+      return useListenerStore();
+    },
+    bypassStore() {
+      return useBypassStore();
+    },
+    credentialStore() {
+      return useCredentialStore();
+    },
+    malleableProfileStore() {
+      return useMalleableProfileStore();
+    },
+    agents() {
+      return this.agentStore.agents;
+    },
+    listeners() {
+      return this.listenerStore.listenerNames;
+    },
+    bypasses() {
+      return this.bypassStore.bypassNames;
+    },
+    credentials() {
+      return this.credentialStore.credentials;
+    },
+    malleableProfiles() {
+      return this.malleableProfileStore.profileNames;
+    },
     /**
      * Fields that go in the "Optional" section
      */
@@ -165,21 +193,17 @@ export default {
     },
   },
   mounted() {
-    if (this.listeners?.length === 0) {
-      this.$store.dispatch("listener/getListeners");
-    }
-    if (this.bypasses?.length === 0) {
-      this.$store.dispatch("bypass/getBypasses");
-    }
-    if (this.malleableProfiles?.length === 0) {
-      this.$store.dispatch("malleable/getMalleableProfiles");
-    }
-    if (this.credentials?.length === 0) {
-      this.$store.dispatch("credential/getCredentials");
-    }
+    this.agentStore.getAgents();
+    this.listenerStore.getListeners();
+    this.bypassStore.getBypasses();
+    this.malleableProfileStore.getMalleableProfiles();
+    this.credentialStore.getCredentials();
   },
   methods: {
     suggestedValuesForField(field) {
+      if (field.name === "Agent") {
+        return this.agents;
+      }
       if (["Listener", "RedirectListener"].includes(field.name)) {
         return this.listeners;
       }
diff --git a/src/components/ListPageTop.vue b/src/components/ListPageTop.vue
index e51bf33..7b23174 100644
--- a/src/components/ListPageTop.vue
+++ b/src/components/ListPageTop.vue
@@ -18,7 +18,7 @@
           <v-icon right> fa-trash-alt </v-icon>
         </v-btn>
         <v-btn
-          v-if="showRefresh"
+          v-if="showRefresh && !isAutoRefresh"
           :disabled="refreshLoading"
           color="primary"
           text
@@ -28,6 +28,13 @@
           {{ refreshText }}
           <v-icon right> fa-redo {{ refreshLoading ? "fa-spin" : "" }} </v-icon>
         </v-btn>
+        <tooltip-button-toggle
+          v-if="showRefresh && isAutoRefresh"
+          v-model="autoRefreshInternal"
+          icon="fa-redo"
+          :button-text="autoRefreshInternal ? 'On' : 'Off'"
+          :text="refreshText"
+        />
         <v-btn
           v-if="showCreate"
           color="primary"
@@ -44,8 +51,11 @@
 </template>
 
 <script>
+import TooltipButtonToggle from "@/components/TooltipButtonToggle.vue";
+
 export default {
   name: "ListPageTop",
+  components: { TooltipButtonToggle },
   props: {
     deleteText: {
       type: String,
@@ -75,11 +85,39 @@ export default {
       type: Boolean,
       default: false,
     },
+    // Whether the refresh button is a toggle or not
+    isAutoRefresh: {
+      type: Boolean,
+      default: false,
+    },
+    // Whether the auto refresh is on or off
+    autoRefresh: {
+      type: Boolean,
+      default: false,
+    },
     breads: {
       type: Array,
       default: () => [],
     },
   },
+  data() {
+    return {
+      autoRefreshInternal: false,
+    };
+  },
+  watch: {
+    autoRefresh: {
+      immediate: true,
+      handler(newValue) {
+        this.autoRefreshInternal = newValue;
+      },
+    },
+    autoRefreshInternal: {
+      handler(newValue) {
+        this.$emit("update:auto-refresh", newValue);
+      },
+    },
+  },
 };
 </script>
 
diff --git a/src/components/Login.vue b/src/components/Login.vue
index c0c8f33..3ead211 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from "vuex";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "Login",
@@ -38,12 +38,15 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      isLoggedIn: "application/isLoggedIn",
-    }),
-    ...mapState({
-      loginError: (state) => state.application.loginError,
-    }),
+    applicationStore() {
+      return useApplicationStore();
+    },
+    isLoggedIn() {
+      return this.applicationStore.isLoggedIn;
+    },
+    loginError() {
+      return this.applicationStore.loginError;
+    },
   },
   watch: {
     loginError(val) {
@@ -84,7 +87,7 @@ export default {
         socketUrl = `wss://${host}`;
       }
 
-      this.$store.dispatch("application/login", {
+      this.applicationStore.login({
         url: cleanedUrl,
         socketUrl,
         username: this.form.username,
diff --git a/src/components/NotificationBell.vue b/src/components/NotificationBell.vue
index 6887028..9aa4b1b 100644
--- a/src/components/NotificationBell.vue
+++ b/src/components/NotificationBell.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "NotificationBell",
@@ -56,9 +56,12 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      notifications: (state) => state.application.notifications,
-    }),
+    applicationStore() {
+      return useApplicationStore();
+    },
+    notifications() {
+      return this.applicationStore.notifications;
+    },
     unreadCount() {
       return this.notifications.filter((n) => !n.read).length;
     },
@@ -76,12 +79,12 @@ export default {
       this.$router.push({ name: "notifications" });
     },
     markAsRead() {
-      this.$store.dispatch("application/markAllNotificationsAsRead");
+      this.applicationStore.markAllNotificationsAsRead();
     },
     push(notification) {
       notification.buttonText = notification.buttonText || "View";
       notification.read = false;
-      this.$store.dispatch("application/addNotification", notification);
+      this.applicationStore.addNotification(notification);
     },
   },
 };
diff --git a/src/components/SideNav.vue b/src/components/SideNav.vue
index d4777bf..0f7db69 100644
--- a/src/components/SideNav.vue
+++ b/src/components/SideNav.vue
@@ -50,7 +50,8 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
+import { mapState } from "pinia";
+import { useApplicationStore } from "@/stores/application-module";
 import { version } from "../../package.json";
 
 export default {
@@ -76,9 +77,7 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      empireVersion: (state) => state.application.empireVersion,
-    }),
+    ...mapState(useApplicationStore, ["empireVersion"]),
     expandOnHover() {
       return this.mini;
     },
diff --git a/src/components/SocketNotifications.vue b/src/components/SocketNotifications.vue
index deb42a9..a5bd858 100644
--- a/src/components/SocketNotifications.vue
+++ b/src/components/SocketNotifications.vue
@@ -1,13 +1,17 @@
 <template>
   <div>
-    <chat v-if="socket && isChatWidget" :socket="socket" />
+    <chat v-if="socket && chatWidget" :socket="socket" />
   </div>
 </template>
 
 <script>
 import io from "socket.io-client";
-import { mapState, mapGetters } from "vuex";
+import { mapState } from "pinia";
 import Chat from "@/components/Chat.vue";
+import { useListenerStore } from "@/stores/listener-module";
+import { usePluginStore } from "@/stores/plugin-module";
+import { useApplicationStore } from "@/stores/application-module";
+import { useAgentStore } from "@/stores/agent-module";
 
 export default {
   name: "SocketNotifications",
@@ -20,18 +24,28 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      user: (state) => state.application.user,
-      plugins: (state) => state.plugin.plugins,
-    }),
-    ...mapGetters({
-      isLoggedIn: "application/isLoggedIn",
-      isChatWidget: "application/isChatWidget",
-      socketUrl: "application/socketUrl",
-      token: "application/token",
-      isAutoSubscribeAgents: "application/isAutoSubscribeAgents",
-      subscribedAgents: "agent/subscribed",
-      agents: "agent/agents",
+    agentStore() {
+      return useAgentStore();
+    },
+    listenerStore() {
+      return useListenerStore();
+    },
+    pluginStore() {
+      return usePluginStore();
+    },
+    plugins() {
+      return this.pluginStore.plugins;
+    },
+    ...mapState(useApplicationStore, [
+      "user",
+      "isLoggedIn",
+      "chatWidget",
+      "socketUrl",
+      "token",
+    ]),
+    ...mapState(useAgentStore, {
+      subscribedAgents: "subscribed",
+      agents: "agents",
     }),
   },
   watch: {
@@ -133,7 +147,7 @@ export default {
             params: { id: data.id },
           },
         });
-        this.$store.dispatch("listener/addListener", data);
+        this.listenerStore.addListener(data);
       });
 
       this.socket.on("agents/new", (data) => {
@@ -146,7 +160,7 @@ export default {
             params: { id: data.session_id },
           },
         });
-        this.$store.dispatch("agent/addAgent", data);
+        this.agentStore.addAgent(data);
       });
 
       this.socket.on("reconnect_failed", () => {
diff --git a/src/components/TooltipButton.vue b/src/components/TooltipButton.vue
index 56baad2..29bb522 100644
--- a/src/components/TooltipButton.vue
+++ b/src/components/TooltipButton.vue
@@ -4,6 +4,7 @@
       <v-btn
         :color="flat ? '' : color"
         :to="to"
+        :disabled="disabled"
         class="mr-5"
         icon
         :small="!xSmall"
@@ -12,7 +13,7 @@
         @click="$emit('click')"
       >
         <v-icon :style="padLeft !== 0 ? `padding-left: ${padLeft}px` : ''">
-          {{ icon }}
+          {{ icon }} {{ rotate ? "fa-spin" : "" }}
         </v-icon>
       </v-btn>
     </template>
@@ -52,6 +53,19 @@ export default {
       type: Boolean,
       default: false,
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    rotate: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  methods: {
+    style() {
+      return this.padLeft !== 0 ? `padding-left: ${this.padLeft}px` : "";
+    },
   },
 };
 </script>
diff --git a/src/components/agents/AgentCommandViewer.vue b/src/components/agents/AgentCommandViewer.vue
deleted file mode 100644
index dc2674d..0000000
--- a/src/components/agents/AgentCommandViewer.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-  <div class="agent-command-viewer">
-    <v-icon
-      v-if="!initialized"
-      style="width: 50px"
-      class="fa-3x fas fa-spinner fa-spin"
-    />
-    <ul class="shell-body">
-      <agent-command-viewer-entry
-        v-for="result in agentResults"
-        :key="result.id"
-        :result="result"
-      />
-    </ul>
-  </div>
-</template>
-
-<script>
-import AgentCommandViewerEntry from "./AgentCommandViewerEntry.vue";
-
-export default {
-  components: { AgentCommandViewerEntry },
-  props: {
-    name: {
-      type: String,
-      required: true,
-    },
-    taskResults: {
-      type: Array,
-      default: () => [],
-    },
-    initialized: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      interval: null,
-    };
-  },
-  computed: {
-    agentResults() {
-      return this.taskResults.length > 0
-        ? this.taskResults
-            .map((res) => ({
-              id: res.id,
-              input: res.input,
-              output: res.output ? res.output.split("\\n") : "",
-              ogOutput: res.output ? res.output.split("\\n").join("\n") : "",
-              username: res.username ? res.username : "unknown",
-              updatedAt: res.updated_at,
-            }))
-            .slice(-10)
-        : [];
-    },
-    totalLength() {
-      return [
-        ...this.agentResults
-          .map((el) => el.input)
-          .filter((input) => input.length > 0),
-        ...this.agentResults
-          .map((el) => el.output)
-          .filter((output) => output.length > 0),
-      ];
-    },
-  },
-  watch: {
-    /**
-     * Update the DOM scroll if the total length of the results, input and output, changes.
-     */
-    totalLength(val, oldVal) {
-      if (val.length !== oldVal.length) {
-        this.$nextTick(() => {
-          this.$emit("new-results");
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.agent-command-viewer {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  background-color: #141414;
-}
-
-/* https://guides.codechewing.com/mac-terminal-shell-css-html */
-.shell-body {
-  margin: 0;
-  padding: 5px;
-  list-style: none;
-  background: #141414;
-  color: #45d40c;
-  font:
-    0.8em "Andale Mono",
-    Consolas,
-    "Courier New";
-  line-height: 1.6em;
-
-  -webkit-border-bottom-right-radius: 3px;
-  -webkit-border-bottom-left-radius: 3px;
-  -moz-border-radius-bottomright: 3px;
-  -moz-border-radius-bottomleft: 3px;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-</style>
diff --git a/src/components/agents/AgentCommandViewerEntry.vue b/src/components/agents/AgentCommandViewerEntry.vue
deleted file mode 100644
index bfe9b9f..0000000
--- a/src/components/agents/AgentCommandViewerEntry.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div :class="pulsate ? 'pulsate' : ''">
-    <li>
-      <span class="username">({{ result.username }})</span>&nbsp;{{
-        result.input
-      }}
-    </li>
-    <li>{{ result.ogOutput }}</li>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "AgentCommandViewerEntry",
-  props: {
-    result: {
-      type: Object,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      pulsate: true,
-    };
-  },
-  watch: {
-    result: {
-      async handler(oldVal, newVal) {
-        if (oldVal.updatedAt !== newVal.updatedAt) {
-          console.log("TRIGGGERED");
-          this.pulsate = false;
-          await this.$nextTick();
-          this.pulsate = true;
-        }
-      },
-      deep: true,
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.shell-body li .username {
-  color: yellow;
-}
-
-.shell-body li:first-child:before {
-  content: ">";
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-.shell-body li {
-  word-wrap: break-word;
-  position: relative;
-  padding: 0 0 0 15px;
-  text-align: left;
-
-  white-space: pre-wrap;
-}
-
-// https://www.kevinleary.net/pulsating-css3-animations/
-.pulsate {
-  -webkit-animation: pulsate 2.5s ease-out;
-  -webkit-animation-iteration-count: 1;
-  opacity: 1;
-}
-@-webkit-keyframes pulsate {
-  0% {
-  }
-  50% {
-    background: #33940c;
-    color: #ffffff;
-  }
-  100% {
-  }
-}
-</style>
diff --git a/src/components/agents/AgentExecuteModule.vue b/src/components/agents/AgentExecuteModule.vue
index 416e93a..a2679a9 100644
--- a/src/components/agents/AgentExecuteModule.vue
+++ b/src/components/agents/AgentExecuteModule.vue
@@ -108,10 +108,10 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import InfoViewer from "@/components/InfoViewer.vue";
 import * as moduleApi from "@/api/module-api";
 import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
+import { useModuleStore } from "@/stores/module-module";
 import GeneralForm from "../GeneralForm.vue";
 import TechniqueChips from "../TechniqueChips.vue";
 
@@ -159,14 +159,15 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      modules: (state) =>
-        state.module.modules.filter((el) => el.enabled === true),
-      selectOptions: (state) =>
-        state.module.modules
-          .filter((el) => el.enabled === true)
-          .map((el) => el.id),
-    }),
+    moduleStore() {
+      return useModuleStore();
+    },
+    modules() {
+      return this.moduleStore.modules.filter((el) => el.enabled === true);
+    },
+    selectOptions() {
+      return this.modules.map((el) => el.id);
+    },
     moduleOptions() {
       let { options } = this.selectedItem;
       options = options || {};
@@ -229,7 +230,7 @@ export default {
     },
   },
   async mounted() {
-    this.$store.dispatch("module/getModules");
+    await this.moduleStore.getModules();
   },
   methods: {
     async handleSelect(item) {
diff --git a/src/components/agents/AgentForm.vue b/src/components/agents/AgentForm.vue
index da6754c..67251ac 100644
--- a/src/components/agents/AgentForm.vue
+++ b/src/components/agents/AgentForm.vue
@@ -131,12 +131,13 @@
 
 <script>
 import Vue from "vue";
-import { mapState } from "vuex";
 import moment from "moment";
 import TagViewer from "@/components/TagViewer.vue";
 import ClickToEdit from "@/components/ClickToEdit.vue";
 import * as agentTaskApi from "@/api/agent-task-api";
 import * as agentApi from "@/api/agent-api";
+import { useListenerStore } from "@/stores/listener-module";
+import { useAgentStore } from "@/stores/agent-module";
 
 export default {
   components: { TagViewer, ClickToEdit },
@@ -182,9 +183,15 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      listeners: (state) => state.listener.listeners,
-    }),
+    agentStore() {
+      return useAgentStore();
+    },
+    listenerStore() {
+      return useListenerStore();
+    },
+    listeners() {
+      return this.listenerStore.listeners;
+    },
     fields() {
       // stale comes back as a boolean, while no other property does and el-input
       // doesn't accept booleans so this will do.
@@ -229,7 +236,7 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch("listener/getListeners");
+    this.listenerStore.getListeners();
   },
   methods: {
     deleteTag(tag) {
@@ -261,7 +268,7 @@ export default {
       if (this.agent.name === this.form.name) return;
 
       try {
-        await this.$store.dispatch("agent/rename", {
+        await this.agentStore.rename({
           sessionId: this.agent.session_id,
           newName: this.form.name,
         });
@@ -270,6 +277,7 @@ export default {
         return;
       }
       this.$snack.info(`Agent ${this.agent.name} name updated`);
+      this.$emit("refresh-agent");
     },
     async updateListener() {
       if (this.agent.listener === this.form.listener) return;
@@ -286,9 +294,7 @@ export default {
       this.$snack.info(
         `Tasked agent to change listener to: ${this.form.listener}`,
       );
-      await this.$store.dispatch("agent/getAgent", {
-        sessionId: this.form.name,
-      });
+      this.$emit("refresh-agent");
     },
     async updateKillDate() {
       let date = "";
@@ -304,7 +310,7 @@ export default {
         return;
       }
       this.$snack.info(`Tasked agent to change kill date to: ${date}`);
-      this.$store.dispatch("agent/getAgent", { sessionId: this.form.name });
+      this.$emit("refresh-agent");
     },
     async updateWorkingHours() {
       if (this.agent.working_hours === this.form.working_hours) return;
@@ -321,6 +327,7 @@ export default {
       this.$snack.info(
         `Tasked agent to change working hours to: ${this.form.working_hours}`,
       );
+      this.$emit("refresh-agent");
     },
     async updateDelay() {
       if (this.agent.delay === this.form.delay) return;
@@ -336,6 +343,7 @@ export default {
         return;
       }
       this.$snack.info(`Tasked agent to change delay to: ${this.form.delay}`);
+      this.$emit("refresh-agent");
     },
     async updateJitter() {
       if (this.agent.jitter === this.form.jitter) return;
@@ -351,6 +359,7 @@ export default {
         return;
       }
       this.$snack.info(`Tasked agent to change jitter to: ${this.form.jitter}`);
+      this.$emit("refresh-agent");
     },
     fieldExists(name) {
       return this.fields.filter((el) => el.name === name).length > 0;
diff --git a/src/components/agents/AgentTasksList.vue b/src/components/agents/AgentTasksList.vue
index 280b9b4..307a3b8 100644
--- a/src/components/agents/AgentTasksList.vue
+++ b/src/components/agents/AgentTasksList.vue
@@ -1,11 +1,15 @@
 <template>
   <div>
     <list-page-top
-      v-if="active"
+      v-if="active && useHeader"
       :breads="breads"
       :show-create="false"
       :show-refresh="true"
       :show-delete="false"
+      :is-auto-refresh="true"
+      :auto-refresh="useHeader ? autoRefresh : refreshTasks"
+      refresh-text="Auto-refresh Tasks"
+      @update:auto-refresh="autoRefresh = $event"
       @refresh="getTasks"
     />
     <advanced-table>
@@ -46,7 +50,7 @@
         <agent-tasks-table
           ref="agentTasksTable"
           :agent="agent"
-          :refresh-tasks="refreshTasks"
+          :refresh-tasks="useHeader ? autoRefresh : refreshTasks"
           :hide-columns="['id', 'task_name']"
           :selected-agents="selectedAgents"
           :selected-users="selectedUsers"
@@ -61,8 +65,7 @@
 
 <script>
 import moment from "moment";
-import debounce from "lodash.debounce";
-import { mapState } from "vuex";
+import { mapState } from "pinia";
 
 import AgentTasksTable from "@/components/agents/AgentTasksTable.vue";
 import ListPageTop from "@/components/ListPageTop.vue";
@@ -71,6 +74,8 @@ import ExpansionPanelFilter from "@/components/tables/ExpansionPanelFilter.vue";
 import ExpansionPanelSearch from "@/components/tables/ExpansionPanelSearch.vue";
 import AdvancedTable from "@/components/tables/AdvancedTable.vue";
 import * as tagApi from "@/api/tag-api";
+import { useUserStore } from "@/stores/user-module";
+import { useAgentStore } from "@/stores/agent-module";
 
 export default {
   name: "AgentTasksList",
@@ -88,6 +93,12 @@ export default {
       required: false,
       default: null,
     },
+    // Whether the list-page-top component should be used.
+    useHeader: {
+      type: Boolean,
+      default: false,
+    },
+    // If useHeader is true, this will be ignored.
     refreshTasks: {
       type: Boolean,
       default: false,
@@ -119,21 +130,27 @@ export default {
       selectedUsers: [],
       selectedTags: [],
       tags: [],
-      debouncedGetTasks: debounce(this.getTasks, 500),
+      autoRefresh: true,
     };
   },
   computed: {
-    ...mapState({
-      agents: (state) => state.agent.agents,
-      users: (state) => {
-        const u = state.user.users;
-        u.push({
+    agentStore() {
+      return useAgentStore();
+    },
+    userStore() {
+      return useUserStore();
+    },
+    users() {
+      const u = this.userStore.users;
+      return [
+        ...u,
+        {
           id: 0,
           username: "Non-User",
-        });
-        return u;
-      },
-    }),
+        },
+      ];
+    },
+    ...mapState(useAgentStore, ["agents"]),
   },
   watch: {
     agent: {
@@ -147,8 +164,8 @@ export default {
   },
   async mounted() {
     await Promise.all([
-      this.$store.dispatch("agent/getAgents"),
-      this.$store.dispatch("user/getUsers"),
+      this.agentStore.getAgents(),
+      this.userStore.getUsers(),
       this.getTags(),
     ]);
   },
diff --git a/src/components/agents/AgentTerminal.vue b/src/components/agents/AgentTerminal.vue
index 29eb206..97bfbe2 100644
--- a/src/components/agents/AgentTerminal.vue
+++ b/src/components/agents/AgentTerminal.vue
@@ -43,8 +43,8 @@ import pause from "@/utils/pause";
 import * as moduleApi from "@/api/module-api";
 import * as agentTaskApi from "@/api/agent-task-api";
 import AnsiUp from "ansi_up";
-import { mapState } from "vuex";
 import { table } from "table";
+import { useModuleStore } from "@/stores/module-module";
 
 function fuzzyMatch(query, string) {
   const q = Array.from(query);
@@ -217,9 +217,12 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      allModules: (state) => state.module.modules,
-    }),
+    moduleStore() {
+      return useModuleStore();
+    },
+    allModules() {
+      return this.moduleStore.modules;
+    },
     currentPrompt() {
       const prefix = this.colorizeText("(Empire: ", "white");
       const suffix = this.colorizeText(" )>", "white");
@@ -248,7 +251,7 @@ export default {
     // Autofocus on the input field
     this.$refs.inputField.focus();
     if (this.allModules?.length === 0) {
-      this.$store.dispatch("module/getModules");
+      await this.moduleStore.getModules();
     }
 
     // Load the command history from local storage
diff --git a/src/components/agents/AgentsList.vue b/src/components/agents/AgentsList.vue
index 45a0e65..1ac3b28 100644
--- a/src/components/agents/AgentsList.vue
+++ b/src/components/agents/AgentsList.vue
@@ -6,15 +6,22 @@
       :show-create="false"
       :show-refresh="true"
       :show-delete="showDelete"
+      :is-auto-refresh="true"
+      :auto-refresh="autoRefresh"
+      refresh-text="Auto-refresh Agents"
       delete-text="Kill"
+      @update:auto-refresh="autoRefresh = $event"
       @delete="killAgents"
       @refresh="getAgents"
     />
     <advanced-table>
       <template #filters>
-        <v-switch v-model="hideStaleAgentsCheckbox" label="Hide Stale Agents" />
         <v-switch
-          v-model="hideArchivedAgentsCheckbox"
+          v-model="applicationStore.hideStaleAgents"
+          label="Hide Stale Agents"
+        />
+        <v-switch
+          v-model="applicationStore.hideArchivedAgents"
           class="pl-4"
           label="Hide Archived Agents"
         />
@@ -32,9 +39,10 @@
         <agents-table
           ref="agentsTable"
           v-model="selected"
-          :hide-stale-agents="hideStaleAgentsCheckbox"
-          :hide-archived-agents="hideArchivedAgentsCheckbox"
+          :hide-stale-agents="applicationStore.hideStaleAgents"
+          :hide-archived-agents="applicationStore.hideArchivedAgents"
           :selected-tags="selectedTags"
+          :refresh-agents="autoRefresh"
           @refresh-tags="getTags"
         />
       </template>
@@ -44,12 +52,13 @@
 
 <script>
 import moment from "moment";
-import { mapState } from "vuex";
 import ListPageTop from "@/components/ListPageTop.vue";
 import ExpansionPanelFilter from "@/components/tables/ExpansionPanelFilter.vue";
 import AgentsTable from "@/components/agents/AgentsTable.vue";
 import AdvancedTable from "@/components/tables/AdvancedTable.vue";
 import * as tagApi from "@/api/tag-api";
+import { useAgentStore } from "@/stores/agent-module";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "AgentsList",
@@ -83,14 +92,19 @@ export default {
       selectedTags: [],
       tags: [],
       moment,
+      autoRefresh: true,
     };
   },
   computed: {
-    ...mapState({
-      agents: (state) => state.agent.agents,
-      hideStaleAgents: (state) => state.application.hideStaleAgents,
-      hideArchivedAgents: (state) => state.application.hideArchivedAgents,
-    }),
+    agentStore() {
+      return useAgentStore();
+    },
+    applicationStore() {
+      return useApplicationStore();
+    },
+    agents() {
+      return this.agentStore.agents;
+    },
     sortedAgents() {
       let sorted = this.agents.slice();
       sorted.sort((a, b) => -a.lastseen_time.localeCompare(b.lastseen_time));
@@ -114,22 +128,6 @@ export default {
     showDelete() {
       return this.selected.length > 0;
     },
-    hideStaleAgentsCheckbox: {
-      set(val) {
-        this.$store.dispatch("application/hideStaleAgents", val);
-      },
-      get() {
-        return this.hideStaleAgents;
-      },
-    },
-    hideArchivedAgentsCheckbox: {
-      set(val) {
-        this.$store.dispatch("application/hideArchivedAgents", val);
-      },
-      get() {
-        return this.hideArchivedAgents;
-      },
-    },
   },
   async mounted() {
     this.getTags();
@@ -163,9 +161,7 @@ export default {
         )
       ) {
         this.selected.forEach((agent) => {
-          this.$store.dispatch("agent/killAgent", {
-            sessionId: agent.session_id,
-          });
+          this.agentStore.killAgent({ sessionId: agent.session_id });
         });
         this.$snack.success(
           `${this.selected.length} agents tasked to run TASK_EXIT.`,
@@ -184,7 +180,7 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("agent/killAgent", { sessionId: item.session_id });
+        this.agentStore.killAgent({ sessionId: item.session_id });
         this.$snack.success(`Agent ${item.name} tasked to run TASK_EXIT.`);
       }
     },
diff --git a/src/components/agents/AgentsTable.vue b/src/components/agents/AgentsTable.vue
index 089a48f..c47d3da 100644
--- a/src/components/agents/AgentsTable.vue
+++ b/src/components/agents/AgentsTable.vue
@@ -129,10 +129,11 @@
 
 <script>
 import moment from "moment";
-import { mapState } from "vuex";
 import DateTimeDisplay from "@/components/DateTimeDisplay.vue";
 import TagViewer from "@/components/TagViewer.vue";
 import * as agentApi from "@/api/agent-api";
+import { useAgentStore } from "@/stores/agent-module";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "AgentsTable",
@@ -157,6 +158,10 @@ export default {
       type: Boolean,
       required: true,
     },
+    refreshAgents: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -245,15 +250,23 @@ export default {
       selectedHeadersTemp: [],
       selected: [],
       showHeaderMenu: false,
+      refreshInterval: null,
       moment,
     };
   },
   computed: {
-    ...mapState({
-      agents: (state) => state.agent.agents,
-      agentsStatus: (state) => state.agent.status,
-      selectedHeadersState: (state) => state.application.agentHeaders,
-    }),
+    agentStore() {
+      return useAgentStore();
+    },
+    applicationStore() {
+      return useApplicationStore();
+    },
+    agents() {
+      return this.agentStore.agents;
+    },
+    agentsStatus() {
+      return this.agentStore.status;
+    },
     selectedAll: {
       set(val) {
         this.selectedHeadersTemp = [...this.staticHeaders];
@@ -271,7 +284,9 @@ export default {
       return this.headersFull
         .filter(
           (h) =>
-            this.selectedHeaders.findIndex((h2) => h2.text === h.text) > -1,
+            this.applicationStore.agentHeaders.findIndex(
+              (h2) => h2.text === h.text,
+            ) > -1,
         )
         .sort((a, b) => a.order - b.order);
     },
@@ -301,14 +316,6 @@ export default {
 
       return sorted;
     },
-    selectedHeaders: {
-      set(val) {
-        this.$store.dispatch("application/agentHeaders", val);
-      },
-      get() {
-        return this.selectedHeadersState;
-      },
-    },
   },
   watch: {
     selectedTags() {
@@ -317,15 +324,32 @@ export default {
     selected(val) {
       this.$emit("input", val);
     },
+    refreshAgents: {
+      handler(newVal) {
+        if (newVal) {
+          this.getAgents();
+          this.refreshInterval = setInterval(() => {
+            this.getAgents();
+          }, 8000);
+        } else {
+          console.log("Clearing interval");
+          clearInterval(this.refreshInterval);
+        }
+      },
+      immediate: true,
+    },
+  },
+  beforeDestroy() {
+    clearInterval(this.refreshInterval);
   },
   async mounted() {
     this.getAgents();
-    if (this.selectedHeaders.length === 0) {
-      this.selectedHeaders = this.headersFull.filter(
+    if (this.applicationStore.agentHeaders.length === 0) {
+      this.applicationStore.agentHeaders = this.headersFull.filter(
         (h) => h.defaultHeader === true,
       );
     }
-    this.selectedHeadersTemp = [...this.selectedHeaders];
+    this.selectedHeadersTemp = [...this.applicationStore.agentHeaders];
   },
   methods: {
     deleteTag(agent, tag) {
@@ -358,11 +382,11 @@ export default {
         .catch((err) => this.$snack.error(`Error: ${err}`));
     },
     submitHeaderForm() {
-      this.selectedHeaders = [...this.selectedHeadersTemp];
+      this.applicationStore.agentHeaders = [...this.selectedHeadersTemp];
       this.showHeaderMenu = false;
     },
     getAgents() {
-      this.$store.dispatch("agent/getAgents");
+      this.agentStore.getAgents();
     },
     async killAgent(item) {
       this.$emit("killAgent", item);
diff --git a/src/components/listeners/ListenersList.vue b/src/components/listeners/ListenersList.vue
index f0a8668..d40c0e5 100644
--- a/src/components/listeners/ListenersList.vue
+++ b/src/components/listeners/ListenersList.vue
@@ -36,13 +36,13 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import moment from "moment";
 import ListPageTop from "@/components/ListPageTop.vue";
 import ExpansionPanelFilter from "@/components/tables/ExpansionPanelFilter.vue";
 import AdvancedTable from "@/components/tables/AdvancedTable.vue";
 import ListenersTable from "@/components/listeners/ListenersTable.vue";
 import * as tagApi from "@/api/tag-api";
+import { useListenerStore } from "@/stores/listener-module";
 
 export default {
   name: "Listeners",
@@ -79,10 +79,13 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      listeners: (state) => state.listener.listeners,
-      listenersStatus: (state) => state.listener.status,
-    }),
+    // mapStore breaks autocomplete
+    listenerStore() {
+      return useListenerStore();
+    },
+    listenersStatus() {
+      return this.listenerStore.status;
+    },
     showDelete() {
       return this.selected.length > 0;
     },
@@ -122,7 +125,7 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("listener/killListener", item.id);
+        await this.listenerStore.killListener(item.id);
       }
     },
     async killListeners() {
@@ -134,7 +137,7 @@ export default {
         )
       ) {
         this.selected.forEach((listener) => {
-          this.$store.dispatch("listener/killListener", listener.id);
+          this.listenerStore.killListener(listener.id);
         });
         this.selected = [];
       }
diff --git a/src/components/listeners/ListenersTable.vue b/src/components/listeners/ListenersTable.vue
index 5c3ff0c..a77d692 100644
--- a/src/components/listeners/ListenersTable.vue
+++ b/src/components/listeners/ListenersTable.vue
@@ -81,11 +81,11 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import moment from "moment";
 import TagViewer from "@/components/TagViewer.vue";
 import DateTimeDisplay from "@/components/DateTimeDisplay.vue";
 import * as listenerApi from "@/api/listener-api";
+import { useListenerStore } from "@/stores/listener-module";
 
 export default {
   name: "ListenersTable",
@@ -126,12 +126,14 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      listeners: (state) => state.listener.listeners,
-      listenersStatus: (state) => state.listener.status,
-    }),
+    listenerStore() {
+      return useListenerStore();
+    },
+    listenersStatus() {
+      return this.listenerStore.status;
+    },
     sortedListeners() {
-      let sorted = this.listeners.slice();
+      let sorted = this.listenerStore.listeners.slice();
 
       if (this.selectedTags.length === 0) {
         return sorted;
@@ -190,7 +192,7 @@ export default {
       this.$emit("kill-listener", item);
     },
     getListeners() {
-      this.$store.dispatch("listener/getListeners");
+      this.listenerStore.getListeners();
     },
   },
 };
diff --git a/src/components/listeners/MalleableProfilesList.vue b/src/components/listeners/MalleableProfilesList.vue
index 4871946..e0011fb 100644
--- a/src/components/listeners/MalleableProfilesList.vue
+++ b/src/components/listeners/MalleableProfilesList.vue
@@ -100,9 +100,9 @@
 
 <script>
 import moment from "moment";
-import { mapState } from "vuex";
 import ListPageTop from "@/components/ListPageTop.vue";
 import DateTimeDisplay from "@/components/DateTimeDisplay.vue";
+import { useMalleableProfileStore } from "@/stores/malleable-module";
 
 export default {
   name: "MalleableProfiles",
@@ -144,9 +144,12 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      malleableProfiles: (state) => state.malleable.malleableProfiles,
-    }),
+    malleableProfileStore() {
+      return useMalleableProfileStore();
+    },
+    malleableProfiles() {
+      return this.malleableProfileStore.malleableProfiles;
+    },
     showDelete() {
       return this.selected.length > 0;
     },
@@ -156,7 +159,7 @@ export default {
   },
   methods: {
     getMalleableProfiles() {
-      this.$store.dispatch("malleable/getMalleableProfiles");
+      this.malleableProfileStore.getMalleableProfiles();
     },
     create() {
       this.$router.push({ name: "malleableProfileNew" });
@@ -175,7 +178,7 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("malleable/deleteMalleableProfile", item.id);
+        await this.malleableProfileStore.deleteMalleableProfile(item.id);
       }
     },
     async deleteMalleableProfiles() {
@@ -187,7 +190,7 @@ export default {
         )
       ) {
         this.selected.forEach((profile) => {
-          this.$store.dispatch("malleable/deleteMalleableProfile", profile.id);
+          this.malleableProfileStore.deleteMalleableProfile(profile.id);
         });
         this.selected = [];
       }
diff --git a/src/components/modules/ModulesTable.vue b/src/components/modules/ModulesTable.vue
index c5f8556..aeaf218 100644
--- a/src/components/modules/ModulesTable.vue
+++ b/src/components/modules/ModulesTable.vue
@@ -52,8 +52,8 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import TechniqueChips from "@/components/TechniqueChips.vue";
+import { useModuleStore } from "@/stores/module-module";
 
 export default {
   name: "ModulesTable",
@@ -90,9 +90,12 @@ export default {
     return {};
   },
   computed: {
-    ...mapState({
-      modules: (state) => state.module.modules,
-    }),
+    moduleStore() {
+      return useModuleStore();
+    },
+    modules() {
+      return this.moduleStore.modules;
+    },
     languagesUnique() {
       return [
         ...new Set(this.modules.map((mod) => mod.language.toLowerCase())),
@@ -157,7 +160,7 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch("module/getModules");
+    this.moduleStore.getModules();
   },
   methods: {
     sortLanguage(a, b) {
diff --git a/src/components/plugins/PluginTasksList.vue b/src/components/plugins/PluginTasksList.vue
index 0234d76..b0e57bd 100644
--- a/src/components/plugins/PluginTasksList.vue
+++ b/src/components/plugins/PluginTasksList.vue
@@ -1,11 +1,15 @@
 <template>
   <div>
     <list-page-top
-      v-if="active"
+      v-if="active && useHeader"
       :breads="breads"
       :show-create="false"
       :show-refresh="true"
       :show-delete="false"
+      :is-auto-refresh="true"
+      :auto-refresh="useHeader ? autoRefresh : refreshTasks"
+      refresh-text="Auto-refresh Tasks"
+      @update:auto-refresh="autoRefresh = $event"
       @refresh="getTasks"
     />
     <advanced-table>
@@ -46,7 +50,7 @@
         <plugin-tasks-table
           ref="pluginTaskTable"
           :plugin="plugin"
-          :refresh-tasks="refreshTasks"
+          :refresh-tasks="useHeader ? autoRefresh : refreshTasks"
           :hide-columns="['id', 'task_name']"
           :selected-plugins="selectedPlugins"
           :selected-users="selectedUsers"
@@ -61,8 +65,7 @@
 
 <script>
 import moment from "moment";
-import debounce from "lodash.debounce";
-import { mapState } from "vuex";
+import { mapState } from "pinia";
 
 import PluginTasksTable from "@/components/plugins/PluginTasksTable.vue";
 import ListPageTop from "@/components/ListPageTop.vue";
@@ -71,6 +74,8 @@ import ExpansionPanelFilter from "@/components/tables/ExpansionPanelFilter.vue";
 import ExpansionPanelSearch from "@/components/tables/ExpansionPanelSearch.vue";
 import AdvancedTable from "@/components/tables/AdvancedTable.vue";
 import * as tagApi from "@/api/tag-api";
+import { usePluginStore } from "@/stores/plugin-module";
+import { useUserStore } from "@/stores/user-module";
 
 export default {
   name: "PluginTasksList",
@@ -88,6 +93,12 @@ export default {
       required: false,
       default: null,
     },
+    // Whether the list-page-top component should be used.
+    useHeader: {
+      type: Boolean,
+      default: false,
+    },
+    // If useHeader is true, this will be ignored.
     refreshTasks: {
       type: Boolean,
       default: false,
@@ -119,21 +130,27 @@ export default {
       selectedUsers: [],
       selectedTags: [],
       tags: [],
-      debouncedGetTasks: debounce(this.getTasks, 500),
+      autoRefresh: true,
     };
   },
   computed: {
-    ...mapState({
-      plugins: (state) => state.plugin.plugins,
-      users: (state) => {
-        const u = state.user.users;
-        u.push({
+    pluginStore() {
+      return usePluginStore();
+    },
+    userStore() {
+      return useUserStore();
+    },
+    users() {
+      const u = this.userStore.users;
+      return [
+        ...u,
+        {
           id: 0,
           username: "Non-User",
-        });
-        return u;
-      },
-    }),
+        },
+      ];
+    },
+    ...mapState(usePluginStore, ["plugins"]),
   },
   watch: {
     plugin: {
@@ -147,8 +164,8 @@ export default {
   },
   async mounted() {
     await Promise.all([
-      this.$store.dispatch("plugin/getPlugins"),
-      this.$store.dispatch("user/getUsers"),
+      this.pluginStore.getPlugins(),
+      this.userStore.getUsers(),
       this.getTags(),
     ]);
   },
diff --git a/src/components/plugins/PluginsList.vue b/src/components/plugins/PluginsList.vue
index e5cdaf6..f619889 100644
--- a/src/components/plugins/PluginsList.vue
+++ b/src/components/plugins/PluginsList.vue
@@ -23,7 +23,7 @@
 
 <script>
 import ListPageTop from "@/components/ListPageTop.vue";
-import { mapState } from "vuex";
+import { usePluginStore } from "@/stores/plugin-module";
 
 export default {
   name: "PluginsList",
@@ -57,16 +57,19 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      plugins: (state) => state.plugin.plugins,
-    }),
+    pluginStore() {
+      return usePluginStore();
+    },
+    plugins() {
+      return this.pluginStore.plugins;
+    },
   },
   mounted() {
     this.getPlugins();
   },
   methods: {
     getPlugins() {
-      this.$store.dispatch("plugin/getPlugins");
+      this.pluginStore.getPlugins();
     },
   },
 };
diff --git a/src/components/stagers/StagersTable.vue b/src/components/stagers/StagersTable.vue
index 9a4e005..eaf4752 100644
--- a/src/components/stagers/StagersTable.vue
+++ b/src/components/stagers/StagersTable.vue
@@ -87,12 +87,13 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import moment from "moment";
 import DownloadMixin from "@/mixins/download-stager";
 import CopyMixin from "@/mixins/copy-stager";
 import DateTimeDisplay from "@/components/DateTimeDisplay.vue";
 import * as downloadApi from "@/api/download-api";
+import { useStagerStore } from "@/stores/stager-module";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "StagersTable",
@@ -125,17 +126,27 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      stagers: (state) => state.stager.stagers,
-      stagersStatus: (state) => state.stager.status,
-    }),
+    stagerStore() {
+      return useStagerStore();
+    },
+    applicationStore() {
+      return useApplicationStore();
+    },
+    stagers() {
+      return this.stagerStore.stagers;
+    },
+    stagersStatus() {
+      return this.stagerStore.status;
+    },
+    userId() {
+      return this.applicationStore.user.id;
+    },
     filteredStagers() {
-      return this.stagers.filter((stager) => {
-        if (this.onlyMyStagers) {
-          return stager.user_id === this.user.id;
-        }
-        return true;
-      });
+      if (this.onlyMyStagers) {
+        return this.stagers.filter((stager) => stager.user_id === this.userId);
+      }
+
+      return this.stagers;
     },
   },
   watch: {
@@ -171,7 +182,7 @@ export default {
       this.$emit("delete-stager", item);
     },
     getStagers() {
-      this.$store.dispatch("stager/getStagers");
+      this.stagerStore.getStagers();
     },
   },
 };
diff --git a/src/main.js b/src/main.js
index 24fe98b..783b72f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,18 +1,24 @@
 import Vue from "vue";
 import Chat from "vue-beautiful-chat";
+import { createPinia } from "pinia";
+import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
+
 import App from "./App.vue";
 import router from "./router";
-import store from "./store";
 
 import "@fontsource/roboto";
 import vuetify from "./plugins/vuetify";
 
 Vue.use(Chat);
 
+const pinia = createPinia();
+pinia.use(piniaPluginPersistedstate);
+Vue.use(pinia);
+
 Vue.config.productionTip = false;
 new Vue({
   router,
-  store,
   vuetify,
+  pinia,
   render: (h) => h(App),
 }).$mount("#app");
diff --git a/src/router/index.js b/src/router/index.js
index b259852..34c0f58 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
-import store from "@/store/index";
+import { useApplicationStore } from "@/stores/application-module";
 import Home from "../views/Home.vue";
 
 Vue.use(VueRouter);
@@ -166,11 +166,11 @@ const router = new VueRouter({
 });
 
 function isAuthenticated() {
-  return store.getters["application/token"].length > 0;
+  return useApplicationStore().token.length > 0;
 }
 
 function isAdmin() {
-  return store.getters["application/isAdmin"] === true;
+  return useApplicationStore().isAdmin;
 }
 
 // Auth
diff --git a/src/store/AgentModule.js b/src/store/AgentModule.js
deleted file mode 100644
index d79c90f..0000000
--- a/src/store/AgentModule.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import * as agentApi from "@/api/agent-api";
-import * as agentTaskApi from "@/api/agent-task-api";
-
-export default {
-  namespaced: true,
-  state: {
-    agents: [],
-    status: "success",
-    subscribed: {},
-  },
-  mutations: {
-    setAgents(state, agents) {
-      state.agents = agents;
-    },
-    pushAgent(state, agent) {
-      state.agents.push(agent);
-    },
-    setStatus(state, status) {
-      state.status = status;
-    },
-    setSubscribed(state, subscribed) {
-      state.subscribed = subscribed;
-    },
-  },
-  actions: {
-    async getAgents(context) {
-      context.commit("setStatus", "loading");
-      const agents = await agentApi.getAgents(true);
-      await context.commit("setAgents", agents);
-      context.commit("setStatus", "success");
-
-      const { autoSubscribeAgents } = context.rootState.application;
-      if (autoSubscribeAgents) {
-        agents.forEach((agent) => {
-          if (!context.state.subscribed[agent.session_id]) {
-            context.dispatch("subscribe", { sessionId: agent.session_id });
-          }
-        });
-      }
-    },
-    async getAgent(context, { sessionId }) {
-      const agent = (await agentApi.getAgent(sessionId))[0];
-      context.dispatch("addAgent", agent);
-    },
-    async rename(context, { sessionId, newName }) {
-      let { agents } = context.state;
-      if (agents == null || agents.length === 0) {
-        await context.dispatch("getAgents");
-        ({ agents } = context.state);
-      }
-      const agent = agents.find((el) => el.session_id === sessionId);
-
-      await agentApi.renameAgent(agent, newName);
-      if (agent != null) {
-        agent.name = newName;
-      }
-
-      context.commit("setAgents", agents);
-      return agent.name;
-    },
-    async killAgent(context, { sessionId }) {
-      const { agents } = context.state;
-      const agent = agents.find((el) => el.session_id === sessionId);
-
-      if (agent == null) {
-        return;
-      }
-
-      await agentApi.killAgent(sessionId);
-      agent.archived = true;
-      context.commit("setAgents", agents);
-    },
-    async addAgent(context, agent) {
-      const { agents } = context.state;
-      const foundIndex = agents.findIndex(
-        (el) => el.session_id === agent.session_id,
-      );
-
-      if (foundIndex >= 0) {
-        agents.splice(foundIndex, 1, agent);
-        context.commit("setAgents", agents);
-      } else {
-        context.commit("pushAgent", agent);
-      }
-
-      const { autoSubscribeAgents } = context.rootState.application;
-      if (autoSubscribeAgents) {
-        context.dispatch("subscribe", { sessionId: agent.session_id });
-      }
-    },
-    clearQueue(context, { name, tasks }) {
-      tasks.forEach((task) => {
-        agentTaskApi.deleteTask(name, task);
-      });
-    },
-    async subscribe(context, { sessionId }) {
-      const { subscribed } = context.state;
-      subscribed[sessionId] = true;
-      context.commit("setSubscribed", { ...subscribed });
-    },
-    async unsubscribe(context, { sessionId }) {
-      const { subscribed } = context.state;
-      subscribed[sessionId] = false;
-      context.commit("setSubscribed", { ...subscribed });
-    },
-    async clear(context) {
-      context.commit("setAgents", []);
-      context.commit("setSubscribed", {});
-    },
-  },
-  getters: {
-    subscribed: (state) => state.subscribed,
-    agents: (state) => state.agents,
-  },
-};
diff --git a/src/store/ApplicationModule.js b/src/store/ApplicationModule.js
deleted file mode 100644
index cb7fa83..0000000
--- a/src/store/ApplicationModule.js
+++ /dev/null
@@ -1,204 +0,0 @@
-import { setInstance } from "@/api/axios-instance";
-import axios from "axios";
-
-export default {
-  namespaced: true,
-  state: {
-    token: "",
-    url: "",
-    user: {},
-    loginError: "",
-    empireVersion: "",
-    darkMode: true,
-    chatWidget: true,
-    hideStaleAgents: false,
-    hideArchivedAgents: true,
-    filterOnlyMyStagers: true,
-    autoSubscribeAgents: true,
-    agentHeaders: [],
-    connectionError: 0,
-    notifications: [],
-  },
-  mutations: {
-    setApplicationState(
-      state,
-      { token, url, socketUrl, user, version, notifications },
-    ) {
-      state.token = token;
-      state.url = url;
-      state.socketUrl = socketUrl;
-      state.user = user;
-      state.empireVersion = version;
-      state.notifications = notifications;
-      setInstance(url, token);
-    },
-    setLoginError(state, error) {
-      state.loginError = error;
-    },
-    setConnectionError(state) {
-      state.connectionError += 1;
-    },
-    setLogout(state) {
-      state.token = "";
-      state.url = "";
-      state.socketUrl = "";
-      state.user = {};
-      state.empireVersion = "";
-      state.notifications = [];
-    },
-    clearState(state) {
-      state.token = "";
-      state.url = "";
-      state.user = {};
-      state.loginError = "";
-      state.empireVersion = "";
-      state.darkMode = true;
-      state.chatWidget = true;
-      state.hideStaleAgents = false;
-      state.hideArchivedAgents = true;
-      state.filterOnlyMyStagers = true;
-      state.autoSubscribeAgents = true;
-      state.agentHeaders = [];
-      state.notifications = [];
-    },
-    setDarkMode(state, val) {
-      state.darkMode = val;
-    },
-    setChatWidget(state, val) {
-      state.chatWidget = val;
-    },
-    setHideStaleAgents(state, val) {
-      state.hideStaleAgents = val;
-    },
-    setHideArchivedAgents(state, val) {
-      state.hideArchivedAgents = val;
-    },
-    setFilterOnlyMyStagers(state, val) {
-      state.filterOnlyMyStagers = val;
-    },
-    setAutoSubscribeAgents(state, val) {
-      state.autoSubscribeAgents = val;
-    },
-    setAgentHeaders(state, val) {
-      state.agentHeaders = val;
-    },
-    setMe(state, val) {
-      state.user = val;
-    },
-    setNotifications(state, val) {
-      state.notifications = val;
-    },
-    addNotification(state, notification) {
-      state.notifications = [notification, ...state.notifications];
-    },
-  },
-  actions: {
-    async login(context, { url, socketUrl, username, password }) {
-      try {
-        context.commit("setLoginError", "");
-        const formData = new FormData();
-        formData.append("username", username);
-        formData.append("password", password);
-        const token = await axios.post(`${url}/token`, formData);
-
-        const user = await axios.get(`${url}/api/v2/users/me`, {
-          headers: { Authorization: `Bearer ${token.data.access_token}` },
-        });
-        const version = await axios.get(`${url}/api/v2/meta/version`, {
-          headers: { Authorization: `Bearer ${token.data.access_token}` },
-        });
-        context.commit("setApplicationState", {
-          token: token.data.access_token,
-          url,
-          socketUrl,
-          user: user.data,
-          version: version.data.version,
-          notifications: [],
-        });
-      } catch (err) {
-        let message = "";
-        if (err.response && err.response.data) {
-          message = err.response.data.detail;
-        } else if (err.response && err.response.statusText) {
-          message = err.response.statusText;
-        } else {
-          message = "Unable to connect to server.";
-        }
-        context.commit("setLoginError", message);
-      }
-    },
-    async refreshMe(context) {
-      const user = await axios.get(`${context.state.url}/api/v2/users/me`, {
-        headers: { Authorization: `Bearer ${context.state.token}` },
-      });
-      context.commit("setMe", user.data);
-    },
-    addNotification(context, notification) {
-      context.commit("addNotification", notification);
-    },
-    markAllNotificationsAsRead(context) {
-      const notifications = context.state.notifications.map((n) => {
-        const notification = n;
-        notification.read = true;
-        return notification;
-      });
-      context.commit("setNotifications", notifications);
-    },
-    clearNotifications(context) {
-      context.commit("setNotifications", []);
-    },
-    connectionError(context) {
-      context.commit("setConnectionError");
-    },
-    async logout(context) {
-      context.commit("setLogout");
-    },
-    clear(context) {
-      context.commit("clearState");
-    },
-    darkMode(context, val) {
-      context.commit("setDarkMode", val);
-    },
-    chatWidget(context, val) {
-      context.commit("setChatWidget", val);
-    },
-    hideStaleAgents(context, val) {
-      context.commit("setHideStaleAgents", val);
-    },
-    hideArchivedAgents(context, val) {
-      context.commit("setHideArchivedAgents", val);
-    },
-    filterOnlyMyStagers(context, val) {
-      context.commit("setFilterOnlyMyStagers", val);
-    },
-    autoSubscribeAgents(context, val) {
-      context.commit("setAutoSubscribeAgents", val);
-    },
-    agentHeaders(context, val) {
-      context.commit("setAgentHeaders", val);
-    },
-  },
-  getters: {
-    isLoggedIn(state) {
-      return state.token.length > 0;
-    },
-    isAdmin(state) {
-      return state.user.is_admin === true;
-    },
-    isDarkMode(state) {
-      return state.darkMode;
-    },
-    isChatWidget(state) {
-      return state.chatWidget;
-    },
-    isAutoSubscribeAgents(state) {
-      return state.autoSubscribeAgents;
-    },
-    token(state) {
-      return state.token;
-    },
-    socketUrl(state) {
-      return state.socketUrl;
-    },
-  },
-};
diff --git a/src/store/BypassModule.js b/src/store/BypassModule.js
deleted file mode 100644
index d84faa6..0000000
--- a/src/store/BypassModule.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as bypassApi from "@/api/bypass-api";
-
-export default {
-  namespaced: true,
-  state: {
-    /**
-     * Full array of bypass objects
-     */
-    bypasses: [],
-  },
-  mutations: {
-    setBypasses(state, bypasses) {
-      state.bypasses = bypasses;
-    },
-  },
-  actions: {
-    async getBypasses(context) {
-      const bypasses = await bypassApi.getBypasses();
-      context.commit("setBypasses", bypasses);
-    },
-    async deleteBypass(context, id) {
-      await bypassApi.deleteBypass(id);
-      const find = context.state.bypasses.findIndex((p) => p.id === id);
-      if (find) {
-        const bypasses = context.state.bypasses.slice();
-        bypasses.splice(find, 1);
-        context.commit("setBypasses", bypasses);
-      }
-    },
-  },
-  getters: {
-    bypassNames: (state) => state.bypasses.map((el) => el.name),
-  },
-};
diff --git a/src/store/CredentialModule.js b/src/store/CredentialModule.js
deleted file mode 100644
index b4b622e..0000000
--- a/src/store/CredentialModule.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as credentialApi from "@/api/credential-api";
-
-export default {
-  namespaced: true,
-  state: {
-    /**
-     * Full array of credential objects
-     */
-    credentials: [],
-  },
-  mutations: {
-    setCredentials(state, credentials) {
-      state.credentials = credentials;
-    },
-    removeCredential(state, id) {
-      const find = state.credentials.findIndex((c) => c.id === id);
-      if (find > -1) {
-        state.credentials.splice(find, 1);
-      }
-    },
-  },
-  actions: {
-    async getCredentials(context) {
-      const credentials = await credentialApi.getCredentials();
-      context.commit("setCredentials", credentials);
-    },
-    async deleteCredential(context, id) {
-      await credentialApi.deleteCredential(id);
-      context.commit("removeCredential", id);
-    },
-  },
-  getters: {
-    credentialIds: (state) => state.credentials.map((c) => c.id),
-    credentials: (state) => state.credentials,
-  },
-};
diff --git a/src/store/ListenerModule.js b/src/store/ListenerModule.js
deleted file mode 100644
index da99ef0..0000000
--- a/src/store/ListenerModule.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import * as listenerApi from "@/api/listener-api";
-
-export default {
-  namespaced: true,
-  state: {
-    /**
-     * Full array of listener objects
-     */
-    listeners: [],
-    /**
-     * The status of the listeners request. This can be used to determine if the
-     * request is still in progress.
-     */
-    status: "success",
-    /**
-     * Full array of listener template objects
-     */
-    templates: [],
-  },
-  mutations: {
-    setListeners(state, listeners) {
-      state.listeners = listeners;
-    },
-    setStatus(state, status) {
-      state.status = status;
-    },
-    pushListener(state, listener) {
-      state.listeners.push(listener);
-    },
-    setTemplates(state, templates) {
-      state.templates = templates;
-    },
-    removeListener(state, id) {
-      const find = state.listeners.findIndex((l) => l.id === id);
-      if (find > -1) {
-        state.listeners.splice(find, 1);
-      }
-    },
-  },
-  actions: {
-    async getListeners(context) {
-      context.commit("setStatus", "loading");
-      const listeners = await listenerApi.getListeners();
-      await context.commit("setListeners", listeners);
-      context.commit("setStatus", "success");
-    },
-    async getListenerTemplates(context) {
-      const templates = await listenerApi.getListenerTemplates();
-      context.commit("setTemplates", templates);
-    },
-    async killListener(context, id) {
-      await listenerApi.killListener(id);
-      context.commit("removeListener", id);
-    },
-    async addListener(context, listener) {
-      const found = context.state.listeners.find((el) => el.id === listener.id);
-
-      if (!found) {
-        context.commit("pushListener", listener);
-      }
-    },
-  },
-  getters: {
-    listenerNames: (state) => state.listeners.map((el) => el.name),
-    templateIds: (state) => [...state.templates.map((el) => el.id)].sort(),
-  },
-};
diff --git a/src/store/MalleableModule.js b/src/store/MalleableModule.js
deleted file mode 100644
index fc80075..0000000
--- a/src/store/MalleableModule.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as malleableApi from "@/api/malleable-api";
-
-export default {
-  namespaced: true,
-  state: {
-    /**
-     * Full array of malleable profile objects
-     */
-    malleableProfiles: [],
-  },
-  mutations: {
-    setMalleableProfiles(state, malleableProfiles) {
-      state.malleableProfiles = malleableProfiles;
-    },
-  },
-  actions: {
-    async getMalleableProfiles(context) {
-      const profiles = await malleableApi.getMalleableProfiles();
-      context.commit("setMalleableProfiles", profiles);
-    },
-    async deleteMalleableProfile(context, name) {
-      await malleableApi.deleteMalleableProfile(name);
-      const find = context.state.malleableProfiles.findIndex(
-        (p) => p.name === name,
-      );
-      if (find) {
-        const profiles = context.state.malleableProfiles.slice();
-        profiles.splice(find, 1);
-        context.commit("setMalleableProfiles", profiles);
-      }
-    },
-  },
-  getters: {
-    profileNames: (state) => state.malleableProfiles.map((el) => el.name),
-  },
-};
diff --git a/src/store/ModuleModule.js b/src/store/ModuleModule.js
deleted file mode 100644
index 5b6c0a1..0000000
--- a/src/store/ModuleModule.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as moduleApi from "@/api/module-api";
-
-export default {
-  namespaced: true,
-  state: {
-    modules: [],
-  },
-  mutations: {
-    setModules(state, modules) {
-      state.modules = modules;
-    },
-  },
-  actions: {
-    async getModules(context) {
-      const modules = await moduleApi.getModules();
-      context.commit("setModules", modules);
-    },
-  },
-  getters: {},
-};
diff --git a/src/store/ObfuscationModule.js b/src/store/ObfuscationModule.js
deleted file mode 100644
index 95d99fb..0000000
--- a/src/store/ObfuscationModule.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as obfuscationApi from "@/api/obfuscation-api";
-
-export default {
-  namespaced: true,
-  state: {
-    /**
-     * Full array of keyword objects
-     */
-    keywords: [],
-    configs: [],
-  },
-  mutations: {
-    setKeywords(state, keywords) {
-      state.keywords = keywords;
-    },
-    setConfigs(state, configs) {
-      state.configs = configs;
-    },
-    removeKeyword(state, id) {
-      const find = state.keywords.findIndex((k) => k.id === id);
-      if (find > -1) {
-        state.keywords.splice(find, 1);
-      }
-    },
-  },
-  actions: {
-    async getKeywords(context) {
-      const keywords = await obfuscationApi.getKeywords();
-      context.commit("setKeywords", keywords);
-    },
-    async deleteKeyword(context, id) {
-      await obfuscationApi.deleteKeyword(id);
-      context.commit("removeKeyword", id);
-    },
-    async getConfigs(context) {
-      const configs = await obfuscationApi.getObfuscationConfigs();
-      context.commit("setConfigs", configs);
-    },
-  },
-  getters: {},
-};
diff --git a/src/store/PluginModule.js b/src/store/PluginModule.js
deleted file mode 100644
index 2eac20d..0000000
--- a/src/store/PluginModule.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as pluginApi from "@/api/plugin-api";
-
-export default {
-  namespaced: true,
-  state: {
-    /**
-     * Full array of credential objects
-     */
-    plugins: [],
-  },
-  mutations: {
-    setPlugins(state, plugins) {
-      state.plugins = plugins;
-    },
-  },
-  actions: {
-    async getPlugins(context) {
-      const plugins = await pluginApi.getPlugins();
-      context.commit("setPlugins", plugins);
-    },
-  },
-  getters: {},
-};
diff --git a/src/store/StagerModule.js b/src/store/StagerModule.js
deleted file mode 100644
index 2f9fff6..0000000
--- a/src/store/StagerModule.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import * as stagerApi from "@/api/stager-api";
-
-export default {
-  namespaced: true,
-  state: {
-    stagers: [],
-    templates: [],
-    status: "success",
-  },
-  mutations: {
-    setStagers(state, stagers) {
-      state.stagers = stagers;
-    },
-    setStatus(state, status) {
-      state.status = status;
-    },
-    pushStager(state, stager) {
-      state.stagers.push(stager);
-    },
-    setTemplates(state, templates) {
-      state.templates = templates;
-    },
-    removeStager(state, id) {
-      const find = state.stagers.findIndex((s) => s.id === id);
-      if (find > -1) {
-        state.stagers.splice(find, 1);
-      }
-    },
-  },
-  actions: {
-    async getStagers(context) {
-      context.commit("setStatus", "loading");
-      const stagers = await stagerApi.getStagers();
-      await context.commit("setStagers", stagers);
-      context.commit("setStatus", "success");
-    },
-    async getStagerTemplates(context) {
-      const templates = await stagerApi.getStagerTemplates();
-      context.commit("setTemplates", templates);
-    },
-    async deleteStager(context, id) {
-      await stagerApi.deleteStager(id);
-      context.commit("removeStager", id);
-    },
-    async addStager(context, stager) {
-      const found = context.state.stagers.find((el) => el.ID === stager.id);
-
-      if (!found) {
-        context.commit("pushStager", stager);
-      }
-    },
-  },
-  getters: {
-    templateIds: (state) => [...state.templates.map((el) => el.id)].sort(),
-  },
-};
diff --git a/src/store/index.js b/src/store/index.js
deleted file mode 100644
index 24a677e..0000000
--- a/src/store/index.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import Vue from "vue";
-import Vuex from "vuex";
-
-import createPersistedState from "vuex-persistedstate";
-import { setInstance } from "@/api/axios-instance";
-import UserModule from "./UserModule";
-import ListenerModule from "./ListenerModule";
-import StagerModule from "./StagerModule";
-import AgentModule from "./AgentModule";
-import ModuleModule from "./ModuleModule";
-import ObfuscationModule from "./ObfuscationModule";
-import CredentialModule from "./CredentialModule";
-import PluginModule from "./PluginModule";
-import ApplicationModule from "./ApplicationModule";
-import BypassModule from "./BypassModule";
-import MalleableModule from "./MalleableModule";
-
-Vue.use(Vuex);
-
-export default new Vuex.Store({
-  state: {},
-  mutations: {},
-  actions: {},
-  modules: {
-    user: UserModule,
-    listener: ListenerModule,
-    stager: StagerModule,
-    agent: AgentModule,
-    module: ModuleModule,
-    obfuscation: ObfuscationModule,
-    credential: CredentialModule,
-    bypass: BypassModule,
-    malleable: MalleableModule,
-    plugin: PluginModule,
-    application: ApplicationModule,
-  },
-  plugins: [
-    createPersistedState({
-      paths: ["application", "agent"],
-      rehydrated: ({ state }) => {
-        setInstance(state.application.url, state.application.token);
-      },
-    }),
-  ],
-});
diff --git a/src/stores/agent-module.js b/src/stores/agent-module.js
new file mode 100644
index 0000000..679541e
--- /dev/null
+++ b/src/stores/agent-module.js
@@ -0,0 +1,99 @@
+import { defineStore } from "pinia";
+import * as agentApi from "@/api/agent-api";
+import * as agentTaskApi from "@/api/agent-task-api";
+import { useApplicationStore } from "@/stores/application-module";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useAgentStore = defineStore("agent", {
+  persist: true,
+  state: () => ({
+    agents: [],
+    status: "success",
+    subscribed: {},
+  }),
+  actions: {
+    async getAgents() {
+      this.status = "loading";
+      const agents = await agentApi.getAgents(true);
+      this.agents = agents;
+      this.status = "success";
+
+      const { autoSubscribeAgents } = useApplicationStore();
+      if (autoSubscribeAgents) {
+        agents.forEach((agent) => {
+          if (!this.subscribed[agent.session_id]) {
+            this.subscribe({ sessionId: agent.session_id });
+          }
+        });
+      }
+    },
+    async getAgent({ sessionId }) {
+      const agent = (await agentApi.getAgent(sessionId))[0];
+      this.addAgent(agent);
+    },
+    async rename({ sessionId, newName }) {
+      const agentIndex = this.agents.findIndex(
+        (el) => el.session_id === sessionId,
+      );
+      if (agentIndex < 0) {
+        await this.getAgents();
+      }
+
+      const agent = this.agents[agentIndex];
+      await agentApi.renameAgent(agent, newName);
+      if (agent) {
+        agent.name = newName;
+        this.agents.splice(agentIndex, 1, agent);
+      }
+
+      return agent ? agent.name : null;
+    },
+    async killAgent({ sessionId }) {
+      const agentIndex = this.agents.findIndex(
+        (el) => el.session_id === sessionId,
+      );
+      if (agentIndex < 0) return;
+
+      const agent = this.agents[agentIndex];
+      await agentApi.killAgent(sessionId);
+      if (agent) {
+        agent.archived = true;
+        this.agents.splice(agentIndex, 1, agent);
+      }
+    },
+    async addAgent(agent) {
+      const foundIndex = this.agents.findIndex(
+        (el) => el.session_id === agent.session_id,
+      );
+
+      if (foundIndex >= 0) {
+        this.agents.splice(foundIndex, 1, agent);
+      } else {
+        this.agents.push(agent);
+      }
+
+      const { autoSubscribeAgents } = useApplicationStore();
+      if (autoSubscribeAgents) {
+        this.subscribe({ sessionId: agent.session_id });
+      }
+    },
+    clearQueue({ sessionId, tasks }) {
+      tasks.forEach((task) => {
+        agentTaskApi.deleteTask(sessionId, task);
+      });
+    },
+    async subscribe({ sessionId }) {
+      this.subscribed[sessionId] = true;
+      this.subscribed = { ...this.subscribed };
+    },
+    async unsubscribe({ sessionId }) {
+      this.subscribed[sessionId] = false;
+      this.subscribed = { ...this.subscribed };
+    },
+    async clear() {
+      this.agents = [];
+      this.subscribed = {};
+    },
+  },
+  getters: {},
+});
diff --git a/src/stores/application-module.js b/src/stores/application-module.js
new file mode 100644
index 0000000..80d5df6
--- /dev/null
+++ b/src/stores/application-module.js
@@ -0,0 +1,116 @@
+import { defineStore } from "pinia";
+import axios from "axios";
+import { setInstance } from "@/api/axios-instance";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useApplicationStore = defineStore("application", {
+  persist: {
+    afterRestore: (ctx) => {
+      setInstance(ctx.store.url, ctx.store.token);
+    },
+  },
+  state: () => ({
+    token: "",
+    url: "",
+    socketUrl: "",
+    user: {},
+    loginError: "",
+    empireVersion: "",
+    darkMode: true,
+    chatWidget: true,
+    hideStaleAgents: false,
+    hideArchivedAgents: true,
+    filterOnlyMyStagers: true,
+    autoSubscribeAgents: true,
+    agentHeaders: [],
+    connectionError: 0,
+    notifications: [],
+  }),
+  actions: {
+    async login({ url, socketUrl, username, password }) {
+      try {
+        this.loginError = "";
+        const formData = new FormData();
+        formData.append("username", username);
+        formData.append("password", password);
+        const tokenResponse = await axios.post(`${url}/token`, formData);
+
+        const userResponse = await axios.get(`${url}/api/v2/users/me`, {
+          headers: {
+            Authorization: `Bearer ${tokenResponse.data.access_token}`,
+          },
+        });
+        const versionResponse = await axios.get(`${url}/api/v2/meta/version`, {
+          headers: {
+            Authorization: `Bearer ${tokenResponse.data.access_token}`,
+          },
+        });
+
+        this.token = tokenResponse.data.access_token;
+        this.url = url;
+        this.socketUrl = socketUrl;
+        this.user = userResponse.data;
+        this.empireVersion = versionResponse.data.version;
+        this.notifications = [];
+
+        setInstance(url, tokenResponse.data.access_token);
+      } catch (err) {
+        this.loginError = this.extractErrorMessage(err);
+      }
+    },
+    extractErrorMessage(err) {
+      if (err.response && err.response.data) {
+        return err.response.data.detail;
+      }
+      if (err.response && err.response.statusText) {
+        return err.response.statusText;
+      }
+      return "Unable to connect to server.";
+    },
+    async refreshMe() {
+      const userResponse = await axios.get(`${this.url}/api/v2/users/me`, {
+        headers: { Authorization: `Bearer ${this.token}` },
+      });
+      this.user = userResponse.data;
+    },
+    addNotification(notification) {
+      this.notifications = [notification, ...this.notifications];
+    },
+    markAllNotificationsAsRead() {
+      this.notifications = this.notifications.map((n) => ({
+        ...n,
+        read: true,
+      }));
+    },
+    clearNotifications() {
+      this.notifications = [];
+    },
+    async logout() {
+      this.token = "";
+      this.url = "";
+      this.socketUrl = "";
+      this.user = {};
+      this.empireVersion = "";
+      this.notifications = [];
+    },
+    clear() {
+      this.token = "";
+      this.url = "";
+      this.user = {};
+      this.loginError = "";
+      this.empireVersion = "";
+      this.darkMode = true;
+      this.chatWidget = true;
+      this.hideStaleAgents = false;
+      this.hideArchivedAgents = true;
+      this.filterOnlyMyStagers = true;
+      this.autoSubscribeAgents = true;
+      this.agentHeaders = [];
+      this.notifications = [];
+    },
+  },
+  getters: {
+    isLoggedIn: (state) => state.token.length > 0,
+    isAdmin: (state) => state.user.is_admin === true,
+  },
+});
diff --git a/src/stores/bypass-module.js b/src/stores/bypass-module.js
new file mode 100644
index 0000000..ef79172
--- /dev/null
+++ b/src/stores/bypass-module.js
@@ -0,0 +1,25 @@
+import { defineStore } from "pinia";
+import * as bypassApi from "@/api/bypass-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useBypassStore = defineStore("bypass", {
+  state: () => ({
+    bypasses: [],
+  }),
+  actions: {
+    async getBypasses() {
+      const bypasses = await bypassApi.getBypasses();
+      this.bypasses = bypasses;
+    },
+    async deleteBypass(id) {
+      await bypassApi.deleteBypass(id);
+      const index = this.bypasses.findIndex((p) => p.id === id);
+      if (index > -1) {
+        this.bypasses.splice(index, 1);
+      }
+    },
+  },
+  getters: {
+    bypassNames: (state) => state.bypasses.map((el) => el.name),
+  },
+});
diff --git a/src/stores/credential-module.js b/src/stores/credential-module.js
new file mode 100644
index 0000000..79b0c99
--- /dev/null
+++ b/src/stores/credential-module.js
@@ -0,0 +1,25 @@
+import { defineStore } from "pinia";
+import * as credentialApi from "@/api/credential-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useCredentialStore = defineStore("credential", {
+  state: () => ({
+    credentials: [],
+  }),
+  actions: {
+    async getCredentials(search) {
+      const credentials = await credentialApi.getCredentials(search);
+      this.credentials = credentials;
+    },
+    async deleteCredential(id) {
+      await credentialApi.deleteCredential(id);
+      const index = this.credentials.findIndex((c) => c.id === id);
+      if (index > -1) {
+        this.credentials.splice(index, 1);
+      }
+    },
+  },
+  getters: {
+    credentialIds: (state) => state.credentials.map((c) => c.id),
+  },
+});
diff --git a/src/stores/listener-module.js b/src/stores/listener-module.js
new file mode 100644
index 0000000..8d7f107
--- /dev/null
+++ b/src/stores/listener-module.js
@@ -0,0 +1,43 @@
+import { defineStore } from "pinia";
+import * as listenerApi from "@/api/listener-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useListenerStore = defineStore("listener", {
+  state: () => ({
+    listeners: [],
+    status: "success",
+    templates: [],
+  }),
+  actions: {
+    async getListeners() {
+      this.status = "loading";
+      const listeners = await listenerApi.getListeners();
+      this.listeners = listeners;
+      this.status = "success";
+    },
+    async getListenerTemplates() {
+      const templates = await listenerApi.getListenerTemplates();
+      this.templates = templates;
+    },
+    async killListener(id) {
+      await listenerApi.killListener(id);
+      this.removeListener(id);
+    },
+    async addListener(listener) {
+      const found = this.listeners.find((el) => el.id === listener.id);
+      if (!found) {
+        this.listeners.push(listener);
+      }
+    },
+    removeListener(id) {
+      const index = this.listeners.findIndex((l) => l.id === id);
+      if (index > -1) {
+        this.listeners.splice(index, 1);
+      }
+    },
+  },
+  getters: {
+    listenerNames: (state) => state.listeners.map((el) => el.name),
+    templateIds: (state) => [...state.templates.map((el) => el.id)].sort(),
+  },
+});
diff --git a/src/stores/malleable-module.js b/src/stores/malleable-module.js
new file mode 100644
index 0000000..806390e
--- /dev/null
+++ b/src/stores/malleable-module.js
@@ -0,0 +1,25 @@
+import { defineStore } from "pinia";
+import * as malleableApi from "@/api/malleable-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useMalleableProfileStore = defineStore("malleableProfile", {
+  state: () => ({
+    malleableProfiles: [],
+  }),
+  actions: {
+    async getMalleableProfiles() {
+      const profiles = await malleableApi.getMalleableProfiles();
+      this.malleableProfiles = profiles;
+    },
+    async deleteMalleableProfile(id) {
+      await malleableApi.deleteMalleableProfile(id);
+      const index = this.malleableProfiles.findIndex((p) => p.id === id);
+      if (index > -1) {
+        this.malleableProfiles.splice(index, 1);
+      }
+    },
+  },
+  getters: {
+    profileNames: (state) => state.malleableProfiles.map((el) => el.name),
+  },
+});
diff --git a/src/stores/module-module.js b/src/stores/module-module.js
new file mode 100644
index 0000000..75a8c0a
--- /dev/null
+++ b/src/stores/module-module.js
@@ -0,0 +1,16 @@
+import { defineStore } from "pinia";
+import * as moduleApi from "@/api/module-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useModuleStore = defineStore("module", {
+  state: () => ({
+    modules: [],
+  }),
+  actions: {
+    async getModules() {
+      const modules = await moduleApi.getModules();
+      this.modules = modules;
+    },
+  },
+  getters: {},
+});
diff --git a/src/stores/obfuscation-module.js b/src/stores/obfuscation-module.js
new file mode 100644
index 0000000..c6d85cc
--- /dev/null
+++ b/src/stores/obfuscation-module.js
@@ -0,0 +1,28 @@
+import { defineStore } from "pinia";
+import * as obfuscationApi from "@/api/obfuscation-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useObfuscationStore = defineStore("obfuscation", {
+  state: () => ({
+    keywords: [],
+    configs: [],
+  }),
+  actions: {
+    async getKeywords() {
+      const keywords = await obfuscationApi.getKeywords();
+      this.keywords = keywords;
+    },
+    async deleteKeyword(id) {
+      await obfuscationApi.deleteKeyword(id);
+      const index = this.keywords.findIndex((k) => k.id === id);
+      if (index > -1) {
+        this.keywords.splice(index, 1);
+      }
+    },
+    async getConfigs() {
+      const configs = await obfuscationApi.getObfuscationConfigs();
+      this.configs = configs;
+    },
+  },
+  getters: {},
+});
diff --git a/src/stores/plugin-module.js b/src/stores/plugin-module.js
new file mode 100644
index 0000000..a6477c2
--- /dev/null
+++ b/src/stores/plugin-module.js
@@ -0,0 +1,16 @@
+import { defineStore } from "pinia";
+import * as pluginApi from "@/api/plugin-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const usePluginStore = defineStore("plugin", {
+  state: () => ({
+    plugins: [],
+  }),
+  actions: {
+    async getPlugins() {
+      const plugins = await pluginApi.getPlugins();
+      this.plugins = plugins;
+    },
+  },
+  getters: {},
+});
diff --git a/src/stores/stager-module.js b/src/stores/stager-module.js
new file mode 100644
index 0000000..b4edbe4
--- /dev/null
+++ b/src/stores/stager-module.js
@@ -0,0 +1,36 @@
+import { defineStore } from "pinia";
+import * as stagerApi from "@/api/stager-api";
+
+// eslint-disable-next-line import/prefer-default-export
+export const useStagerStore = defineStore("stager", {
+  state: () => ({
+    stagers: [],
+    templates: [],
+    status: "success",
+  }),
+  actions: {
+    async getStagers() {
+      this.status = "loading";
+      const stagers = await stagerApi.getStagers();
+      this.stagers = stagers;
+      this.status = "success";
+    },
+    async getStagerTemplates() {
+      const templates = await stagerApi.getStagerTemplates();
+      this.templates = templates;
+    },
+    async deleteStager(id) {
+      await stagerApi.deleteStager(id);
+      this.removeStager(id);
+    },
+    removeStager(id) {
+      const index = this.stagers.findIndex((s) => s.id === id);
+      if (index > -1) {
+        this.stagers.splice(index, 1);
+      }
+    },
+  },
+  getters: {
+    templateIds: (state) => [...state.templates.map((el) => el.id)].sort(),
+  },
+});
diff --git a/src/store/UserModule.js b/src/stores/user-module.js
similarity index 66%
rename from src/store/UserModule.js
rename to src/stores/user-module.js
index 3519960..ab8dded 100644
--- a/src/store/UserModule.js
+++ b/src/stores/user-module.js
@@ -1,20 +1,16 @@
+import { defineStore } from "pinia";
 import * as userApi from "@/api/user-api";
 import * as downloadApi from "@/api/download-api";
 
-export default {
-  namespaced: true,
-  state: {
+// eslint-disable-next-line import/prefer-default-export
+export const useUserStore = defineStore("user", {
+  state: () => ({
     token: "",
     url: "",
     users: [],
-  },
-  mutations: {
-    setUsers(state, users) {
-      state.users = users;
-    },
-  },
+  }),
   actions: {
-    async getUsers(context) {
+    async getUsers() {
       const response = await userApi.getUsers();
 
       await Promise.all(
@@ -25,8 +21,8 @@ export default {
         }),
       );
 
-      context.commit("setUsers", response);
+      this.users = response;
     },
   },
   getters: {},
-};
+});
diff --git a/src/views/AgentEdit.vue b/src/views/AgentEdit.vue
index 38506eb..6db5cb9 100644
--- a/src/views/AgentEdit.vue
+++ b/src/views/AgentEdit.vue
@@ -252,7 +252,7 @@ import * as agentApi from "@/api/agent-api";
 import * as agentTaskApi from "@/api/agent-task-api";
 
 import "splitpanes/dist/splitpanes.css";
-import { mapGetters } from "vuex";
+import { useAgentStore } from "@/stores/agent-module";
 
 export default {
   name: "AgentEdit",
@@ -293,9 +293,12 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      subscribedAgents: "agent/subscribed",
-    }),
+    agentStore() {
+      return useAgentStore();
+    },
+    subscribedAgents() {
+      return this.agentStore.subscribed;
+    },
     subscribed() {
       return this.subscribedAgents[this.id] || false;
     },
@@ -364,10 +367,10 @@ export default {
   },
   methods: {
     subscribe() {
-      this.$store.dispatch("agent/subscribe", { sessionId: this.id });
+      this.agentStore.subscribe({ sessionId: this.id });
     },
     unsubscribe() {
-      this.$store.dispatch("agent/unsubscribe", { sessionId: this.id });
+      this.agentStore.unsubscribe({ sessionId: this.id });
     },
     toggleCollapsePane() {
       if (this.paneSize > 95) {
@@ -424,9 +427,7 @@ export default {
           },
         )
       ) {
-        this.$store.dispatch("agent/killAgent", {
-          sessionId: this.agent.session_id,
-        });
+        this.agentStore.killAgent({ sessionId: this.agent.session_id });
         this.$snack.success(
           `Agent ${this.agent.name} tasked to run TASK_EXIT.`,
         );
@@ -453,8 +454,8 @@ export default {
           },
         )
       ) {
-        this.$store.dispatch("agent/clearQueue", {
-          name: this.agent.session_id,
+        this.agentStore.clearQueue({
+          sessionId: this.agent.session_id,
           tasks: queuedIds,
         });
         this.$snack.success(
diff --git a/src/views/Agents.vue b/src/views/Agents.vue
index f0f488b..4b8bc5a 100644
--- a/src/views/Agents.vue
+++ b/src/views/Agents.vue
@@ -32,7 +32,7 @@
         :reverse-transition="false"
       >
         <v-card flat>
-          <agent-tasks-list :active="tab === 'tasks'" />
+          <agent-tasks-list :active="tab === 'tasks'" :use-header="true" />
         </v-card>
       </v-tab-item>
     </v-tabs-items>
diff --git a/src/views/BypassEdit.vue b/src/views/BypassEdit.vue
index 6fe6aad..b12b55e 100644
--- a/src/views/BypassEdit.vue
+++ b/src/views/BypassEdit.vue
@@ -59,6 +59,7 @@ import Vue from "vue";
 import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
 import EditPageTop from "@/components/EditPageTop.vue";
 import * as bypassApi from "@/api/bypass-api";
+import { useBypassStore } from "@/stores/bypass-module";
 
 export default {
   name: "BypassEdit",
@@ -90,6 +91,9 @@ export default {
     };
   },
   computed: {
+    bypassStore() {
+      return useBypassStore();
+    },
     isNew() {
       return this.$route.name === "bypassNew";
     },
@@ -196,7 +200,7 @@ export default {
         )
       ) {
         try {
-          await this.$store.dispatch("bypass/deleteBypass", this.form.id);
+          this.bypassStore.deleteBypass(this.form.id);
           this.$router.push({ name: "bypasses" });
         } catch (err) {
           this.$snack.error(`Error: ${err}`);
diff --git a/src/views/Bypasses.vue b/src/views/Bypasses.vue
index 0a1b2a7..85cd119 100644
--- a/src/views/Bypasses.vue
+++ b/src/views/Bypasses.vue
@@ -80,9 +80,10 @@
 
 <script>
 import moment from "moment";
-import { mapState } from "vuex";
 import ListPageTop from "@/components/ListPageTop.vue";
 import DateTimeDisplay from "@/components/DateTimeDisplay.vue";
+import { useBypassStore } from "@/stores/bypass-module";
+import { mapState } from "pinia";
 
 export default {
   name: "Bypasses",
@@ -111,9 +112,10 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      bypasses: (state) => state.bypass.bypasses,
-    }),
+    bypassStore() {
+      return useBypassStore();
+    },
+    ...mapState(useBypassStore, ["bypasses"]),
     showDelete() {
       return this.selected.length > 0;
     },
@@ -123,7 +125,7 @@ export default {
   },
   methods: {
     getBypasses() {
-      this.$store.dispatch("bypass/getBypasses");
+      this.bypassStore.getBypasses();
     },
     create() {
       this.$router.push({ name: "bypassNew" });
@@ -139,7 +141,7 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("bypass/deleteBypass", item.id);
+        await this.bypassStore.deleteBypass(item.id);
       }
     },
     async deleteBypasses() {
@@ -151,7 +153,7 @@ export default {
         )
       ) {
         this.selected.forEach((bypass) => {
-          this.$store.dispatch("bypass/deleteBypass", bypass.id);
+          this.bypassStore.deleteBypass(bypass.id);
         });
       }
     },
diff --git a/src/views/CredentialEdit.vue b/src/views/CredentialEdit.vue
index faa1e40..a0b4ee0 100644
--- a/src/views/CredentialEdit.vue
+++ b/src/views/CredentialEdit.vue
@@ -43,6 +43,7 @@ import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
 import EditPageTop from "@/components/EditPageTop.vue";
 import TagViewer from "@/components/TagViewer.vue";
 import * as credentialApi from "@/api/credential-api";
+import { useCredentialStore } from "@/stores/credential-module";
 
 export default {
   name: "CredentialEdit",
@@ -78,6 +79,9 @@ export default {
         },
       ];
     },
+    credentialStore() {
+      return useCredentialStore();
+    },
     isNew() {
       return this.$route.name === "credentialNew";
     },
@@ -124,6 +128,13 @@ export default {
       return op;
     },
   },
+  watch: {
+    id(val) {
+      if (val) {
+        this.getCredential(val);
+      }
+    },
+  },
   mounted() {
     if (!this.isNew || this.isCopy) {
       // using the route param id instad of this.id
@@ -199,7 +210,7 @@ export default {
         )
       ) {
         try {
-          this.$store.dispatch("credential/deleteCredential", this.id);
+          this.credentialStore.deleteCredential(this.id);
           this.$router.push({ name: "credentials" });
         } catch (err) {
           this.$snack.error(`Error: ${err}`);
diff --git a/src/views/Credentials.vue b/src/views/Credentials.vue
index be34ae5..a050282 100644
--- a/src/views/Credentials.vue
+++ b/src/views/Credentials.vue
@@ -7,8 +7,8 @@
       :show-refresh="true"
       :show-delete="showDelete"
       @create="create"
-      @refresh="getCredentials"
       @delete="deleteCredentials"
+      @refresh="getCredentials"
     />
     <div style="display: flex; flex-direction: row; flex-wrap: wrap">
       <v-card
@@ -131,6 +131,7 @@ import ExpansionPanelSearch from "@/components/tables/ExpansionPanelSearch.vue";
 import ExpansionPanelFilter from "@/components/tables/ExpansionPanelFilter.vue";
 import * as tagApi from "@/api/tag-api";
 import * as credentialApi from "@/api/credential-api";
+import { useCredentialStore } from "@/stores/credential-module";
 
 export default {
   name: "Credentials",
@@ -162,13 +163,16 @@ export default {
       selected: [],
       selectedTags: [],
       tags: [],
-      credentials: [],
       search: "",
+      credentials: [],
       debouncedGetCredentials: debounce(this.getCredentials, 500),
       loading: false,
     };
   },
   computed: {
+    credentialStore() {
+      return useCredentialStore();
+    },
     showDelete() {
       return this.selected.length > 0;
     },
@@ -236,10 +240,11 @@ export default {
     },
     async getCredentials() {
       this.loading = true;
+
       try {
         this.credentials = await credentialApi.getCredentials({
-          tags: this.selectedTags,
           search: this.search,
+          tags: this.selectedTags,
         });
       } finally {
         this.loading = false;
@@ -256,7 +261,8 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("credential/deleteCredential", item.id);
+        await this.credentialStore.deleteCredential(item.id);
+        this.debouncedGetCredentials();
       }
     },
     async deleteCredentials() {
@@ -267,9 +273,10 @@ export default {
           { color: "red" },
         )
       ) {
-        this.selected.forEach((credential) => {
-          this.$store.dispatch("credential/deleteCredential", credential.id);
+        this.selected.map(async (credential) => {
+          await this.credentialStore.deleteCredential(credential.id);
         });
+        this.debouncedGetCredentials();
       }
     },
     async copyToClipboard(val) {
diff --git a/src/views/ListenerEdit.vue b/src/views/ListenerEdit.vue
index 0242113..886ebe1 100644
--- a/src/views/ListenerEdit.vue
+++ b/src/views/ListenerEdit.vue
@@ -99,12 +99,12 @@
 
 <script>
 import * as listenerApi from "@/api/listener-api";
-import { mapGetters } from "vuex";
 import GeneralForm from "@/components/GeneralForm.vue";
 import InfoViewer from "@/components/InfoViewer.vue";
 import EditPageTop from "@/components/EditPageTop.vue";
 import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
 import TagViewer from "@/components/TagViewer.vue";
+import { useListenerStore } from "@/stores/listener-module";
 
 export default {
   name: "ListenerEdit",
@@ -137,9 +137,12 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      listenerTemplateIds: "listener/templateIds",
-    }),
+    listenerStore() {
+      return useListenerStore();
+    },
+    listenerTemplateIds() {
+      return this.listenerStore.templateIds;
+    },
     isNew() {
       return this.$route.name === "listenerNew";
     },
@@ -233,7 +236,7 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch("listener/getListenerTemplates");
+    this.listenerStore.getListenerTemplates();
 
     if (!this.isNew || this.isCopy) {
       // using the route param id instad of this.id
@@ -328,7 +331,7 @@ export default {
         )
       ) {
         try {
-          await this.$store.dispatch("listener/killListener", this.id);
+          await this.listenerStore.killListener(this.id);
           this.$router.push({ name: "listeners" });
         } catch (err) {
           this.$snack.error(`Error: ${err}`);
diff --git a/src/views/MalleableProfileEdit.vue b/src/views/MalleableProfileEdit.vue
index e8a1060..efd3aec 100644
--- a/src/views/MalleableProfileEdit.vue
+++ b/src/views/MalleableProfileEdit.vue
@@ -65,6 +65,7 @@ import Vue from "vue";
 import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
 import EditPageTop from "@/components/EditPageTop.vue";
 import * as malleableApi from "@/api/malleable-api";
+import { useMalleableProfileStore } from "@/stores/malleable-module";
 
 export default {
   name: "MalleableProfileEdit",
@@ -92,6 +93,9 @@ export default {
     };
   },
   computed: {
+    malleableProfileStore() {
+      return useMalleableProfileStore();
+    },
     isNew() {
       return this.$route.name === "malleableProfileNew";
     },
@@ -206,11 +210,11 @@ export default {
         )
       ) {
         try {
-          await this.$store.dispatch(
-            "malleable/deleteMalleableProfile",
-            this.form.name,
-          );
-          this.$router.push({ name: "malleableProfiles" });
+          await this.malleableProfileStore.deleteMalleableProfile(this.id);
+          this.$router.push({
+            name: "listeners",
+            query: { tab: "malleable-profiles" },
+          });
         } catch (err) {
           this.$snack.error(`Error: ${err}`);
         }
diff --git a/src/views/ModuleExecute.vue b/src/views/ModuleExecute.vue
index 59259a6..66b7d40 100644
--- a/src/views/ModuleExecute.vue
+++ b/src/views/ModuleExecute.vue
@@ -11,7 +11,7 @@
       placeholder="Agents"
       :items="agents"
       item-text="name"
-      item-value="name"
+      item-value="session_id"
     />
     <v-card>
       <agent-execute-module
@@ -27,9 +27,9 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import AgentExecuteModule from "@/components/agents/AgentExecuteModule.vue";
 import EditPageTop from "@/components/EditPageTop.vue";
+import { useAgentStore } from "@/stores/agent-module";
 
 export default {
   name: "ModuleExecute",
@@ -44,12 +44,14 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      agents: (state) =>
-        state.agent.agents.filter(
-          (agent) => agent.archived === false && agent.stale === false,
-        ),
-    }),
+    agentStore() {
+      return useAgentStore();
+    },
+    agents() {
+      return this.agentStore.agents.filter(
+        (agent) => agent.archived === false && agent.stale === false,
+      );
+    },
     breads() {
       return [
         {
@@ -72,7 +74,6 @@ export default {
   },
   methods: {
     submit() {
-      // I don't love this but it works.
       this.$refs.executeform.create();
     },
     moduleChange(val) {
@@ -80,7 +81,7 @@ export default {
       this.$router.push({ name: "moduleExecute", params: { id: val } });
     },
     getAgents() {
-      this.$store.dispatch("agent/getAgents");
+      this.agentStore.getAgents();
     },
     clearAgents() {
       this.selectedAgents = [];
diff --git a/src/views/Modules.vue b/src/views/Modules.vue
index a4da909..87c5e44 100644
--- a/src/views/Modules.vue
+++ b/src/views/Modules.vue
@@ -47,10 +47,12 @@ import ModulesTable from "@/components/modules/ModulesTable.vue";
 import AdvancedTable from "@/components/tables/AdvancedTable.vue";
 import ExpansionPanelFilter from "@/components/tables/ExpansionPanelFilter.vue";
 import ExpansionPanelBoolean from "@/components/tables/ExpansionPanelBoolean.vue";
+import ExpansionPanelSearch from "@/components/tables/ExpansionPanelSearch.vue";
 
 export default {
   name: "Modules",
   components: {
+    ExpansionPanelSearch,
     ExpansionPanelBoolean,
     ExpansionPanelFilter,
     AdvancedTable,
diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
index c3005c2..dd33c1f 100644
--- a/src/views/Notifications.vue
+++ b/src/views/Notifications.vue
@@ -50,22 +50,25 @@
 
 <script>
 import ListPageTop from "@/components/ListPageTop.vue";
-import { mapState } from "vuex";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "Notifications",
   components: { ListPageTop },
   computed: {
-    ...mapState({
-      notifications: (state) => state.application.notifications,
-    }),
+    applicationStore() {
+      return useApplicationStore();
+    },
+    notifications() {
+      return this.applicationStore.notifications;
+    },
   },
   beforeDestroy() {
-    this.$store.dispatch("application/markAllNotificationsAsRead");
+    this.applicationStore.markAllNotificationsAsRead();
   },
   methods: {
     clearNotifications() {
-      this.$store.dispatch("application/clearNotifications");
+      this.applicationStore.clearNotifications();
     },
   },
 };
diff --git a/src/views/Obfuscation.vue b/src/views/Obfuscation.vue
index e35cb0b..a406303 100644
--- a/src/views/Obfuscation.vue
+++ b/src/views/Obfuscation.vue
@@ -187,9 +187,10 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import * as obfuscationApi from "@/api/obfuscation-api";
 import ListPageTop from "@/components/ListPageTop.vue";
+import { useObfuscationStore } from "@/stores/obfuscation-module";
+import { mapState } from "pinia";
 
 export default {
   components: {
@@ -230,16 +231,22 @@ export default {
         },
       ],
       rules: {
-        keyword: [(v) => !!v || "Keyword is required"],
-        replacement: [(v) => !!v || "Replacement is required"],
+        keyword: [
+          (v) => !!v || "Keyword is required",
+          (v) => v.length >= 3 || "Keyword must be at least 3 characters",
+        ],
+        replacement: [
+          (v) => !!v || "Replacement is required",
+          (v) => v.length >= 3 || "Replacement must be at least 3 characters",
+        ],
       },
     };
   },
   computed: {
-    ...mapState({
-      keywords: (state) => state.obfuscation.keywords,
-      configs: (state) => state.obfuscation.configs,
-    }),
+    obfuscationStore() {
+      return useObfuscationStore();
+    },
+    ...mapState(useObfuscationStore, ["keywords", "configs"]),
   },
   mounted() {
     this.refresh();
@@ -250,10 +257,10 @@ export default {
       this.refreshConfigs();
     },
     refreshKeywords() {
-      this.$store.dispatch("obfuscation/getKeywords");
+      this.obfuscationStore.getKeywords();
     },
     refreshConfigs() {
-      this.$store.dispatch("obfuscation/getConfigs");
+      this.obfuscationStore.getConfigs();
     },
     toggleEditing(item) {
       console.log("editing");
@@ -301,7 +308,7 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("obfuscation/deleteKeyword", item.id);
+        await this.obfuscationStore.deleteKeyword(item.id);
       }
     },
     async editConfig(config) {
diff --git a/src/views/Plugins.vue b/src/views/Plugins.vue
index 33fc7ed..92e908f 100644
--- a/src/views/Plugins.vue
+++ b/src/views/Plugins.vue
@@ -32,7 +32,7 @@
         :reverse-transition="false"
       >
         <v-card flat>
-          <plugin-tasks-list :active="tab === 'tasks'" />
+          <plugin-tasks-list :active="tab === 'tasks'" :use-header="true" />
         </v-card>
       </v-tab-item>
     </v-tabs-items>
@@ -50,19 +50,7 @@ export default {
     PluginTasksList,
   },
   data() {
-    return {
-      breads: [
-        {
-          text: "Plugins",
-          disabled: true,
-          href: "/plugins",
-        },
-      ],
-      headers: [
-        { text: "Name", value: "name" },
-        { text: "Description", value: "description" },
-      ],
-    };
+    return {};
   },
   computed: {
     // https://jareklipski.medium.com/linking-to-a-specific-tab-in-vuetify-js-d978525f2e1a
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 78086ce..0eaeae1 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -27,9 +27,9 @@
       </div>
       <v-divider />
       <div style="display: flex; flex-direction: row">
-        <v-switch v-model="darkModeSwitch" :label="`Dark Mode`" />
+        <v-switch v-model="applicationStore.darkMode" :label="`Dark Mode`" />
         <v-switch
-          v-model="chatWidgetSwitch"
+          v-model="applicationStore.chatWidget"
           class="pl-8"
           :label="`Chat Widget`"
         />
@@ -84,7 +84,10 @@
             Turning this off will require you to manually subscribe to agents.
           </span>
         </div>
-        <v-switch v-model="autoSubscribeSwitch" color="primary" />
+        <v-switch
+          v-model="applicationStore.autoSubscribeAgents"
+          color="primary"
+        />
       </div>
       <v-divider />
       <div class="headers pl-0 mt-2">
@@ -204,8 +207,10 @@ import * as malleableApi from "@/api/malleable-api";
 import * as pluginApi from "@/api/plugin-api";
 import * as userApi from "@/api/user-api";
 import * as downloadApi from "@/api/download-api";
-import { mapState } from "vuex";
 import ListPageTop from "@/components/ListPageTop.vue";
+import { useApplicationStore } from "@/stores/application-module";
+import { mapState } from "pinia";
+import { useAgentStore } from "@/stores/agent-module";
 
 export default {
   components: {
@@ -255,38 +260,15 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      user: (state) => state.application.user,
-      darkMode: (state) => state.application.darkMode,
-      chatWidget: (state) => state.application.chatWidget,
-      autoSubscribeAgents: (state) => state.application.autoSubscribeAgents,
-    }),
-    userId() {
-      return this.user.id;
+    ...mapState(useApplicationStore, ["user"]),
+    applicationStore() {
+      return useApplicationStore();
     },
-    darkModeSwitch: {
-      set(val) {
-        this.$store.dispatch("application/darkMode", val);
-      },
-      get() {
-        return this.darkMode;
-      },
+    agentStore() {
+      return useAgentStore();
     },
-    chatWidgetSwitch: {
-      set(val) {
-        this.$store.dispatch("application/chatWidget", val);
-      },
-      get() {
-        return this.chatWidget;
-      },
-    },
-    autoSubscribeSwitch: {
-      set(val) {
-        this.$store.dispatch("application/autoSubscribeAgents", val);
-      },
-      get() {
-        return this.autoSubscribeAgents;
-      },
+    userId() {
+      return this.user.id;
     },
   },
   watch: {
@@ -327,7 +309,7 @@ export default {
       data.append("file", selectedFile);
 
       await userApi.uploadAvatar(this.userId, data);
-      await this.$store.dispatch("application/refreshMe");
+      this.applicationStore.refreshMe();
       this.$snack.success("Upload complete");
     },
     async logout() {
@@ -336,12 +318,12 @@ export default {
           color: "green",
         })
       ) {
-        this.$store.dispatch("application/logout");
+        this.applicationStore.logout();
       }
     },
     clearState() {
-      this.$store.dispatch("application/clear");
-      this.$store.dispatch("agent/clear");
+      this.applicationStore.clear();
+      this.agentStore.clear();
     },
     submit() {
       if (this.password.loading || !this.$refs.form.validate()) {
diff --git a/src/views/StagerEdit.vue b/src/views/StagerEdit.vue
index ab75b43..d0c13f5 100644
--- a/src/views/StagerEdit.vue
+++ b/src/views/StagerEdit.vue
@@ -78,8 +78,6 @@
 </template>
 
 <script>
-import * as stagerApi from "@/api/stager-api";
-import { mapGetters } from "vuex";
 import InfoViewer from "@/components/InfoViewer.vue";
 import GeneralForm from "@/components/GeneralForm.vue";
 import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
@@ -87,6 +85,8 @@ import EditPageTop from "@/components/EditPageTop.vue";
 import * as downloadApi from "@/api/download-api";
 import CopyMixin from "@/mixins/copy-stager";
 import TooltipButton from "@/components/TooltipButton.vue";
+import { useStagerStore } from "@/stores/stager-module";
+import * as stagerApi from "@/api/stager-api";
 
 export default {
   name: "StagerEdit",
@@ -112,9 +112,12 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      stagerTemplateIds: "stager/templateIds",
-    }),
+    stagerStore() {
+      return useStagerStore();
+    },
+    stagerTemplateIds() {
+      return this.stagerStore.templateIds;
+    },
     isNew() {
       return this.$route.name === "stagerNew";
     },
@@ -216,7 +219,7 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch("stager/getStagerTemplates");
+    this.stagerStore.getStagerTemplates();
 
     if (!this.isNew || this.isCopy) {
       // using the route param id instad of this.id
@@ -242,6 +245,9 @@ export default {
             this.$snack.success("Stager updated");
             this.loading = false;
           })
+          .then(() => {
+            this.getStager(this.id);
+          })
           .catch((err) => {
             this.$snack.error(`Error: ${err}`);
             this.loading = false;
@@ -273,7 +279,7 @@ export default {
         )
       ) {
         try {
-          await this.$store.dispatch("stager/deleteStager", this.id);
+          await this.stagerStore.deleteStager(this.id);
           this.$router.push({ name: "stagers" });
         } catch (err) {
           this.$snack.error(`Error: ${err}`);
diff --git a/src/views/Stagers.vue b/src/views/Stagers.vue
index 4d17977..a3c2420 100644
--- a/src/views/Stagers.vue
+++ b/src/views/Stagers.vue
@@ -12,7 +12,7 @@
     <advanced-table>
       <template #filters>
         <v-switch
-          v-model="filterOnlyMyStagersCheckbox"
+          v-model="applicationStore.filterOnlyMyStagers"
           label="Only My Stagers"
         />
       </template>
@@ -20,7 +20,7 @@
         <stagers-table
           ref="stagersTable"
           v-model="selected"
-          :only-my-stagers="filterOnlyMyStagersCheckbox"
+          :only-my-stagers="applicationStore.filterOnlyMyStagers"
           @delete-stager="deleteStager"
         />
       </template>
@@ -29,13 +29,15 @@
 </template>
 
 <script>
-import { mapState } from "vuex";
 import moment from "moment";
 import DownloadMixin from "@/mixins/download-stager";
 import CopyMixin from "@/mixins/copy-stager";
 import ListPageTop from "@/components/ListPageTop.vue";
 import StagersTable from "@/components/stagers/StagersTable.vue";
 import AdvancedTable from "@/components/tables/AdvancedTable.vue";
+import { useStagerStore } from "@/stores/stager-module";
+import { useApplicationStore } from "@/stores/application-module";
+import app from "@/App.vue";
 
 export default {
   name: "Stagers",
@@ -59,21 +61,18 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      filterOnlyMyStagersCheckbox: (state) =>
-        state.application.filterOnlyMyStagers,
-    }),
+    app() {
+      return app;
+    },
+    stagerStore() {
+      return useStagerStore();
+    },
+    applicationStore() {
+      return useApplicationStore();
+    },
     showDelete() {
       return this.selected.length > 0;
     },
-    filterOnlyMyStagersCheckbox: {
-      set(val) {
-        this.$store.dispatch("application/filterOnlyMyStagers", val);
-      },
-      get() {
-        return this.filterOnlyMyStagers;
-      },
-    },
   },
   methods: {
     create() {
@@ -87,7 +86,7 @@ export default {
           { color: "red" },
         )
       ) {
-        this.$store.dispatch("stager/deleteStager", item.id);
+        await this.stagerStore.deleteStager(item.id);
       }
     },
     async deleteStagers() {
@@ -99,7 +98,7 @@ export default {
         )
       ) {
         this.selected.forEach((stager) => {
-          this.$store.dispatch("stager/deleteStager", stager.id);
+          this.stagerStore.deleteStager(stager.id);
         });
         this.selected = [];
       }
diff --git a/src/views/UserEdit.vue b/src/views/UserEdit.vue
index 8a437d7..f20d986 100644
--- a/src/views/UserEdit.vue
+++ b/src/views/UserEdit.vue
@@ -64,10 +64,11 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapState } from "pinia";
 import * as userApi from "@/api/user-api";
 import ErrorStateAlert from "@/components/ErrorStateAlert.vue";
 import EditPageTop from "@/components/EditPageTop.vue";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "UserEdit",
@@ -109,9 +110,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      isAdmin: "application/isAdmin",
-    }),
+    ...mapState(useApplicationStore, ["isAdmin"]),
     breads() {
       return [
         {
diff --git a/src/views/Users.vue b/src/views/Users.vue
index 55074b3..360977a 100644
--- a/src/views/Users.vue
+++ b/src/views/Users.vue
@@ -43,10 +43,12 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from "vuex";
+import { mapState } from "pinia";
 import * as userApi from "@/api/user-api";
 import moment from "moment";
 import ListPageTop from "@/components/ListPageTop.vue";
+import { useUserStore } from "@/stores/user-module";
+import { useApplicationStore } from "@/stores/application-module";
 
 export default {
   name: "Users",
@@ -71,12 +73,13 @@ export default {
     };
   },
   computed: {
-    ...mapState({
-      users: (state) => state.user.users,
-    }),
-    ...mapGetters({
-      isAdmin: "application/isAdmin",
-    }),
+    userStore() {
+      return useUserStore();
+    },
+    users() {
+      return this.userStore.users;
+    },
+    ...mapState(useApplicationStore, ["isAdmin"]),
   },
   mounted() {
     this.getUsers();
@@ -92,7 +95,7 @@ export default {
       });
     },
     getUsers() {
-      this.$store.dispatch("user/getUsers");
+      this.userStore.getUsers();
     },
   },
 };
diff --git a/yarn.lock b/yarn.lock
index d777fc7..df8ab05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19,15 +19,115 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@esbuild/android-arm@0.15.18":
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80"
-  integrity sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==
-
-"@esbuild/linux-loong64@0.15.18":
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239"
-  integrity sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==
+"@esbuild/android-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
+  integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
+
+"@esbuild/android-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
+  integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
+
+"@esbuild/android-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
+  integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
+
+"@esbuild/darwin-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
+  integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
+
+"@esbuild/darwin-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
+  integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
+
+"@esbuild/freebsd-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
+  integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
+
+"@esbuild/freebsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
+  integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
+
+"@esbuild/linux-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
+  integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
+
+"@esbuild/linux-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
+  integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
+
+"@esbuild/linux-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
+  integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
+
+"@esbuild/linux-loong64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
+  integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
+
+"@esbuild/linux-mips64el@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
+  integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
+
+"@esbuild/linux-ppc64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
+  integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
+
+"@esbuild/linux-riscv64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
+  integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
+
+"@esbuild/linux-s390x@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
+  integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
+
+"@esbuild/linux-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
+  integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
+
+"@esbuild/netbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
+  integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
+
+"@esbuild/openbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
+  integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
+
+"@esbuild/sunos-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
+  integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
+
+"@esbuild/win32-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
+  integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
+
+"@esbuild/win32-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
+  integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
+
+"@esbuild/win32-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
+  integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0":
   version "4.4.0"
@@ -165,7 +265,7 @@
 
 "@vitejs/plugin-vue2@^2.2.0":
   version "2.2.0"
-  resolved "https://registry.npmjs.org/@vitejs/plugin-vue2/-/plugin-vue2-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.2.0.tgz#7453207197d6ac2b7023cedc7133b142c604c356"
   integrity sha512-1km7zEuZ/9QRPvzXSjikbTYGQPG86Mq1baktpC4sXqsXlb02HQKfi+fl8qVS703JM7cgm24Ga9j+RwKmvFn90A==
 
 "@vue/compiler-sfc@2.7.14":
@@ -177,6 +277,11 @@
     postcss "^8.4.14"
     source-map "^0.6.1"
 
+"@vue/devtools-api@^6.5.0":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz#7f71f31e40973eeee65b9a64382b13593fdbd697"
+  integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==
+
 "@vue/eslint-config-airbnb@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/@vue/eslint-config-airbnb/-/eslint-config-airbnb-7.0.0.tgz"
@@ -621,11 +726,6 @@ deep-is@^0.1.3:
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2:
-  version "4.3.1"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
 define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"
@@ -791,133 +891,33 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild-android-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz#20a7ae1416c8eaade917fb2453c1259302c637a5"
-  integrity sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==
-
-esbuild-android-arm64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz#9cc0ec60581d6ad267568f29cf4895ffdd9f2f04"
-  integrity sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==
-
-esbuild-darwin-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz#428e1730ea819d500808f220fbc5207aea6d4410"
-  integrity sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==
-
-esbuild-darwin-arm64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz#b6dfc7799115a2917f35970bfbc93ae50256b337"
-  integrity sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==
-
-esbuild-freebsd-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz#4e190d9c2d1e67164619ae30a438be87d5eedaf2"
-  integrity sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==
-
-esbuild-freebsd-arm64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz#18a4c0344ee23bd5a6d06d18c76e2fd6d3f91635"
-  integrity sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==
-
-esbuild-linux-32@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz#9a329731ee079b12262b793fb84eea762e82e0ce"
-  integrity sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==
-
-esbuild-linux-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz#532738075397b994467b514e524aeb520c191b6c"
-  integrity sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==
-
-esbuild-linux-arm64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz#5372e7993ac2da8f06b2ba313710d722b7a86e5d"
-  integrity sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==
-
-esbuild-linux-arm@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz#e734aaf259a2e3d109d4886c9e81ec0f2fd9a9cc"
-  integrity sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==
-
-esbuild-linux-mips64le@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz#c0487c14a9371a84eb08fab0e1d7b045a77105eb"
-  integrity sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==
-
-esbuild-linux-ppc64le@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz#af048ad94eed0ce32f6d5a873f7abe9115012507"
-  integrity sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==
-
-esbuild-linux-riscv64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz#423ed4e5927bd77f842bd566972178f424d455e6"
-  integrity sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==
-
-esbuild-linux-s390x@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz#21d21eaa962a183bfb76312e5a01cc5ae48ce8eb"
-  integrity sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==
-
-esbuild-netbsd-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz#ae75682f60d08560b1fe9482bfe0173e5110b998"
-  integrity sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==
-
-esbuild-openbsd-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz#79591a90aa3b03e4863f93beec0d2bab2853d0a8"
-  integrity sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==
-
-esbuild-sunos-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz#fd528aa5da5374b7e1e93d36ef9b07c3dfed2971"
-  integrity sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==
-
-esbuild-windows-32@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz#0e92b66ecdf5435a76813c4bc5ccda0696f4efc3"
-  integrity sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==
-
-esbuild-windows-64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz"
-  integrity sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==
-
-esbuild-windows-arm64@0.15.18:
-  version "0.15.18"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz#5b5bdc56d341d0922ee94965c89ee120a6a86eb7"
-  integrity sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==
-
-esbuild@^0.15.9:
-  version "0.15.18"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"
-  integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==
+esbuild@^0.18.10:
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
+  integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==
   optionalDependencies:
-    "@esbuild/android-arm" "0.15.18"
-    "@esbuild/linux-loong64" "0.15.18"
-    esbuild-android-64 "0.15.18"
-    esbuild-android-arm64 "0.15.18"
-    esbuild-darwin-64 "0.15.18"
-    esbuild-darwin-arm64 "0.15.18"
-    esbuild-freebsd-64 "0.15.18"
-    esbuild-freebsd-arm64 "0.15.18"
-    esbuild-linux-32 "0.15.18"
-    esbuild-linux-64 "0.15.18"
-    esbuild-linux-arm "0.15.18"
-    esbuild-linux-arm64 "0.15.18"
-    esbuild-linux-mips64le "0.15.18"
-    esbuild-linux-ppc64le "0.15.18"
-    esbuild-linux-riscv64 "0.15.18"
-    esbuild-linux-s390x "0.15.18"
-    esbuild-netbsd-64 "0.15.18"
-    esbuild-openbsd-64 "0.15.18"
-    esbuild-sunos-64 "0.15.18"
-    esbuild-windows-32 "0.15.18"
-    esbuild-windows-64 "0.15.18"
-    esbuild-windows-arm64 "0.15.18"
+    "@esbuild/android-arm" "0.18.20"
+    "@esbuild/android-arm64" "0.18.20"
+    "@esbuild/android-x64" "0.18.20"
+    "@esbuild/darwin-arm64" "0.18.20"
+    "@esbuild/darwin-x64" "0.18.20"
+    "@esbuild/freebsd-arm64" "0.18.20"
+    "@esbuild/freebsd-x64" "0.18.20"
+    "@esbuild/linux-arm" "0.18.20"
+    "@esbuild/linux-arm64" "0.18.20"
+    "@esbuild/linux-ia32" "0.18.20"
+    "@esbuild/linux-loong64" "0.18.20"
+    "@esbuild/linux-mips64el" "0.18.20"
+    "@esbuild/linux-ppc64" "0.18.20"
+    "@esbuild/linux-riscv64" "0.18.20"
+    "@esbuild/linux-s390x" "0.18.20"
+    "@esbuild/linux-x64" "0.18.20"
+    "@esbuild/netbsd-x64" "0.18.20"
+    "@esbuild/openbsd-x64" "0.18.20"
+    "@esbuild/sunos-x64" "0.18.20"
+    "@esbuild/win32-arm64" "0.18.20"
+    "@esbuild/win32-ia32" "0.18.20"
+    "@esbuild/win32-x64" "0.18.20"
 
 escape-goat@^1.3.0:
   version "1.3.0"
@@ -1321,10 +1321,10 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.1, function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 function.prototype.name@^1.1.5:
   version "1.1.5"
@@ -1508,11 +1508,16 @@ has-values@^1.0.0:
     kind-of "^4.0.0"
 
 has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
+
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 ignore@^3.3.5:
   version "3.3.10"
@@ -1626,7 +1631,14 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.11.0, is-core-module@^2.9.0:
+is-core-module@^2.11.0, is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
+is-core-module@^2.9.0:
   version "2.12.1"
   resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz"
   integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
@@ -2066,9 +2078,9 @@ msgdown@^1.0.2:
   integrity sha512-KY0nYCeFfG34umrpWPPRLQTh0apC6RdsnAaKZIG9A38HZ3RfVxamgvYwuxA1Z1o/wk6ycR/JmZI5ZKFpMO7AFA==
 
 nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -2259,7 +2271,7 @@ path-key@^3.1.0:
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-type@^3.0.0:
@@ -2271,7 +2283,7 @@ path-type@^3.0.0:
 
 picocolors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
@@ -2289,6 +2301,19 @@ pify@^4.0.1:
   resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
+pinia-plugin-persistedstate@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-3.2.0.tgz#9932ca2ae88aa6c0d6763bebc6447d7bd1f097d0"
+  integrity sha512-tZbNGf2vjAQcIm7alK40sE51Qu/m9oWr+rEgNm/2AWr1huFxj72CjvpQcIQzMknDBJEkQznCLAGtJTIcLKrKdw==
+
+pinia@^2.1.7:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.7.tgz#4cf5420d9324ca00b7b4984d3fbf693222115bbc"
+  integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==
+  dependencies:
+    "@vue/devtools-api" "^6.5.0"
+    vue-demi ">=0.14.5"
+
 popper.js@^1.16.1:
   version "1.16.1"
   resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
@@ -2312,7 +2337,7 @@ postcss-selector-parser@^6.0.9:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss@^8.4.14, postcss@^8.4.18:
+postcss@^8.4.14:
   version "8.4.24"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz"
   integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
@@ -2321,6 +2346,15 @@ postcss@^8.4.14, postcss@^8.4.18:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.27:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
+  dependencies:
+    nanoid "^3.3.6"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
@@ -2421,7 +2455,16 @@ resolve-url@^0.2.1:
   resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.22.1, resolve@^1.22.2:
+resolve@^1.22.1:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.22.2:
   version "1.22.2"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
   integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
@@ -2456,10 +2499,10 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rollup@^2.79.1:
-  version "2.79.1"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+rollup@^3.27.1:
+  version "3.29.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
+  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -2527,11 +2570,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shvl@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/shvl/-/shvl-2.0.3.tgz"
-  integrity sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw==
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
@@ -2605,7 +2643,7 @@ socket.io-parser@~4.2.4:
 
 source-map-js@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
 source-map-resolve@^0.5.0:
@@ -2730,7 +2768,7 @@ supports-color@^7.1.0:
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 table@^6.8.1:
@@ -2903,15 +2941,14 @@ v-tooltip@^2.0.1:
     popper.js "^1.16.1"
     vue-resize "^1.0.1"
 
-vite@^3:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz"
-  integrity sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==
+vite@^4:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.0.tgz#ec406295b4167ac3bc23e26f9c8ff559287cff26"
+  integrity sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==
   dependencies:
-    esbuild "^0.15.9"
-    postcss "^8.4.18"
-    resolve "^1.22.1"
-    rollup "^2.79.1"
+    esbuild "^0.18.10"
+    postcss "^8.4.27"
+    rollup "^3.27.1"
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -2929,6 +2966,11 @@ vue-beautiful-chat@^2.5.0:
     msgdown "^1.0.2"
     v-tooltip "^2.0.1"
 
+vue-demi@>=0.14.5:
+  version "0.14.6"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92"
+  integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==
+
 vue-eslint-parser@^9.0.1, vue-eslint-parser@^9.0.3, vue-eslint-parser@^9.3.0:
   version "9.3.1"
   resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz"
@@ -2967,19 +3009,6 @@ vuetify@^2.6.0:
   resolved "https://registry.npmjs.org/vuetify/-/vuetify-2.6.15.tgz"
   integrity sha512-2a6sBSHzivXgi9pZMyHuzTgMyInCkj/BrVwTnoCa1Y/Dnfwj7lkWzgKQDScbGVK0q4vJ+YHoBBrLOmnhz1R0YA==
 
-vuex-persistedstate@^3.0.1:
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-3.2.1.tgz"
-  integrity sha512-0OnHKGsCHJcvbEraaGZvuvX4aybM2oQWYRuZmIQB7zUjVM6tP+Hg+oXLrq9r6elT4she9SGtEbGE1L2+XdFgUw==
-  dependencies:
-    deepmerge "^4.2.2"
-    shvl "^2.0.3"
-
-vuex@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"
-  integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
-
 webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"