diff --git a/scm-ui/ui-api/package.json b/scm-ui/ui-api/package.json
index e6cc7f54b6..6516f6815b 100644
--- a/scm-ui/ui-api/package.json
+++ b/scm-ui/ui-api/package.json
@@ -19,29 +19,29 @@
     "depcheck": "depcheck"
   },
   "peerDependencies": {
+    "react": "^17.0.1",
+    "query-string": "6.14.1",
+    "react-query": "^3.39.2",
+    "react-router-dom": "^5.3.1",
+    "react-i18next": "11"
+  },
+  "devDependencies": {
+    "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
+    "tsup": "^5.12.6",
+    "@types/react-test-renderer": "^17.0.1",
     "@scm-manager/babel-preset": "^2.13.1",
     "@scm-manager/eslint-config": "^2.17.0",
     "@scm-manager/jest-preset": "^2.14.1",
     "@scm-manager/prettier-config": "^2.12.0",
     "@scm-manager/tsconfig": "^2.13.0",
+    "@testing-library/react-hooks": "8.0.1",
     "@types/react": "^17.0.1",
     "react-test-renderer": "^17.0.1",
     "fetch-mock": "^7.5.1",
-    "gitdiff-parser": "^0.2.2",
-    "react": "^17.0.1",
-    "query-string": "6.14.1",
-    "react-query": "^3.39.2",
-    "react-router-dom": "^5.3.1",
-    "react-i18next": "11",
-    "@testing-library/react-hooks": "8.0.1"
-  },
-  "devDependencies": {
-    "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
-    "tsup": "^5.12.6",
-    "@types/react-test-renderer": "^17.0.1"
+    "fetch-mock-jest": "^1.5.1"
   },
   "dependencies": {
-    "fetch-mock-jest": "^1.5.1"
+    "gitdiff-parser": "^0.2.2"
   },
   "babel": {
     "presets": [
diff --git a/scm-ui/ui-buttons/package.json b/scm-ui/ui-buttons/package.json
index d729dc0c96..8317eca0a4 100644
--- a/scm-ui/ui-buttons/package.json
+++ b/scm-ui/ui-buttons/package.json
@@ -8,9 +8,6 @@
     "depcheck": "depcheck"
   },
   "peerDependencies": {
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/tsconfig": "^2.13.0",
     "react": "^17.0.1",
     "react-router-dom": "^5.3.1",
     "classnames": "^2.3.1"
@@ -18,6 +15,11 @@
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT"
   },
+  "devDependencies": {
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/tsconfig": "^2.13.0"
+  },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
     "extends": "@scm-manager/eslint-config"
diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json
index 5bf2de4a4d..4728307f0b 100644
--- a/scm-ui/ui-components/package.json
+++ b/scm-ui/ui-components/package.json
@@ -20,12 +20,26 @@
     "depcheck": "depcheck"
   },
   "peerDependencies": {
-    "@scm-manager/babel-preset": "^2.13.1",
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/jest-preset": "^2.14.1",
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/tsconfig": "^2.13.0",
-    "decode-named-character-reference": "^1.0.1",
+    "@headlessui/react": "^1.7.17",
+    "classnames": "^2.3.1",
+    "date-fns": "^2.4.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "react-i18next": "11",
+    "react-router-dom": "^5.3.1",
+    "styled-components": "^5.3.5",
+    "i18next": "21",
+    "react-query": "^3.39.2"
+  },
+  "devDependencies": {
+    "@scm-manager/ui-tests": "3.5.1-SNAPSHOT",
+    "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
+    "@types/fetch-mock": "^7.3.1",
+    "@types/react-select": "^2.0.19",
+    "@types/unist": "^2.0.3",
+    "gitdiff-parser": "^0.2.2",
+    "i18next-fetch-backend": "4",
+    "webpack": "^5.72.0",
     "@storybook/addon-actions": "^6.5.10",
     "@storybook/addon-essentials": "^6.5.10",
     "@storybook/addon-interactions": "^6.5.10",
@@ -46,27 +60,15 @@
     "mini-css-extract-plugin": "^2.4.3",
     "react-test-renderer": "^17.0.1",
     "sass-loader": "^12.3.0",
-    "@headlessui/react": "^1.7.17",
-    "classnames": "^2.3.1",
-    "date-fns": "^2.4.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-i18next": "11",
-    "react-router-dom": "^5.3.1",
-    "styled-components": "^5.3.5",
-    "i18next": "21",
-    "react-query": "^3.39.2",
-    "@types/react-test-renderer": "^17.0.1"
-  },
-  "devDependencies": {
-    "@scm-manager/ui-tests": "3.5.1-SNAPSHOT",
-    "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
-    "@types/fetch-mock": "^7.3.1",
-    "@types/react-select": "^2.0.19",
-    "@types/unist": "^2.0.3",
-    "gitdiff-parser": "^0.2.2",
-    "i18next-fetch-backend": "4",
-    "webpack": "^5.72.0"
+    "@types/react-test-renderer": "^17.0.1",
+    "decode-named-character-reference": "^1.0.1",
+    "@scm-manager/babel-preset": "^2.13.1",
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/jest-preset": "^2.14.1",
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/tsconfig": "^2.13.0",
+    "@scm-manager/ui-syntaxhighlighting": "3.5.1-SNAPSHOT",
+    "@scm-manager/ui-text": "3.5.1-SNAPSHOT"
   },
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT",
@@ -74,8 +76,6 @@
     "@scm-manager/ui-layout": "3.5.1-SNAPSHOT",
     "@scm-manager/ui-buttons": "3.5.1-SNAPSHOT",
     "@scm-manager/ui-shortcuts": "3.5.1-SNAPSHOT",
