diff --git a/eslint.config.ts b/eslint.config.ts
index bd52ee0e17..6f8eb77869 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -5,6 +5,7 @@ import jsonConfig from '@dataport/eslint-config-geodev/json'
 import markdownConfig from '@dataport/eslint-config-geodev/markdown'
 import tsConfig from '@dataport/eslint-config-geodev/typescript'
 import vueConfig from '@dataport/eslint-config-geodev/vue'
+import importPlugin from 'eslint-plugin-import'
 import perfectionist from 'eslint-plugin-perfectionist'
 import prettierConfig from 'eslint-plugin-prettier/recommended'
 import vue from 'eslint-plugin-vue'
@@ -15,6 +16,7 @@ import { defineConfig } from 'eslint/config'
  */
 const polarConfig = defineConfig({
 	plugins: {
+		import: importPlugin,
 		perfectionist,
 		vue,
 	},
@@ -42,7 +44,28 @@ const polarConfig = defineConfig({
 			},
 		],
 		'import-x/order': 'off',
-		'perfectionist/sort-imports': 'error',
+		'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
+		'perfectionist/sort-imports': [
+			'error',
+			{
+				groups: [
+					'type-import',
+					{ newlinesBetween: 0 },
+					'type-internal',
+					{ newlinesBetween: 0 },
+					'type-parent',
+					{ newlinesBetween: 0 },
+					'type-sibling',
+					{ newlinesBetween: 0 },
+					'type-index',
+					['value-builtin', 'value-external'],
+					'value-internal',
+					['value-parent', 'value-sibling', 'value-index'],
+					'ts-equals-import',
+					'unknown',
+				],
+			},
+		],
 		'perfectionist/sort-named-imports': 'error',
 		'vue/html-self-closing': [
 			'error',
@@ -82,6 +105,14 @@ const polarTsConfig = defineConfig({
 				groups: ['required-member', 'unknown'],
 			},
 		],
+		'@typescript-eslint/consistent-type-imports': [
+			'error',
+			{
+				disallowTypeAnnotations: true,
+				fixStyle: 'separate-type-imports',
+				prefer: 'type-imports',
+			},
+		],
 	},
 })
 
diff --git a/examples/github-io/components/HeroPolarMap.vue b/examples/github-io/components/HeroPolarMap.vue
index 931b95a37a..7ee52c1526 100644
--- a/examples/github-io/components/HeroPolarMap.vue
+++ b/examples/github-io/components/HeroPolarMap.vue
@@ -8,13 +8,12 @@
 
 <script setup lang="ts">
 import type { Feature } from 'ol'
+import type { MpapiParameters } from '@/lib/getFeatures/types'
 
 import { createMap } from '@polar/polar/client'
 import { toMerged } from 'es-toolkit'
 import { onMounted } from 'vue'
 
-import type { MpapiParameters } from '@/lib/getFeatures/types'
-
 const basemapId = '23420'
 const basemapGreyId = '23421'
 const reports = '6059'
diff --git a/examples/iceberg/stores/iceberg.ts b/examples/iceberg/stores/iceberg.ts
index 06636aeadd..e18498dff1 100644
--- a/examples/iceberg/stores/iceberg.ts
+++ b/examples/iceberg/stores/iceberg.ts
@@ -1,12 +1,12 @@
-import {
-	type MapConfiguration,
-	type MasterportalApiServiceRegister,
+import type {
+	MapConfiguration,
+	MasterportalApiServiceRegister,
 } from '@polar/polar'
+import type { MpapiParameters } from '@/lib/getFeatures/types'
+
 import { defineStore } from 'pinia'
 import { reactive, ref } from 'vue'
 
-import type { MpapiParameters } from '@/lib/getFeatures/types'
-
 import services from '../services'
 
 export const useIcebergStore = defineStore('iceberg', () => {
diff --git a/package-lock.json b/package-lock.json
index 5d9c23ef4c..f83e5eb920 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,7 @@
 				"es-toolkit": "^1.47.1",
 				"eslint": "^9.34.0",
 				"eslint-config-prettier": "^10.1.8",
+				"eslint-plugin-import": "^2.32.0",
 				"eslint-plugin-prettier": "^5.5.6",
 				"events": "^3.3.0",
 				"hammerjs": "2.0.8",
@@ -2664,6 +2665,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/@rtsao/scc": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+			"integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@rushstack/node-core-library": {
 			"version": "5.23.1",
 			"resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.23.1.tgz",
@@ -3015,6 +3023,13 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/@types/json5": {
+			"version": "0.0.29",
+			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@types/mdast": {
 			"version": "4.0.4",
 			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
@@ -4077,6 +4092,28 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/array.prototype.findlastindex": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+			"integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.8",
+				"call-bound": "^1.0.4",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.9",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.1.1",
+				"es-shim-unscopables": "^1.1.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/array.prototype.flat": {
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
@@ -5864,6 +5901,80 @@
 				"eslint": ">=7.0.0"
 			}
 		},
+		"node_modules/eslint-import-resolver-node": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.10.tgz",
+			"integrity": "sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^3.2.7",
+				"is-core-module": "^2.16.1",
+				"resolve": "^2.0.0-next.6"
+			}
+		},
+		"node_modules/eslint-import-resolver-node/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/eslint-import-resolver-node/node_modules/resolve": {
+			"version": "2.0.0-next.7",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.7.tgz",
+			"integrity": "sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"is-core-module": "^2.16.2",
+				"node-exports-info": "^1.6.0",
+				"object-keys": "^1.1.1",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/eslint-module-utils": {
+			"version": "2.13.0",
+			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.13.0.tgz",
+			"integrity": "sha512-bLohSkT6469rRs8czj0tLTD8vaeIS/whvPRJVjDr7IuoTT1k5DYDERlNycjDj/HkOlvQdYurmfZ/g3fG5bgeLQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"debug": "^3.2.7"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependenciesMeta": {
+				"eslint": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/eslint-module-utils/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
 		"node_modules/eslint-plugin-es-x": {
 			"version": "7.8.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz",
@@ -5886,6 +5997,91 @@
 				"eslint": ">=8"
 			}
 		},
+		"node_modules/eslint-plugin-import": {
+			"version": "2.32.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+			"integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@rtsao/scc": "^1.1.0",
+				"array-includes": "^3.1.9",
+				"array.prototype.findlastindex": "^1.2.6",
+				"array.prototype.flat": "^1.3.3",
+				"array.prototype.flatmap": "^1.3.3",
+				"debug": "^3.2.7",
+				"doctrine": "^2.1.0",
+				"eslint-import-resolver-node": "^0.3.9",
+				"eslint-module-utils": "^2.12.1",
+				"hasown": "^2.0.2",
+				"is-core-module": "^2.16.1",
+				"is-glob": "^4.0.3",
+				"minimatch": "^3.1.2",
+				"object.fromentries": "^2.0.8",
+				"object.groupby": "^1.0.3",
+				"object.values": "^1.2.1",
+				"semver": "^6.3.1",
+				"string.prototype.trimend": "^1.0.9",
+				"tsconfig-paths": "^3.15.0"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/balanced-match": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true,
+			"license": "MIT"
+		},
+		"node_modules/eslint-plugin-import/node_modules/brace-expansion": {
+			"version": "1.1.15",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
+			"integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/minimatch": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+			"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+			"dev": true,
+			"license": "ISC",
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"license": "ISC",
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
 		"node_modules/eslint-plugin-n": {
 			"version": "17.24.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.24.0.tgz",
@@ -7273,9 +7469,9 @@
 			}
 		},
 		"node_modules/hasown": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+			"integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7650,13 +7846,13 @@
 			}
 		},
 		"node_modules/is-core-module": {
-			"version": "2.16.1",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-			"integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+			"version": "2.16.2",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz",
+			"integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"hasown": "^2.0.2"
+				"hasown": "^2.0.3"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -10604,6 +10800,21 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/object.groupby": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+			"integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"call-bind": "^1.0.7",
+				"define-properties": "^1.2.1",
+				"es-abstract": "^1.23.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/object.values": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
@@ -12557,6 +12768,16 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/strip-bom": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -12954,6 +13175,32 @@
 				"node": ">=4.2.0"
 			}
 		},
