diff --git a/bun.lock b/bun.lock
index 02557ab6..9201d548 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1206,9 +1206,9 @@
 
     "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@vue/language-core/@vue/compiler-dom": ["@vue/compiler-dom@3.5.35", "", { "dependencies": { "@vue/compiler-core": "3.5.35", "@vue/shared": "3.5.35" } }, "sha512-k+bprkXxuqhVajgTx5mUHuir7TwQzUKOWR40ng1ncAqQRPnrLngGGgqVEEhOnTMlc8btHYVKmrP8s5Qyg0hvYA=="],
+    "@vue/language-core/@vue/compiler-dom": ["@vue/compiler-dom@3.5.37", "", { "dependencies": { "@vue/compiler-core": "3.5.37", "@vue/shared": "3.5.37" } }, "sha512-oqfl/QaCVEWxphALFEZ7m+q9z+Sghz9ZCcoJ/oplTGxsOgx2czVzSZxkMkzQrWIahywOeyGHdg9ml/WUz3DMzw=="],
 
-    "@vue/language-core/@vue/shared": ["@vue/shared@3.5.35", "", {}, "sha512-zSbjL7gRXwks2ZQLRGCajBtBXEOXW9Ddhn/HvSdrGkE2dqGnumzW8XtusRrxrE9LvqtiqDXQ+A60Hp6mvdYxfA=="],
+    "@vue/language-core/@vue/shared": ["@vue/shared@3.5.37", "", {}, "sha512-JzFx4aYGz+EtBl8zzw8XECNWSmNXTrU5jpub3T1lQ+2X5Ys9QzHWafxhE+E5qS2Ry/mVl8o2QqrwRGYYOFYguw=="],
 
     "app-builder-lib/@electron/get": ["@electron/get@3.1.0", "", { "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", "fs-extra": "^8.1.0", "got": "^11.8.5", "progress": "^2.0.3", "semver": "^6.2.0", "sumchecker": "^3.0.1" }, "optionalDependencies": { "global-agent": "^3.0.0" } }, "sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ=="],
 
@@ -1304,7 +1304,7 @@
 
     "@electron/universal/minimatch/brace-expansion": ["brace-expansion@2.1.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA=="],
 