-    "@scm-manager/ui-syntaxhighlighting": "3.5.1-SNAPSHOT",
-    "@scm-manager/ui-text": "3.5.1-SNAPSHOT",
     "@scm-manager/ui-api": "3.5.1-SNAPSHOT",
     "@scm-manager/ui-extensions": "3.5.1-SNAPSHOT",
     "deepmerge": "^4.2.2",
diff --git a/scm-ui/ui-core/package.json b/scm-ui/ui-core/package.json
index 5839027e14..89a6b47b1e 100644
--- a/scm-ui/ui-core/package.json
+++ b/scm-ui/ui-core/package.json
@@ -9,10 +9,6 @@
     "build-storybook": "build-storybook"
   },
   "peerDependencies": {
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/tsconfig": "^2.12.0",
-    "@scm-manager/babel-preset": "^2.13.1",
     "@headlessui/react": "^1.7.17",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
@@ -21,8 +17,7 @@
     "react-hook-form": "^7.33.1",
     "react-i18next": "11",
     "react-query": "^3.39.2",
-    "styled-components": "5",
-    "babel-loader": "^8.2.5"
+    "styled-components": "5"
   },
   "dependencies": {
     "@scm-manager/ui-api": "3.5.1-SNAPSHOT",
@@ -38,6 +33,10 @@
     "mousetrap": "1.6.5"
   },
   "devDependencies": {
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/tsconfig": "^2.12.0",
+    "@scm-manager/babel-preset": "^2.13.1",
     "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
     "@types/mousetrap": "1.6.5",
     "@testing-library/react-hooks": "8.0.1",
@@ -66,7 +65,8 @@
     "@babel/core": "^7.19.0",
     "i18next": "21",
     "i18next-fetch-backend": "4",
-    "jest-extended": "3.1.0"
+    "jest-extended": "3.1.0",
+    "babel-loader": "^8.2.5"
   },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json
