diff --git a/theseus_gui/package.json b/theseus_gui/package.json
index 41ebe09ae..9cbc6c5b6 100644
--- a/theseus_gui/package.json
+++ b/theseus_gui/package.json
@@ -18,7 +18,7 @@
     "floating-vue": "^2.0.0-beta.20",
     "mixpanel-browser": "^2.47.0",
     "ofetch": "^1.0.1",
-    "omorphia": "^0.4.38",
+    "omorphia": "^0.6.0",
     "pinia": "^2.1.3",
     "qrcode.vue": "^3.4.0",
     "tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
diff --git a/theseus_gui/pnpm-lock.yaml b/theseus_gui/pnpm-lock.yaml
index 34af6ce8f..517f7001d 100644
--- a/theseus_gui/pnpm-lock.yaml
+++ b/theseus_gui/pnpm-lock.yaml
@@ -21,8 +21,8 @@ dependencies:
     specifier: ^1.0.1
     version: 1.0.1
   omorphia:
-    specifier: ^0.4.38
-    version: 0.4.38
+    specifier: ^0.6.0
+    version: 0.6.0(vue@3.3.4)
   pinia:
     specifier: ^2.1.3
     version: 2.1.3(vue@3.3.4)
@@ -31,7 +31,7 @@ dependencies:
     version: 3.4.0(vue@3.3.4)
   tauri-plugin-window-state-api:
     specifier: github:tauri-apps/tauri-plugin-window-state#v1
-    version: github.com/tauri-apps/tauri-plugin-window-state/5ea9eb0d4a9affd17269f92c0085935046be3f4a
+    version: github.com/tauri-apps/tauri-plugin-window-state/c479a6d131999b4bcf0d05eb7fdb031f87a716d1
   vite-svg-loader:
     specifier: ^4.0.0
     version: 4.0.0
@@ -373,6 +373,10 @@ packages:
   /@jridgewell/sourcemap-codec@1.4.15:
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
+  /@kurkle/color@0.3.2:
+    resolution: {integrity: sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==}
+    dev: false
+
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -419,8 +423,8 @@ packages:
     engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
     dev: false
 
-  /@tauri-apps/api@1.4.0:
-    resolution: {integrity: sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==}
+  /@tauri-apps/api@1.5.0:
+    resolution: {integrity: sha512-yQY9wpVNuiYhLLuyDlu1nBpqJELT1fGp7OctN4rW9I2W1T2p7A3tqPxsEzQprEwneQRBAlPM9vC8NsnMbct+pg==}
     engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
     dev: false
 
@@ -714,6 +718,13 @@ packages:
       supports-color: 7.2.0
     dev: true
 
+  /chart.js@4.4.0:
+    resolution: {integrity: sha512-vQEj6d+z0dcsKLlQvbKIMYFHd3t8W/7L2vfJIbYcfyPcRx92CsHqECpueN8qVGNlKyDcr5wBrYAYKnfu/9Q1hQ==}
+    engines: {pnpm: '>=7'}
+    dependencies:
+      '@kurkle/color': 0.3.2
+    dev: false
+
   /chokidar@3.5.3:
     resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
     engines: {node: '>= 8.10.0'}
@@ -1355,15 +1366,19 @@ packages:
       ufo: 1.1.2
     dev: false
 
-  /omorphia@0.4.38:
-    resolution: {integrity: sha512-V0vEarmAart6Gf5WuPUZ58TuIiQf7rI5HJpmYU7FVbtdvZ3q08VqyKZflCddbeBSFQ4/N+A+sNr/ELf/jz+Cug==}
+  /omorphia@0.6.0(vue@3.3.4):
+    resolution: {integrity: sha512-L2OA4ADcwK73f10/VabvAcllJkMy+PdqMQxtGfrK/wVQ8je4hpKJQqo6BUS3A/G3q2m7ZPbq/djRDCyEnOa7Eg==}
+    peerDependencies:
+      vue: ^3.3.4
     dependencies:
+      chart.js: 4.4.0
       dayjs: 1.11.7
       floating-vue: 2.0.0-beta.20(vue@3.3.4)
       highlight.js: 11.8.0
       markdown-it: 13.0.1
       qrcode.vue: 3.4.0(vue@3.3.4)
       vue: 3.3.4
