diff --git a/eslint.config.js b/eslint.config.js
index d4d3fd3..ebcc0b6 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -3,7 +3,7 @@ import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescri
 import pluginVitest from '@vitest/eslint-plugin'
 import pluginPlaywright from 'eslint-plugin-playwright'
 import i18nJsonPlugin from 'eslint-plugin-i18n-json'
-import path from 'path'
+import path from 'node:path'
 
 export default defineConfigWithVueTs(
   {
diff --git a/index.html b/index.html
index 7dc4658..ec09710 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,7 @@
     <link rel="mask-icon" href="/img/icons/maskable-icon-512x512.png" color="#fff">
     <!-- Matomo Tracking: Cookie-less and GDPR-conformant -->
     <script>
-      var _paq = window._paq = window._paq || [];
+      var _paq = globalThis._paq = globalThis._paq || [];
       (function() {
         var u="//matomo.brdgm.me/";
         _paq.push(['setTrackerUrl', u+'matomo.php']);
diff --git a/package-lock.json b/package-lock.json
index e65a802..22c84e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "@brdgm/millennia-solo-helper",
       "version": "1.0.17",
       "dependencies": {
-        "@brdgm/brdgm-commons": "^1.8.0",
+        "@brdgm/brdgm-commons": "^1.8.1",
         "@popperjs/core": "^2.11.8",
         "bootstrap": "^5.3.3",
         "core-js": "^3.41.0",
@@ -139,7 +139,6 @@
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -1680,9 +1679,9 @@
       }
     },
     "node_modules/@brdgm/brdgm-commons": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@brdgm/brdgm-commons/-/brdgm-commons-1.8.0.tgz",
-      "integrity": "sha512-bBlqcWE73PX5zf5b9y1Vl16dHHgyZpqzvyBlOhCzFTtUGgkyh/Vtvk6B18SxAc970/oRL6kDU7Is1It5r+RmNA==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@brdgm/brdgm-commons/-/brdgm-commons-1.8.1.tgz",
+      "integrity": "sha512-HnMllq6rI762MYR+c4ZCJtOVAqoXhJJK5eTY47WbmLaVX8CcCg8zNiG28ERoJ0a6dFBcI6WmrRLH8yoBsBoI+Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@popperjs/core": "^2.11.8",
@@ -1814,7 +1813,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1861,7 +1859,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -3410,7 +3407,6 @@
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -3946,7 +3942,6 @@
       "integrity": "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.13.0"
       }
@@ -4163,7 +4158,6 @@
       "integrity": "sha512-EHrrEsyhOhxYt8MTg4zTF+DJMuNBzWwgvvOYNj/zm1vnaD/IC5zCXFehZv94Piqa2cRFfXrTFxIvO95L7Qc/cw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.44.1",
         "@typescript-eslint/types": "8.44.1",
@@ -4655,7 +4649,6 @@
       "integrity": "sha512-p2KHvsyuv/njmLSwDjpok0CFYKmAdV5ckWjVSxktNXbKAuHX3+WCTy4X3LuwWl0RGsCWBPerSUVNvE/02D565w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cac": "^6.7.14",
         "colorette": "^2.0.20",
@@ -5078,7 +5071,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5549,7 +5541,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.9",
         "caniuse-lite": "^1.0.30001746",
@@ -6512,7 +6503,6 @@
       "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -6720,7 +6710,6 @@
       "integrity": "sha512-7BZHsG3kC2vei8F2W8hnfDi9RK+cv5eKPMvzBdrl8Vuc0hR5odGQRli8VVzUkrmUHkxFEm4Iio1r5HOKslO0Aw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -8467,7 +8456,6 @@
       "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "lib/jiti-cli.mjs"
       }
@@ -9436,7 +9424,6 @@
       "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.3.tgz",
       "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^7.7.2"
       },
@@ -9569,7 +9556,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -9921,7 +9907,6 @@
       "integrity": "sha512-RIDh866U8agLgiIcdpB+COKnlCreHJLfIhWC3LVflku5YHfpnsIKigRZeFfMfCc4dVcqNVfQQ5gO/afOck064A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -10078,7 +10063,6 @@
       "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -10824,7 +10808,6 @@
       "integrity": "sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.15.0",
@@ -11174,7 +11157,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11243,7 +11225,6 @@
       "integrity": "sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.45.0",
         "@typescript-eslint/types": "8.45.0",
@@ -11492,7 +11473,6 @@
       "integrity": "sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -11622,7 +11602,6 @@
       "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/chai": "^5.2.2",
         "@vitest/expect": "3.2.4",