index 51effb7e55..622a519af4 100644
--- a/scm-ui/ui-extensions/package.json
+++ b/scm-ui/ui-extensions/package.json
@@ -18,6 +18,11 @@
     "depcheck": "depcheck"
   },
   "peerDependencies": {
+    "react": "^17.0.1"
+  },
+  "devDependencies": {
+    "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
+    "@scm-manager/ui-tests": "3.5.1-SNAPSHOT",
     "@scm-manager/babel-preset": "^2.13.1",
     "@scm-manager/eslint-config": "^2.17.0",
     "@scm-manager/jest-preset": "^2.14.1",
@@ -26,12 +31,7 @@
     "@types/enzyme": "^3.10.18",
     "@types/react": "^17.0.1",
     "tsup": "^5.12.6",
-    "enzyme": "^3.11.0",
-    "react": "^17.0.1"
-  },
-  "devDependencies": {
-    "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
-    "@scm-manager/ui-tests": "3.5.1-SNAPSHOT"
+    "enzyme": "^3.11.0"
   },
   "babel": {
     "presets": [
diff --git a/scm-ui/ui-forms/package.json b/scm-ui/ui-forms/package.json
index 76a1d5d610..e0f05619c2 100644
--- a/scm-ui/ui-forms/package.json
+++ b/scm-ui/ui-forms/package.json
@@ -8,9 +8,6 @@
   },
   "license": "AGPL-3.0-only",
   "peerDependencies": {
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/tsconfig": "^2.13.0",
     "@radix-ui/react-slot": "^1.0.1",
     "@radix-ui/react-visually-hidden": "^1.0.3",
     "@headlessui/react": "^1.7.17",
@@ -26,6 +23,11 @@
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT"
   },
+  "devDependencies": {
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/tsconfig": "^2.13.0"
+  },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
     "extends": "@scm-manager/eslint-config"
diff --git a/scm-ui/ui-layout/package.json b/scm-ui/ui-layout/package.json
index 6a8a7cd197..6b784277ff 100644
--- a/scm-ui/ui-layout/package.json
+++ b/scm-ui/ui-layout/package.json
@@ -8,9 +8,6 @@
   },
   "license": "AGPL-3.0-only",
   "peerDependencies": {
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/tsconfig": "^2.13.0",
     "@radix-ui/react-collapsible": "^1.0.3",
     "classnames": "^2.3.1",
     "styled-components": "^5.3.5",
@@ -19,6 +16,11 @@
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT"
   },
+  "devDependencies": {
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/tsconfig": "^2.13.0"
+  },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
     "extends": "@scm-manager/eslint-config"
diff --git a/scm-ui/ui-legacy/package.json b/scm-ui/ui-legacy/package.json
index 48fdbfb2be..d450be4906 100644
--- a/scm-ui/ui-legacy/package.json
+++ b/scm-ui/ui-legacy/package.json
@@ -20,17 +20,17 @@
   },
   "devDependencies": {
     "@scm-manager/ui-types": "3.5.1-SNAPSHOT",
-    "@types/react-redux": "5.0.7"
-  },
-  "peerDependencies": {
+    "@types/react-redux": "5.0.7",
     "@scm-manager/babel-preset": "^2.13.1",
     "@scm-manager/eslint-config": "^2.17.0",
     "@scm-manager/jest-preset": "^2.14.1",
     "@scm-manager/prettier-config": "^2.12.0",
     "@types/react": "^17.0.1",
-    "react": "^17.0.1",
     "tsup": "^5.12.6"
   },