+      vue-chartjs: 5.2.0(chart.js@4.4.0)(vue@3.3.4)
       vue-router: 4.2.1(vue@3.3.4)
       vue-select: 4.0.0-beta.6(vue@3.3.4)
       xss: 1.0.14
@@ -1707,6 +1722,16 @@ packages:
       fsevents: 2.3.2
     dev: true
 
+  /vue-chartjs@5.2.0(chart.js@4.4.0)(vue@3.3.4):
+    resolution: {integrity: sha512-d3zpKmGZr2OWHQ1xmxBcAn5ShTG917+/UCLaSpaCDDqT0U7DBsvFzTs69ZnHCgKoXT55GZDW8YEj9Av+dlONLA==}
+    peerDependencies:
+      chart.js: ^4.1.1
+      vue: ^3.0.0-0 || ^2.7.0
+    dependencies:
+      chart.js: 4.4.0
+      vue: 3.3.4
+    dev: false
+
   /vue-demi@0.14.5(vue@3.3.4):
     resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
     engines: {node: '>=12'}
@@ -1838,10 +1863,10 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  github.com/tauri-apps/tauri-plugin-window-state/5ea9eb0d4a9affd17269f92c0085935046be3f4a:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/5ea9eb0d4a9affd17269f92c0085935046be3f4a}
+  github.com/tauri-apps/tauri-plugin-window-state/c479a6d131999b4bcf0d05eb7fdb031f87a716d1:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-window-state/tar.gz/c479a6d131999b4bcf0d05eb7fdb031f87a716d1}
     name: tauri-plugin-window-state-api
     version: 0.0.0
     dependencies:
-      '@tauri-apps/api': 1.4.0
+      '@tauri-apps/api': 1.5.0
     dev: false
diff --git a/theseus_gui/src/components/GridDisplay.vue b/theseus_gui/src/components/GridDisplay.vue
index 615ff5e08..87e63e053 100644
--- a/theseus_gui/src/components/GridDisplay.vue
+++ b/theseus_gui/src/components/GridDisplay.vue
@@ -2,20 +2,20 @@
 import Instance from '@/components/ui/Instance.vue'
 import { computed, ref } from 'vue'
 import {
+  Button,
+  Card,
   ClipboardCopyIcon,
+  ConfirmModal,
+  DropdownSelect,
+  EyeIcon,
   FolderOpenIcon,
+  formatCategoryHeader,
   PlayIcon,
   PlusIcon,
-  TrashIcon,
-  StopCircleIcon,
-  EyeIcon,
-  Card,
-  DropdownSelect,
   SearchIcon,
+  StopCircleIcon,
+  TrashIcon,
   XIcon,
-  Button,
-  formatCategoryHeader,
-  ModalConfirm,
 } from 'omorphia'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import dayjs from 'dayjs'
@@ -233,7 +233,7 @@ const filteredResults = computed(() => {
 })
 </script>
 <template>
-  <ModalConfirm
+  <ConfirmModal
     ref="confirmModal"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