+		"node_modules/tsconfig-paths": {
+			"version": "3.15.0",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+			"integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@types/json5": "^0.0.29",
+				"json5": "^1.0.2",
+				"minimist": "^1.2.6",
+				"strip-bom": "^3.0.0"
+			}
+		},
+		"node_modules/tsconfig-paths/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
+			}
+		},
 		"node_modules/tslib": {
 			"version": "2.8.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
diff --git a/package.json b/package.json
index dbc49b23d8..b498f59f7c 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
 		"es-toolkit": "^1.47.1",
 		"eslint": "^9.34.0",
 		"eslint-config-prettier": "^10.1.8",
+		"eslint-plugin-import": "^2.32.0",
 		"eslint-plugin-prettier": "^5.5.6",
 		"events": "^3.3.0",
 		"hammerjs": "2.0.8",
diff --git a/src/architecture.spec.ts b/src/architecture.spec.ts
index ef5fba0cf8..4f524b9f54 100644
--- a/src/architecture.spec.ts
+++ b/src/architecture.spec.ts
@@ -1,5 +1,7 @@
+import type { FileConditionBuilder } from 'tsarch'
+
 import { resolve } from 'node:path'
-import { FileConditionBuilder, filesOfProject } from 'tsarch'
+import { filesOfProject } from 'tsarch'
 import { beforeAll, describe, expect, test } from 'vitest'
 
 describe('Architectural checks', () => {
diff --git a/src/client.ts b/src/client.ts
index 5c7b050475..0595ad1159 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -1,10 +1,12 @@
-import {
-	fetchServiceRegister,
-	type MapConfiguration,
-	type MasterportalApiServiceRegister,
-	type PluginContainer,
-	type PolarContainer,
+import type {
+	MapConfiguration,
+	MasterportalApiServiceRegister,
+	PluginContainer,
+	PolarContainer,
 } from '@/core'
+import type { Menu } from '@/plugins/iconMenu'
+
+import { fetchServiceRegister } from '@/core'
 import {
 	addPlugins as coreAddPlugins,
 	createMap as coreCreateMap,
@@ -12,7 +14,7 @@ import {
 import AddressSearch from '@/plugins/addressSearch'
 import Fullscreen from '@/plugins/fullscreen'
 import GeoLocation from '@/plugins/geoLocation'
-import IconMenu, { type Menu } from '@/plugins/iconMenu'
+import IconMenu from '@/plugins/iconMenu'
 import LayerChooser from '@/plugins/layerChooser'
 import LoadingIndicator from '@/plugins/loadingIndicator'
 import Pins from '@/plugins/pins'
diff --git a/src/components/kern/KernBlockButtonCheckbox.ce.vue b/src/components/kern/KernBlockButtonCheckbox.ce.vue
index c4884159a7..7db388e935 100644
--- a/src/components/kern/KernBlockButtonCheckbox.ce.vue
+++ b/src/components/kern/KernBlockButtonCheckbox.ce.vue
@@ -13,10 +13,10 @@
 </template>
 
 <script setup lang="ts">
-import { useId } from 'vue'
-
 import type { Icon } from '@/core'
 
+import { useId } from 'vue'
+
 defineProps<{ icon?: Icon }>()
 
 const model = defineModel<boolean>({ required: true })
diff --git a/src/components/kern/KernBlockButtonRadioGroup.ce.vue b/src/components/kern/KernBlockButtonRadioGroup.ce.vue
index e7e9f2f4fe..6c91a57e80 100644
--- a/src/components/kern/KernBlockButtonRadioGroup.ce.vue
+++ b/src/components/kern/KernBlockButtonRadioGroup.ce.vue
@@ -30,10 +30,10 @@
 </template>
 
 <script setup lang="ts">
-import { useId, useTemplateRef } from 'vue'
-
 import type { Icon } from '@/core'
 
+import { useId, useTemplateRef } from 'vue'
+
 defineProps<{
 	items: {
 		value: string
diff --git a/src/components/kern/KernRadioGroup.ce.vue b/src/components/kern/KernRadioGroup.ce.vue
index 19273452e6..c13e679359 100644
--- a/src/components/kern/KernRadioGroup.ce.vue
+++ b/src/components/kern/KernRadioGroup.ce.vue
@@ -14,10 +14,10 @@
 </template>
 
 <script setup lang="ts">
-import { useId } from 'vue'
-
 import type { Icon } from '@/core'
 
+import { useId } from 'vue'
+
 defineProps<{
 	items: {
 		value: string
diff --git a/src/composables/usePluginStoreWatcher.ts b/src/composables/usePluginStoreWatcher.ts
index 9e481a534f..115665b33d 100644
--- a/src/composables/usePluginStoreWatcher.ts
+++ b/src/composables/usePluginStoreWatcher.ts
@@ -4,17 +4,11 @@
  */
 /* eslint-enable tsdoc/syntax */
 
-import {
-	computed,
-	type ComputedRef,
-	onScopeDispose,
-	watch,
-	type WatchOptions,
-	type WatchStopHandle,
-} from 'vue'
-
+import type { ComputedRef, WatchOptions, WatchStopHandle } from 'vue'
 import type { StoreReference } from '@/core/types'
 
+import { computed, onScopeDispose, watch } from 'vue'
+
 import { useCoreStore } from '@/core/stores'
 
 /**
diff --git a/src/core/components/PolarContainer.ce.vue b/src/core/components/PolarContainer.ce.vue
index 3d394d9db2..8fe27f2507 100644
--- a/src/core/components/PolarContainer.ce.vue
+++ b/src/core/components/PolarContainer.ce.vue
@@ -25,10 +25,13 @@
 </template>
 
 <script setup lang="ts">
+import type { Pinia } from 'pinia'
+import type { MapConfiguration, MasterportalApiServiceRegister } from '../types'
+
 import { toMerged } from 'es-toolkit'
 import Hammer from 'hammerjs'
 import i18next, { t } from 'i18next'
-import { disposePinia, getActivePinia, type Pinia, storeToRefs } from 'pinia'
+import { disposePinia, getActivePinia, storeToRefs } from 'pinia'
 import {
 	computed,
 	getCurrentInstance,
@@ -45,11 +48,7 @@ import { useT } from '../composables/useT'
 import { useCoreStore } from '../stores'
 import { useMainStore } from '../stores/main'
 import { useMoveHandleStore } from '../stores/moveHandle'
-import {
-	CoreId,
-	type MapConfiguration,
-	type MasterportalApiServiceRegister,
-} from '../types'
+import { CoreId } from '../types'
 import { loadKern } from '../utils/loadKern'
 import { teardownMarkers } from '../utils/map/setupMarkers'
 import { mapZoomOffset } from '../utils/mapZoomOffset'
diff --git a/src/core/components/PolarMapOverlay.ce.vue b/src/core/components/PolarMapOverlay.ce.vue
index f12e22b250..1a4e302cbb 100644
--- a/src/core/components/PolarMapOverlay.ce.vue
+++ b/src/core/components/PolarMapOverlay.ce.vue
@@ -7,7 +7,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, type Ref, watch, type WatchHandle } from 'vue'
+import type { Ref, WatchHandle } from 'vue'
+
+import { ref, watch } from 'vue'
 
 const message = ref('')
 const messageWatcher = ref<WatchHandle | null>(null)
diff --git a/src/core/composables/useT.ts b/src/core/composables/useT.ts
index 9b06a63ca9..b856dc7e3b 100644
--- a/src/core/composables/useT.ts
+++ b/src/core/composables/useT.ts
@@ -1,5 +1,7 @@
+import type { Ref } from 'vue'
+
 import i18next from 'i18next'
-import { onMounted, onUnmounted, ref, type Ref } from 'vue'
+import { onMounted, onUnmounted, ref } from 'vue'
 
 export function useT(translator: () => string): Ref<string> {
 	const message = ref(translator())
diff --git a/src/core/monkeyHeaderLoader.ts b/src/core/monkeyHeaderLoader.ts
index e3b0ef8e0b..b7315ba2f6 100644
--- a/src/core/monkeyHeaderLoader.ts
+++ b/src/core/monkeyHeaderLoader.ts
@@ -1,6 +1,8 @@
-import { type ImageTile, Map } from 'ol'
+import type { ImageTile } from 'ol'
+import type { TileWMS } from 'ol/source'
+
+import { Map } from 'ol'
 import TileLayer from 'ol/layer/Tile'
-import { type TileWMS } from 'ol/source'
 
 // NOTE: This monkey patch allows url parameters of tiled WMS layers to become headers if used like `{key=value}`
 
diff --git a/src/core/stores/main.ts b/src/core/stores/main.ts
index b104dd9f79..fcecf83ac4 100644
--- a/src/core/stores/main.ts
+++ b/src/core/stores/main.ts
@@ -1,17 +1,16 @@
 import type { Feature, Map } from 'ol'
 import type { Point } from 'ol/geom'
-
-import { rawLayerList } from '@masterportal/masterportalapi'
-import { toMerged } from 'es-toolkit'
-import { acceptHMRUpdate, defineStore } from 'pinia'
-import { computed, ref, shallowRef, watch } from 'vue'
-
 import type {
 	ColorScheme,
 	MapConfigurationIncludingDefaults,
 	MasterportalApiServiceRegister,
 } from '../types'
 
+import { rawLayerList } from '@masterportal/masterportalapi'
+import { toMerged } from 'es-toolkit'
+import { acceptHMRUpdate, defineStore } from 'pinia'
+import { computed, ref, shallowRef, watch } from 'vue'
+
 import { addInterceptor } from '../utils/addInterceptor'
 import { SMALL_DISPLAY_HEIGHT, SMALL_DISPLAY_WIDTH } from '../utils/constants'
 import defaults from '../utils/defaults'
diff --git a/src/core/stores/marker.ts b/src/core/stores/marker.ts
index aefdfde9fc..abb9894cc5 100644
--- a/src/core/stores/marker.ts
+++ b/src/core/stores/marker.ts
@@ -1,10 +1,10 @@
-import { Feature } from 'ol'
-import { Point } from 'ol/geom'
+import type { Feature } from 'ol'
+import type { Point } from 'ol/geom'
+import type { CallOnMapSelect } from '../types'
+
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, shallowRef } from 'vue'
 
-import type { CallOnMapSelect } from '../types'
-
 import { useMainStore } from './main'
 
 export const useMarkerStore = defineStore('marker', () => {
diff --git a/src/core/stores/moveHandle.ts b/src/core/stores/moveHandle.ts
index c68fe18a3f..36cee22737 100644
--- a/src/core/stores/moveHandle.ts
+++ b/src/core/stores/moveHandle.ts
@@ -1,8 +1,9 @@
-import { defineStore } from 'pinia'
-import { type Component, markRaw, ref } from 'vue'
-
+import type { Component } from 'vue'
 import type { Icon, MoveHandleProperties } from '../types'
 
+import { defineStore } from 'pinia'
+import { markRaw, ref } from 'vue'
+
 export const useMoveHandleStore = defineStore('moveHandle', () => {
 	const actionButton = ref<Component | null>(null)
 	const closeFunction = ref<(userInteraction: boolean) => void>(() => {})
diff --git a/src/core/stores/plugin.ts b/src/core/stores/plugin.ts
index c2c4101686..d38d36da26 100644
--- a/src/core/stores/plugin.ts
+++ b/src/core/stores/plugin.ts
@@ -1,8 +1,3 @@
-import { toMerged } from 'es-toolkit'
-import i18next from 'i18next'
-import { acceptHMRUpdate, defineStore } from 'pinia'
-import { markRaw, reactive } from 'vue'
-
 import type {
 	BundledPluginId,
 	BundledPluginStores,
@@ -12,6 +7,11 @@ import type {
 	PolarPluginStore,
 } from '../types'
 
+import { toMerged } from 'es-toolkit'
+import i18next from 'i18next'
+import { acceptHMRUpdate, defineStore } from 'pinia'
+import { markRaw, reactive } from 'vue'
+
 import { useMainStore } from './main'
 
 export const usePluginStore = defineStore('plugin', () => {
diff --git a/src/core/types/locales.ts b/src/core/types/locales.ts
index 73b7907ff3..20b13f6571 100644
--- a/src/core/types/locales.ts
+++ b/src/core/types/locales.ts
@@ -1,5 +1,4 @@
 import type { ResourceKey } from 'i18next'
-
 import type { BundledPluginId, BundledPluginLocaleResources } from '@/core'
 import type { resourcesEn as core } from '@/core/locales'
 import type { CoreId } from '@/core/types'
diff --git a/src/core/types/main.ts b/src/core/types/main.ts
index ac7f362cd9..c13c587de2 100644
--- a/src/core/types/main.ts
+++ b/src/core/types/main.ts
@@ -1,5 +1,4 @@
 import type { VueElement } from 'vue'
-
 import type { AddressSearchPluginOptions } from '@/plugins/addressSearch'
 import type { AttributionsPluginOptions } from '@/plugins/attributions'
 import type { ExportPluginOptions } from '@/plugins/export/types'
@@ -14,7 +13,6 @@ import type { PointerPositionPluginOptions } from '@/plugins/pointerPosition'
 import type { ReverseGeocoderPluginOptions } from '@/plugins/reverseGeocoder'
 import type { ScalePluginOptions } from '@/plugins/scale'
 import type { ToastPluginOptions } from '@/plugins/toast'
-
 import type defaults from '../utils/defaults'
 import type { LayerConfiguration } from './layer'
 import type { LocaleOverride } from './locales'
diff --git a/src/core/types/moveHandle.ts b/src/core/types/moveHandle.ts
index e4afcaefa4..f562b9685f 100644
--- a/src/core/types/moveHandle.ts
+++ b/src/core/types/moveHandle.ts
@@ -1,5 +1,4 @@
 import type { Component } from 'vue'
-
 import type { Icon } from '../types'
 
 export interface MoveHandleProperties {
diff --git a/src/core/types/plugin.ts b/src/core/types/plugin.ts
index dc047f6d65..6a6fd3312f 100644
--- a/src/core/types/plugin.ts
+++ b/src/core/types/plugin.ts
@@ -1,6 +1,5 @@
 import type { SetupStoreDefinition } from 'pinia'
 import type { Component } from 'vue'
-
 import type { PluginId as AddressSearchPluginId } from '@/plugins/addressSearch'
 import type { resourcesEn as AddressSearchResources } from '@/plugins/addressSearch/locales'
 import type { useAddressSearchStore as AddressSearchStore } from '@/plugins/addressSearch/store'
@@ -47,7 +46,6 @@ import type { useToastStore as ToastStore } from '@/plugins/toast/store'
 import type { PluginId as ZoomPluginId } from '@/plugins/zoom'
 import type { resourcesEn as ZoomResources } from '@/plugins/zoom/locales'
 import type { useZoomStore as ZoomStore } from '@/plugins/zoom/store'
-
 import type { NineLayoutTag } from '../utils/NineLayoutTag'
 import type { Locale } from './locales'
 import type { Icon } from './theme'
diff --git a/src/core/utils/checkServiceAvailability.ts b/src/core/utils/checkServiceAvailability.ts
index b72bc54183..7dc7b0cc0a 100644
--- a/src/core/utils/checkServiceAvailability.ts
+++ b/src/core/utils/checkServiceAvailability.ts
@@ -1,14 +1,15 @@
+import type {
+	MapConfiguration,
+	MasterportalApiServiceRegister,
+	ServiceAvailabilityCheck,
+} from '../types'
+
 import { ping } from '@masterportal/masterportalapi'
 import { t } from 'i18next'
 
 import { notifyUser } from '@/lib/notifyUser'
 
-import {
-	CoreId,
-	type MapConfiguration,
-	type MasterportalApiServiceRegister,
-	type ServiceAvailabilityCheck,
-} from '../types'
+import { CoreId } from '../types'
 
 export function checkServiceAvailability(
 	configuration: MapConfiguration,
diff --git a/src/core/utils/export/store.ts b/src/core/utils/export/store.ts
index 72e9969cba..019d31592a 100644
--- a/src/core/utils/export/store.ts
+++ b/src/core/utils/export/store.ts
@@ -1,5 +1,4 @@
-import { watch, type WatchOptions } from 'vue'
-
+import type { WatchOptions } from 'vue'
 import type { PolarContainer } from '@/core'
 import type { useCoreStore } from '@/core/stores'
 import type {
@@ -9,6 +8,8 @@ import type {
 	PolarPluginStore,
 } from '@/core/types'
 
+import { watch } from 'vue'
+
 export type SubscribeCallback = (value: unknown, oldValue: unknown) => void
 
 type StoreType<T extends 'core' | BundledPluginId> = T extends BundledPluginId
diff --git a/src/core/utils/fetchServiceRegister.ts b/src/core/utils/fetchServiceRegister.ts
index c0a336e450..59fb28a363 100644
--- a/src/core/utils/fetchServiceRegister.ts
+++ b/src/core/utils/fetchServiceRegister.ts
@@ -1,7 +1,7 @@
-import { rawLayerList } from '@masterportal/masterportalapi'
-
 import type { MasterportalApiServiceRegister } from '../types'
 
+import { rawLayerList } from '@masterportal/masterportalapi'
+
 export async function fetchServiceRegister(url: string) {
 	return await new Promise<MasterportalApiServiceRegister>((resolve) =>
 		rawLayerList.initializeLayerList(url, resolve)
diff --git a/src/core/utils/loadKern.ts b/src/core/utils/loadKern.ts
index f3e7f07057..15c588735c 100644
--- a/src/core/utils/loadKern.ts
+++ b/src/core/utils/loadKern.ts
@@ -1,8 +1,8 @@
+import type { KernTheme, KernThemeTree } from '../types'
+
 import kernCss from '@kern-ux/native/dist/kern.min.css?raw'
 import kernExtraIcons from 'virtual:kern-extra-icons'
 
-import type { KernTheme, KernThemeTree } from '../types'
-
 function flattenKernTheme(theme: KernThemeTree, prefix: string[] = []) {
 	return Object.entries(theme).flatMap(([k, v]) => {
 		const keys = [...prefix, k.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase())]
diff --git a/src/core/utils/map/setupMarkers.ts b/src/core/utils/map/setupMarkers.ts
index 2546201580..1e4267bb49 100644
--- a/src/core/utils/map/setupMarkers.ts
+++ b/src/core/utils/map/setupMarkers.ts
@@ -1,12 +1,13 @@
+import type { Feature, Map, MapBrowserEvent, MapEvent } from 'ol'
 import type BaseLayer from 'ol/layer/Base'
+import type VectorSource from 'ol/source/Vector'
+import type { MarkerLayer, MarkerStyle, PluginId } from '../../types'
 
 import { toMerged } from 'es-toolkit'
-import { Feature, Map, MapBrowserEvent, MapEvent } from 'ol'
 import { createEmpty, extend } from 'ol/extent'
 import VectorLayer from 'ol/layer/Vector'
 import RenderFeature from 'ol/render/Feature'
 import Cluster from 'ol/source/Cluster'
-import VectorSource from 'ol/source/Vector'
 import { markRaw, toRaw, watch } from 'vue'
 
 import { useMarkerStore } from '@/core/stores/marker'
@@ -14,8 +15,6 @@ import { usePluginStore } from '@/core/stores/plugin'
 import getCluster from '@/lib/getCluster'
 import { isVisible } from '@/lib/invisibleStyle'
 
-import type { MarkerLayer, MarkerStyle, PluginId } from '../../types'
-
 import { useMainStore } from '../../stores/main'
 import { getMarkerStyle } from '../../utils/markers'
 
diff --git a/src/core/utils/map/setupStyling.ts b/src/core/utils/map/setupStyling.ts
index 9391d5dd43..9a6029ed5b 100644
--- a/src/core/utils/map/setupStyling.ts
+++ b/src/core/utils/map/setupStyling.ts
@@ -1,16 +1,15 @@
 import type { Feature, Map } from 'ol'
 import type { FeatureLike } from 'ol/Feature'
 import type VectorLayer from 'ol/layer/Vector'
-
-import createStyle from '@masterportal/masterportalapi/src/vectorStyle/createStyle'
-import styleList from '@masterportal/masterportalapi/src/vectorStyle/styleList'
-import noop from '@repositoryname/noop'
-
 import type {
 	MapConfiguration,
 	MasterportalApiServiceRegister,
 } from '@/core/types'
 
+import createStyle from '@masterportal/masterportalapi/src/vectorStyle/createStyle'
+import styleList from '@masterportal/masterportalapi/src/vectorStyle/styleList'
+import noop from '@repositoryname/noop'
+
 export async function setupStyling(
 	map: Map,
 	configuration: MapConfiguration,
diff --git a/src/core/utils/markers.ts b/src/core/utils/markers.ts
index 33e82e45e6..3f855b38c3 100644
--- a/src/core/utils/markers.ts
+++ b/src/core/utils/markers.ts
@@ -1,9 +1,9 @@
+import type { MarkerStyle } from '../types'
+
 import PolygonStyle from '@masterportal/masterportalapi/src/vectorStyle/styles/polygon/stylePolygon'
 import Icon from 'ol/style/Icon'
 import Style from 'ol/style/Style'
 
-import type { MarkerStyle } from '../types'
-
 const polygonStyle = new PolygonStyle()
 
 type GetMarkerFunction = (style: MarkerStyle, multi: boolean) => Style
diff --git a/src/lib/getCluster.ts b/src/lib/getCluster.ts
index 7665975776..ddb4e76ef0 100644
--- a/src/lib/getCluster.ts
+++ b/src/lib/getCluster.ts
@@ -1,6 +1,8 @@
-import { Feature, Map } from 'ol'
+import type { Map } from 'ol'
+import type VectorSource from 'ol/source/Vector'
+
+import { Feature } from 'ol'
 import VectorLayer from 'ol/layer/Vector'
-import VectorSource from 'ol/source/Vector'
 
 /*
  * Helper function to retrieve the related cluster of a feature.
diff --git a/src/lib/getFeatures/bkg.ts b/src/lib/getFeatures/bkg.ts
index fb2742ec9d..1b794b3ec5 100644
--- a/src/lib/getFeatures/bkg.ts
+++ b/src/lib/getFeatures/bkg.ts
@@ -1,12 +1,10 @@
 import type { FeatureCollection, Point } from 'geojson'
+import type { PolarGeoJsonFeature, PolarGeoJsonFeatureCollection } from '@/core'
+import type { BKGParameters } from './types'
 
 import { toMerged } from 'es-toolkit'
 import { transform as transformCoordinates } from 'ol/proj'
 
-import type { PolarGeoJsonFeature, PolarGeoJsonFeatureCollection } from '@/core'
-
-import type { BKGParameters } from './types'
-
 import { errorCheck } from './errorCheck'
 
 function getRequestUrlQuery(
diff --git a/src/lib/getFeatures/mpapi.ts b/src/lib/getFeatures/mpapi.ts
index 2e1c03e5d2..e0f38c2b0f 100644
--- a/src/lib/getFeatures/mpapi.ts
+++ b/src/lib/getFeatures/mpapi.ts
@@ -1,11 +1,10 @@
+import type { PolarGeoJsonFeature, PolarGeoJsonFeatureCollection } from '@/core'
+import type { MpapiParameters, MpapiResult } from './types'
+
 import { search, setGazetteerUrl } from '@masterportal/masterportalapi'
 import { toMerged } from 'es-toolkit'
 import { transform } from 'ol/proj'
 
-import type { PolarGeoJsonFeature, PolarGeoJsonFeatureCollection } from '@/core'
-
-import type { MpapiParameters, MpapiResult } from './types'
-
 // AbortSignal is not used as the AbortController is implemented by @masterportal/masterportalapi
 
 export default async function (
diff --git a/src/lib/getFeatures/vector.ts b/src/lib/getFeatures/vector.ts
index dd34c770bb..439929bbc7 100644
--- a/src/lib/getFeatures/vector.ts
+++ b/src/lib/getFeatures/vector.ts
@@ -1,5 +1,6 @@
+import type { Feature } from 'ol'
+
 import { rawLayerList } from '@masterportal/masterportalapi'
-import { Feature } from 'ol'
 
 const supportedFormats = ['OAF', 'WFS']
 
diff --git a/src/lib/getFeatures/wfs/buildWfsFilter.ts b/src/lib/getFeatures/wfs/buildWfsFilter.ts
index fa26cd234f..2f60230db5 100644
--- a/src/lib/getFeatures/wfs/buildWfsFilter.ts
+++ b/src/lib/getFeatures/wfs/buildWfsFilter.ts
@@ -1,7 +1,7 @@
-import { toMerged } from 'es-toolkit'
-
 import type { KeyValueSetArray, WfsParameters } from '../types'
 
+import { toMerged } from 'es-toolkit'
+
 const removeLinebreaks = (s) => s.replace(/\r?\n|\r/g, '')
 
 const getFeaturePrefix = ({ maxFeatures }: WfsParameters) =>
diff --git a/src/lib/getFeatures/wfs/parse.ts b/src/lib/getFeatures/wfs/parse.ts
index 8ca85c5c0c..c4747cf740 100644
--- a/src/lib/getFeatures/wfs/parse.ts
+++ b/src/lib/getFeatures/wfs/parse.ts
@@ -1,9 +1,9 @@
+import type { PolarGeoJsonFeature, PolarGeoJsonFeatureCollection } from '@/core'
+
 import { toMerged } from 'es-toolkit'
 import { GeoJSON, WFS } from 'ol/format'
 import { transform as transformCoordinates } from 'ol/proj'
 
-import type { PolarGeoJsonFeature, PolarGeoJsonFeatureCollection } from '@/core'
-
 import { getFeatureTitleFromPattern } from './getFeatureTitleFromPattern'
 
 const parser = new WFS()
diff --git a/src/lib/invisibleStyle.ts b/src/lib/invisibleStyle.ts
index c26e85d72c..bd310afba0 100644
--- a/src/lib/invisibleStyle.ts
+++ b/src/lib/invisibleStyle.ts
@@ -1,4 +1,5 @@
-import { Feature } from 'ol'
+import type { Feature } from 'ol'
+
 import Style from 'ol/style/Style'
 
 /*
diff --git a/src/lib/notifyUser.ts b/src/lib/notifyUser.ts
index 94965a5078..d1e62baa1a 100644
--- a/src/lib/notifyUser.ts
+++ b/src/lib/notifyUser.ts
@@ -1,8 +1,8 @@
 import type { Ref } from 'vue'
+import type { ToastOptions } from '@/plugins/toast'
 
 import { useCoreStore } from '@/core/stores'
 import { computedT } from '@/lib/computedT'
-import { type ToastOptions } from '@/plugins/toast'
 
 export function notifyUser(
 	severity: 'error' | 'warning' | 'info' | 'success',
diff --git a/src/lib/tooltip.ts b/src/lib/tooltip.ts
index f615d7aeb6..ae9074fdf4 100644
--- a/src/lib/tooltip.ts
+++ b/src/lib/tooltip.ts
@@ -1,4 +1,6 @@
-import i18next, { type TOptions } from 'i18next'
+import type { TOptions } from 'i18next'
+
+import i18next from 'i18next'
 
 type TooltipLocaleKeys = [string, string, TOptions?][]
 
diff --git a/src/plugins/addressSearch/components/SearchResults.ce.vue b/src/plugins/addressSearch/components/SearchResults.ce.vue
index 6765618b28..537a679e94 100644
--- a/src/plugins/addressSearch/components/SearchResults.ce.vue
+++ b/src/plugins/addressSearch/components/SearchResults.ce.vue
@@ -89,6 +89,8 @@
 </template>
 
 <script setup lang="ts">
+import type { SearchResult } from '../types'
+
 import { storeToRefs } from 'pinia'
 import { computed, nextTick, ref, toRaw, watch } from 'vue'
 
@@ -96,7 +98,7 @@ import KernButton from '@/components/kern/KernButton.ce.vue'
 import { useCoreStore } from '@/core/stores'
 
 import { useAddressSearchStore } from '../store'
-import { PluginId, type SearchResult } from '../types'
+import { PluginId } from '../types'
 import { focusFirstResult } from '../utils/focusFirstResult'
 import { strongTitleByInput } from '../utils/strongTitleByInput'
 
diff --git a/src/plugins/addressSearch/index.ts b/src/plugins/addressSearch/index.ts
index d043b5ee3d..292b68b16a 100644
--- a/src/plugins/addressSearch/index.ts
+++ b/src/plugins/addressSearch/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { AddressSearchPluginOptions } from './types'
 
 import component from './components/AddressSearch.ce.vue'
 import locales from './locales'
 import { useAddressSearchStore } from './store'
-import { type AddressSearchPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which adds a user interface to search for various kinds of textual information to map it to a
diff --git a/src/plugins/addressSearch/store.ts b/src/plugins/addressSearch/store.ts
index 529bbddede..33aab1788d 100644
--- a/src/plugins/addressSearch/store.ts
+++ b/src/plugins/addressSearch/store.ts
@@ -4,22 +4,22 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type { PolarGeoJsonFeature } from '@/core'
+import type {
+	AddressSearchPluginOptions,
+	GroupProperties,
+	SearchMethodConfiguration,
+	SearchResult,
+} from './types'
+
 import { debounce, toMerged } from 'es-toolkit'
 import { t } from 'i18next'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import type { PolarGeoJsonFeature } from '@/core'
-
 import { useCoreStore } from '@/core/stores'
 
-import {
-	type AddressSearchPluginOptions,
-	type GroupProperties,
-	PluginId,
-	type SearchMethodConfiguration,
-	type SearchResult,
-} from './types'
+import { PluginId } from './types'
 import { getResultsFromPromises } from './utils/getResultsFromPromises'
 import { getMethodContainer } from './utils/methodContainer'
 import SearchResultSymbols from './utils/searchResultSymbols'
diff --git a/src/plugins/addressSearch/types.ts b/src/plugins/addressSearch/types.ts
index 1235d4d129..989824e6f4 100644
--- a/src/plugins/addressSearch/types.ts
+++ b/src/plugins/addressSearch/types.ts
@@ -1,5 +1,4 @@
 import type { Component } from 'vue'
-
 import type {
 	PluginOptions,
 	PolarGeoJsonFeature,
diff --git a/src/plugins/addressSearch/utils/methodContainer.ts b/src/plugins/addressSearch/utils/methodContainer.ts
index a960c67084..54bec658f5 100644
--- a/src/plugins/addressSearch/utils/methodContainer.ts
+++ b/src/plugins/addressSearch/utils/methodContainer.ts
@@ -1,9 +1,9 @@
+import type { SearchMethodFunction } from '../types'
+
 import bkg from '@/lib/getFeatures/bkg'
 import mpapi from '@/lib/getFeatures/mpapi'
 import { getWfsFeatures } from '@/lib/getFeatures/wfs'
 
-import type { SearchMethodFunction } from '../types'
-
 export function getMethodContainer() {
 	const methods = { bkg, mpapi, wfs: getWfsFeatures }
 
diff --git a/src/plugins/attributions/index.ts b/src/plugins/attributions/index.ts
index 8120d31f57..4d169f2d0b 100644
--- a/src/plugins/attributions/index.ts
+++ b/src/plugins/attributions/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { AttributionsPluginOptions } from './types'
 
 import AttributionsWrapper from './components/AttributionsWrapper.ce.vue'
 import locales from './locales'
 import { useAttributionsStore } from './store'
-import { type AttributionsPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which adds attributions (copyright information) regarding all currently active layers.
diff --git a/src/plugins/attributions/store.ts b/src/plugins/attributions/store.ts
index e34a683749..2203aaa826 100644
--- a/src/plugins/attributions/store.ts
+++ b/src/plugins/attributions/store.ts
@@ -4,16 +4,15 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type { StoreReference } from '@/core'
+import type { Attribution } from './types'
+
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import type { StoreReference } from '@/core'
-
 import { usePluginStoreWatcher } from '@/composables/usePluginStoreWatcher'
 import { useCoreStore } from '@/core/stores'
 
-import type { Attribution } from './types'
-
 import { buildMapInfo } from './utils/buildMapInfo'
 import { formatAttributionText } from './utils/formatAttributionText'
 import { getVisibleAttributions } from './utils/getVisibleAttributions.ts'
diff --git a/src/plugins/export/components/ExportUI.ce.vue b/src/plugins/export/components/ExportUI.ce.vue
index 5fd7049b3b..9e0578ef17 100644
--- a/src/plugins/export/components/ExportUI.ce.vue
+++ b/src/plugins/export/components/ExportUI.ce.vue
@@ -40,13 +40,15 @@
 </template>
 
 <script setup lang="ts">
+import type { ExportFormat } from '../types'
+
 import { storeToRefs } from 'pinia'
 import { computed, ref } from 'vue'
 
 import PolarIconButton from '@/components/PolarIconButton.ce.vue'
 
 import { useExportStore } from '../store'
-import { type ExportFormat, PluginId } from '../types'
+import { PluginId } from '../types'
 
 const exportStore = useExportStore()
 
diff --git a/src/plugins/export/index.ts b/src/plugins/export/index.ts
index 0ce8654616..a47e5cb320 100644
--- a/src/plugins/export/index.ts
+++ b/src/plugins/export/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { ExportPluginOptions } from './types'
 
 import component from './components/ExportUI.ce.vue'
 import locales from './locales'
 import { useExportStore } from './store'
-import { type ExportPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * The Export plugin allows making screenshots of the currently visible map.
diff --git a/src/plugins/export/store.ts b/src/plugins/export/store.ts
index f14f2379c8..fcf82c2264 100644
--- a/src/plugins/export/store.ts
+++ b/src/plugins/export/store.ts
@@ -5,6 +5,7 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { Interaction } from 'ol/interaction'
+import type { ExportFormat } from './types'
 
 import { t } from 'i18next'
 import { defineStore } from 'pinia'
@@ -13,8 +14,6 @@ import { computed, ref } from 'vue'
 import { useCoreStore } from '@/core/stores'
 import { notifyUser } from '@/lib/notifyUser'
 
-import type { ExportFormat } from './types'
-
 import { EXPORT_FORMATS, PluginId } from './types'
 import { convertToPdf } from './utils/convertToPdf'
 import { CrossOriginMonkey } from './utils/CrossOriginMonkey'
diff --git a/src/plugins/export/utils/CrossOriginMonkey.ts b/src/plugins/export/utils/CrossOriginMonkey.ts
index 5cb7ea6ede..051b367ce0 100644
--- a/src/plugins/export/utils/CrossOriginMonkey.ts
+++ b/src/plugins/export/utils/CrossOriginMonkey.ts
@@ -1,4 +1,5 @@
-import { Map } from 'ol'
+import type { Map } from 'ol'
+
 import { ImageWMS } from 'ol/source'
 
 /**
diff --git a/src/plugins/export/utils/downloadAsImage.ts b/src/plugins/export/utils/downloadAsImage.ts
index 2f46fd4364..47981c3701 100644
--- a/src/plugins/export/utils/downloadAsImage.ts
+++ b/src/plugins/export/utils/downloadAsImage.ts
@@ -1,4 +1,4 @@
-import { type ExportFormat } from '../types'
+import type { ExportFormat } from '../types'
 
 export const downloadAsImage = (base64String: string, type: ExportFormat) => {
 	const link = document.createElement('a')
diff --git a/src/plugins/export/utils/getCanvasFromMap.ts b/src/plugins/export/utils/getCanvasFromMap.ts
index b46dc5af23..66a004a146 100644
--- a/src/plugins/export/utils/getCanvasFromMap.ts
+++ b/src/plugins/export/utils/getCanvasFromMap.ts
@@ -1,4 +1,4 @@
-import { Map } from 'ol'
+import type { Map } from 'ol'
 
 export function getCanvasFromMap(map: Map) {
 	const viewport = map.getViewport()
diff --git a/src/plugins/filter/components/FilterUI.spec.ts b/src/plugins/filter/components/FilterUI.spec.ts
index c7566ef92e..412d2fbe21 100644
--- a/src/plugins/filter/components/FilterUI.spec.ts
+++ b/src/plugins/filter/components/FilterUI.spec.ts
@@ -1,5 +1,7 @@
+import type { VueWrapper } from '@vue/test-utils'
+
 import { createTestingPinia } from '@pinia/testing'
-import { mount, VueWrapper } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import { test as _test, assert, expect, vi } from 'vitest'
 import { nextTick } from 'vue'
 
diff --git a/src/plugins/filter/index.ts b/src/plugins/filter/index.ts
index d6e3adc894..db30f9d792 100644
--- a/src/plugins/filter/index.ts
+++ b/src/plugins/filter/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { FilterPluginOptions } from './types'
 
 import component from './components/FilterUI.ce.vue'
 import locales from './locales'
 import { useFilterStore } from './store'
-import { type FilterPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which allows to filter arbitrary configurable vector layers by their properties.
diff --git a/src/plugins/filter/stores/category.ts b/src/plugins/filter/stores/category.ts
index 283c15cdf4..a4b2c5c370 100644
--- a/src/plugins/filter/stores/category.ts
+++ b/src/plugins/filter/stores/category.ts
@@ -1,6 +1,7 @@
+import type { Category, CategoryValue, FilterState } from '../types'
+
 import { acceptHMRUpdate, defineStore } from 'pinia'
 
-import { type Category, type CategoryValue, type FilterState } from '../types'
 import { flattenValue } from '../utils/flattenAndExpandValue'
 import { useFilterMainStore } from './main'
 
diff --git a/src/plugins/filter/stores/main.ts b/src/plugins/filter/stores/main.ts
index ccc7cc9755..02bd279ccb 100644
--- a/src/plugins/filter/stores/main.ts
+++ b/src/plugins/filter/stores/main.ts
@@ -1,14 +1,15 @@
+import type {
+	FilterConfiguration,
+	FilterPluginOptions,
+	FilterState,
+} from '../types'
+
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
 
 import { useCoreStore } from '@/core/stores'
 
-import {
-	type FilterConfiguration,
-	type FilterPluginOptions,
-	type FilterState,
-	PluginId,
-} from '../types'
+import { PluginId } from '../types'
 
 export const useFilterMainStore = defineStore('plugins/filter/main', () => {
 	const coreStore = useCoreStore()
diff --git a/src/plugins/filter/stores/time.ts b/src/plugins/filter/stores/time.ts
index 1f7151418c..3a978c73c6 100644
--- a/src/plugins/filter/stores/time.ts
+++ b/src/plugins/filter/stores/time.ts
@@ -1,12 +1,13 @@
+import type { Icon } from '@/core'
+import type { Time } from '../types'
+
 import { t } from 'i18next'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import type { Icon } from '@/core'
-
 import { useCoreStore } from '@/core/stores'
 
-import { PluginId, type Time } from '../types'
+import { PluginId } from '../types'
 import { useFilterMainStore } from './main'
 
 export const useFilterTimeStore = defineStore('plugins/filter/time', () => {
diff --git a/src/plugins/filter/utils/doesFeaturePassFilter.ts b/src/plugins/filter/utils/doesFeaturePassFilter.ts
index d18e307781..11a7ad63cc 100644
--- a/src/plugins/filter/utils/doesFeaturePassFilter.ts
+++ b/src/plugins/filter/utils/doesFeaturePassFilter.ts
@@ -1,7 +1,7 @@
-import { Feature } from 'ol'
-
 import type { FilterState } from '../types'
 
+import { Feature } from 'ol'
+
 import { parseDateWithPattern } from './parseDateWithPattern'
 
 /**
diff --git a/src/plugins/filter/utils/updateFeatureVisibility.ts b/src/plugins/filter/utils/updateFeatureVisibility.ts
index 7c85f10b86..feb5ad1b17 100644
--- a/src/plugins/filter/utils/updateFeatureVisibility.ts
+++ b/src/plugins/filter/utils/updateFeatureVisibility.ts
@@ -1,10 +1,10 @@
+import type { FilterState } from '../types'
+
 import { Feature } from 'ol'
 import VectorSource from 'ol/source/Vector'
 
 import { hideFeature, showFeature } from '@/lib/invisibleStyle'
 
-import type { FilterState } from '../types'
-
 import { doesFeaturePassFilter } from './doesFeaturePassFilter'
 
 /**
diff --git a/src/plugins/footer/index.ts b/src/plugins/footer/index.ts
index 26db59882f..f1b4c80cd6 100644
--- a/src/plugins/footer/index.ts
+++ b/src/plugins/footer/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { FooterPluginOptions } from './types'
 
 import component from './components/PolarFooter.ce.vue'
 import locales from './locales'
 import { useFooterStore } from './store'
-import { type FooterPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which adds the possibility to display various content as a
diff --git a/src/plugins/footer/store.ts b/src/plugins/footer/store.ts
index 5b1005f66c..8153a52bcd 100644
--- a/src/plugins/footer/store.ts
+++ b/src/plugins/footer/store.ts
@@ -4,11 +4,12 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type { Component } from 'vue'
+import type { PluginContainer } from '@/core'
+
 import { toMerged } from 'es-toolkit'
 import { acceptHMRUpdate, defineStore } from 'pinia'
-import { type Component, markRaw, ref } from 'vue'
-
-import type { PluginContainer } from '@/core'
+import { markRaw, ref } from 'vue'
 
 import { useCoreStore } from '@/core/stores'
 
diff --git a/src/plugins/fullscreen/components/FullscreenUI.spec.ts b/src/plugins/fullscreen/components/FullscreenUI.spec.ts
index 66cfead36b..db51139321 100644
--- a/src/plugins/fullscreen/components/FullscreenUI.spec.ts
+++ b/src/plugins/fullscreen/components/FullscreenUI.spec.ts
@@ -1,5 +1,7 @@
+import type { VueWrapper } from '@vue/test-utils'
+
 import { createTestingPinia } from '@pinia/testing'
-import { mount, VueWrapper } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import { test as _test, expect, vi } from 'vitest'
 import { nextTick } from 'vue'
 
diff --git a/src/plugins/fullscreen/index.ts b/src/plugins/fullscreen/index.ts
index 093166b57c..83077a7135 100644
--- a/src/plugins/fullscreen/index.ts
+++ b/src/plugins/fullscreen/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { FullscreenPluginOptions } from './types'
 
 import component from './components/FullscreenUI.ce.vue'
 import locales from './locales'
 import { useFullscreenStore } from './store'
-import { type FullscreenPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which provides a fullscreen mode with a fullscreen toggle button.
diff --git a/src/plugins/fullscreen/store.ts b/src/plugins/fullscreen/store.ts
index d746c1c81c..7ab019b7ff 100644
--- a/src/plugins/fullscreen/store.ts
+++ b/src/plugins/fullscreen/store.ts
@@ -5,13 +5,14 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { Reactive } from 'vue'
+import type { FullscreenPluginOptions } from './types'
 
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
 import { useCoreStore } from '@/core/stores'
 
-import { type FullscreenPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /* eslint-disable tsdoc/syntax */
 /**
diff --git a/src/plugins/geoLocation/components/GeoLocation.spec.ts b/src/plugins/geoLocation/components/GeoLocation.spec.ts
index 9abdf83838..fc786be745 100644
--- a/src/plugins/geoLocation/components/GeoLocation.spec.ts
+++ b/src/plugins/geoLocation/components/GeoLocation.spec.ts
@@ -1,5 +1,7 @@
+import type { VueWrapper } from '@vue/test-utils'
+
 import { createTestingPinia } from '@pinia/testing'
-import { mount, type VueWrapper } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import { test as _test, expect, vi } from 'vitest'
 
 import { mockedT } from '@/test/utils/mockI18n'
diff --git a/src/plugins/geoLocation/index.ts b/src/plugins/geoLocation/index.ts
index 2aebd2502a..8cfae4bf97 100644
--- a/src/plugins/geoLocation/index.ts
+++ b/src/plugins/geoLocation/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { GeoLocationPluginOptions } from './types'
 
 import component from './components/GeoLocation.ce.vue'
 import locales from './locales'
 import { useGeoLocationStore } from './store'
-import { type GeoLocationPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * The GeoLocation plugin is responsible for collecting and displaying a user's
diff --git a/src/plugins/geoLocation/store.ts b/src/plugins/geoLocation/store.ts
index 994b141af2..7d839c3c36 100644
--- a/src/plugins/geoLocation/store.ts
+++ b/src/plugins/geoLocation/store.ts
@@ -6,6 +6,7 @@
 
 import type { Coordinate } from 'ol/coordinate'
 import type { ObjectEvent } from 'ol/Object'
+import type { GeoLocationPluginOptions, PluginState } from './types'
 
 import { noop, toMerged } from 'es-toolkit'
 import { t } from 'i18next'
@@ -26,11 +27,7 @@ import { notifyUser } from '@/lib/notifyUser'
 import { passesBoundaryCheck } from '@/lib/passesBoundaryCheck'
 import { getTooltip } from '@/lib/tooltip'
 
-import {
-	type GeoLocationPluginOptions,
-	PluginId,
-	type PluginState,
-} from './types'
+import { PluginId } from './types'
 import { detectDeniedGeolocationEarly } from './utils/detectDeniedGeolocationEarly'
 import { getGeoLocationStyle } from './utils/olStyle'
 import { positionChanged } from './utils/positionChanged'
diff --git a/src/plugins/iconMenu/components/StandardFocusMenu.ce.vue b/src/plugins/iconMenu/components/StandardFocusMenu.ce.vue
index 5533ccf9a0..9080f88540 100644
--- a/src/plugins/iconMenu/components/StandardFocusMenu.ce.vue
+++ b/src/plugins/iconMenu/components/StandardFocusMenu.ce.vue
@@ -27,17 +27,19 @@
 </template>
 
 <script setup lang="ts">
+import type { Component } from 'vue'
+import type { Icon } from '@/core'
+import type { Menu } from '../types'
+
 import { t } from 'i18next'
 import { storeToRefs } from 'pinia'
-import { type Component, computed, markRaw, ref } from 'vue'
-
-import type { Icon } from '@/core'
+import { computed, markRaw, ref } from 'vue'
 
 import KernButton from '@/components/kern/KernButton.ce.vue'
 import { useCoreStore } from '@/core/stores'
 
 import { useIconMenuStore } from '../store'
-import { type Menu, PluginId } from '../types'
+import { PluginId } from '../types'
 
 const props = defineProps<{
 	menus: (Menu & { buttonClass: string; icon: Icon })[]
diff --git a/src/plugins/iconMenu/components/StandardMenuList.ce.vue b/src/plugins/iconMenu/components/StandardMenuList.ce.vue
index 39a5b171f2..1b0df4448f 100644
--- a/src/plugins/iconMenu/components/StandardMenuList.ce.vue
+++ b/src/plugins/iconMenu/components/StandardMenuList.ce.vue
@@ -40,9 +40,11 @@
 </template>
 
 <script setup lang="ts">
+import type { Component } from 'vue'
+import type { Menu } from '../types'
+
 import { storeToRefs } from 'pinia'
 import {
-	type Component,
 	computed,
 	nextTick,
 	onBeforeUnmount,
@@ -56,7 +58,7 @@ import PolarIconButton from '@/components/PolarIconButton.ce.vue'
 import { useCoreStore } from '@/core/stores'
 
 import { useIconMenuStore } from '../store'
-import { type Menu, PluginId } from '../types'
+import { PluginId } from '../types'
 
 withDefaults(
 	defineProps<{
diff --git a/src/plugins/iconMenu/index.ts b/src/plugins/iconMenu/index.ts
index 9ad576f24a..d42418a049 100644
--- a/src/plugins/iconMenu/index.ts
+++ b/src/plugins/iconMenu/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { IconMenuPluginOptions } from './types'
 
 import component from './components/IconMenu.ce.vue'
 import locales from './locales'
 import { useIconMenuStore } from './store'
-import { type IconMenuPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which adds the possibility to open various functionality as
diff --git a/src/plugins/iconMenu/store.ts b/src/plugins/iconMenu/store.ts
index cd81881e2c..30a638d72c 100644
--- a/src/plugins/iconMenu/store.ts
+++ b/src/plugins/iconMenu/store.ts
@@ -4,16 +4,18 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type { Component } from 'vue'
+import type { Icon } from '@/core'
+import type { Menu } from './types'
+
 import { toMerged } from 'es-toolkit'
 import { t } from 'i18next'
 import { acceptHMRUpdate, defineStore } from 'pinia'
-import { type Component, computed, markRaw, ref } from 'vue'
-
-import type { Icon } from '@/core'
+import { computed, markRaw, ref } from 'vue'
 
 import { useCoreStore } from '@/core/stores'
 
-import { type Menu, PluginId } from './types'
+import { PluginId } from './types'
 
 /* eslint-disable tsdoc/syntax */
 /**
diff --git a/src/plugins/iconMenu/types.ts b/src/plugins/iconMenu/types.ts
index c710026a58..111b4ac4f9 100644
--- a/src/plugins/iconMenu/types.ts
+++ b/src/plugins/iconMenu/types.ts
@@ -1,5 +1,4 @@
 import type { Component } from 'vue'
-
 import type { Icon, PluginContainer, PluginOptions } from '@/core'
 import type { NineLayoutTag } from '@/core/utils/NineLayoutTag.ts'
 
diff --git a/src/plugins/layerChooser/components/LayerLegend.ce.vue b/src/plugins/layerChooser/components/LayerLegend.ce.vue
index e1498f044b..790ee53c13 100644
--- a/src/plugins/layerChooser/components/LayerLegend.ce.vue
+++ b/src/plugins/layerChooser/components/LayerLegend.ce.vue
@@ -22,10 +22,12 @@
 </template>
 
 <script setup lang="ts">
+import type { LayerLegend } from '../types'
+
 import { computed } from 'vue'
 
 import { useLayerChooserStore } from '../store'
-import { type LayerLegend, PluginId } from '../types'
+import { PluginId } from '../types'
 import LayerInformationCard from './LayerInformationCard.ce.vue'
 
 const layerChooserStore = useLayerChooserStore()
diff --git a/src/plugins/layerChooser/components/LayerOptions.ce.vue b/src/plugins/layerChooser/components/LayerOptions.ce.vue
index 76cd5da5e3..e37839d6b0 100644
--- a/src/plugins/layerChooser/components/LayerOptions.ce.vue
+++ b/src/plugins/layerChooser/components/LayerOptions.ce.vue
@@ -30,8 +30,10 @@
 </template>
 
 <script setup lang="ts">
-import Layer from 'ol/layer/Layer'
-import { ImageWMS, TileWMS } from 'ol/source'
+import type Layer from 'ol/layer/Layer'
+import type { ImageWMS, TileWMS } from 'ol/source'
+import type { LayerOptions } from '../types'
+
 import { storeToRefs } from 'pinia'
 import { computed, onMounted, ref } from 'vue'
 
@@ -40,7 +42,7 @@ import PolarInputGroup from '@/components/PolarInputGroup.ce.vue'
 import { useCoreStore } from '@/core/stores'
 
 import { useLayerChooserStore } from '../store'
-import { type LayerOptions, PluginId } from '../types'
+import { PluginId } from '../types'
 import LayerInformationCard from './LayerInformationCard.ce.vue'
 
 const coreStore = useCoreStore()
diff --git a/src/plugins/layerChooser/store.ts b/src/plugins/layerChooser/store.ts
index 30fb35e122..4d08b002e9 100644
--- a/src/plugins/layerChooser/store.ts
+++ b/src/plugins/layerChooser/store.ts
@@ -4,18 +4,17 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type Layer from 'ol/layer/Layer'
+import type { ImageWMS, TileWMS } from 'ol/source'
+import type { LayerConfiguration } from '@/core'
+import type { LayerLegend, LayerOptions } from './types'
+
 import { toMerged } from 'es-toolkit'
-import Layer from 'ol/layer/Layer'
-import { ImageWMS, TileWMS } from 'ol/source'
 import { defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
 
-import type { LayerConfiguration } from '@/core'
-
 import { useCoreStore } from '@/core/stores'
 
-import type { LayerLegend, LayerOptions } from './types'
-
 import { areLayersActive } from './utils/areLayersActive'
 import {
 	loadCapabilities,
diff --git a/src/plugins/layerChooser/utils/capabilities.ts b/src/plugins/layerChooser/utils/capabilities.ts
index 583f0c9011..079871a872 100644
--- a/src/plugins/layerChooser/utils/capabilities.ts
+++ b/src/plugins/layerChooser/utils/capabilities.ts
@@ -1,9 +1,9 @@
+import type { LayerConfiguration, LayerConfigurationOptionLayers } from '@/core'
+
 import { rawLayerList } from '@masterportal/masterportalapi'
 import { toMerged } from 'es-toolkit'
 import WMSCapabilities from 'ol/format/WMSCapabilities'
 
-import type { LayerConfiguration, LayerConfigurationOptionLayers } from '@/core'
-
 import {
 	findLayerTitleInCapabilitiesByName,
 	findLegendUrlInCapabilitiesByName,
diff --git a/src/plugins/layerChooser/utils/getBackgroundsAndMasks.ts b/src/plugins/layerChooser/utils/getBackgroundsAndMasks.ts
index 9800545991..763e781c1c 100644
--- a/src/plugins/layerChooser/utils/getBackgroundsAndMasks.ts
+++ b/src/plugins/layerChooser/utils/getBackgroundsAndMasks.ts
@@ -1,7 +1,7 @@
-import { rawLayerList } from '@masterportal/masterportalapi'
-
 import type { LayerConfiguration } from '@/core'
 
+import { rawLayerList } from '@masterportal/masterportalapi'
+
 export const getBackgroundsAndMasks = (
 	layers: LayerConfiguration[]
 ): [LayerConfiguration[], LayerConfiguration[]] =>
diff --git a/src/plugins/layerChooser/utils/prepareLegends.ts b/src/plugins/layerChooser/utils/prepareLegends.ts
index 6fec610c81..203a5cd6a0 100644
--- a/src/plugins/layerChooser/utils/prepareLegends.ts
+++ b/src/plugins/layerChooser/utils/prepareLegends.ts
@@ -1,10 +1,9 @@
-import { layerLib, rawLayerList } from '@masterportal/masterportalapi'
-import { toMerged } from 'es-toolkit'
-
 import type { LayerConfiguration } from '@/core'
-
 import type { LayerLegend } from '../types'
 
+import { layerLib, rawLayerList } from '@masterportal/masterportalapi'
+import { toMerged } from 'es-toolkit'
+
 export const prepareLegends = (
 	layers: LayerConfiguration[]
 ): Record<string, LayerLegend> =>
diff --git a/src/plugins/loadingIndicator/index.ts b/src/plugins/loadingIndicator/index.ts
index 211cf3a848..f697eb4319 100644
--- a/src/plugins/loadingIndicator/index.ts
+++ b/src/plugins/loadingIndicator/index.ts
@@ -5,10 +5,11 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { LoadingIndicatorOptions } from './types'
 
 import component from './components/LoadingIndicator.ce.vue'
 import { useLoadingIndicatorStore } from './store'
-import { type LoadingIndicatorOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin that offers a generic loading indicator that may be used by
diff --git a/src/plugins/loadingIndicator/types.ts b/src/plugins/loadingIndicator/types.ts
index 493c3dd48a..25fa8c6005 100644
--- a/src/plugins/loadingIndicator/types.ts
+++ b/src/plugins/loadingIndicator/types.ts
@@ -1,5 +1,4 @@
 import type { PluginOptions } from '@/core'
-
 import type { LoaderStyles } from './store'
 
 export const PluginId = 'loadingIndicator'
diff --git a/src/plugins/pins/index.ts b/src/plugins/pins/index.ts
index b0508ac1cf..72fd4bd796 100644
--- a/src/plugins/pins/index.ts
+++ b/src/plugins/pins/index.ts
@@ -5,10 +5,11 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { PinsPluginOptions } from './types'
 
 import locales from './locales'
 import { usePinsStore } from './store'
-import { type PinsPluginOptions, PluginId } from './types'
+import { PluginId } from './types'
 
 /**
  * Pins plugin for POLAR that adds map interactions to client that allow users
diff --git a/src/plugins/pins/store.ts b/src/plugins/pins/store.ts
index 520821263e..1b1032099a 100644
--- a/src/plugins/pins/store.ts
+++ b/src/plugins/pins/store.ts
@@ -7,6 +7,8 @@
 import type { GeoJsonGeometryTypes, Point as GeoJsonPoint } from 'geojson'
 import type { MapBrowserEvent } from 'ol'
 import type { Coordinate } from 'ol/coordinate'
+import type { PolarGeoJsonFeature } from '@/core'
+import type { PinMovable, PinsPluginOptions } from './types'
 
 import { toMerged } from 'es-toolkit'
 import { pointerMove } from 'ol/events/condition'
@@ -19,13 +21,9 @@ import { Vector } from 'ol/source'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-import type { PolarGeoJsonFeature } from '@/core'
-
 import { usePluginStoreWatcher } from '@/composables/usePluginStoreWatcher'
 import { useCoreStore } from '@/core/stores'
 
-import type { PinMovable, PinsPluginOptions } from './types'
-
 import { getPinStyle } from './utils/getPinStyle'
 import { getPointCoordinate } from './utils/getPointCoordinate'
 import { isCoordinateInBoundaryLayer } from './utils/isCoordinateInBoundaryLayer'
diff --git a/src/plugins/pins/utils/getPinStyle.ts b/src/plugins/pins/utils/getPinStyle.ts
index 5528490af5..8d5f033cc0 100644
--- a/src/plugins/pins/utils/getPinStyle.ts
+++ b/src/plugins/pins/utils/getPinStyle.ts
@@ -1,7 +1,7 @@
-import { Icon, Style } from 'ol/style'
-
 import type { PinStyle } from '../types'
 
+import { Icon, Style } from 'ol/style'
+
 import { getPinSvg } from './getPinSvg'
 
 export const getPinStyle = ({
diff --git a/src/plugins/pins/utils/isCoordinateInBoundaryLayer.ts b/src/plugins/pins/utils/isCoordinateInBoundaryLayer.ts
index 83f0ef8c18..bdf8837de4 100644
--- a/src/plugins/pins/utils/isCoordinateInBoundaryLayer.ts
+++ b/src/plugins/pins/utils/isCoordinateInBoundaryLayer.ts
@@ -1,10 +1,9 @@
 import type { Map } from 'ol'
 import type { Coordinate } from 'ol/coordinate'
+import type { BoundaryOptions } from '@/core'
 
 import { t } from 'i18next'
 
-import type { BoundaryOptions } from '@/core'
-
 import { notifyUser } from '@/lib/notifyUser'
 import { passesBoundaryCheck } from '@/lib/passesBoundaryCheck'
 
diff --git a/src/plugins/pointerPosition/index.ts b/src/plugins/pointerPosition/index.ts
index c65a47bd38..06fcc4bbe7 100644
--- a/src/plugins/pointerPosition/index.ts
+++ b/src/plugins/pointerPosition/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { PointerPositionPluginOptions } from './types'
 
 import component from './components/PointerPosition.ce.vue'
 import locales from './locales'
 import { usePointerPositionStore } from './store'
-import { PluginId, type PointerPositionPluginOptions } from './types'
+import { PluginId } from './types'
 
 /**
  * The PointerPosition plugin makes the current/last pointer position visible
diff --git a/src/plugins/pointerPosition/store.ts b/src/plugins/pointerPosition/store.ts
index 4364abce7f..eab6e9e0a9 100644
--- a/src/plugins/pointerPosition/store.ts
+++ b/src/plugins/pointerPosition/store.ts
@@ -4,7 +4,9 @@
  */
 /* eslint-enable tsdoc/syntax */
 
-import { type Coordinate, createStringXY } from 'ol/coordinate'
+import type { Coordinate } from 'ol/coordinate'
+
+import { createStringXY } from 'ol/coordinate'
 import { transform } from 'ol/proj'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { computed, ref } from 'vue'
diff --git a/src/plugins/reverseGeocoder/index.ts b/src/plugins/reverseGeocoder/index.ts
index 2b709dcd09..fb6f0e31c6 100644
--- a/src/plugins/reverseGeocoder/index.ts
+++ b/src/plugins/reverseGeocoder/index.ts
@@ -5,9 +5,10 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { ReverseGeocoderPluginOptions } from './types'
 
 import { useReverseGeocoderStore } from './store'
-import { PluginId, type ReverseGeocoderPluginOptions } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which converts coordinates into addresses.
diff --git a/src/plugins/reverseGeocoder/store.ts b/src/plugins/reverseGeocoder/store.ts
index 1b22bdb537..66a5f1e828 100644
--- a/src/plugins/reverseGeocoder/store.ts
+++ b/src/plugins/reverseGeocoder/store.ts
@@ -5,21 +5,22 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { Mock } from 'vitest'
+import type { Reactive } from 'vue'
+import type {
+	ReverseGeocoderFeature,
+	ReverseGeocoderPluginOptions,
+} from './types'
 
 import { easeOut } from 'ol/easing'
 import { Point } from 'ol/geom'
 import { acceptHMRUpdate, defineStore } from 'pinia'
-import { computed, type Reactive, ref, toRaw } from 'vue'
+import { computed, ref, toRaw } from 'vue'
 
 import { usePluginStoreWatcher } from '@/composables/usePluginStoreWatcher'
 import { useCoreStore } from '@/core/stores'
 import { indicateLoading } from '@/lib/indicateLoading'
 
-import {
-	PluginId,
-	type ReverseGeocoderFeature,
-	type ReverseGeocoderPluginOptions,
-} from './types'
+import { PluginId } from './types'
 import { reverseGeocode as reverseGeocodeUtil } from './utils/reverseGeocode'
 
 /* eslint-disable tsdoc/syntax */
diff --git a/src/plugins/reverseGeocoder/types.ts b/src/plugins/reverseGeocoder/types.ts
index 4a7e962e78..9a00697cf7 100644
--- a/src/plugins/reverseGeocoder/types.ts
+++ b/src/plugins/reverseGeocoder/types.ts
@@ -1,5 +1,4 @@
 import type { Feature } from 'geojson'
-
 import type { PluginOptions, StoreReference } from '@/core'
 
 /**
diff --git a/src/plugins/reverseGeocoder/utils/reverseGeocode.ts b/src/plugins/reverseGeocoder/utils/reverseGeocode.ts
index 5aa8d0700f..74c66770b4 100644
--- a/src/plugins/reverseGeocoder/utils/reverseGeocode.ts
+++ b/src/plugins/reverseGeocoder/utils/reverseGeocode.ts
@@ -1,7 +1,7 @@
-import { Parser, processors } from 'xml2js'
-
 import type { ReverseGeocoderFeature } from '../types'
 
+import { Parser, processors } from 'xml2js'
+
 const buildPostBody = ([x, y]: [number, number]) => `<wps:Execute
 	xmlns:wps='http://www.opengis.net/wps/1.0.0'
 	xmlns:xlink='http://www.w3.org/1999/xlink'
diff --git a/src/plugins/scale/index.ts b/src/plugins/scale/index.ts
index 1cd76b8ae6..5ac717e36f 100644
--- a/src/plugins/scale/index.ts
+++ b/src/plugins/scale/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { ScalePluginOptions } from './types'
 
 import component from './components/ScaleWidget.ce.vue'
 import locales from './locales'
 import { useScaleStore } from './store'
-import { PluginId, type ScalePluginOptions } from './types'
+import { PluginId } from './types'
 
 export { beautifyScale } from './utils/beautifyScale'
 export { calculateScaleFromResolution } from './utils/calculateScaleFromResolution'
diff --git a/src/plugins/scale/utils/calculateScaleFromResolution.ts b/src/plugins/scale/utils/calculateScaleFromResolution.ts
index ee1e223914..9c8f58d175 100644
--- a/src/plugins/scale/utils/calculateScaleFromResolution.ts
+++ b/src/plugins/scale/utils/calculateScaleFromResolution.ts
@@ -1,4 +1,6 @@
-import { METERS_PER_UNIT, type Units } from 'ol/proj/Units'
+import type { Units } from 'ol/proj/Units'
+
+import { METERS_PER_UNIT } from 'ol/proj/Units'
 
 /**
  * Calculates the current scale from given parameters.
diff --git a/src/plugins/toast/components/ToastUI.ce.vue b/src/plugins/toast/components/ToastUI.ce.vue
index a1b18097f9..40c5918823 100644
--- a/src/plugins/toast/components/ToastUI.ce.vue
+++ b/src/plugins/toast/components/ToastUI.ce.vue
@@ -23,13 +23,15 @@
 </template>
 
 <script setup lang="ts">
+import type { ToastSeverity } from '../types'
+
 import { computed } from 'vue'
 
 import KernButton from '@/components/kern/KernButton.ce.vue'
 import { getCssColor } from '@/lib/getCssColor'
 
 import { useToastStore } from '../store'
-import { PluginId, type ToastSeverity } from '../types'
+import { PluginId } from '../types'
 
 const store = useToastStore()
 
diff --git a/src/plugins/toast/components/ToastUI.spec.ts b/src/plugins/toast/components/ToastUI.spec.ts
index aad13cf893..b34809c1f3 100644
--- a/src/plugins/toast/components/ToastUI.spec.ts
+++ b/src/plugins/toast/components/ToastUI.spec.ts
@@ -1,5 +1,7 @@
+import type { VueWrapper } from '@vue/test-utils'
+
 import { createTestingPinia } from '@pinia/testing'
-import { mount, VueWrapper } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import { test as _test, expect, vi } from 'vitest'
 import { nextTick } from 'vue'
 
diff --git a/src/plugins/toast/index.ts b/src/plugins/toast/index.ts
index 5cc168d7b7..b787d2ab56 100644
--- a/src/plugins/toast/index.ts
+++ b/src/plugins/toast/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { ToastPluginOptions } from './types'
 
 import component from './components/ToastContainer.ce.vue'
 import locales from './locales'
 import { useToastStore } from './store'
-import { PluginId, type ToastPluginOptions } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which provides toast messages.
diff --git a/src/plugins/toast/store.ts b/src/plugins/toast/store.ts
index f3e69f8975..ca01968483 100644
--- a/src/plugins/toast/store.ts
+++ b/src/plugins/toast/store.ts
@@ -4,20 +4,22 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type { Reactive } from 'vue'
+import type {
+	Toast,
+	ToastOptions,
+	ToastPluginOptions,
+	ToastSeverity,
+	ToastTheme,
+} from './types'
+
 import { toMerged } from 'es-toolkit'
 import { acceptHMRUpdate, defineStore } from 'pinia'
-import { computed, type Reactive, ref, toRaw } from 'vue'
+import { computed, ref, toRaw } from 'vue'
 
 import { useCoreStore } from '@/core/stores'
 
-import {
-	PluginId,
-	type Toast,
-	type ToastOptions,
-	type ToastPluginOptions,
-	type ToastSeverity,
-	type ToastTheme,
-} from './types'
+import { PluginId } from './types'
 
 interface ToastItem {
 	toast: Toast
diff --git a/src/plugins/toast/types.ts b/src/plugins/toast/types.ts
index c29ff6bf65..7df62f0f9d 100644
--- a/src/plugins/toast/types.ts
+++ b/src/plugins/toast/types.ts
@@ -1,5 +1,4 @@
 import type { Ref } from 'vue'
-
 import type { Color, Icon, PluginOptions } from '@/core'
 
 /**
diff --git a/src/plugins/zoom/index.ts b/src/plugins/zoom/index.ts
index 19e7899698..98f493da85 100644
--- a/src/plugins/zoom/index.ts
+++ b/src/plugins/zoom/index.ts
@@ -5,11 +5,12 @@
 /* eslint-enable tsdoc/syntax */
 
 import type { PluginContainer, PolarPluginStore } from '@/core'
+import type { ZoomPluginOptions } from './types'
 
 import component from './components/ZoomUI.ce.vue'
 import locales from './locales'
 import { useZoomStore } from './store'
-import { PluginId, type ZoomPluginOptions } from './types'
+import { PluginId } from './types'
 
 /**
  * Creates a plugin which provides UI and functionality regarding zooming.
diff --git a/src/plugins/zoom/store.ts b/src/plugins/zoom/store.ts
index 43c7c3921a..c88aa97445 100644
--- a/src/plugins/zoom/store.ts
+++ b/src/plugins/zoom/store.ts
@@ -4,12 +4,15 @@
  */
 /* eslint-enable tsdoc/syntax */
 
+import type { ComputedRef } from 'vue'
+import type { ZoomPluginOptions } from './types'
+
 import { acceptHMRUpdate, defineStore } from 'pinia'
-import { computed, type ComputedRef } from 'vue'
+import { computed } from 'vue'
 
 import { useCoreStore } from '@/core/stores'
 
-import { PluginId, type ZoomPluginOptions } from './types'
+import { PluginId } from './types'
 
 /* eslint-disable tsdoc/syntax */
 /**