+  "peerDependencies": {
+    "react": "^17.0.1"
+  },
   "babel": {
     "presets": [
       "@scm-manager/babel-preset"
diff --git a/scm-ui/ui-overlays/package.json b/scm-ui/ui-overlays/package.json
index 83218451b3..df02319e0f 100644
--- a/scm-ui/ui-overlays/package.json
+++ b/scm-ui/ui-overlays/package.json
@@ -8,9 +8,6 @@
   },
   "license": "AGPL-3.0-only",
   "peerDependencies": {
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/tsconfig": "^2.13.0",
     "@radix-ui/react-dialog": "1.0.4",
     "@radix-ui/react-tooltip": "1.0.2",
     "@radix-ui/react-dropdown-menu": "2.0.5",
@@ -24,6 +21,11 @@
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT"
   },
+  "devDependencies": {
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/tsconfig": "^2.13.0"
+  },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
     "extends": "@scm-manager/eslint-config"
diff --git a/scm-ui/ui-plugins/.depcheckrc b/scm-ui/ui-plugins/.depcheckrc
index e27c51423c..058e245994 100644
--- a/scm-ui/ui-plugins/.depcheckrc
+++ b/scm-ui/ui-plugins/.depcheckrc
@@ -1 +1,21 @@
-ignores: ["redux", "react-redux", "@scm-manager/plugin-scripts", "@scm-manager/ui-tests", "@scm-manager/ui-types", "@types/i18next", "@types/jest", "@types/react-redux", "jest"]
+ignores: [
+  "redux",
+  "react-redux",
+  "@scm-manager/plugin-scripts",
+  "@scm-manager/ui-tests",
+  "@scm-manager/ui-types",
+  "@types/i18next",
+  "@types/jest",
+  "@types/react-redux",
+  "jest",
+  "@scm-manager/babel-preset",
+  "@scm-manager/eslint-config",
+  "@scm-manager/prettier-config",
+  "@scm-manager/jest-preset",
+  "@scm-manager/tsconfig",
+  "@types/enzyme",
+  "@types/react",
+  "@types/react-router-dom",
+  "@types/styled-components",
+  "@types/classnames"
+]
diff --git a/scm-ui/ui-shortcuts/package.json b/scm-ui/ui-shortcuts/package.json
index 00a00fa379..1c4bb1c960 100644
--- a/scm-ui/ui-shortcuts/package.json
+++ b/scm-ui/ui-shortcuts/package.json
@@ -8,13 +8,15 @@
     "depcheck": "depcheck"
   },
   "peerDependencies": {
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/tsconfig": "^2.13.0",
     "react": "^17.0.1",
     "mousetrap": "1.6.5",
     "react-i18next": "11"
   },
+  "devDependencies": {
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/tsconfig": "^2.13.0"
+  },
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT"
   },
diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json
index 308f89bb92..08d5694cd1 100644
--- a/scm-ui/ui-styles/package.json
+++ b/scm-ui/ui-styles/package.json
@@ -9,21 +9,23 @@
     "serve": "webpack serve",
     "depcheck": "depcheck"
   },
-  "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.11.2",
-    "bulma": "https://github.com/scm-manager/bulma#3ae8dbdd13196d472ab5fbec543d0c649c149e5a",
-    "bulma-popover": "^1.0.0"
-  },
-  "peerDependencies": {
+  "devDependencies": {
     "@scm-manager/eslint-config": "^2.17.0",
     "@scm-manager/prettier-config": "^2.12.0",
-    "react-diff-view": "^2.4.10",
     "css-loader": "^6.5.0",
     "html-webpack-plugin": "^5.5.0",
     "sass-loader": "^12.3.0",
     "style-loader": "^3.3.1",
     "webpack": "^5.72.0"
   },
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.11.2",
+    "bulma": "https://github.com/scm-manager/bulma#3ae8dbdd13196d472ab5fbec543d0c649c149e5a",
+    "bulma-popover": "^1.0.0"
+  },
+  "peerDependencies": {
+    "react-diff-view": "^2.4.10"
+  },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
     "extends": "@scm-manager/eslint-config"
diff --git a/scm-ui/ui-syntaxhighlighting/package.json b/scm-ui/ui-syntaxhighlighting/package.json
index a2c76acfe8..19a0b0f708 100644
--- a/scm-ui/ui-syntaxhighlighting/package.json
+++ b/scm-ui/ui-syntaxhighlighting/package.json
@@ -18,6 +18,12 @@
     "refractor": "^4.5.0"
   },
   "peerDependencies": {
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "react-diff-view": "^2.4.10"
+  },
+  "devDependencies": {
+    "decode-named-character-reference": "^1.0.1",
     "@scm-manager/babel-preset": "^2.13.1",
     "@scm-manager/eslint-config": "^2.17.0",
     "@scm-manager/jest-preset": "^2.14.1",
@@ -27,12 +33,6 @@
     "@storybook/builder-webpack5": "^6.5.10",
     "@storybook/manager-webpack5": "^6.5.10",
     "@storybook/react": "^6.5.10",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-diff-view": "^2.4.10",
-    "decode-named-character-reference": "^1.0.1"
-  },
-  "devDependencies": {
     "@types/hast": "^2.3.1",
     "depcheck": "^1.4.3"
   },
diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json
index 8d8342033e..b94a9ec6ee 100644
--- a/scm-ui/ui-tests/package.json
+++ b/scm-ui/ui-tests/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@wojtekmaj/enzyme-adapter-react-17": "^0.7.0",
+    "enzyme": "^3.11.0",
     "enzyme-context": "^1.1.2",
     "enzyme-context-react-router-4": "^2.0.0",
     "raf": "^3.4.1"
@@ -18,7 +19,6 @@
   "peerDependencies": {
     "@scm-manager/tsconfig": "^2.13.0",
     "@scm-manager/prettier-config": "^2.12.0",
-    "enzyme": "^3.11.0",
     "@types/enzyme": "^3.10.18"
   },
   "prettier": "@scm-manager/prettier-config",
diff --git a/scm-ui/ui-text/package.json b/scm-ui/ui-text/package.json
index 3c99db75c7..f23771c079 100644
--- a/scm-ui/ui-text/package.json
+++ b/scm-ui/ui-text/package.json
@@ -7,14 +7,16 @@
     "depcheck": "depcheck"
   },
   "peerDependencies": {
-    "@scm-manager/eslint-config": "^2.17.0",
-    "@scm-manager/prettier-config": "^2.12.0",
-    "@scm-manager/tsconfig": "^2.13.0",
     "react": "^17.0.1"
   },
   "dependencies": {
     "@scm-manager/ui-core": "3.5.1-SNAPSHOT"
   },
+  "devDependencies": {
+    "@scm-manager/eslint-config": "^2.17.0",
+    "@scm-manager/prettier-config": "^2.12.0",
+    "@scm-manager/tsconfig": "^2.13.0"
+  },
   "prettier": "@scm-manager/prettier-config",
   "eslintConfig": {
     "extends": "@scm-manager/eslint-config"
diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json
index 2e2af71ef0..685b72d3c5 100644
--- a/scm-ui/ui-types/package.json
+++ b/scm-ui/ui-types/package.json
@@ -15,7 +15,7 @@
     "lint": "eslint src",
     "depcheck": "depcheck"
   },
-  "peerDependencies": {
+  "devDependencies": {
     "@scm-manager/eslint-config": "^2.17.0",
     "@scm-manager/tsconfig": "^2.13.0",
     "@scm-manager/prettier-config": "^2.12.0"
diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json
index 3dfe37f379..b1a2db6cfc 100644
--- a/scm-ui/ui-webapp/package.json
+++ b/scm-ui/ui-webapp/package.json
@@ -57,7 +57,6 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/styled-components": "^5.1.25",
     "@types/ua-parser-js": "^0.7.36",
-    "fetch-mock": "^7.5.1",
     "react-test-renderer": "^17.0.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
     "webpack-bundle-analyzer": "^4.5.0",
diff --git a/yarn.lock b/yarn.lock
index 8ebd3b9569..0b21a4d8e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3133,7 +3133,7 @@
     unist-util-generated "^1.1.6"
     unist-util-visit "^2.0.3"
 
-"@scm-manager/tsconfig@^2.13.0":
+"@scm-manager/tsconfig@^2.12.0", "@scm-manager/tsconfig@^2.13.0":
   version "2.13.0"
   resolved "https://registry.npmjs.org/@scm-manager/tsconfig/-/tsconfig-2.13.0.tgz"
   integrity sha512-Tc9LZAxHUKd+yVBHcCMyRVYTBjhJez+zj+ABxiTOdZOQp/WtJ2Zt084HWxWEOyrXHI6dgo3qv+1H6P1m+UcpoQ==