@@ -304,14 +304,38 @@ const filteredResults = computed(() => {
     </section>
   </div>
   <ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
-    <template #play> <PlayIcon /> Play </template>
-    <template #stop> <StopCircleIcon /> Stop </template>
-    <template #add_content> <PlusIcon /> Add content </template>
-    <template #edit> <EyeIcon /> View instance </template>
-    <template #duplicate> <ClipboardCopyIcon /> Duplicate instance</template>
-    <template #delete> <TrashIcon /> Delete </template>
-    <template #open> <FolderOpenIcon /> Open folder </template>
-    <template #copy> <ClipboardCopyIcon /> Copy path </template>
+    <template #play>
+      <PlayIcon />
+      Play
+    </template>
+    <template #stop>
+      <StopCircleIcon />
+      Stop
+    </template>
+    <template #add_content>
+      <PlusIcon />
+      Add content
+    </template>
+    <template #edit>
+      <EyeIcon />
+      View instance
+    </template>
+    <template #duplicate>
+      <ClipboardCopyIcon />
+      Duplicate instance
+    </template>
+    <template #delete>
+      <TrashIcon />
+      Delete
+    </template>
+    <template #open>
+      <FolderOpenIcon />
+      Open folder
+    </template>
+    <template #copy>
+      <ClipboardCopyIcon />
+      Copy path
+    </template>
   </ContextMenu>
 </template>
 <style lang="scss" scoped>
diff --git a/theseus_gui/src/components/RowDisplay.vue b/theseus_gui/src/components/RowDisplay.vue
index d260f6e54..60b2b2c43 100644
--- a/theseus_gui/src/components/RowDisplay.vue
+++ b/theseus_gui/src/components/RowDisplay.vue
@@ -1,17 +1,17 @@
 <script setup>
 import {
+  ChevronRightIcon,
   ClipboardCopyIcon,
+  ConfirmModal,
+  DownloadIcon,
+  ExternalIcon,
+  EyeIcon,
   FolderOpenIcon,
+  GlobeIcon,
   PlayIcon,
   PlusIcon,
-  TrashIcon,
-  DownloadIcon,
-  GlobeIcon,
   StopCircleIcon,
-  ExternalIcon,
-  EyeIcon,
-  ChevronRightIcon,
-  ModalConfirm,
+  TrashIcon,
 } from 'omorphia'
 import Instance from '@/components/ui/Instance.vue'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
@@ -227,7 +227,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <ModalConfirm
+  <ConfirmModal
     ref="deleteConfirmModal"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
@@ -265,17 +265,51 @@ onUnmounted(() => {
     </div>
   </div>
   <ContextMenu ref="instanceOptions" @option-clicked="handleOptionsClick">
-    <template #play> <PlayIcon /> Play </template>
-    <template #stop> <StopCircleIcon /> Stop </template>
-    <template #add_content> <PlusIcon /> Add content </template>
-    <template #edit> <EyeIcon /> View instance </template>
-    <template #delete> <TrashIcon /> Delete </template>
-    <template #open_folder> <FolderOpenIcon /> Open folder </template>
-    <template #duplicate> <ClipboardCopyIcon /> Duplicate instance</template>
-    <template #copy_path> <ClipboardCopyIcon /> Copy path </template>
-    <template #install> <DownloadIcon /> Install </template>
-    <template #open_link> <GlobeIcon /> Open in Modrinth <ExternalIcon /> </template>
-    <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
+    <template #play>
+      <PlayIcon />
+      Play
+    </template>
+    <template #stop>
+      <StopCircleIcon />
+      Stop
+    </template>
+    <template #add_content>
+      <PlusIcon />
+      Add content
+    </template>
+    <template #edit>
+      <EyeIcon />
+      View instance
+    </template>
+    <template #delete>
+      <TrashIcon />
+      Delete
+    </template>
+    <template #open_folder>
+      <FolderOpenIcon />
+      Open folder
+    </template>
+    <template #duplicate>
+      <ClipboardCopyIcon />
+      Duplicate instance
+    </template>
+    <template #copy_path>
+      <ClipboardCopyIcon />
+      Copy path
+    </template>
+    <template #install>
+      <DownloadIcon />
+      Install
+    </template>
+    <template #open_link>
+      <GlobeIcon />
+      Open in Modrinth
+      <ExternalIcon />
+    </template>
+    <template #copy_link>
+      <ClipboardCopyIcon />
+      Copy link
+    </template>
   </ContextMenu>
   <InstallConfirmModal ref="confirmModal" />
   <ModInstallModal ref="modInstallModal" />
diff --git a/theseus_gui/src/components/ui/ExportModal.vue b/theseus_gui/src/components/ui/ExportModal.vue
index a9bd402db..4b8b9e5af 100644
--- a/theseus_gui/src/components/ui/ExportModal.vue
+++ b/theseus_gui/src/components/ui/ExportModal.vue
@@ -33,7 +33,7 @@ const themeStore = useTheming()
 
 const initFiles = async () => {
   const newFolders = new Map()
-  const sep = '/';
+  const sep = '/'
   files.value = []
   await get_pack_export_candidates(props.instance.path).then((filePaths) =>
     filePaths
diff --git a/theseus_gui/src/pages/instance/Mods.vue b/theseus_gui/src/pages/instance/Mods.vue
index da04ebd24..eb32f85af 100644
--- a/theseus_gui/src/pages/instance/Mods.vue
+++ b/theseus_gui/src/pages/instance/Mods.vue
@@ -42,24 +42,33 @@
       <UpdatedIcon />
       Update all
     </Button>
-
-    <DropdownButton
-      v-if="!isPackLocked"
-      :options="['search', 'from_file']"
-      default-value="search"
-      name="add-content-dropdown"
-      color="primary"
-      @option-click="handleContentOptionClick"
-    >
-      <template #search>
+    <div v-if="!isPackLocked" class="joined-buttons">
+      <Button
+        color="primary"
+        name="add-content-dropdown"
+        @click="handleContentOptionClick({ option: 'search' })"
+      >
         <SearchIcon />
-        <span class="no-wrap"> Add content </span>
-      </template>
-      <template #from_file>
-        <FolderOpenIcon />
-        <span class="no-wrap"> Add from file </span>
-      </template>
-    </DropdownButton>
+        Add content
+      </Button>
+      <OverflowMenu
+        :options="[
+          {
+            id: 'from_file',
+            action: () => {
+              handleContentOptionClick({ option: 'from_file' })
+            },
+          },
+        ]"
+        class="btn btn-primary btn-dropdown-animation icon-only"
+      >
+        <DropdownIcon />
+        <template #from_file>
+          <FolderOpenIcon />
+          Add from file
+        </template>
+      </OverflowMenu>
+    </div>
   </Card>
   <Pagination
     v-if="projects.length > 0"
@@ -284,22 +293,33 @@
     <h3>No projects found</h3>
     <p class="empty-subtitle">Add a project to get started</p>
     <div class="empty-action">
-      <DropdownButton
-        :options="['search', 'from_file']"
-        default-value="search"
-        name="add-content-dropdown-from-empty"
-        color="primary"
-        @option-click="handleContentOptionClick"
-      >
-        <template #search>
+      <div class="joined-buttons">
+        <Button
+          color="primary"
+          name="add-content-dropdown-from-empty"
+          @click="handleContentOptionClick({ option: 'search' })"
+        >
           <SearchIcon />
-          <span class="no-wrap"> Add content </span>
-        </template>
-        <template #from_file>
-          <FolderOpenIcon />
-          <span class="no-wrap"> Add from file </span>
-        </template>
-      </DropdownButton>
+          Add content
+        </Button>
+        <OverflowMenu
+          :options="[
+            {
+              id: 'from_file',
+              action: () => {
+                handleContentOptionClick({ option: 'from_file' })
+              },
+            },
+          ]"
+          class="btn btn-primary btn-dropdown-animation icon-only"
+        >
+          <DropdownIcon />
+          <template #from_file>
+            <FolderOpenIcon />
+            Add from file
+          </template>
+        </OverflowMenu>
+      </div>
     </div>
   </div>
   <Pagination
@@ -321,7 +341,7 @@
         </p>
       </div>
       <div class="button-group push-right">
-        <Button @click="deleteWarning.hide()"> Cancel </Button>
+        <Button @click="deleteWarning.hide()"> Cancel</Button>
         <Button color="danger" @click="deleteSelected">
           <TrashIcon />
           Remove
@@ -344,7 +364,7 @@
         </p>
       </div>
       <div class="button-group push-right">
-        <Button @click="deleteDisabledWarning.hide()"> Cancel </Button>
+        <Button @click="deleteDisabledWarning.hide()"> Cancel</Button>
         <Button color="danger" @click="deleteDisabled">
           <TrashIcon />
           Remove
@@ -367,30 +387,30 @@
 </template>
 <script setup>
 import {
+  AnimatedLogo,
   Avatar,
   Button,
-  TrashIcon,
   Card,
+  Checkbox,
   CheckIcon,
-  SearchIcon,
-  UpdatedIcon,
-  AnimatedLogo,
+  CodeIcon,
+  DropdownIcon,
+  DropdownSelect,
+  EyeIcon,
+  EyeOffIcon,
+  FileIcon,
   FolderOpenIcon,
-  Checkbox,
   formatProjectType,
-  DropdownButton,
+  GlobeIcon,
   Modal,
-  XIcon,
+  OverflowMenu,
+  Pagination,
+  SearchIcon,
   ShareIcon,
-  DropdownIcon,
-  GlobeIcon,
-  FileIcon,
-  EyeIcon,
-  EyeOffIcon,
   ShareModal,
-  CodeIcon,
-  Pagination,
-  DropdownSelect,
+  TrashIcon,
+  UpdatedIcon,
+  XIcon,
 } from 'omorphia'
 import { computed, onUnmounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -408,7 +428,7 @@ import { open } from '@tauri-apps/api/dialog'
 import { listen } from '@tauri-apps/api/event'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
 import { highlightModInProfile } from '@/helpers/utils.js'
-import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } from '@/assets/icons'
+import { AddProjectImage, MenuIcon, PackageIcon, TextInputIcon, ToggleIcon } from '@/assets/icons'
 import ExportModal from '@/components/ui/ExportModal.vue'
 import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
 
@@ -1129,6 +1149,7 @@ onUnmounted(() => {
     }
   }
 }
+
 .empty-prompt {
   display: flex;
   flex-direction: column;
diff --git a/theseus_gui/src/pages/instance/Options.vue b/theseus_gui/src/pages/instance/Options.vue
index 8d048b650..f8d56efe9 100644
--- a/theseus_gui/src/pages/instance/Options.vue
+++ b/theseus_gui/src/pages/instance/Options.vue
@@ -1,5 +1,5 @@
 <template>
-  <ModalConfirm
+  <ConfirmModal
     ref="modal_confirm"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
@@ -386,7 +386,8 @@
         </span>
       </label>
       <Button id="unlock-profile" @click="$refs.modalConfirmUnlock.show()">
-        <LockIcon /> Unlock
+        <LockIcon />
+        Unlock
       </Button>
     </div>
 
@@ -400,7 +401,8 @@
         </span>
       </label>
       <Button id="unpair-profile" @click="$refs.modalConfirmUnpair.show()">
-        <XIcon /> Unpair
+        <XIcon />
+        Unpair
       </Button>
     </div>
 
@@ -431,7 +433,8 @@
         </span>
       </label>
       <Button id="repair-modpack" color="highlight" :disabled="offline" @click="repairModpack">
-        <DownloadIcon /> Reinstall
+        <DownloadIcon />
+        Reinstall
       </Button>
     </div>
   </Card>
@@ -453,7 +456,8 @@
         :disabled:="installing || inProgress || offline"
         @click="duplicateProfile"
       >
-        <ClipboardCopyIcon /> Duplicate
+        <ClipboardCopyIcon />
+        Duplicate
       </Button>
     </div>
     <div class="adjacent-input">
@@ -470,7 +474,8 @@
         :disabled="installing || inProgress || repairing || offline"
         @click="repairProfile"
       >
-        <HammerIcon /> Repair
+        <HammerIcon />
+        Repair
       </Button>
     </div>
     <div class="adjacent-input">
@@ -487,7 +492,8 @@
         :disabled="removing"
         @click="$refs.modal_confirm.show()"
       >
-        <TrashIcon /> Delete
+        <TrashIcon />
+        Delete
       </Button>
     </div>
   </Card>
@@ -501,24 +507,24 @@
 
 <script setup>
 import {
+  Avatar,
+  Button,
   Card,
-  Slider,
-  TrashIcon,
   Checkbox,
-  UploadIcon,
-  Avatar,
-  EditIcon,
-  Modal,
   Chips,
+  ClipboardCopyIcon,
+  ConfirmModal,
+  DownloadIcon,
   DropdownSelect,
-  XIcon,
-  SaveIcon,
-  LockIcon,
+  EditIcon,
   HammerIcon,
-  ModalConfirm,
-  DownloadIcon,
-  ClipboardCopyIcon,
-  Button,
+  LockIcon,
+  Modal,
+  SaveIcon,
+  Slider,
+  TrashIcon,
+  UploadIcon,
+  XIcon,
 } from 'omorphia'
 import { SwapIcon } from '@/assets/icons'
 
@@ -798,6 +804,7 @@ async function repairModpack() {
 }
 
 const removing = ref(false)
+
 async function removeProfile() {
   removing.value = true
   await remove(props.instance.path).catch(handleError)
@@ -899,6 +906,7 @@ const isChanged = computed(() => {
 watch(loader, () => (loaderVersionIndex.value = 0))
 
 const editing = ref(false)
+
 async function saveGvLoaderEdits() {
   editing.value = true