-    "@vue/language-core/@vue/compiler-dom/@vue/compiler-core": ["@vue/compiler-core@3.5.35", "", { "dependencies": { "@babel/parser": "^7.29.3", "@vue/shared": "3.5.35", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "sha512-BUmHaR1J+O+CKZ9uJucdVTEr1LHsdyvv7vG3eNRhK3CczEHeMd/LtsHAuD7PbrxvI2envCY2v7HI1vC1aBRzKw=="],
+    "@vue/language-core/@vue/compiler-dom/@vue/compiler-core": ["@vue/compiler-core@3.5.37", "", { "dependencies": { "@babel/parser": "^7.29.7", "@vue/shared": "3.5.37", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "sha512-TfQz4bsBQTPoTeBWTUPJPq+4FCTTXg2pbp8TjjAyrGaLAu9nfrZTxKLf6mdAlclnwtyUToFaMQu7QRS63Qek1g=="],
 
     "app-builder-lib/@electron/get/env-paths": ["env-paths@2.2.1", "", {}, "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="],
 
diff --git a/package.json b/package.json
index 8c362050..04972cdf 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "0.20260611.1",
+  "version": "0.20260611.2",
   "engines": {
     "bun": ">=1.2.0"
   },
diff --git a/src/renderer/bun.lock b/src/renderer/bun.lock
index 3ced1cae..927cf735 100644
--- a/src/renderer/bun.lock
+++ b/src/renderer/bun.lock
@@ -711,9 +711,9 @@
 
     "@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "@vue/language-core/@vue/compiler-dom": ["@vue/compiler-dom@3.5.35", "", { "dependencies": { "@vue/compiler-core": "3.5.35", "@vue/shared": "3.5.35" } }, "sha512-k+bprkXxuqhVajgTx5mUHuir7TwQzUKOWR40ng1ncAqQRPnrLngGGgqVEEhOnTMlc8btHYVKmrP8s5Qyg0hvYA=="],
+    "@vue/language-core/@vue/compiler-dom": ["@vue/compiler-dom@3.5.37", "", { "dependencies": { "@vue/compiler-core": "3.5.37", "@vue/shared": "3.5.37" } }, "sha512-oqfl/QaCVEWxphALFEZ7m+q9z+Sghz9ZCcoJ/oplTGxsOgx2czVzSZxkMkzQrWIahywOeyGHdg9ml/WUz3DMzw=="],
 
-    "@vue/language-core/@vue/shared": ["@vue/shared@3.5.35", "", {}, "sha512-zSbjL7gRXwks2ZQLRGCajBtBXEOXW9Ddhn/HvSdrGkE2dqGnumzW8XtusRrxrE9LvqtiqDXQ+A60Hp6mvdYxfA=="],
+    "@vue/language-core/@vue/shared": ["@vue/shared@3.5.37", "", {}, "sha512-JzFx4aYGz+EtBl8zzw8XECNWSmNXTrU5jpub3T1lQ+2X5Ys9QzHWafxhE+E5qS2Ry/mVl8o2QqrwRGYYOFYguw=="],
 
     "cliui/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],
 
@@ -737,7 +737,7 @@
 
     "yargs/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],
 
-    "@vue/language-core/@vue/compiler-dom/@vue/compiler-core": ["@vue/compiler-core@3.5.35", "", { "dependencies": { "@babel/parser": "^7.29.3", "@vue/shared": "3.5.35", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "sha512-BUmHaR1J+O+CKZ9uJucdVTEr1LHsdyvv7vG3eNRhK3CczEHeMd/LtsHAuD7PbrxvI2envCY2v7HI1vC1aBRzKw=="],
+    "@vue/language-core/@vue/compiler-dom/@vue/compiler-core": ["@vue/compiler-core@3.5.37", "", { "dependencies": { "@babel/parser": "^7.29.7", "@vue/shared": "3.5.37", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "sha512-TfQz4bsBQTPoTeBWTUPJPq+4FCTTXg2pbp8TjjAyrGaLAu9nfrZTxKLf6mdAlclnwtyUToFaMQu7QRS63Qek1g=="],
 
     "mlly/pkg-types/confbox": ["confbox@0.1.8", "", {}, "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w=="],
 
diff --git a/src/renderer/package.json b/src/renderer/package.json
index 5e4d3c99..fc661a1b 100644
--- a/src/renderer/package.json
+++ b/src/renderer/package.json
@@ -42,7 +42,7 @@
     },
     "./style.css": "./dist/opencor.css"
   },
-  "version": "0.20260611.1",
+  "version": "0.20260611.2",
   "libopencorVersion": "0.20260604.0",
   "scripts": {
     "build": "vite build && bun scripts/generate.version.js",
diff --git a/src/renderer/src/assets/app.css b/src/renderer/src/assets/app.css
index 915b662b..19270180 100644
--- a/src/renderer/src/assets/app.css
+++ b/src/renderer/src/assets/app.css
@@ -46,6 +46,11 @@ body {
       transition: none !important;
     }
 
+    .p-contextmenu-item-content,
+    .p-contextmenu-item-link {
+      color: var(--p-contextmenu-item-color, var(--p-text-color));
+    }
+
     a {
       color: var(--p-button-link-color);
     }
diff --git a/src/renderer/src/components/OpenCOR.vue b/src/renderer/src/components/OpenCOR.vue
index 0e948d56..8bee276f 100644
--- a/src/renderer/src/components/OpenCOR.vue
+++ b/src/renderer/src/components/OpenCOR.vue
@@ -1,5 +1,5 @@
 <template>
-  <SafeBlockUI ref="safeBlockUiRef" class="opencor" :class="isFullWebApp ? 'with-main-menu' : ''"
+  <SafeBlockUIWidget ref="safeBlockUiRef" class="opencor" :class="isFullWebApp ? 'with-main-menu' : ''"
     :blocked="compBlockUiEnabled"
     @click="activateInstance"
     @focus="activateInstance"
@@ -110,7 +110,7 @@
         @close="webUpdateAvailableVisible = false"
       />
     </div>
-  </SafeBlockUI>
+  </SafeBlockUIWidget>
 </template>
 
 <script setup lang="ts">
@@ -146,7 +146,7 @@ import ContentsComponent from '../components/ContentsComponent.vue';
 import * as locApi from '../libopencor/locApi';
 
 import { provideDialogState } from './dialogs/BaseDialog.vue';
-import SafeBlockUI from './widgets/SafeBlockUI.vue';
+import SafeBlockUIWidget from './widgets/SafeBlockUIWidget.vue';
 import MainMenu from './MainMenu.vue';
 
 const props = defineProps<IOpenCORProps>();
@@ -273,7 +273,7 @@ defineExpose({
 
 const { isDialogActive } = provideDialogState();
 
-const safeBlockUiRef = vue.ref<InstanceType<typeof SafeBlockUI> | null>(null);
+const safeBlockUiRef = vue.ref<InstanceType<typeof SafeBlockUIWidget> | null>(null);
 const mainMenuRef = vue.ref<InstanceType<typeof MainMenu> | null>(null);
 const filesRef = vue.ref<HTMLElement | null>(null);
 const issues = vue.ref<locApi.IIssue[]>([]);
@@ -332,7 +332,7 @@ const compUiEnabled = vue.computed<boolean>(() => {
   return !compBlockUiEnabled.value && !isDialogActive.value;
 });
 
-// Remove any leftover SafeBlockUI masks when unblocking.
+// Remove any leftover SafeBlockUIWidget masks when unblocking.
 // Note: this is to ensure that we don't end up with leftover masks if the block event is emitted multiple times before
 //       the unblock event is emitted, which can lead to multiple masks being created and not properly removed.
 
@@ -340,7 +340,7 @@ vue.watch(
   compBlockUiEnabled,
   (newCompBlockUiEnabled: boolean) => {
     if (!newCompBlockUiEnabled) {
-      const safeBlockUi = safeBlockUiRef.value as unknown as InstanceType<typeof SafeBlockUI> | null;
+      const safeBlockUi = safeBlockUiRef.value as unknown as InstanceType<typeof SafeBlockUIWidget> | null;
 
       if (!safeBlockUi) {
         return;
diff --git a/src/renderer/src/components/dialogs/SimulationExperimentViewSettingsDialog.vue b/src/renderer/src/components/dialogs/SimulationExperimentViewSettingsDialog.vue
index e95fd1ac..321618ff 100644
--- a/src/renderer/src/components/dialogs/SimulationExperimentViewSettingsDialog.vue
+++ b/src/renderer/src/components/dialogs/SimulationExperimentViewSettingsDialog.vue
@@ -38,7 +38,7 @@
 
               <div class="settings-form">
                 <div class="form-row">
-                  <InputScientificNumber v-model="localSettings.simulation.initialPoint" class="form-field"
+                  <InputScientificNumberWidget v-model="localSettings.simulation.initialPoint" class="form-field"
                     :label="`Initial point (${voiUnit})`"
                     size="small"
                   />
@@ -50,17 +50,17 @@
                   </div>
                 </div>
                 <div class="form-row">
-                  <InputScientificNumber v-model="localSettings.simulation.startingPoint" class="form-field"
+                  <InputScientificNumberWidget v-model="localSettings.simulation.startingPoint" class="form-field"
                     :label="`Starting point (${voiUnit})`"
                     size="small"
                   />
-                  <InputScientificNumber v-model="localSettings.simulation.endingPoint" class="form-field"
+                  <InputScientificNumberWidget v-model="localSettings.simulation.endingPoint" class="form-field"
                     :label="`Ending point (${voiUnit})`"
                     size="small"
                   />
                 </div>
                 <div class="form-row">
-                  <InputScientificNumber v-model="localSettings.simulation.pointInterval" class="form-field"
+                  <InputScientificNumberWidget v-model="localSettings.simulation.pointInterval" class="form-field"
                     :label="`Point interval (${voiUnit})`"
                     size="small"
                   />
@@ -93,7 +93,7 @@
 
               <div class="settings-form">
                 <div class="form-row">
-                  <InputScientificNumber v-model="localSettings.solvers.cvodeMaximumStep" class="form-field"
+                  <InputScientificNumberWidget v-model="localSettings.solvers.cvodeMaximumStep" class="form-field"
                     :label="`CVODE's maximum step (${voiUnit})`"
                     size="small"
                   />
@@ -200,7 +200,7 @@
                                   </FloatLabel>
                                 </div>
                                 <div class="form-row">
-                                  <InputScientificNumber v-model="input.defaultValue" class="form-field"
+                                  <InputScientificNumberWidget v-model="input.defaultValue" class="form-field"
                                     label="Default value"
                                     size="small"
                                   />
@@ -231,15 +231,15 @@
                                 <!-- Scalar model input fields -->
 
                                 <div v-if="locApi.isScalarInput(input)" class="form-row">
-                                  <InputScientificNumber v-model="input.minimumValue" class="form-field"
+                                  <InputScientificNumberWidget v-model="input.minimumValue" class="form-field"
                                     label="Minimum value"
                                     size="small"
                                   />
-                                  <InputScientificNumber v-model="input.maximumValue" class="form-field"
+                                  <InputScientificNumberWidget v-model="input.maximumValue" class="form-field"
                                     label="Maximum value"
                                     size="small"
                                   />
-                                  <InputScientificNumber v-model="input.stepValue" class="form-field"
+                                  <InputScientificNumberWidget v-model="input.stepValue" class="form-field"
                                     label="Step value (optional)"
                                     :allowEmpty="true"
                                     size="small"
@@ -271,7 +271,7 @@
                                         <InputText v-model="possibleValue.name" class="w-full" size="small" />
                                         <label>Name</label>
                                       </FloatLabel>
-                                      <InputScientificNumber v-model="possibleValue.value" class="form-field"
+                                      <InputScientificNumberWidget v-model="possibleValue.value" class="form-field"
                                         label="Value"
                                         size="small"
                                       />
@@ -348,12 +348,12 @@
                                 />
                                 <label>Model parameter</label>
                               </FloatLabel>
-                              <Tooltip :content="parameterValueTooltip()" class="flex-1">
+                              <TooltipWidget :content="parameterValueTooltip()" class="flex-1">
                                 <FloatLabel variant="on" class="w-full">
                                   <InputText v-model="parameter.value" class="w-full" size="small" />
                                   <label>Value</label>
                                 </FloatLabel>
-                              </Tooltip>
+                              </TooltipWidget>
                               <Button
                                 icon="pi pi-times"
                                 text rounded
@@ -520,18 +520,18 @@
                               <!-- Description and VOI expression -->
 
                                 <div class="form-row">
-                                  <Tooltip :content="externalDataDescriptionTooltip()" class="flex-1">
+                                  <TooltipWidget :content="externalDataDescriptionTooltip()" class="flex-1">
                                     <FloatLabel variant="on" class="w-full">
                                       <InputText v-model="externalDataFile.description" class="w-full" size="small" />
                                       <label>Description (optional)</label>
                                     </FloatLabel>
-                                  </Tooltip>
-                                  <Tooltip :content="externalDataVoiExpressionTooltip()" class="flex-1">
+                                  </TooltipWidget>
+                                  <TooltipWidget :content="externalDataVoiExpressionTooltip()" class="flex-1">
                                     <FloatLabel variant="on" class="w-full">
                                       <InputText v-model="externalDataFile.voiExpression" class="w-full" size="small" />
                                       <label>VOI expression (optional)</label>
                                     </FloatLabel>
-                                  </Tooltip>
+                                  </TooltipWidget>
                                 </div>
 
                                 <!-- External data entries -->
@@ -663,26 +663,26 @@
                                       </div>
                                       <div class="w-full">
                                         <div class="mb-3">
-                                          <Tooltip :content="traceNameTooltip()" class="flex-1">
+                                          <TooltipWidget :content="traceNameTooltip()" class="flex-1">
                                             <FloatLabel variant="on" class="w-full">
                                               <InputText v-model="plot.name" class="w-full" size="small" />
                                               <label>Name (optional)</label>
                                             </FloatLabel>
-                                          </Tooltip>
+                                          </TooltipWidget>
                                         </div>
                                         <div class="entry-row">
-                                          <Tooltip :content="xyValueTooltip(true)" class="flex-1">
+                                          <TooltipWidget :content="xyValueTooltip(true)" class="flex-1">
                                             <FloatLabel variant="on" class="w-full">
                                               <InputText v-model="plot.xValue" class="w-full" size="small" />
                                               <label>X value</label>
                                             </FloatLabel>
-                                          </Tooltip>
-                                          <Tooltip :content="xyValueTooltip(false)" class="flex-1">
+                                          </TooltipWidget>
+                                          <TooltipWidget :content="xyValueTooltip(false)" class="flex-1">
                                             <FloatLabel variant="on" class="w-full">
                                               <InputText v-model="plot.yValue" class="w-full" size="small" />
                                               <label>Y value</label>
                                             </FloatLabel>
-                                          </Tooltip>
+                                          </TooltipWidget>
                                         </div>
                                       </div>
                                       <Button
@@ -708,26 +708,26 @@
                                         </div>
                                         <div class="w-full">
                                           <div class="mb-3">
-                                            <Tooltip :content="traceNameTooltip()" class="flex-1">
+                                            <TooltipWidget :content="traceNameTooltip()" class="flex-1">
                                                 <FloatLabel variant="on" class="w-full">
                                                   <InputText v-model="trace.name" class="w-full" size="small" />
                                                   <label>Name (optional)</label>
                                                 </FloatLabel>
-                                              </Tooltip>
+                                              </TooltipWidget>
                                           </div>
                                           <div class="entry-row">
-                                            <Tooltip :content="xyValueTooltip(true)" class="flex-1">
+                                            <TooltipWidget :content="xyValueTooltip(true)" class="flex-1">
                                               <FloatLabel variant="on" class="w-full">
                                                 <InputText v-model="trace.xValue" class="w-full" size="small" />
                                                 <label>X value</label>
                                               </FloatLabel>
-                                            </Tooltip>
-                                            <Tooltip :content="xyValueTooltip(false)" class="flex-1">
+                                            </TooltipWidget>
+                                            <TooltipWidget :content="xyValueTooltip(false)" class="flex-1">
                                               <FloatLabel variant="on" class="w-full">
                                                 <InputText v-model="trace.yValue" class="w-full" size="small" />
                                                 <label>Y value</label>
                                               </FloatLabel>
-                                            </Tooltip>
+                                            </TooltipWidget>
                                           </div>
                                         </div>
                                         <Button
diff --git a/src/renderer/src/components/views/SimulationExperimentView.vue b/src/renderer/src/components/views/SimulationExperimentView.vue
index 43c8577a..1c72dcde 100644
--- a/src/renderer/src/components/views/SimulationExperimentView.vue
+++ b/src/renderer/src/components/views/SimulationExperimentView.vue
@@ -154,12 +154,12 @@
                     >
                       <div class="flex items-center">
                         <div class="w-1 h-6 rounded-xs mr-2" :style="`background-color: ${run.color};`"></div>
-                        <Tooltip :content="run.isLiveRun ? '' : run.tooltip"
+                        <TooltipWidget :content="run.isLiveRun ? '' : run.tooltip"
                           class="grow text-sm"
                           :class="{ 'cursor-help': !run.isLiveRun, 'opacity-50': !run.isVisible }"
                         >
                           {{ run.isLiveRun ? 'Live run' : `Run #${index}` }}
-                        </Tooltip>
+                        </TooltipWidget>
                         <div class="flex items-center">
                           <Button class="p-0! w-5! h-5! run-action-button"
                             icon="pi pi-palette"
diff --git a/src/renderer/src/components/widgets/InputScientificNumber.vue b/src/renderer/src/components/widgets/InputScientificNumberWidget.vue
similarity index 100%
rename from src/renderer/src/components/widgets/InputScientificNumber.vue
rename to src/renderer/src/components/widgets/InputScientificNumberWidget.vue
diff --git a/src/renderer/src/components/widgets/InputWidget.vue b/src/renderer/src/components/widgets/InputWidget.vue
index f3ef4821..c5a2fd38 100644
--- a/src/renderer/src/components/widgets/InputWidget.vue
+++ b/src/renderer/src/components/widgets/InputWidget.vue
@@ -14,7 +14,7 @@
     </FloatLabel>
   </div>
   <div v-else>
-    <InputScientificNumber v-model="value"
+    <InputScientificNumberWidget v-model="value"
       :label="name"
       :min="minimumValue"
       :max="maximumValue"
diff --git a/src/renderer/src/components/widgets/SafeBlockUI.vue b/src/renderer/src/components/widgets/SafeBlockUIWidget.vue
similarity index 100%
rename from src/renderer/src/components/widgets/SafeBlockUI.vue
rename to src/renderer/src/components/widgets/SafeBlockUIWidget.vue
diff --git a/src/renderer/src/components/widgets/Tooltip.vue b/src/renderer/src/components/widgets/TooltipWidget.vue
similarity index 100%
rename from src/renderer/src/components/widgets/Tooltip.vue
rename to src/renderer/src/components/widgets/TooltipWidget.vue