@@ -11712,7 +11691,6 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.22.tgz",
       "integrity": "sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.22",
         "@vue/compiler-sfc": "3.5.22",
@@ -12179,7 +12157,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -12293,7 +12270,6 @@
       "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
diff --git a/package.json b/package.json
index f74b57a..faceb87 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "generate-pwa-assets": "pwa-assets-generator"
   },
   "dependencies": {
-    "@brdgm/brdgm-commons": "^1.8.0",
+    "@brdgm/brdgm-commons": "^1.8.1",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "core-js": "^3.41.0",
diff --git a/src/components/setup/DifficultyLevel.vue b/src/components/setup/DifficultyLevel.vue
index 3a3b177..538fa2f 100644
--- a/src/components/setup/DifficultyLevel.vue
+++ b/src/components/setup/DifficultyLevel.vue
@@ -40,7 +40,7 @@ export default defineComponent({
   },
   methods: {
     updateDifficultyLevel(event: Event) {
-      this.difficultyLevel = parseInt((event.target as HTMLInputElement).value)
+      this.difficultyLevel = Number.parseInt((event.target as HTMLInputElement).value)
       this.state.setup.difficultyLevel = this.difficultyLevel
     }
   }
diff --git a/src/services/ConstructionCards.ts b/src/services/ConstructionCards.ts
index 66199ca..8035ea7 100644
--- a/src/services/ConstructionCards.ts
+++ b/src/services/ConstructionCards.ts
@@ -32,7 +32,9 @@ const cards : ConstructionCard[] = [
 ]
 
 const cardsMap = new Map<number,ConstructionCard>()
-cards.forEach(card => cardsMap.set(card.id, card))
+for (const card of cards) {
+  cardsMap.set(card.id, card)
+}
 
 export default {
 
diff --git a/src/services/DraftingPriorityCards.ts b/src/services/DraftingPriorityCards.ts
index 80f1a98..3487065 100644
--- a/src/services/DraftingPriorityCards.ts
+++ b/src/services/DraftingPriorityCards.ts
@@ -42,7 +42,9 @@ const cards : DraftingPriorityCard[] = [
 ]
 
 const cardsMap = new Map<number,DraftingPriorityCard>()
-cards.forEach(card => cardsMap.set(card.id, card))
+for (const card of cards) {
+  cardsMap.set(card.id, card)
+}
 
 export default {
 
diff --git a/src/services/DraftingRowCards.ts b/src/services/DraftingRowCards.ts
index 4ed1ea8..2e2234e 100644
--- a/src/services/DraftingRowCards.ts
+++ b/src/services/DraftingRowCards.ts
@@ -78,7 +78,9 @@ const cards : DraftingRowCard[] = [
 ]
 
 const cardsMap = new Map<number,DraftingRowCard>()
-cards.forEach(card => cardsMap.set(card.id, card))
+for (const card of cards) {
+  cardsMap.set(card.id, card)
+}
 
 export default {
 
diff --git a/src/services/WarCards.ts b/src/services/WarCards.ts
index be37016..1253b37 100644
--- a/src/services/WarCards.ts
+++ b/src/services/WarCards.ts
@@ -56,7 +56,9 @@ const cards : WarCard[] = [
 ]
 
 const cardsMap = new Map<number,WarCard>()
-cards.forEach(card => cardsMap.set(card.id, card))
+for (const card of cards) {
+  cardsMap.set(card.id, card)
+}
 
 export default {
 
diff --git a/src/store/state.ts b/src/store/state.ts
index 2904630..3d8275f 100644
--- a/src/store/state.ts
+++ b/src/store/state.ts
@@ -9,7 +9,7 @@ export const useStateStore = defineStore(`${name}.state`, {
   state: () => {
     return {
       language: 'en',
-      baseFontSize: 1.0,
+      baseFontSize: 1,
       setup: {
         difficultyLevel: DifficultyLevel.NORMAL
       },
diff --git a/src/util/getTechColor.ts b/src/util/getTechColor.ts
index 32361a2..0f8bd85 100644
--- a/src/util/getTechColor.ts
+++ b/src/util/getTechColor.ts
@@ -5,7 +5,7 @@ import Tech from '@/services/enum/Tech'
  * @param tech Tech card
  * @returns Color code
  */
-export default function(tech: Tech) : string {
+export default function getTechColor(tech: Tech) : string {
   switch (tech) {
     case Tech.AGRICULTURE:    return '#47914d'
     case Tech.ARMY:           return '#ce372f'
diff --git a/src/util/getTechDuration.ts b/src/util/getTechDuration.ts
index 091cbe2..7cd91ec 100644
--- a/src/util/getTechDuration.ts
+++ b/src/util/getTechDuration.ts
@@ -6,7 +6,7 @@ import Tech from '@/services/enum/Tech'
  * @param round Age
  * @returns Tech duration
  */
-export default function(tech: Tech, round: number) : number {
+export default function getTechDuration(tech: Tech, round: number) : number {
   const index = round - 1
   switch (tech) {
     case Tech.AGRICULTURE:    return [2,3,1,2,1,1,2,1][index]
diff --git a/src/util/toTech.ts b/src/util/toTech.ts
index b6b3d92..cd43073 100644
--- a/src/util/toTech.ts
+++ b/src/util/toTech.ts
@@ -5,7 +5,7 @@ import TechPlaceholder from '@/services/enum/TechPlaceholder'
  * Converts tech placeholder to undefined, keeps tech as is.
  * @returns Tech or undefined
  */
-export default function(tech: (Tech|TechPlaceholder)) : Tech|undefined {
+export default function toTech(tech: (Tech|TechPlaceholder)) : Tech|undefined {
   if (tech == TechPlaceholder.BLANK || tech == TechPlaceholder.EMPTY) {
     return undefined
   }
diff --git a/tests/unit/helper/mockRound.ts b/tests/unit/helper/mockRound.ts
index 295885c..8c28731 100644
--- a/tests/unit/helper/mockRound.ts
+++ b/tests/unit/helper/mockRound.ts
@@ -1,7 +1,7 @@
 import Player from '@/services/enum/Player'
 import { BotCardsPersistence, ProsperityCardsPersistence, Round, RowPlaceholdersPersistence, TechCardSelectionPersistence } from '@/store/state'
 
-export default function (params?: MockRoundParams) : Round {
+export default function mockRound(params?: MockRoundParams) : Round {
   const round : Round = {
     round: params?.round ?? 1,
     startPlayer: params?.startPlayer ?? Player.PLAYER,
diff --git a/tests/unit/helper/mockRouteLocation.ts b/tests/unit/helper/mockRouteLocation.ts
index 08efb35..3b10d1c 100644
--- a/tests/unit/helper/mockRouteLocation.ts
+++ b/tests/unit/helper/mockRouteLocation.ts
@@ -1,6 +1,6 @@
 import { LocationQuery, RouteLocation, RouteMeta, RouteParams, RouteRecord, RouteRecordName } from 'vue-router'
 
-export default function (params?: MockRouteLocationParams) : RouteLocation {
+export default function mockRouteLocation(params?: MockRouteLocationParams) : RouteLocation {
   return {
     name: params?.name,
     path: params?.path ?? '',
diff --git a/tests/unit/helper/mockState.ts b/tests/unit/helper/mockState.ts
index dd472fe..d33d58e 100644
--- a/tests/unit/helper/mockState.ts
+++ b/tests/unit/helper/mockState.ts
@@ -2,7 +2,7 @@ import DifficultyLevel from '@/services/enum/DifficultyLevel'
 import Player from '@/services/enum/Player'
 import { Round, State } from '@/store/state'
 
-export default function (params?: MockStateParams) : State {  
+export default function mockState(params?: MockStateParams) : State {  
   return {
     language: 'en',
     baseFontSize: 1,
diff --git a/tests/unit/services/RowPlaceholders.spec.ts b/tests/unit/services/RowPlaceholders.spec.ts
index c704297..541f2a1 100644
--- a/tests/unit/services/RowPlaceholders.spec.ts
+++ b/tests/unit/services/RowPlaceholders.spec.ts
@@ -6,10 +6,10 @@ describe('services/RowPlaceholders', () => {
     const rowPlaceholders = RowPlaceholders.new()
 
     expect(rowPlaceholders.rows.length).to.eq(2)
-    rowPlaceholders.rows.forEach(row => {
+    for (const row of rowPlaceholders.rows) {
       expect(row).to.greaterThanOrEqual(1)
       expect(row).to.lessThanOrEqual(4)
-    })
+    }
 
     const persistence = rowPlaceholders.toPersistence()
     expect(persistence.rows.length).to.eq(2)
diff --git a/vite.config.ts b/vite.config.ts
index 856c090..e4517a7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import { VitePWA } from 'vite-plugin-pwa'
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
-import path from 'path'
+import path from 'node:path'
 import { description, appDeployName } from './package.json'
 import legacy from '@vitejs/plugin-legacy'